diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS
index 2ef607d0ff..98a7022088 100644
--- a/third_party/nixpkgs/.github/CODEOWNERS
+++ b/third_party/nixpkgs/.github/CODEOWNERS
@@ -196,6 +196,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/nixos/tests/kea.nix @mweinelt
/nixos/tests/knot.nix @mweinelt
+# Web servers
+/doc/builders/packages/nginx.section.md @raitobezarius
+/pkgs/servers/http/nginx/ @raitobezarius
+/nixos/modules/services/web-servers/nginx/ @raitobezarius
+
# Dhall
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry
@@ -226,11 +231,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# VsCode Extensions
/pkgs/applications/editors/vscode/extensions @jonringer
-# Prometheus exporter modules and tests
-/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
-/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz
-/nixos/tests/prometheus-exporters.nix @WilliButz
-
# PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @aanderse @drupol @etu @globin @ma27 @talyz
/nixos/tests/php @aanderse @drupol @etu @globin @ma27 @talyz
@@ -308,3 +308,6 @@ nixos/lib/make-single-disk-zfs-image.nix @raitobezarius
nixos/lib/make-multi-disk-zfs-image.nix @raitobezarius
nixos/modules/tasks/filesystems/zfs.nix @raitobezarius
nixos/tests/zfs.nix @raitobezarius
+
+# Linux Kernel
+pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs
diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
index b2ec787313..4517080bb3 100644
--- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
+++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,11 @@
-###### Description of changes
+## Description of changes
-###### Things done
+## Things done
diff --git a/third_party/nixpkgs/.gitignore b/third_party/nixpkgs/.gitignore
index b1018d44b8..b23460ec91 100644
--- a/third_party/nixpkgs/.gitignore
+++ b/third_party/nixpkgs/.gitignore
@@ -9,6 +9,7 @@
outputs/
result-*
result
+repl-result-*
!pkgs/development/python-modules/result
/doc/NEWS.html
/doc/NEWS.txt
diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/builders/packages/ibus.section.md
index ec78cd0c9a..4eb74c0b69 100644
--- a/third_party/nixpkgs/doc/builders/packages/ibus.section.md
+++ b/third_party/nixpkgs/doc/builders/packages/ibus.section.md
@@ -34,5 +34,7 @@ The `ibus-engines.typing-booster` package contains a program named `emoji-picker
On NixOS, it can be installed using the following expression:
```nix
-{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
+{ pkgs, ... }: {
+ fonts.packages = with pkgs; [ noto-fonts-emoji ];
+}
```
diff --git a/third_party/nixpkgs/doc/common.nix b/third_party/nixpkgs/doc/common.nix
new file mode 100644
index 0000000000..56f723eb6b
--- /dev/null
+++ b/third_party/nixpkgs/doc/common.nix
@@ -0,0 +1,4 @@
+{
+ outputPath = "share/doc/nixpkgs";
+ indexPath = "manual.html";
+}
diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md
index 03cd3dd458..eb9932d48b 100644
--- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md
+++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md
@@ -456,7 +456,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these
owner = "NixOS";
repo = "nix";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";
+ hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";
}
```
diff --git a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md
index a732eee4b9..557473555f 100644
--- a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md
+++ b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md
@@ -1,28 +1,24 @@
# Contributing to this documentation {#chap-contributing}
-The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup).
+The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository.
-You can quickly check your edits with `make`:
+You can quickly check your edits with `nix-build`:
```ShellSession
-$ cd /path/to/nixpkgs/doc
-$ nix-shell
-[nix-shell]$ make
-```
-
-If you experience problems, run `make debug` to help understand the docbook errors.
-
-After making modifications to the manual, it's important to build it before committing. You can do that as follows:
-
-```ShellSession
-$ cd /path/to/nixpkgs/doc
-$ nix-shell
-[nix-shell]$ make clean
-[nix-shell]$ nix-build .
+$ cd /path/to/nixpkgs
+$ nix-build doc
```
If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
+## devmode {#sec-contributing-devmode}
+
+The shell in the manual source directory makes available a command, `devmode`.
+It is a daemon, that:
+1. watches the manual's source for changes and when they occur — rebuilds
+2. HTTP serves the manual, injecting a script that triggers reload on changes
+3. opens the manual in the default browser
+
## Syntax {#sec-contributing-markup}
As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect.
@@ -114,5 +110,3 @@ Additional syntax extensions are available, all of which can be used in NixOS op
>
> watermelon
> : green fruit with red flesh
-
-For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/).
diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix
index 8efa406ec1..f4270ae856 100644
--- a/third_party/nixpkgs/doc/default.nix
+++ b/third_party/nixpkgs/doc/default.nix
@@ -3,6 +3,8 @@ let
inherit (pkgs) lib;
inherit (lib) hasPrefix removePrefix;
+ common = import ./common.nix;
+
lib-docs = import ./doc-support/lib-function-docs.nix {
inherit pkgs nixpkgs;
libsets = [
@@ -132,15 +134,15 @@ in pkgs.stdenv.mkDerivation {
'';
installPhase = ''
- dest="$out/share/doc/nixpkgs"
+ dest="$out/${common.outputPath}"
mkdir -p "$(dirname "$dest")"
mv out "$dest"
- mv "$dest/index.html" "$dest/manual.html"
+ mv "$dest/index.html" "$dest/${common.indexPath}"
cp ${epub} "$dest/nixpkgs-manual.epub"
mkdir -p $out/nix-support/
- echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
+ echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products
echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
'';
}
diff --git a/third_party/nixpkgs/doc/hooks/index.md b/third_party/nixpkgs/doc/hooks/index.md
index c1e86a3033..602febaf9d 100644
--- a/third_party/nixpkgs/doc/hooks/index.md
+++ b/third_party/nixpkgs/doc/hooks/index.md
@@ -29,5 +29,6 @@ tetex-tex-live.section.md
unzip.section.md
validatePkgConfig.section.md
waf.section.md
+zig.section.md
xcbuild.section.md
```
diff --git a/third_party/nixpkgs/doc/hooks/zig.section.md b/third_party/nixpkgs/doc/hooks/zig.section.md
new file mode 100644
index 0000000000..78b8262f47
--- /dev/null
+++ b/third_party/nixpkgs/doc/hooks/zig.section.md
@@ -0,0 +1,59 @@
+# zigHook {#zighook}
+
+[Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software.
+
+In Nixpkgs, `zigHook` overrides the default build, check and install phases.
+
+## Example code snippet {#example-code-snippet}
+
+```nix
+{ lib
+, stdenv
+, zigHook
+}:
+
+stdenv.mkDerivation {
+ # . . .
+
+ nativeBuildInputs = [
+ zigHook
+ ];
+
+ zigBuildFlags = [ "-Dman-pages=true" ];
+
+ dontUseZigCheck = true;
+
+ # . . .
+}
+```
+
+## Variables controlling zigHook {#variables-controlling-zighook}
+
+### `dontUseZigBuild` {#dontUseZigBuild}
+
+Disables using `zigBuildPhase`.
+
+### `zigBuildFlags` {#zigBuildFlags}
+
+Controls the flags passed to the build phase.
+
+### `dontUseZigCheck` {#dontUseZigCheck}
+
+Disables using `zigCheckPhase`.
+
+### `zigCheckFlags` {#zigCheckFlags}
+
+Controls the flags passed to the check phase.
+
+### `dontUseZigInstall` {#dontUseZigInstall}
+
+Disables using `zigInstallPhase`.
+
+### `zigInstallFlags` {#zigInstallFlags}
+
+Controls the flags passed to the install phase.
+
+### Variables honored by zigHook {#variablesHonoredByZigHook}
+
+- `prefixKey`
+- `dontAddPrefix`
diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md
index 6b19e02e74..b7f1f19546 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md
@@ -12,8 +12,11 @@ compatible are available as well. For example, there can be a
To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional
```nix
-cudaSupport ? false
-cudaPackages ? {}
+{ config
+, cudaSupport ? config.cudaSupport
+, cudaPackages ? { }
+, ...
+}:
```
When using `callPackage`, you can choose to pass in a different variant, e.g.
diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md
index cf18084142..7fd38a7d21 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md
@@ -20,7 +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-dependent `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.
+- `modPostBuild`: Shell commands to run after the build of the goModules 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 {
@@ -115,7 +115,7 @@ done
## Attributes used by the builders {#ssec-go-common-attributes}
-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:
+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/` goModules fixed output derivation as well:
- [`sourceRoot`](#var-stdenv-sourceRoot)
- [`prePatch`](#var-stdenv-prePatch)
diff --git a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md
index 3b5e2e14ee..7e287a097c 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md
@@ -4,6 +4,87 @@ Maven is a well-known build tool for the Java ecosystem however it has some chal
The following provides a list of common patterns with how to package a Maven project (or any JVM language that can export to Maven) as a Nix package.
+## Building a package using `maven.buildMavenPackage` {#maven-buildmavenpackage}
+
+Consider the following package:
+
+```nix
+{ lib, fetchFromGitHub, jre, makeWrapper, maven }:
+
+maven.buildMavenPackage rec {
+ pname = "jd-cli";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "intoolswetrust";
+ repo = pname;
+ rev = "${pname}-${version}";
+ hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
+ };
+
+ mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo=";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/jd-cli
+ install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli
+
+ makeWrapper ${jre}/bin/java $out/bin/jd-cli \
+ --add-flags "-jar $out/share/jd-cli/jd-cli.jar"
+ '';
+
+ meta = with lib; {
+ description = "Simple command line wrapper around JD Core Java Decompiler project";
+ homepage = "https://github.com/intoolswetrust/jd-cli";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ majiir ];
+ };
+}:
+```
+
+This package calls `maven.buildMavenPackage` to do its work. The primary difference from `stdenv.mkDerivation` is the `mvnHash` variable, which is a hash of all of the Maven dependencies.
+
+::: {.tip}
+After setting `maven.buildMavenPackage`, we then do standard Java `.jar` installation by saving the `.jar` to `$out/share/java` and then making a wrapper which allows executing that file; see [](#sec-language-java) for additional generic information about packaging Java applications.
+:::
+
+### Stable Maven plugins {#stable-maven-plugins}
+
+Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash.
+
+When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will simply be built on the derivation of old plugins, and fail because the requested plugins are missing.
+
+This clearly prevents automatic upgrades of Maven: a manual effort must be made throughout nixpkgs by any maintainer wishing to push the upgrades.
+
+To make sure that your package does not add extra manual effort when upgrading Maven, explicitly define versions for all plugins. You can check if this is the case by adding the following plugin to your (parent) POM:
+
+```xml
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ 3.3.0
+
+
+ enforce-plugin-versions
+
+ enforce
+
+
+
+
+
+
+
+
+
+```
+
+## Manually using `mvn2nix` {#maven-mvn2nix}
+::: {.warning}
+This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way.
+:::
+
For the purposes of this example let's consider a very basic Maven project with the following `pom.xml` with a single dependency on [emoji-java](https://github.com/vdurmont/emoji-java).
```xml
@@ -41,14 +122,11 @@ public class Main {
}
```
-You find this demo project at https://github.com/fzakaria/nixos-maven-example
+You find this demo project at [https://github.com/fzakaria/nixos-maven-example](https://github.com/fzakaria/nixos-maven-example).
-## Solving for dependencies {#solving-for-dependencies}
-
-### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin}
-
-> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while.
+### Solving for dependencies {#solving-for-dependencies}
+#### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin}
`buildMaven` is an alternative method that tries to follow similar patterns of other programming languages by generating a lock file. It relies on the maven plugin [mvn2nix-maven-plugin](https://github.com/NixOS/mvn2nix-maven-plugin).
First you generate a `project-info.json` file using the maven plugin.
@@ -105,9 +183,10 @@ The benefit over the _double invocation_ as we will see below, is that the _/nix
│ ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar
```
-### Double Invocation {#double-invocation}
-
-> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing.
+#### Double Invocation {#double-invocation}
+::: {.note}
+This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing.
+:::
The double invocation is a _simple_ way to get around the problem that `nix-build` may be sandboxed and have no Internet connectivity.
@@ -115,7 +194,9 @@ It treats the entire Maven repository as a single source to be downloaded, relyi
The first step will be to build the Maven project as a fixed-output derivation in order to collect the Maven repository -- below is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/double-invocation-repository.nix).
-> Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.
+::: {.note}
+Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory.
+:::
```nix
{ lib, stdenv, maven }:
@@ -147,7 +228,9 @@ stdenv.mkDerivation {
The build will fail, and tell you the expected `outputHash` to place. When you've set the hash, the build will return with a `/nix/store` entry whose contents are the full Maven repository.
-> Some additional files are deleted that would cause the output hash to change potentially on subsequent runs.
+::: {.warning}
+Some additional files are deleted that would cause the output hash to change potentially on subsequent runs.
+:::
```bash
❯ tree $(nix-build --no-out-link double-invocation-repository.nix) | head
@@ -165,40 +248,7 @@ The build will fail, and tell you the expected `outputHash` to place. When you'v
If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`.
-#### Stable Maven plugins {#stable-maven-plugins}
-
-Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`.
-If your project does not override these versions, an upgrade of Maven will change the version of the used plugins.
-This changes the output of the first invocation and the plugins required by the second invocation.
-However, since a hash is given for the output of the first invocation, the second invocation will simply fail
-because the requested plugins are missing.
-This will prevent automatic upgrades of Maven: the manual fix for this is to change the hash of the first invocation.
-
-To make sure that your package does not add manual effort when upgrading Maven, explicitly define versions for all
-plugins. You can check if this is the case by adding the following plugin to your (parent) POM:
-
-```xml
-
- org.apache.maven.plugins
- maven-enforcer-plugin
- 3.3.0
-
-
- enforce-plugin-versions
-
- enforce
-
-
-
-
-
-
-
-
-
-```
-
-## Building a JAR {#building-a-jar}
+### Building a JAR {#building-a-jar}
Regardless of which strategy is chosen above, the step to build the derivation is the same.
@@ -224,7 +274,9 @@ in stdenv.mkDerivation rec {
}
```
-> We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment.
+::: {.tip}
+We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment.
+:::
```bash
❯ tree $(nix-build --no-out-link build-jar.nix)
@@ -236,7 +288,7 @@ in stdenv.mkDerivation rec {
2 directories, 1 file
```
-## Runnable JAR {#runnable-jar}
+### Runnable JAR {#runnable-jar}
The previous example builds a `jar` file but that's not a file one can run.
@@ -248,9 +300,9 @@ We will use the same repository we built above (either _double invocation_ or _b
The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach.
-### CLASSPATH {#classpath}
+#### CLASSPATH {#classpath}
-> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`.
+This method is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`.
We will read the Maven repository and flatten it to a single list. This list will then be concatenated with the _CLASSPATH_ separator to create the full classpath.
@@ -288,9 +340,9 @@ in stdenv.mkDerivation rec {
}
```
-### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin}
+#### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin}
-> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it.
+This method is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it.
Augment the `pom.xml` to create a JAR with the following manifest:
@@ -366,8 +418,9 @@ in stdenv.mkDerivation rec {
'';
}
```
-
-> Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application.
+::: {.note}
+Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application.
+:::
This will give you an executable shell-script that launches your JAR with all the dependencies available.
diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
index 23c8526787..947ce60286 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
@@ -1514,11 +1514,11 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in
### Tools {#tools}
-Packages inside nixpkgs are written by hand. However many tools exist in
-community to help save time. No tool is preferred at the moment.
+Packages inside nixpkgs must use the `buildPythonPackage` or `buildPythonApplication` function directly,
+because we can only provide security support for non-vendored dependencies.
-- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools)
-- [poetry2nix](https://github.com/nix-community/poetry2nix)
+We recommend [nix-init](https://github.com/nix-community/nix-init) for creating new python packages within nixpkgs,
+as it already prefetches the source, parses dependencies for common formats and prefills most things in `meta`.
### Deterministic builds {#deterministic-builds}
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
index 7d46bdbd4d..0873802644 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
description = "A fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = licenses.unlicense;
- maintainers = [ maintainers.tailhook ];
+ maintainers = [];
};
}
```
@@ -558,7 +558,7 @@ buildPythonPackage rec {
hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY=";
};
- sourceRoot = "source/bindings/python";
+ sourceRoot = "${src.name}/bindings/python";
nativeBuildInputs = [
cargo
@@ -926,7 +926,7 @@ rustPlatform.buildRustPackage rec {
description = "A fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = with licenses; [ mit unlicense ];
- maintainers = with maintainers; [ tailhook ];
+ maintainers = with maintainers; [];
};
}
```
diff --git a/third_party/nixpkgs/doc/shell.nix b/third_party/nixpkgs/doc/shell.nix
new file mode 100644
index 0000000000..d71e3f3a70
--- /dev/null
+++ b/third_party/nixpkgs/doc/shell.nix
@@ -0,0 +1,20 @@
+let
+ pkgs = import ../. {
+ config = {};
+ overlays = [];
+ };
+
+ common = import ./common.nix;
+ inherit (common) outputPath indexPath;
+
+ web-devmode = import ../pkgs/tools/nix/web-devmode.nix {
+ inherit pkgs;
+ buildArgs = "./.";
+ open = "/${outputPath}/${indexPath}";
+ };
+in
+ pkgs.mkShell {
+ packages = [
+ web-devmode
+ ];
+ }
diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md
index e626e79429..f6da0bb84b 100644
--- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md
@@ -70,7 +70,7 @@ A list of the maintainers of this Nix expression. Maintainers are defined in [`n
### `mainProgram` {#var-meta-mainProgram}
-The name of the main binary for the package. This affects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"`
+The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"`
### `priority` {#var-meta-priority}
diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
index a0f81b97f6..4e8559467f 100644
--- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
@@ -614,14 +614,19 @@ The list of source files or directories to be unpacked or copied. One of these m
##### `sourceRoot` {#var-stdenv-sourceRoot}
-After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself.
+After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it.
-By default the `sourceRoot` is set to `"source"`. If you want to point to a sub-directory inside your project, you therefore need to set `sourceRoot = "source/my-sub-directory"`.
+If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory.
+You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase.
+
+For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`.
##### `setSourceRoot` {#var-stdenv-setSourceRoot}
Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`.
+For example, if you are using `fetchurl` on an archive file that gets unpacked into a single directory the name of which changes between package versions, and you want your build to start in its sub-directory, you need to set `setSourceRoot = "sourceRoot=$(echo */my-sub-directory)";`, or in the case of multiple sources, you could use something more specific, like `setSourceRoot = "sourceRoot=$(echo ${pname}-*/my-sub-directory)";`.
+
##### `preUnpack` {#var-stdenv-preUnpack}
Hook executed at the start of the unpack phase.
diff --git a/third_party/nixpkgs/lib/README.md b/third_party/nixpkgs/lib/README.md
new file mode 100644
index 0000000000..ac7cbd4330
--- /dev/null
+++ b/third_party/nixpkgs/lib/README.md
@@ -0,0 +1,73 @@
+# Nixpkgs lib
+
+This directory contains the implementation, documentation and tests for the Nixpkgs `lib` library.
+
+## Overview
+
+The evaluation entry point for `lib` is [`default.nix`](default.nix).
+This file evaluates to an attribute set containing two separate kinds of attributes:
+- Sub-libraries:
+ Attribute sets grouping together similar functionality.
+ Each sub-library is defined in a separate file usually matching its attribute name.
+
+ Example: `lib.lists` is a sub-library containing list-related functionality such as `lib.lists.take` and `lib.lists.imap0`.
+ These are defined in the file [`lists.nix`](lists.nix).
+
+- Aliases:
+ Attributes that point to an attribute of the same name in some sub-library.
+
+ Example: `lib.take` is an alias for `lib.lists.take`.
+
+Most files in this directory are definitions of sub-libraries, but there are a few others:
+- [`minver.nix`](minver.nix): A string of the minimum version of Nix that is required to evaluate Nixpkgs.
+- [`tests`](tests): Tests, see [Running tests](#running-tests)
+ - [`release.nix`](tests/release.nix): A derivation aggregating all tests
+ - [`misc.nix`](tests/misc.nix): Evaluation unit tests for most sub-libraries
+ - `*.sh`: Bash scripts that run tests for specific sub-libraries
+ - All other files in this directory exist to support the tests
+- [`systems`](systems): The `lib.systems` sub-library, structured into a directory instead of a file due to its complexity
+- [`path`](path): The `lib.path` sub-library, which includes tests as well as a document describing the design goals of `lib.path`
+- All other files in this directory are sub-libraries
+
+### Module system
+
+The [module system](https://nixos.org/manual/nixpkgs/#module-system) spans multiple sub-libraries:
+- [`modules.nix`](modules.nix): `lib.modules` for the core functions and anything not relating to option definitions
+- [`options.nix`](options.nix): `lib.options` for anything relating to option definitions
+- [`types.nix`](types.nix): `lib.types` for module system types
+
+## Reference documentation
+
+Reference documentation for library functions is written above each function as a multi-line comment.
+These comments are processed using [nixdoc](https://github.com/nix-community/nixdoc) and [rendered in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-functions).
+The nixdoc README describes the [comment format](https://github.com/nix-community/nixdoc#comment-format).
+
+See the [chapter on contributing to the Nixpkgs manual](https://nixos.org/manual/nixpkgs/#chap-contributing) for how to build the manual.
+
+## Running tests
+
+All library tests can be run by building the derivation in [`tests/release.nix`](tests/release.nix):
+
+```bash
+nix-build tests/release.nix
+```
+
+Some commands for quicker iteration over parts of the test suite are also available:
+
+```bash
+# Run all evaluation unit tests in tests/misc.nix
+# if the resulting list is empty, all tests passed
+nix-instantiate --eval --strict tests/misc.nix
+
+# Run the module system tests
+tests/modules.sh
+
+# Run the lib.sources tests
+tests/sources.sh
+
+# Run the lib.filesystem tests
+tests/filesystem.sh
+
+# Run the lib.path property tests
+path/tests/prop.sh
+```
diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix
index 0335146e2a..77e36d3271 100644
--- a/third_party/nixpkgs/lib/attrsets.nix
+++ b/third_party/nixpkgs/lib/attrsets.nix
@@ -738,6 +738,42 @@ rec {
sets:
zipAttrsWith (name: values: values) sets;
+ /*
+ Merge a list of attribute sets together using the `//` operator.
+ In case of duplicate attributes, values from later list elements take precedence over earlier ones.
+ The result is the same as `foldl mergeAttrs { }`, but the performance is better for large inputs.
+ For n list elements, each with an attribute set containing m unique attributes, the complexity of this operation is O(nm log n).
+
+ Type:
+ mergeAttrsList :: [ Attrs ] -> Attrs
+
+ Example:
+ mergeAttrsList [ { a = 0; b = 1; } { c = 2; d = 3; } ]
+ => { a = 0; b = 1; c = 2; d = 3; }
+ mergeAttrsList [ { a = 0; } { a = 1; } ]
+ => { a = 1; }
+ */
+ mergeAttrsList = list:
+ let
+ # `binaryMerge start end` merges the elements at indices `index` of `list` such that `start <= index < end`
+ # Type: Int -> Int -> Attrs
+ binaryMerge = start: end:
+ # assert start < end; # Invariant
+ if end - start >= 2 then
+ # If there's at least 2 elements, split the range in two, recurse on each part and merge the result
+ # The invariant is satisfied because each half will have at least 1 element
+ binaryMerge start (start + (end - start) / 2)
+ // binaryMerge (start + (end - start) / 2) end
+ else
+ # Otherwise there will be exactly 1 element due to the invariant, in which case we just return it directly
+ elemAt list start;
+ in
+ if list == [ ] then
+ # Calling binaryMerge as below would not satisfy its invariant
+ { }
+ else
+ binaryMerge 0 (length list);
+
/* Does the same as the update operator '//' except that attributes are
merged until the given predicate is verified. The predicate should
diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix
index a2dddedd2d..c37be1942d 100644
--- a/third_party/nixpkgs/lib/generators.nix
+++ b/third_party/nixpkgs/lib/generators.nix
@@ -81,9 +81,10 @@ rec {
*/
toKeyValue = {
mkKeyValue ? mkKeyValueDefault {} "=",
- listsAsDuplicateKeys ? false
+ listsAsDuplicateKeys ? false,
+ indent ? ""
}:
- let mkLine = k: v: mkKeyValue k v + "\n";
+ let mkLine = k: v: indent + mkKeyValue k v + "\n";
mkLines = if listsAsDuplicateKeys
then k: v: map (mkLine k) (if lib.isList v then v else [v])
else k: v: [ (mkLine k v) ];
diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix
index ee71488263..599e8ee53c 100644
--- a/third_party/nixpkgs/lib/licenses.nix
+++ b/third_party/nixpkgs/lib/licenses.nix
@@ -657,6 +657,13 @@ in mkLicense lset) ({
redistributable = true;
};
+ hl3 = {
+ fullName = "Hippocratic License v3.0";
+ url = "https://firstdonoharm.dev/version/3/0/core.txt";
+ free = false;
+ redistributable = true;
+ };
+
issl = {
fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix
index 5d9af0cf71..3e058b3f1a 100644
--- a/third_party/nixpkgs/lib/lists.nix
+++ b/third_party/nixpkgs/lib/lists.nix
@@ -3,7 +3,7 @@
{ lib }:
let
inherit (lib.strings) toInt;
- inherit (lib.trivial) compare min;
+ inherit (lib.trivial) compare min id;
inherit (lib.attrsets) mapAttrs;
in
rec {
@@ -180,18 +180,18 @@ rec {
else if len != 1 then multiple
else head found;
- /* Find the first element in the list matching the specified
+ /* Find the first index in the list matching the specified
predicate or return `default` if no such element exists.
- Type: findFirst :: (a -> bool) -> a -> [a] -> a
+ Type: findFirstIndex :: (a -> Bool) -> b -> [a] -> (Int | b)
Example:
- findFirst (x: x > 3) 7 [ 1 6 4 ]
- => 6
- findFirst (x: x > 9) 7 [ 1 6 4 ]
- => 7
+ findFirstIndex (x: x > 3) null [ 0 6 4 ]
+ => 1
+ findFirstIndex (x: x > 9) null [ 0 6 4 ]
+ => null
*/
- findFirst =
+ findFirstIndex =
# Predicate
pred:
# Default value to return
@@ -229,7 +229,33 @@ rec {
if resultIndex < 0 then
default
else
- elemAt list resultIndex;
+ resultIndex;
+
+ /* Find the first element in the list matching the specified
+ predicate or return `default` if no such element exists.
+
+ Type: findFirst :: (a -> bool) -> a -> [a] -> a
+
+ Example:
+ findFirst (x: x > 3) 7 [ 1 6 4 ]
+ => 6
+ findFirst (x: x > 9) 7 [ 1 6 4 ]
+ => 7
+ */
+ findFirst =
+ # Predicate
+ pred:
+ # Default value to return
+ default:
+ # Input list
+ list:
+ let
+ index = findFirstIndex pred null list;
+ in
+ if index == null then
+ default
+ else
+ elemAt list index;
/* Return true if function `pred` returns true for at least one
element of `list`.
@@ -637,6 +663,32 @@ rec {
else if start + count > len then len - start
else count);
+ /* The common prefix of two lists.
+
+ Type: commonPrefix :: [a] -> [a] -> [a]
+
+ Example:
+ commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ]
+ => [ 1 2 ]
+ commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ]
+ => [ 1 2 3 ]
+ commonPrefix [ 1 2 3 ] [ 4 5 6 ]
+ => [ ]
+ */
+ commonPrefix =
+ list1:
+ list2:
+ let
+ # Zip the lists together into a list of booleans whether each element matches
+ matchings = zipListsWith (fst: snd: fst != snd) list1 list2;
+ # Find the first index where the elements don't match,
+ # which will then also be the length of the common prefix.
+ # If all elements match, we fall back to the length of the zipped list,
+ # which is the same as the length of the smaller list.
+ commonPrefixLength = findFirstIndex id (length matchings) matchings;
+ in
+ take commonPrefixLength list1;
+
/* Return the last element of a list.
This function throws an error if the list is empty.
diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix
index 5fd55c4e90..21404b3a2b 100644
--- a/third_party/nixpkgs/lib/meta.nix
+++ b/third_party/nixpkgs/lib/meta.nix
@@ -132,10 +132,9 @@ rec {
{ shortName = licstr; }
);
- /* Get the path to the main program of a derivation with either
- meta.mainProgram or pname or name
+ /* Get the path to the main program of a package based on meta.mainProgram
- Type: getExe :: derivation -> string
+ Type: getExe :: package -> string
Example:
getExe pkgs.hello
@@ -144,5 +143,9 @@ rec {
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
*/
getExe = x:
- "${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
+ "${lib.getBin x}/bin/${x.meta.mainProgram or (
+ # This could be turned into an error when 23.05 is at end of life
+ lib.warn "getExe: Package ${lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name} does not have the meta.mainProgram attribute. We'll assume that the main program has the same name for now, but this behavior is deprecated, because it leads to surprising errors when the assumption does not hold. If the package has a main program, please set `meta.mainProgram` in its definition to make this warning go away. Otherwise, if the package does not have a main program, or if you don't control its definition, specify the full path to the program, such as \"\${lib.getBin foo}/bin/bar\"."
+ lib.getName x
+ )}";
}
diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix
index f16df20425..4966619f66 100644
--- a/third_party/nixpkgs/lib/modules.nix
+++ b/third_party/nixpkgs/lib/modules.nix
@@ -639,7 +639,7 @@ let
unmatchedDefns = [];
}
else if optionDecls != [] then
- if all (x: x.options.type.name == "submodule") optionDecls
+ if all (x: x.options.type.name or null == "submodule") optionDecls
# Raw options can only be merged into submodules. Merging into
# attrsets might be nice, but ambiguous. Suppose we have
# attrset as a `attrsOf submodule`. User declares option
diff --git a/third_party/nixpkgs/lib/path/README.md b/third_party/nixpkgs/lib/path/README.md
index 87e552d120..89eec18b11 100644
--- a/third_party/nixpkgs/lib/path/README.md
+++ b/third_party/nixpkgs/lib/path/README.md
@@ -187,6 +187,27 @@ Decision: All functions remove trailing slashes in their results.
+### Prefer returning subpaths over components
+[subpath-preference]: #prefer-returning-subpaths-over-components
+
+Observing: Functions could return subpaths or lists of path component strings.
+
+Considering: Subpaths are used as inputs for some functions. Using them for outputs, too, makes the library more consistent and composable.
+
+Decision: Subpaths should be preferred over list of path component strings.
+
+
+Arguments
+
+- (+) It is consistent with functions accepting subpaths, making the library more composable
+- (-) It is less efficient when the components are needed, because after creating the normalised subpath string, it will have to be parsed into components again
+ - (+) If necessary, we can still make it faster by adding builtins to Nix
+ - (+) Alternatively if necessary, versions of these functions that return components could later still be introduced.
+- (+) It makes the path library simpler because there's only two types (paths and subpaths). Only `lib.path.subpath.components` can be used to get a list of components.
+ And once we have a list of component strings, `lib.lists` and `lib.strings` can be used to operate on them.
+ For completeness, `lib.path.subpath.join` allows converting the list of components back to a subpath.
+
+
## Other implementations and references
- [Rust](https://doc.rust-lang.org/std/path/struct.Path.html)
diff --git a/third_party/nixpkgs/lib/path/default.nix b/third_party/nixpkgs/lib/path/default.nix
index 936e9b0302..5c6c5f6089 100644
--- a/third_party/nixpkgs/lib/path/default.nix
+++ b/third_party/nixpkgs/lib/path/default.nix
@@ -20,6 +20,7 @@ let
concatMap
foldl'
take
+ drop
;
inherit (lib.strings)
@@ -217,9 +218,110 @@ in /* No rec! Add dependencies on this file at the top. */ {
second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"'';
take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components;
+ /*
+ Remove the first path as a component-wise prefix from the second path.
+ The result is a normalised subpath string, see `lib.path.subpath.normalise`.
+
+ Laws:
+
+ - Inverts `append` for normalised subpaths:
+
+ removePrefix p (append p s) == subpath.normalise s
+
+ Type:
+ removePrefix :: Path -> Path -> String
+
+ Example:
+ removePrefix /foo /foo/bar/baz
+ => "./bar/baz"
+ removePrefix /foo /foo
+ => "./."
+ removePrefix /foo/bar /foo
+ =>
+ removePrefix /. /foo
+ => "./foo"
+ */
+ removePrefix =
+ path1:
+ assert assertMsg
+ (isPath path1)
+ "lib.path.removePrefix: First argument is of type ${typeOf path1}, but a path was expected.";
+ let
+ path1Deconstructed = deconstructPath path1;
+ path1Length = length path1Deconstructed.components;
+ in
+ path2:
+ assert assertMsg
+ (isPath path2)
+ "lib.path.removePrefix: Second argument is of type ${typeOf path2}, but a path was expected.";
+ let
+ path2Deconstructed = deconstructPath path2;
+ success = take path1Length path2Deconstructed.components == path1Deconstructed.components;
+ components =
+ if success then
+ drop path1Length path2Deconstructed.components
+ else
+ throw ''
+ lib.path.removePrefix: The first path argument "${toString path1}" is not a component-wise prefix of the second path argument "${toString path2}".'';
+ in
+ assert assertMsg
+ (path1Deconstructed.root == path2Deconstructed.root) ''
+ lib.path.removePrefix: Filesystem roots must be the same for both paths, but paths with different roots were given:
+ first argument: "${toString path1}" with root "${toString path1Deconstructed.root}"
+ second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"'';
+ joinRelPath components;
+
+ /*
+ Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path).
+ The result is an attribute set with these attributes:
+ - `root`: The filesystem root of the path, meaning that this directory has no parent directory.
+ - `subpath`: The [normalised subpath string](#function-library-lib.path.subpath.normalise) that when [appended](#function-library-lib.path.append) to `root` returns the original path.
+
+ Laws:
+ - [Appending](#function-library-lib.path.append) the `root` and `subpath` gives the original path:
+
+ p ==
+ append
+ (splitRoot p).root
+ (splitRoot p).subpath
+
+ - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself:
+
+ dirOf (splitRoot p).root == (splitRoot p).root
+
+ Type:
+ splitRoot :: Path -> { root :: Path, subpath :: String }
+
+ Example:
+ splitRoot /foo/bar
+ => { root = /.; subpath = "./foo/bar"; }
+
+ splitRoot /.
+ => { root = /.; subpath = "./."; }
+
+ # Nix neutralises `..` path components for all path values automatically
+ splitRoot /foo/../bar
+ => { root = /.; subpath = "./bar"; }
+
+ splitRoot "/foo/bar"
+ =>
+ */
+ splitRoot = path:
+ assert assertMsg
+ (isPath path)
+ "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected";
+ let
+ deconstructed = deconstructPath path;
+ in {
+ root = deconstructed.root;
+ subpath = joinRelPath deconstructed.components;
+ };
/* Whether a value is a valid subpath string.
+ A subpath string points to a specific file or directory within an absolute base directory.
+ It is a stricter form of a relative path that excludes `..` components, since those could escape the base directory.
+
- The value is a string
- The string is not empty
@@ -336,6 +438,37 @@ in /* No rec! Add dependencies on this file at the top. */ {
${subpathInvalidReason path}''
) 0 subpaths;
+ /*
+ Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings.
+ Throw an error if the subpath isn't valid.
+ Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise).
+
+ Laws:
+
+ - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise):
+
+ subpath.join (subpath.components s) == subpath.normalise s
+
+ Type:
+ subpath.components :: String -> [ String ]
+
+ Example:
+ subpath.components "."
+ => [ ]
+
+ subpath.components "./foo//bar/./baz/"
+ => [ "foo" "bar" "baz" ]
+
+ subpath.components "/foo"
+ =>
+ */
+ subpath.components =
+ subpath:
+ assert assertMsg (isValid subpath) ''
+ lib.path.subpath.components: Argument is not a valid subpath string:
+ ${subpathInvalidReason subpath}'';
+ splitRelPath subpath;
+
/* Normalise a subpath. Throw an error if the subpath isn't valid, see
`lib.path.subpath.isValid`
diff --git a/third_party/nixpkgs/lib/path/tests/prop.sh b/third_party/nixpkgs/lib/path/tests/prop.sh
index 9fea521577..f321fdf1cf 100755
--- a/third_party/nixpkgs/lib/path/tests/prop.sh
+++ b/third_party/nixpkgs/lib/path/tests/prop.sh
@@ -1,9 +1,12 @@
#!/usr/bin/env bash
-# Property tests for the `lib.path` library
-#
+# Property tests for lib/path/default.nix
# It generates random path-like strings and runs the functions on
# them, checking that the expected laws of the functions hold
+# Run:
+# [nixpkgs]$ lib/path/tests/prop.sh
+# or:
+# [nixpkgs]$ nix-build lib/tests/release.nix
set -euo pipefail
shopt -s inherit_errexit
diff --git a/third_party/nixpkgs/lib/path/tests/unit.nix b/third_party/nixpkgs/lib/path/tests/unit.nix
index 9c5b752cf6..bad6560f13 100644
--- a/third_party/nixpkgs/lib/path/tests/unit.nix
+++ b/third_party/nixpkgs/lib/path/tests/unit.nix
@@ -3,7 +3,7 @@
{ libpath }:
let
lib = import libpath;
- inherit (lib.path) hasPrefix append subpath;
+ inherit (lib.path) hasPrefix removePrefix append splitRoot subpath;
cases = lib.runTests {
# Test examples from the lib.path.append documentation
@@ -57,6 +57,40 @@ let
expected = true;
};
+ testRemovePrefixExample1 = {
+ expr = removePrefix /foo /foo/bar/baz;
+ expected = "./bar/baz";
+ };
+ testRemovePrefixExample2 = {
+ expr = removePrefix /foo /foo;
+ expected = "./.";
+ };
+ testRemovePrefixExample3 = {
+ expr = (builtins.tryEval (removePrefix /foo/bar /foo)).success;
+ expected = false;
+ };
+ testRemovePrefixExample4 = {
+ expr = removePrefix /. /foo;
+ expected = "./foo";
+ };
+
+ testSplitRootExample1 = {
+ expr = splitRoot /foo/bar;
+ expected = { root = /.; subpath = "./foo/bar"; };
+ };
+ testSplitRootExample2 = {
+ expr = splitRoot /.;
+ expected = { root = /.; subpath = "./."; };
+ };
+ testSplitRootExample3 = {
+ expr = splitRoot /foo/../bar;
+ expected = { root = /.; subpath = "./bar"; };
+ };
+ testSplitRootExample4 = {
+ expr = (builtins.tryEval (splitRoot "/foo/bar")).success;
+ expected = false;
+ };
+
# Test examples from the lib.path.subpath.isValid documentation
testSubpathIsValidExample1 = {
expr = subpath.isValid null;
@@ -204,6 +238,19 @@ let
expr = (builtins.tryEval (subpath.normalise "..")).success;
expected = false;
};
+
+ testSubpathComponentsExample1 = {
+ expr = subpath.components ".";
+ expected = [ ];
+ };
+ testSubpathComponentsExample2 = {
+ expr = subpath.components "./foo//bar/./baz/";
+ expected = [ "foo" "bar" "baz" ];
+ };
+ testSubpathComponentsExample3 = {
+ expr = (builtins.tryEval (subpath.components "/foo")).success;
+ expected = false;
+ };
};
in
if cases == [] then "Unit tests successful"
diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix
index a3462d2d42..40a2c88f32 100644
--- a/third_party/nixpkgs/lib/systems/default.nix
+++ b/third_party/nixpkgs/lib/systems/default.nix
@@ -85,17 +85,18 @@ rec {
# is why we use the more obscure "bfd" and not "binutils" for this
# choice.
else "bfd";
- extensions = rec {
- sharedLibrary = assert final.hasSharedLibraries;
- /**/ if final.isDarwin then ".dylib"
+ extensions = lib.optionalAttrs final.hasSharedLibraries {
+ sharedLibrary =
+ if final.isDarwin then ".dylib"
else if final.isWindows then ".dll"
else ".so";
+ } // {
staticLibrary =
/**/ if final.isWindows then ".lib"
else ".a";
library =
- /**/ if final.isStatic then staticLibrary
- else sharedLibrary;
+ /**/ if final.isStatic then final.extensions.staticLibrary
+ else final.extensions.sharedLibrary;
executable =
/**/ if final.isWindows then ".exe"
else "";
diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix
index 0b6a9f3891..d2e8f77bec 100644
--- a/third_party/nixpkgs/lib/systems/platforms.nix
+++ b/third_party/nixpkgs/lib/systems/platforms.nix
@@ -213,7 +213,6 @@ rec {
bluefield2 = {
gcc = {
arch = "armv8-a+fp+simd+crc+crypto";
- cpu = "cortex-a72";
};
};
diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix
index ce980436c1..887ea39a08 100644
--- a/third_party/nixpkgs/lib/tests/misc.nix
+++ b/third_party/nixpkgs/lib/tests/misc.nix
@@ -1,6 +1,18 @@
-# to run these tests:
-# nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix
-# if the resulting list is empty, all tests passed
+/*
+Nix evaluation tests for various lib functions.
+
+Since these tests are implemented with Nix evaluation, error checking is limited to what `builtins.tryEval` can detect, which is `throw`'s and `abort`'s, without error messages.
+If you need to test error messages or more complex evaluations, see ./modules.sh, ./sources.sh or ./filesystem.sh as examples.
+
+To run these tests:
+
+ [nixpkgs]$ nix-instantiate --eval --strict lib/tests/misc.nix
+
+If the resulting list is empty, all tests passed.
+Alternatively, to run all `lib` tests:
+
+ [nixpkgs]$ nix-build lib/tests/release.nix
+*/
with import ../default.nix;
let
@@ -488,6 +500,39 @@ runTests {
expected = { a = [ 2 3 ]; b = [7]; c = [8];};
};
+ testListCommonPrefixExample1 = {
+ expr = lists.commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ];
+ expected = [ 1 2 ];
+ };
+ testListCommonPrefixExample2 = {
+ expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ];
+ expected = [ 1 2 3 ];
+ };
+ testListCommonPrefixExample3 = {
+ expr = lists.commonPrefix [ 1 2 3 ] [ 4 5 6 ];
+ expected = [ ];
+ };
+ testListCommonPrefixEmpty = {
+ expr = lists.commonPrefix [ ] [ 1 2 3 ];
+ expected = [ ];
+ };
+ testListCommonPrefixSame = {
+ expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 ];
+ expected = [ 1 2 3 ];
+ };
+ testListCommonPrefixLazy = {
+ expr = lists.commonPrefix [ 1 ] [ 1 (abort "lib.lists.commonPrefix shouldn't evaluate this")];
+ expected = [ 1 ];
+ };
+ # This would stack overflow if `commonPrefix` were implemented using recursion
+ testListCommonPrefixLong =
+ let
+ longList = genList (n: n) 100000;
+ in {
+ expr = lists.commonPrefix longList longList;
+ expected = longList;
+ };
+
testSort = {
expr = sort builtins.lessThan [ 40 2 30 42 ];
expected = [2 30 40 42];
@@ -518,45 +563,55 @@ runTests {
expected = false;
};
- testFindFirstExample1 = {
- expr = findFirst (x: x > 3) 7 [ 1 6 4 ];
- expected = 6;
+ testFindFirstIndexExample1 = {
+ expr = lists.findFirstIndex (x: x > 3) (abort "index found, so a default must not be evaluated") [ 1 6 4 ];
+ expected = 1;
};
- testFindFirstExample2 = {
- expr = findFirst (x: x > 9) 7 [ 1 6 4 ];
- expected = 7;
+ testFindFirstIndexExample2 = {
+ expr = lists.findFirstIndex (x: x > 9) "a very specific default" [ 1 6 4 ];
+ expected = "a very specific default";
};
- testFindFirstEmpty = {
- expr = findFirst (abort "when the list is empty, the predicate is not needed") null [];
+ testFindFirstIndexEmpty = {
+ expr = lists.findFirstIndex (abort "when the list is empty, the predicate is not needed") null [];
expected = null;
};
- testFindFirstSingleMatch = {
- expr = findFirst (x: x == 5) null [ 5 ];
- expected = 5;
+ testFindFirstIndexSingleMatch = {
+ expr = lists.findFirstIndex (x: x == 5) null [ 5 ];
+ expected = 0;
};
- testFindFirstSingleDefault = {
- expr = findFirst (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ];
+ testFindFirstIndexSingleDefault = {
+ expr = lists.findFirstIndex (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ];
expected = null;
};
- testFindFirstNone = {
- expr = builtins.tryEval (findFirst (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]);
+ testFindFirstIndexNone = {
+ expr = builtins.tryEval (lists.findFirstIndex (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]);
expected = { success = false; value = false; };
};
# Makes sure that the implementation doesn't cause a stack overflow
- testFindFirstBig = {
- expr = findFirst (x: x == 1000000) null (range 0 1000000);
+ testFindFirstIndexBig = {
+ expr = lists.findFirstIndex (x: x == 1000000) null (range 0 1000000);
expected = 1000000;
};
- testFindFirstLazy = {
- expr = findFirst (x: x == 1) 7 [ 1 (abort "list elements after the match must not be evaluated") ];
- expected = 1;
+ testFindFirstIndexLazy = {
+ expr = lists.findFirstIndex (x: x == 1) null [ 1 (abort "list elements after the match must not be evaluated") ];
+ expected = 0;
+ };
+
+ testFindFirstExample1 = {
+ expr = lists.findFirst (x: x > 3) 7 [ 1 6 4 ];
+ expected = 6;
+ };
+
+ testFindFirstExample2 = {
+ expr = lists.findFirst (x: x > 9) 7 [ 1 6 4 ];
+ expected = 7;
};
# ATTRSETS
@@ -609,6 +664,31 @@ runTests {
};
};
+
+ testMergeAttrsListExample1 = {
+ expr = attrsets.mergeAttrsList [ { a = 0; b = 1; } { c = 2; d = 3; } ];
+ expected = { a = 0; b = 1; c = 2; d = 3; };
+ };
+ testMergeAttrsListExample2 = {
+ expr = attrsets.mergeAttrsList [ { a = 0; } { a = 1; } ];
+ expected = { a = 1; };
+ };
+ testMergeAttrsListExampleMany =
+ let
+ list = genList (n:
+ listToAttrs (genList (m:
+ let
+ # Integer divide n by two to create duplicate attributes
+ str = "halfn${toString (n / 2)}m${toString m}";
+ in
+ nameValuePair str str
+ ) 100)
+ ) 100;
+ in {
+ expr = attrsets.mergeAttrsList list;
+ expected = foldl' mergeAttrs { } list;
+ };
+
# code from the example
testRecursiveUpdateUntil = {
expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) {
diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh
index 50f24c09ca..b933a24a57 100755
--- a/third_party/nixpkgs/lib/tests/modules.sh
+++ b/third_party/nixpkgs/lib/tests/modules.sh
@@ -1,7 +1,13 @@
#!/usr/bin/env bash
-#
+
# This script is used to test that the module system is working as expected.
+# Executing it runs tests for `lib.modules`, `lib.options` and `lib.types`.
# By default it test the version of nixpkgs which is defined in the NIX_PATH.
+#
+# Run:
+# [nixpkgs]$ lib/tests/modules.sh
+# or:
+# [nixpkgs]$ nix-build lib/tests/release.nix
set -o errexit -o noclobber -o nounset -o pipefail
shopt -s failglob inherit_errexit
@@ -63,6 +69,28 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix
checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix
+# Check that a module argument is passed, also when a default is available
+# (but not needed)
+#
+# When the default is needed, we currently fail to do what the users expect, as
+# we pass our own argument anyway, even if it *turns out* not to exist.
+#
+# The reason for this is that we don't know at invocation time what is in the
+# _module.args option. That value is only available *after* all modules have been
+# invoked.
+#
+# Hypothetically, Nix could help support this by giving access to the default
+# values, through a new built-in function.
+# However the default values are allowed to depend on other arguments, so those
+# would have to be passed in somehow, making this not just a getter but
+# something more complicated.
+#
+# At that point we have to wonder whether the extra complexity is worth the cost.
+# Another - subjective - reason not to support it is that default values
+# contradict the notion that an option has a single value, where _module.args
+# is the option.
+checkConfigOutput '^true$' config.result ./module-argument-default.nix
+
# types.pathInStore
checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix
@@ -365,6 +393,9 @@ checkConfigError \
config.set \
./declare-set.nix ./declare-enable-nested.nix
+# Check that that merging of option collisions doesn't depend on type being set
+checkConfigError 'The option .group..*would be a parent of the following options, but its type .. does not support nested options.\n\s*- option.s. with prefix .group.enable..*' config.group.enable ./merge-typeless-option.nix
+
# Test that types.optionType merges types correctly
checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix
checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix
diff --git a/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix b/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix
new file mode 100644
index 0000000000..627d90b15d
--- /dev/null
+++ b/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix
@@ -0,0 +1,25 @@
+{ lib, ... }:
+
+let
+ typeless =
+ { lib, ... }:
+
+ {
+ options.group = lib.mkOption { };
+ };
+ childOfTypeless =
+ { lib, ... }:
+
+ {
+ options.group.enable = lib.mkEnableOption "nothing";
+ };
+in
+
+{
+ imports = [
+ typeless
+ childOfTypeless
+ ];
+
+ config.group.enable = false;
+}
diff --git a/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix b/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix
new file mode 100644
index 0000000000..8dbb783e2d
--- /dev/null
+++ b/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix
@@ -0,0 +1,9 @@
+{ a ? false, lib, ... }: {
+ options = {
+ result = lib.mkOption {};
+ };
+ config = {
+ _module.args.a = true;
+ result = a;
+ };
+}
diff --git a/third_party/nixpkgs/lib/tests/sources.sh b/third_party/nixpkgs/lib/tests/sources.sh
index cda77aa96b..079c7eea56 100755
--- a/third_party/nixpkgs/lib/tests/sources.sh
+++ b/third_party/nixpkgs/lib/tests/sources.sh
@@ -1,4 +1,11 @@
#!/usr/bin/env bash
+
+# Tests lib/sources.nix
+# Run:
+# [nixpkgs]$ lib/tests/sources.sh
+# or:
+# [nixpkgs]$ nix-build lib/tests/release.nix
+
set -euo pipefail
shopt -s inherit_errexit
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 5294d2e0e4..8a468301ea 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -418,6 +418,12 @@
githubId = 1250775;
name = "Adolfo E. García Castro";
};
+ adriandole = {
+ email = "adrian@dole.tech";
+ github = "adriandole";
+ githubId = 25236206;
+ name = "Adrian Dole";
+ };
AdsonCicilioti = {
name = "Adson Cicilioti";
email = "adson.cicilioti@live.com";
@@ -581,6 +587,12 @@
githubId = 1318982;
name = "Anders Claesson";
};
+ akechishiro = {
+ email = "akechishiro-aur+nixpkgs@lahfa.xyz";
+ github = "AkechiShiro";
+ githubId = 14914796;
+ name = "Samy Lahfa";
+ };
a-kenji = {
email = "aks.kenji@protonmail.com";
github = "a-kenji";
@@ -638,6 +650,13 @@
githubId = 82811;
name = "Aldo Borrero";
};
+ alejandrosame = {
+ email = "alejandrosanchzmedina@gmail.com";
+ matrix = "@alejandrosame:matrix.org";
+ github = "alejandrosame";
+ githubId = 1078000;
+ name = "Alejandro Sánchez Medina";
+ };
aleksana = {
email = "me@aleksana.moe";
github = "Aleksanaa";
@@ -1148,6 +1167,9 @@
githubId = 48802534;
name = "Anselm Schüler";
matrix = "@schuelermine:matrix.org";
+ keys = [{
+ fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955";
+ }];
};
anthonyroussel = {
email = "anthony@roussel.dev";
@@ -1237,6 +1259,12 @@
githubId = 30842467;
name = "April John";
};
+ aqrln = {
+ email = "nix@aqrln.net";
+ github = "aqrln";
+ githubId = 4923335;
+ name = "Alexey Orlenko";
+ };
ar1a = {
email = "aria@ar1as.space";
github = "ar1a";
@@ -1389,6 +1417,12 @@
githubId = 37193992;
name = "Arthur Teisseire";
};
+ arti5an = {
+ email = "artis4n@outlook.com";
+ github = "arti5an";
+ githubId = 14922630;
+ name = "Richard Smith";
+ };
artturin = {
email = "artturin@artturin.com";
matrix = "@artturin:matrix.org";
@@ -1499,6 +1533,13 @@
fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691";
}];
};
+ atalii = {
+ email = "taliauster@gmail.com";
+ github = "atalii";
+ githubId = 120901234;
+ name = "tali auster";
+ matrix = "@atalii:matrix.org";
+ };
ataraxiasjel = {
email = "nix@ataraxiadev.com";
github = "AtaraxiaSjel";
@@ -1691,6 +1732,13 @@
fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B";
}];
};
+ azazak123 = {
+ email = "azazaka2002@gmail.com";
+ matrix = "@ne_dvoeshnik:matrix.org";
+ name = "Volodymyr Antonov";
+ github = "azazak123";
+ githubId = 50211158;
+ };
azd325 = {
email = "tim.kleinschmidt@gmail.com";
github = "Azd325";
@@ -1730,6 +1778,12 @@
fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC";
}];
};
+ babeuh = {
+ name = "Raphael Le Goaller";
+ email = "babeuh@rlglr.fr";
+ github = "babeuh";
+ githubId = 60193302;
+ };
bachp = {
email = "pascal.bach@nextrem.ch";
matrix = "@bachp:matrix.org";
@@ -2554,7 +2608,7 @@
};
cafkafk = {
email = "christina@cafkafk.com";
- matrix = "@cafkafk:m.cafkafk.com";
+ matrix = "@cafkafk:nixos.dev";
name = "Christina Sørensen";
github = "cafkafk";
githubId = 89321978;
@@ -2563,7 +2617,7 @@
fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8";
}
{
- fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
+ fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED";
}
];
};
@@ -2737,6 +2791,12 @@
githubId = 3471749;
name = "Claudio Bley";
};
+ cbourjau = {
+ email = "christianb@posteo.de";
+ github = "cbourjau";
+ githubId = 3288058;
+ name = "Christian Bourjau";
+ };
cbrewster = {
email = "cbrewster@hey.com";
github = "cbrewster";
@@ -2765,6 +2825,13 @@
githubId = 64804;
name = "Dennis Gosnell";
};
+ cdmistman = {
+ name = "Colton Donnelly";
+ email = "colton@donn.io";
+ matrix = "@donnellycolton:matrix.org";
+ github = "cdmistman";
+ githubId = 23486351;
+ };
ceedubs = {
email = "ceedubs@gmail.com";
github = "ceedubs";
@@ -3864,6 +3931,12 @@
githubId = 75067;
name = "Daniel Duan";
};
+ de11n = {
+ email = "nixpkgs-commits@deshaw.com";
+ github = "de11n";
+ githubId = 130508846;
+ name = "Elliot Cameron";
+ };
dearrude = {
name = "Ebrahim Nejati";
email = "dearrude@tfwno.gf";
@@ -4108,6 +4181,12 @@
fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
}];
};
+ dgollings = {
+ email = "daniel.gollings+nixpkgs@gmail.com";
+ github = "dgollings";
+ githubId = 2032823;
+ name = "Daniel Gollings";
+ };
dgonyeo = {
email = "derek@gonyeo.com";
github = "dgonyeo";
@@ -4309,6 +4388,12 @@
githubId = 10998835;
name = "Doron Behar";
};
+ dotemup = {
+ email = "dotemup.designs+nixpkgs@gmail.com";
+ github = "dotemup";
+ githubId = 11077277;
+ name = "Dote";
+ };
dotlambda = {
email = "rschuetz17@gmail.com";
matrix = "@robert:funklause.de";
@@ -4400,6 +4485,13 @@
fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0";
}];
};
+ DrSensor = {
+ name = "Fahmi Akbar Wildana";
+ email = "sensorfied@gmail.com";
+ matrix = "@drsensor:matrix.org";
+ github = "DrSensor";
+ githubId = 4953069;
+ };
drupol = {
name = "Pol Dellaiera";
email = "pol.dellaiera@protonmail.com";
@@ -5312,6 +5404,12 @@
githubId = 4246921;
name = "Florian Beeres";
};
+ fd = {
+ email = "simon.menke@gmail.com";
+ github = "fd";
+ githubId = 591;
+ name = "Simon Menke";
+ };
fdns = {
email = "fdns02@gmail.com";
github = "fdns";
@@ -5601,6 +5699,12 @@
githubId = 84968;
name = "Florian Paul Schmidt";
};
+ fptje = {
+ email = "fpeijnenburg@gmail.com";
+ github = "FPtje";
+ githubId = 1202014;
+ name = "Falco Peijnenburg";
+ };
fragamus = {
email = "innovative.engineer@gmail.com";
github = "fragamus";
@@ -5756,6 +5860,11 @@
githubId = 17859309;
name = "Fuzen";
};
+ fwc = {
+ github = "fwc";
+ githubId = 29337229;
+ name = "mtths";
+ };
fxfactorial = {
email = "edgar.factorial@gmail.com";
github = "fxfactorial";
@@ -5961,6 +6070,12 @@
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}];
};
+ gerg-l = {
+ email = "gregleyda@proton.me";
+ github = "Gerg-L";
+ githubId = 88247690;
+ name = "Greg Leyda";
+ };
geri1701 = {
email = "geri@sdf.org";
github = "geri1701";
@@ -6011,6 +6126,15 @@
githubId = 127353;
name = "Geoffrey Huntley";
};
+ gigglesquid = {
+ email = "jack.connors@protonmail.com";
+ github = "gigglesquid";
+ githubId = 3685154;
+ name = "Jack connors";
+ keys = [{
+ fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019";
+ }];
+ };
gila = {
email = "jeffry.molanus@gmail.com";
github = "gila";
@@ -6583,6 +6707,12 @@
githubId = 41522204;
name = "hexchen";
};
+ hexclover = {
+ email = "hexclover@outlook.com";
+ github = "hexclover";
+ githubId = 47456195;
+ name = "hexclover";
+ };
heyimnova = {
email = "git@heyimnova.dev";
github = "heyimnova";
@@ -7076,12 +7206,6 @@
fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA";
}];
};
- imsofi = {
- email = "sofi+git@mailbox.org";
- github = "imsofi";
- githubId = 20756843;
- name = "Sofi";
- };
imuli = {
email = "i@imu.li";
github = "imuli";
@@ -7147,6 +7271,12 @@
fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E";
}];
};
+ invokes-su = {
+ email = "nixpkgs-commits@deshaw.com";
+ github = "invokes-su";
+ githubId = 88038050;
+ name = "Souvik Sen";
+ };
ionutnechita = {
email = "ionut_n2001@yahoo.com";
github = "ionutnechita";
@@ -7622,6 +7752,13 @@
githubId = 1608697;
name = "Jens Binkert";
};
+ jeremiahs = {
+ email = "jeremiah@secrist.xyz";
+ github = "JeremiahSecrist";
+ githubId = 26032621;
+ matrix = "@jeremiahs:matrix.org";
+ name = "Jeremiah Secrist";
+ };
jeremyschlatter = {
email = "github@jeremyschlatter.com";
github = "jeremyschlatter";
@@ -8247,6 +8384,12 @@
name = "John Soo";
githubId = 10039785;
};
+ jtbx = {
+ email = "jtbx@duck.com";
+ name = "Jeremy Baxter";
+ github = "jtbx";
+ githubId = 92071952;
+ };
jtcoolen = {
email = "jtcoolen@pm.me";
name = "Julien Coolen";
@@ -8349,6 +8492,12 @@
githubId = 662666;
name = "Justinas Stankevičius";
};
+ justinlime = {
+ email = "justinlime1999@gmail.com";
+ github = "justinlime";
+ githubId = 119710965;
+ name = "Justin Fields";
+ };
justinlovinger = {
email = "git@justinlovinger.com";
github = "JustinLovinger";
@@ -8593,6 +8742,11 @@
githubId = 762421;
name = "Pierre Thierry";
};
+ keto = {
+ github = "TheRealKeto";
+ githubId = 24854941;
+ name = "Keto";
+ };
ketzacoatl = {
email = "ketzacoatl@protonmail.com";
github = "ketzacoatl";
@@ -8631,6 +8785,12 @@
githubId = 546087;
name = "Kristoffer K. Føllesdal";
};
+ khaneliman = {
+ email = "khaneliman12@gmail.com";
+ github = "khaneliman";
+ githubId = 1778670;
+ name = "Austin Horstman";
+ };
khaser = {
email = "a-horohorin@mail.ru";
github = "khaser";
@@ -8866,6 +9026,12 @@
githubId = 3287933;
name = "Josef Kemetmüller";
};
+ knightpp = {
+ email = "knightpp@proton.me";
+ github = "knightpp";
+ githubId = 28928944;
+ name = "Danylo Kondratiev";
+ };
knl = {
email = "nikola@knezevic.co";
github = "knl";
@@ -8921,6 +9087,12 @@
githubId = 524268;
name = "Koral";
};
+ koralowiec = {
+ email = "qnlgzyrw@anonaddy.me";
+ github = "koralowiec";
+ githubId = 36413794;
+ name = "Arek Kalandyk";
+ };
koslambrou = {
email = "koslambrou@gmail.com";
github = "koslambrou";
@@ -9017,6 +9189,12 @@
githubId = 5759930;
name = "Alexis Destrez";
};
+ krupkat = {
+ github = "krupkat";
+ githubId = 6817216;
+ name = "Tomas Krupka";
+ matrix = "@krupkat:matrix.org";
+ };
ktf = {
email = "giulio.eulisse@cern.ch";
github = "ktf";
@@ -9091,6 +9269,12 @@
fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372";
}];
};
+ l0b0 = {
+ email = "victor@engmark.name";
+ github = "l0b0";
+ githubId = 168301;
+ name = "Victor Engmark";
+ };
l3af = {
email = "L3afMeAlon3@gmail.com";
matrix = "@L3afMe:matrix.org";
@@ -9547,6 +9731,12 @@
fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991";
}];
};
+ locochoco = {
+ email = "contact@locochoco.dev";
+ github = "loco-choco";
+ githubId = 58634087;
+ name = "Ivan Pancheniak";
+ };
lodi = {
email = "anthony.lodi@gmail.com";
github = "lodi";
@@ -9743,6 +9933,15 @@
githubId = 1168435;
name = "Ludovic Courtès";
};
+ ludovicopiero = {
+ email = "ludovicopiero@pm.me";
+ github = "ludovicopiero";
+ githubId = 44255157;
+ name = "Ludovico Piero";
+ keys = [{
+ fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C";
+ }];
+ };
lufia = {
email = "lufia@lufia.org";
github = "lufia";
@@ -9770,6 +9969,15 @@
githubId = 22085373;
name = "Luis Hebendanz";
};
+ luisdaranda = {
+ email = "luisdomingoaranda@gmail.com";
+ github = "propet";
+ githubId = 8515861;
+ name = "Luis D. Aranda Sánchez";
+ keys = [{
+ fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E";
+ }];
+ };
luisnquin = {
email = "lpaandres2020@gmail.com";
matrix = "@luisnquin:matrix.org";
@@ -9865,6 +10073,12 @@
githubId = 782440;
name = "Luna Nova";
};
+ lurkki = {
+ email = "jussi.kuokkanen@protonmail.com";
+ github = "Lurkki14";
+ githubId = 44469719;
+ name = "Jussi Kuokkanen";
+ };
lux = {
email = "lux@lux.name";
github = "luxzeitlos";
@@ -9976,6 +10190,16 @@
githubId = 93990818;
name = "Madoura";
};
+ maeve = {
+ email = "mrey@mailbox.org";
+ matrix = "@maeve:catgirl.cloud";
+ github = "m-rey";
+ githubId = 42996147;
+ name = "Mæve";
+ keys = [{
+ fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2";
+ }];
+ };
mafo = {
email = "Marc.Fontaine@gmx.de";
github = "MarcFontaine";
@@ -10132,6 +10356,13 @@
githubId = 105451387;
name = "Maria";
};
+ marie = {
+ email = "tabmeier12+nix@gmail.com";
+ github = "nycodeghg";
+ githubId = 37078297;
+ matrix = "@marie:marie.cologne";
+ name = "Marie Ramlow";
+ };
marijanp = {
name = "Marijan Petričević";
email = "marijan.petricevic94@gmail.com";
@@ -10366,6 +10597,12 @@
fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898";
}];
};
+ max-amb = {
+ email = "maxpeterambaum@gmail.com";
+ github = "max-amb";
+ githubId = 137820334;
+ name = "Max Ambaum";
+ };
maxbrunet = {
email = "max@brnt.mx";
github = "maxbrunet";
@@ -10509,12 +10746,6 @@
githubId = 10420834;
name = "Mihai-Drosi Caju";
};
- mcbeth = {
- email = "mcbeth@broggs.org";
- github = "mcbeth";
- githubId = 683809;
- name = "Jeffrey Brent McBeth";
- };
mccurdyc = {
email = "mccurdyc22@gmail.com";
github = "mccurdyc";
@@ -10718,6 +10949,16 @@
fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F";
}];
};
+ mib = {
+ name = "mib";
+ email = "mib@kanp.ai";
+ matrix = "@mib:kanp.ai";
+ github = "mibmo";
+ githubId = 87388017;
+ keys = [{
+ fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F";
+ }];
+ };
mic92 = {
email = "joerg@thalheim.io";
matrix = "@mic92:nixos.dev";
@@ -10814,6 +11055,12 @@
fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83";
}];
};
+ mig4ng = {
+ email = "mig4ng@gmail.com";
+ github = "mig4ng";
+ githubId = 5817039;
+ name = "Miguel Carneiro";
+ };
mightyiam = {
email = "mightyiampresence@gmail.com";
github = "mightyiam";
@@ -11300,6 +11547,12 @@
name = "Maxim Schuwalow";
email = "maxim.schuwalow@gmail.com";
};
+ mschwaig = {
+ name = "Martin Schwaighofer";
+ github = "mschwaig";
+ githubId = 3856390;
+ email = "mschwaig+nixpkgs@eml.cc";
+ };
msfjarvis = {
github = "msfjarvis";
githubId = 13348378;
@@ -14179,6 +14432,12 @@
githubId = 1069318;
name = "Robin Lambertz";
};
+ robwalt = {
+ email = "robwalter96@gmail.com";
+ github = "robwalt";
+ githubId = 26892280;
+ name = "Robert Walter";
+ };
roconnor = {
email = "roconnor@theorem.ca";
github = "roconnor";
@@ -14303,6 +14562,15 @@
}];
name = "Rahul Butani";
};
+ rs0vere = {
+ email = "rs0vere@outlook.com";
+ github = "rs0vere";
+ githubId = 140035635;
+ keys = [{
+ fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D";
+ }];
+ name = "Red Star Over Earth";
+ };
rski = {
name = "rski";
email = "rom.skiad+nix@gmail.com";
@@ -14416,6 +14684,12 @@
githubId = 889991;
name = "Ryan Artecona";
};
+ ryanccn = {
+ email = "hello@ryanccn.dev";
+ github = "ryanccn";
+ githubId = 70191398;
+ name = "Ryan Cao";
+ };
ryane = {
email = "ryanesc@gmail.com";
github = "ryane";
@@ -14470,6 +14744,12 @@
githubId = 3280280;
name = "Ryne Everett";
};
+ ryota-ka = {
+ email = "ok@ryota-ka.me";
+ github = "ryota-ka";
+ githubId = 7309170;
+ name = "Ryota Kameoka";
+ };
rytone = {
email = "max@ryt.one";
github = "rastertail";
@@ -14875,6 +15155,16 @@
githubId = 4805746;
name = "Sebastian Jordan";
};
+ septem9er = {
+ name = "Septem9er";
+ email = "develop@septem9er.de";
+ matrix = "@septem9er:fairydust.space";
+ github = "septem9er";
+ githubId = 33379902;
+ keys = [{
+ fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33";
+ }];
+};
seqizz = {
email = "seqizz@gmail.com";
github = "seqizz";
@@ -15279,6 +15569,12 @@
githubId = 3789764;
name = "skykanin";
};
+ slbtty = {
+ email = "shenlebantongying@gmail.com";
+ github = "shenlebantongying";
+ githubId = 20123683;
+ name = "Shenleban Tongying";
+ };
sleexyz = {
email = "freshdried@gmail.com";
github = "sleexyz";
@@ -15456,6 +15752,12 @@
githubId = 6277322;
name = "Wei Tang";
};
+ soupglasses = {
+ email = "sofi+git@mailbox.org";
+ github = "soupglasses";
+ githubId = 20756843;
+ name = "Sofi";
+ };
soywod = {
name = "Clément DOUIN";
email = "clement.douin@posteo.net";
@@ -15478,6 +15780,12 @@
githubId = 7669898;
name = "Katharina Fey";
};
+ spalf = {
+ email = "tom@tombarrett.xyz";
+ name = "tom barrett";
+ github = "70m6";
+ githubId = 105207964;
+ };
spease = {
email = "peasteven@gmail.com";
github = "spease";
@@ -15509,6 +15817,12 @@
githubId = 6391601;
name = "Roger Mason";
};
+ sputn1ck = {
+ email = "kon@kon.ninja";
+ github = "sputn1ck";
+ githubId = 8904314;
+ name = "Konstantin Nick";
+ };
squalus = {
email = "squalus@squalus.net";
github = "squalus";
@@ -15545,6 +15859,13 @@
githubId = 219362;
name = "Sarah Brofeldt";
};
+ srid = {
+ email = "srid@srid.ca";
+ matrix = "@srid:matrix.org";
+ github = "srid";
+ githubId = 3998;
+ name = "Sridhar Ratnakumar";
+ };
srounce = {
name = "Samuel Rounce";
email = "me@samuelrounce.co.uk";
@@ -15813,6 +16134,12 @@
githubId = 16734772;
name = "Sumner Evans";
};
+ sund3RRR = {
+ email = "evenquantity@gmail.com";
+ github = "sund3RRR";
+ githubId = 73298492;
+ name = "Mikhail Kiselev";
+ };
suominen = {
email = "kimmo@suominen.com";
github = "suominen";
@@ -16714,6 +17041,14 @@
githubId = 8577941;
name = "Kevin Rauscher";
};
+ tomasajt = {
+ github = "TomaSajt";
+ githubId = 62384384;
+ name = "TomaSajt";
+ keys = [{
+ fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1";
+ }];
+ };
tomaskala = {
email = "public+nixpkgs@tomaskala.com";
github = "tomaskala";
@@ -16990,6 +17325,12 @@
matrix = "@ty:tjll.net";
name = "Tyler Langlois";
};
+ tymscar = {
+ email = "oscar@tymscar.com";
+ github = "tymscar";
+ githubId = 3742502;
+ name = "Oscar Molnar";
+ };
typetetris = {
email = "ericwolf42@mail.com";
github = "typetetris";
@@ -17350,6 +17691,12 @@
fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9";
}];
};
+ vinetos = {
+ name = "vinetos";
+ email = "vinetosdev@gmail.com";
+ github = "vinetos";
+ githubId = 10145351;
+ };
vinnymeller = {
email = "vinnymeller@proton.me";
github = "vinnymeller";
@@ -17453,6 +17800,12 @@
githubId = 3413119;
name = "Vonfry";
};
+ votava = {
+ email = "votava@gmail.com";
+ github = "janvotava";
+ githubId = 367185;
+ name = "Jan Votava";
+ };
vq = {
email = "vq@erq.se";
github = "vq";
@@ -18036,6 +18389,12 @@
githubId = 73759599;
name = "Yaya";
};
+ yboettcher = {
+ name = "Yannik Böttcher";
+ github = "yboettcher";
+ githubId = 39460066;
+ email = "yannikboettcher@outlook.de";
+ };
ydlr = {
name = "ydlr";
email = "ydlr@ydlr.io";
@@ -18106,6 +18465,12 @@
github = "ymeister";
githubId = 47071325;
};
+ yoavlavi = {
+ email = "yoav@yoavlavi.com";
+ github = "yoav-lavi";
+ githubId = 14347895;
+ name = "Yoav Lavi";
+ };
yochai = {
email = "yochai@titat.info";
github = "yochai";
@@ -18355,12 +18720,6 @@
github = "zfnmxt";
githubId = 37446532;
};
- zgrannan = {
- email = "zgrannan@gmail.com";
- github = "zgrannan";
- githubId = 1141948;
- name = "Zack Grannan";
- };
zhaofengli = {
email = "hello@zhaofeng.li";
matrix = "@zhaofeng:zhaofeng.li";
@@ -18392,6 +18751,19 @@
githubId = 1108325;
name = "Théo Zimmermann";
};
+ zmitchell = {
+ name = "Zach Mitchell";
+ email = "zmitchell@fastmail.com";
+ matrix = "@zmitchell:matrix.org";
+ github = "zmitchell";
+ githubId = 10246891;
+ };
+ znewman01 = {
+ email = "znewman01@gmail.com";
+ github = "znewman01";
+ githubId = 873857;
+ name = "Zack Newman";
+ };
zoedsoupe = {
github = "zoedsoupe";
githubId = 44469426;
diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh
index a7cfecbbb0..5aa644a3d0 100755
--- a/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh
+++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=.
+#! nix-shell -i bash -p nix curl jq git gnused -I nixpkgs=.
# See regenerate-hackage-packages.sh for details on the purpose of this script.
diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
index 4fee433084..ba64b42ba9 100755
--- a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
+++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.
+#! nix-shell -i bash -p nix curl jq git gnused gnugrep -I nixpkgs=.
# shellcheck shell=bash
set -eu -o pipefail
diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
index e93ceeebc9..52ac8a9343 100644
--- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
@@ -86,6 +86,7 @@ luuid,,,,,,
luv,,,,1.44.2-1,,
lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto
lyaml,,,,,,lblasc
+magick,,,,,,donovanglover
markdown,,,,,,
mediator_lua,,,,,,
mpack,,,,,,
diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 821486d55a..f541d01a68 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -193,10 +193,11 @@ with lib.maintainers; {
deshaw = {
# Verify additions to this team with at least one already existing member of the team.
members = [
- limeytexan
+ de11n
+ invokes-su
];
scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
- shortName = "Shaw employees";
+ shortName = "D. E. Shaw employees";
};
determinatesystems = {
@@ -410,6 +411,14 @@ with lib.maintainers; {
shortName = "Jitsi";
};
+ jupyter = {
+ members = [
+ natsukium
+ ];
+ scope = "Maintain Jupyter and related packages.";
+ shortName = "Jupyter";
+ };
+
kubernetes = {
members = [
johanot
@@ -570,6 +579,7 @@ with lib.maintainers; {
ralith
dandellion
sumnerevans
+ nickcao
];
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
shortName = "Matrix";
@@ -820,9 +830,7 @@ with lib.maintainers; {
};
sphinx = {
- members = [
- SuperSandro2000
- ];
+ members = [ ];
scope = "Maintain Sphinx related packages.";
shortName = "Sphinx";
};
diff --git a/third_party/nixpkgs/nixos/doc/manual/common.nix b/third_party/nixpkgs/nixos/doc/manual/common.nix
new file mode 100644
index 0000000000..48d1d90949
--- /dev/null
+++ b/third_party/nixpkgs/nixos/doc/manual/common.nix
@@ -0,0 +1,4 @@
+{
+ outputPath = "share/doc/nixos";
+ indexPath = "index.html";
+}
diff --git a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md
index c306cc084c..4633c7e1b0 100644
--- a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md
+++ b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md
@@ -11,6 +11,8 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux
If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`.
+There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-devmode).
+
**Contributing to the man pages**
The man pages are written in [DocBook] which is XML.
diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix
index 40af4c1fa0..902dee7018 100644
--- a/third_party/nixpkgs/nixos/doc/manual/default.nix
+++ b/third_party/nixpkgs/nixos/doc/manual/default.nix
@@ -16,6 +16,8 @@ let
lib = pkgs.lib;
+ common = import ./common.nix;
+
manpageUrls = pkgs.path + "/doc/manpage-urls.json";
# We need to strip references to /nix/store/* from options,
@@ -63,6 +65,9 @@ let
optionIdPrefix = "test-opt-";
};
+ testDriverMachineDocstrings = pkgs.callPackage
+ ../../../nixos/lib/test-driver/nixos-test-driver-docstrings.nix {};
+
prepareManualFromMD = ''
cp -r --no-preserve=all $inputs/* .
@@ -75,11 +80,13 @@ let
substituteInPlace ./nixos-options.md \
--replace \
'@NIXOS_OPTIONS_JSON@' \
- ${optionsDoc.optionsJSON}/share/doc/nixos/options.json
+ ${optionsDoc.optionsJSON}/${common.outputPath}/options.json
substituteInPlace ./development/writing-nixos-tests.section.md \
--replace \
'@NIXOS_TEST_OPTIONS_JSON@' \
- ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json
+ ${testOptionsDoc.optionsJSON}/${common.outputPath}/options.json
+ sed -e '/@PYTHON_MACHINE_METHODS@/ {' -e 'r ${testDriverMachineDocstrings}/machine-methods.md' -e 'd' -e '}' \
+ -i ./development/writing-nixos-tests.section.md
'';
in rec {
@@ -94,7 +101,7 @@ in rec {
}
''
# Generate the HTML manual.
- dst=$out/share/doc/nixos
+ dst=$out/${common.outputPath}
mkdir -p $dst
cp ${../../../doc/style.css} $dst/style.css
@@ -115,7 +122,7 @@ in rec {
--toc-depth 1 \
--chunk-toc-depth 1 \
./manual.md \
- $dst/index.html
+ $dst/${common.indexPath}
mkdir -p $out/nix-support
echo "nix-build out $out" >> $out/nix-support/hydra-build-products
@@ -126,7 +133,7 @@ in rec {
manual = manualHTML;
# Index page of the NixOS manual.
- manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html";
+ manualHTMLIndex = "${manualHTML}/${common.outputPath}/${common.indexPath}";
manualEpub = runCommand "nixos-manual-epub"
{ nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ];
@@ -157,7 +164,7 @@ in rec {
}
''
# Generate the epub manual.
- dst=$out/share/doc/nixos
+ dst=$out/${common.outputPath}
xsltproc \
--param chapter.autolabel 0 \
@@ -192,7 +199,7 @@ in rec {
mkdir -p $out/share/man/man5
nixos-render-docs -j $NIX_BUILD_CORES options manpage \
--revision ${lib.escapeShellArg revision} \
- ${optionsJSON}/share/doc/nixos/options.json \
+ ${optionsJSON}/${common.outputPath}/options.json \
$out/share/man/man5/configuration.nix.5
'';
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md
index 486a4b64a2..84b247fd20 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md
@@ -139,210 +139,7 @@ to Python as `machine_a`.
The following methods are available on machine objects:
-`start`
-
-: Start the virtual machine. This method is asynchronous --- it does
- not wait for the machine to finish booting.
-
-`shutdown`
-
-: Shut down the machine, waiting for the VM to exit.
-
-`crash`
-
-: Simulate a sudden power failure, by telling the VM to exit
- immediately.
-
-`block`
-
-: Simulate unplugging the Ethernet cable that connects the machine to
- the other machines.
-
-`unblock`
-
-: Undo the effect of `block`.
-
-`screenshot`
-
-: Take a picture of the display of the virtual machine, in PNG format.
- The screenshot is linked from the HTML log.
-
-`get_screen_text_variants`
-
-: Return a list of different interpretations of what is currently
- visible on the machine's screen using optical character
- recognition. The number and order of the interpretations is not
- specified and is subject to change, but if no exception is raised at
- least one will be returned.
-
- ::: {.note}
- This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
- :::
-
-`get_screen_text`
-
-: Return a textual representation of what is currently visible on the
- machine's screen using optical character recognition.
-
- ::: {.note}
- This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
- :::
-
-`send_monitor_command`
-
-: Send a command to the QEMU monitor. This is rarely used, but allows
- doing stuff such as attaching virtual USB disks to a running
- machine.
-
-`send_key`
-
-: Simulate pressing keys on the virtual keyboard, e.g.,
- `send_key("ctrl-alt-delete")`.
-
-`send_chars`
-
-: Simulate typing a sequence of characters on the virtual keyboard,
- e.g., `send_chars("foobar\n")` will type the string `foobar`
- followed by the Enter key.
-
-`send_console`
-
-: Send keys to the kernel console. This allows interaction with the systemd
- emergency mode, for example. Takes a string that is sent, e.g.,
- `send_console("\n\nsystemctl default\n")`.
-
-`execute`
-
-: Execute a shell command, returning a list `(status, stdout)`.
-
- Commands are run with `set -euo pipefail` set:
-
- - If several commands are separated by `;` and one fails, the
- command as a whole will fail.
-
- - For pipelines, the last non-zero exit status will be returned
- (if there is one; otherwise zero will be returned).
-
- - Dereferencing unset variables fails the command.
-
- - It will wait for stdout to be closed.
-
- If the command detaches, it must close stdout, as `execute` will wait
- for this to consume all output reliably. This can be achieved by
- redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or
- a file. Examples of detaching commands are `sleep 365d &`, where the
- shell forks a new process that can write to stdout and `xclip -i`, where
- the `xclip` command itself forks without closing stdout.
-
- Takes an optional parameter `check_return` that defaults to `True`.
- Setting this parameter to `False` will not check for the return code
- and return -1 instead. This can be used for commands that shut down
- the VM and would therefore break the pipe that would be used for
- retrieving the return code.
-
- A timeout for the command can be specified (in seconds) using the optional
- `timeout` parameter, e.g., `execute(cmd, timeout=10)` or
- `execute(cmd, timeout=None)`. The default is 900 seconds.
-
-`succeed`
-
-: Execute a shell command, raising an exception if the exit status is
- not zero, otherwise returning the standard output. Similar to `execute`,
- except that the timeout is `None` by default. See `execute` for details on
- command execution.
-
-`fail`
-
-: Like `succeed`, but raising an exception if the command returns a zero
- status.
-
-`wait_until_succeeds`
-
-: Repeat a shell command with 1-second intervals until it succeeds.
- Has a default timeout of 900 seconds which can be modified, e.g.
- `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on
- command execution.
-
-`wait_until_fails`
-
-: Like `wait_until_succeeds`, but repeating the command until it fails.
-
-`wait_for_unit`
-
-: Wait until the specified systemd unit has reached the "active"
- state.
-
-`wait_for_file`
-
-: Wait until the specified file exists.
-
-`wait_for_open_port`
-
-: Wait until a process is listening on the given TCP port and IP address
- (default `localhost`).
-
-`wait_for_closed_port`
-
-: Wait until nobody is listening on the given TCP port and IP address
- (default `localhost`).
-
-`wait_for_x`
-
-: Wait until the X11 server is accepting connections.
-
-`wait_for_text`
-
-: Wait until the supplied regular expressions matches the textual
- contents of the screen by using optical character recognition (see
- `get_screen_text` and `get_screen_text_variants`).
-
- ::: {.note}
- This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
- :::
-
-`wait_for_console_text`
-
-: Wait until the supplied regular expressions match a line of the
- serial console output. This method is useful when OCR is not
- possible or accurate enough.
-
-`wait_for_window`
-
-: Wait until an X11 window has appeared whose name matches the given
- regular expression, e.g., `wait_for_window("Terminal")`.
-
-`copy_from_host`
-
-: Copies a file from host to machine, e.g.,
- `copy_from_host("myfile", "/etc/my/important/file")`.
-
- The first argument is the file on the host. The file needs to be
- accessible while building the nix derivation. The second argument is
- the location of the file on the machine.
-
-`systemctl`
-
-: Runs `systemctl` commands with optional support for
- `systemctl --user`
-
- ```py
- machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager`
- machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager`
- ```
-
-`shell_interact`
-
-: Allows you to directly interact with the guest shell. This should
- only be used during test development, not in production tests.
- Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends
- the guest session.
-
-`console_interact`
-
-: Allows you to directly interact with QEMU's stdin. This should
- only be used during test development, not in production tests.
- Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and
- `Ctrl-d` closes console and returns to the test runner.
+@PYTHON_MACHINE_METHODS@
To test user units declared by `systemd.user.services` the optional
`user` argument can be used:
diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md
index 53cf9ed14c..815bcc071c 100644
--- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md
+++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md
@@ -249,14 +249,14 @@ update /etc/fstab.
which will be used by the boot partition.
```ShellSession
- # parted /dev/sda -- mkpart primary 512MB -8GB
+ # parted /dev/sda -- mkpart root ext4 512MB -8GB
```
3. Next, add a *swap* partition. The size required will vary according
to needs, here a 8GB one is created.
```ShellSession
- # parted /dev/sda -- mkpart primary linux-swap -8GB 100%
+ # parted /dev/sda -- mkpart swap linux-swap -8GB 100%
```
::: {.note}
@@ -550,8 +550,8 @@ corresponding configuration Nix expression.
### Example partition schemes for NixOS on `/dev/sda` (UEFI)
```ShellSession
# parted /dev/sda -- mklabel gpt
-# parted /dev/sda -- mkpart primary 512MB -8GB
-# parted /dev/sda -- mkpart primary linux-swap -8GB 100%
+# parted /dev/sda -- mkpart root ext4 512MB -8GB
+# parted /dev/sda -- mkpart swap linux-swap -8GB 100%
# parted /dev/sda -- mkpart ESP fat32 1MB 512MB
# parted /dev/sda -- set 3 esp on
```
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 a31f3511a4..c9da29063e 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
@@ -83,6 +83,8 @@ In addition to numerous new and updated packages, this release has the following
- [gitea-actions-runner](https://gitea.com/gitea/act_runner), a CI runner for Gitea/Forgejo Actions. Available as [services.gitea-actions-runner](#opt-services.gitea-actions-runner.instances).
+- [evdevremapkeys](https://github.com/philipl/evdevremapkeys), a daemon to remap key events. Available as [services.evdevremapkeys](#opt-services.evdevremapkeys.enable).
+
- [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable).
- [go2rtc](https://github.com/AlexxIT/go2rtc), a camera streaming appliation with support for RTSP, WebRTC, HomeKit, FFMPEG, RTMP and other protocols. Available as [services.go2rtc](options.html#opt-services.go2rtc.enable).
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md
index 5ccaa92914..4e8bd36428 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -16,16 +16,30 @@
- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).
+- [wayfire](https://wayfire.org), A modular and extensible wayland compositor. Available as [programs.wayfire](#opt-programs.wayfire.enable).
+
- [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).
+- [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable).
+
+* [NS-USBLoader](https://github.com/developersu/ns-usbloader/), an all-in-one tool for managing Nintendo Switch homebrew. Available as [programs.ns-usbloader](#opt-programs.ns-usbloader.enable).
+
- [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable).
- [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable).
- [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services.
+- [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable).
+
- [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe and secure from the ground up. Available as [services.trust-dns](#opt-services.trust-dns.enable).
+- [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics.
+
+- [ebusd](https://ebusd.eu), a daemon for handling communication with eBUS devices connected to a 2-wire bus system (“energy bus” used by numerous heating systems). Available as [services.ebusd](#opt-services.ebusd.enable).
+
+- [systemd-sysupdate](https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html), atomically updates the host OS, container images, portable service images or other sources. Available as [systemd.sysupdate](opt-systemd.sysupdate).
+
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
- The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices.
@@ -62,6 +76,8 @@
- PHP now defaults to PHP 8.2, updated from 8.1.
+- The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq.
+
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
- `services.keyd` changed API. Now you can create multiple configuration files.
@@ -86,12 +102,20 @@
- `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli.
+- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`.
+
+- The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations.
+
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.
- The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147).
+- The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped.
+
+- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance.
+
## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
@@ -110,6 +134,10 @@
- DocBook option documentation is no longer supported, all module documentation now uses markdown.
+- `buildGoModule` `go-modules` attrs have been renamed to `goModules`.
+
+- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively.
+
- `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets.
- The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki.
@@ -126,8 +154,16 @@ The module update takes care of the new config syntax and the data itself (user
- `programs.gnupg.agent.pinentryFlavor` is now set in `/etc/gnupg/gpg-agent.conf`, and will no longer take precedence over a `pinentry-program` set in `~/.gnupg/gpg-agent.conf`.
+- `wrapHelm` now exposes `passthru.pluginsDir` which can be passed to `helmfile`. For convenience, a top-level package `helmfile-wrapped` has been added, which inherits `passthru.pluginsDir` from `kubernetes-helm-wrapped`. See [#217768](https://github.com/NixOS/nixpkgs/issues/217768) for details.
+
+- `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to.
+
+- Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details.
+
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
+- The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead.
+
- The `qemu-vm.nix` module by default now identifies block devices via
persistent names available in `/dev/disk/by-*`. Because the rootDevice is
identfied by its filesystem label, it needs to be formatted before the VM is
diff --git a/third_party/nixpkgs/nixos/doc/manual/shell.nix b/third_party/nixpkgs/nixos/doc/manual/shell.nix
new file mode 100644
index 0000000000..70500a12b0
--- /dev/null
+++ b/third_party/nixpkgs/nixos/doc/manual/shell.nix
@@ -0,0 +1,20 @@
+let
+ pkgs = import ../../.. {
+ config = {};
+ overlays = [];
+ };
+
+ common = import ./common.nix;
+ inherit (common) outputPath indexPath;
+
+ web-devmode = import ../../../pkgs/tools/nix/web-devmode.nix {
+ inherit pkgs;
+ buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}";
+ open = "/${outputPath}/${indexPath}";
+ };
+in
+ pkgs.mkShell {
+ packages = [
+ web-devmode
+ ];
+ }
diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix
index e1242276a7..81a5ea1750 100644
--- a/third_party/nixpkgs/nixos/lib/eval-config.nix
+++ b/third_party/nixpkgs/nixos/lib/eval-config.nix
@@ -109,8 +109,10 @@ let
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
+ withExtraArgs = nixosSystem: nixosSystem // {
+ inherit extraArgs;
+ inherit (nixosSystem._module.args) pkgs;
+ extendModules = args: withExtraArgs (nixosSystem.extendModules args);
+ };
in
-withWarnings nixosWithUserModules // {
- inherit extraArgs;
- inherit (nixosWithUserModules._module.args) pkgs;
-}
+withWarnings (withExtraArgs nixosWithUserModules)
diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
index fc121345d6..e5d82f4de7 100644
--- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix
+++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
@@ -572,7 +572,7 @@ let format' = format; in let
${lib.optionalString installBootLoader ''
# In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb
# Use this option to create a symlink from vda to any arbitrary device you want.
- ${optionalString (config.boot.loader.grub.device != "/dev/vda") ''
+ ${optionalString (config.boot.loader.grub.enable && config.boot.loader.grub.device != "/dev/vda") ''
mkdir -p $(dirname ${config.boot.loader.grub.device})
ln -s /dev/vda ${config.boot.loader.grub.device}
''}
diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix
index eb2bcb9d3b..641b47def0 100644
--- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix
+++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix
@@ -63,7 +63,12 @@ in rec {
assertMacAddress = name: group: attr:
optional (attr ? ${name} && ! isMacAddress attr.${name})
- "Systemd ${group} field `${name}' must be a valid mac address.";
+ "Systemd ${group} field `${name}' must be a valid MAC address.";
+
+ assertNetdevMacAddress = name: group: attr:
+ optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))
+ "Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
+
isPort = i: i >= 0 && i <= 65535;
@@ -438,4 +443,21 @@ in rec {
${attrsToSection def.sliceConfig}
'';
};
+
+ # Create a directory that contains systemd definition files from an attrset
+ # that contains the file names as keys and the content as values. The values
+ # in that attrset are determined by the supplied format.
+ definitions = directoryName: format: definitionAttrs:
+ let
+ listOfDefinitions = lib.mapAttrsToList
+ (name: format.generate "${name}.conf")
+ definitionAttrs;
+ in
+ pkgs.runCommand directoryName { } ''
+ mkdir -p $out
+ ${(lib.concatStringsSep "\n"
+ (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)
+ )}
+ '';
+
}
diff --git a/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py
new file mode 100644
index 0000000000..5aec4c89a9
--- /dev/null
+++ b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py
@@ -0,0 +1,66 @@
+import ast
+import sys
+
+"""
+This program takes all the Machine class methods and prints its methods in
+markdown-style. These can then be included in the NixOS test driver
+markdown style, assuming the docstrings themselves are also in markdown.
+
+These are included in the test driver documentation in the NixOS manual.
+See https://nixos.org/manual/nixos/stable/#ssec-machine-objects
+
+The python input looks like this:
+
+```py
+...
+
+class Machine(...):
+ ...
+
+ def some_function(self, param1, param2):
+ ""
+ documentation string of some_function.
+ foo bar baz.
+ ""
+ ...
+```
+
+Output will be:
+
+```markdown
+...
+
+some_function(param1, param2)
+
+: documentation string of some_function.
+ foo bar baz.
+
+...
+```
+
+"""
+
+assert len(sys.argv) == 2
+
+with open(sys.argv[1], "r") as f:
+ module = ast.parse(f.read())
+
+class_definitions = (node for node in module.body if isinstance(node, ast.ClassDef))
+
+machine_class = next(filter(lambda x: x.name == "Machine", class_definitions))
+assert machine_class is not None
+
+function_definitions = [
+ node for node in machine_class.body if isinstance(node, ast.FunctionDef)
+]
+function_definitions.sort(key=lambda x: x.name)
+
+for f in function_definitions:
+ docstr = ast.get_docstring(f)
+ if docstr is not None:
+ args = ", ".join((a.arg for a in f.args.args[1:]))
+ args = f"({args})"
+
+ docstr = "\n".join((f" {l}" for l in docstr.strip().splitlines()))
+
+ print(f"{f.name}{args}\n\n:{docstr[1:]}\n")
diff --git a/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix b/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix
new file mode 100644
index 0000000000..a3ef50e4e8
--- /dev/null
+++ b/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix
@@ -0,0 +1,13 @@
+{ runCommand
+, python3
+}:
+
+let
+ env = { nativeBuildInputs = [ python3 ]; };
+in
+
+runCommand "nixos-test-driver-docstrings" env ''
+ mkdir $out
+ python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \
+ > $out/machine-methods.md
+''
diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py
index c315f9b2f5..809fd690d7 100644
--- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py
+++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py
@@ -416,6 +416,10 @@ class Machine:
return answer
def send_monitor_command(self, command: str) -> str:
+ """
+ Send a command to the QEMU monitor. This allows attaching
+ virtual USB disks to a running machine, among other things.
+ """
self.run_callbacks()
message = f"{command}\n".encode()
assert self.monitor is not None
@@ -425,9 +429,10 @@ class Machine:
def wait_for_unit(
self, unit: str, user: Optional[str] = None, timeout: int = 900
) -> None:
- """Wait for a systemd unit to get into "active" state.
- Throws exceptions on "failed" and "inactive" states as well as
- after timing out.
+ """
+ Wait for a systemd unit to get into "active" state.
+ Throws exceptions on "failed" and "inactive" states as well as after
+ timing out.
"""
def check_active(_: Any) -> bool:
@@ -476,6 +481,19 @@ class Machine:
)
def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]:
+ """
+ Runs `systemctl` commands with optional support for
+ `systemctl --user`
+
+ ```py
+ # run `systemctl list-jobs --no-pager`
+ machine.systemctl("list-jobs --no-pager")
+
+ # spawn a shell for `any-user` and run
+ # `systemctl --user list-jobs --no-pager`
+ machine.systemctl("list-jobs --no-pager", "any-user")
+ ```
+ """
if user is not None:
q = q.replace("'", "\\'")
return self.execute(
@@ -520,6 +538,38 @@ class Machine:
check_output: bool = True,
timeout: Optional[int] = 900,
) -> Tuple[int, str]:
+ """
+ Execute a shell command, returning a list `(status, stdout)`.
+
+ Commands are run with `set -euo pipefail` set:
+
+ - If several commands are separated by `;` and one fails, the
+ command as a whole will fail.
+
+ - For pipelines, the last non-zero exit status will be returned
+ (if there is one; otherwise zero will be returned).
+
+ - Dereferencing unset variables fails the command.
+
+ - It will wait for stdout to be closed.
+
+ If the command detaches, it must close stdout, as `execute` will wait
+ for this to consume all output reliably. This can be achieved by
+ redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or
+ a file. Examples of detaching commands are `sleep 365d &`, where the
+ shell forks a new process that can write to stdout and `xclip -i`, where
+ the `xclip` command itself forks without closing stdout.
+
+ Takes an optional parameter `check_return` that defaults to `True`.
+ Setting this parameter to `False` will not check for the return code
+ and return -1 instead. This can be used for commands that shut down
+ the VM and would therefore break the pipe that would be used for
+ retrieving the return code.
+
+ A timeout for the command can be specified (in seconds) using the optional
+ `timeout` parameter, e.g., `execute(cmd, timeout=10)` or
+ `execute(cmd, timeout=None)`. The default is 900 seconds.
+ """
self.run_callbacks()
self.connect()
@@ -533,7 +583,7 @@ class Machine:
# While sh is bash on NixOS, this is not the case for every distro.
# We explicitly call bash here to allow for the driver to boot other distros as well.
out_command = (
- f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
+ f"{timeout_str} bash -c {shlex.quote(command)} | (base64 -w 0; echo)\n"
)
assert self.shell
@@ -555,10 +605,11 @@ class Machine:
return (rc, output.decode(errors="replace"))
def shell_interact(self, address: Optional[str] = None) -> None:
- """Allows you to interact with the guest shell for debugging purposes.
-
- @address string passed to socat that will be connected to the guest shell.
- Check the `Running Tests interactivly` chapter of NixOS manual for an example.
+ """
+ Allows you to directly interact with the guest shell. This should
+ only be used during test development, not in production tests.
+ Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends
+ the guest session.
"""
self.connect()
@@ -577,12 +628,14 @@ class Machine:
pass
def console_interact(self) -> None:
- """Allows you to interact with QEMU's stdin
-
- The shell can be exited with Ctrl+D. Note that Ctrl+C is not allowed to be used.
- QEMU's stdout is read line-wise.
-
- Should only be used during test development, not in the production test."""
+ """
+ Allows you to directly interact with QEMU's stdin, by forwarding
+ terminal input to the QEMU process.
+ This is for use with the interactive test driver, not for production
+ tests, which run unattended.
+ Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and
+ `Ctrl-d` closes console and returns to the test runner.
+ """
self.log("Terminal is ready (there is no prompt):")
assert self.process
@@ -599,7 +652,12 @@ class Machine:
self.send_console(char.decode())
def succeed(self, *commands: str, timeout: Optional[int] = None) -> str:
- """Execute each command and check that it succeeds."""
+ """
+ Execute a shell command, raising an exception if the exit status is
+ not zero, otherwise returning the standard output. Similar to `execute`,
+ except that the timeout is `None` by default. See `execute` for details on
+ command execution.
+ """
output = ""
for command in commands:
with self.nested(f"must succeed: {command}"):
@@ -611,7 +669,10 @@ class Machine:
return output
def fail(self, *commands: str, timeout: Optional[int] = None) -> str:
- """Execute each command and check that it fails."""
+ """
+ Like `succeed`, but raising an exception if the command returns a zero
+ status.
+ """
output = ""
for command in commands:
with self.nested(f"must fail: {command}"):
@@ -622,7 +683,11 @@ class Machine:
return output
def wait_until_succeeds(self, command: str, timeout: int = 900) -> str:
- """Wait until a command returns success and return its output.
+ """
+ Repeat a shell command with 1-second intervals until it succeeds.
+ Has a default timeout of 900 seconds which can be modified, e.g.
+ `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on
+ command execution.
Throws an exception on timeout.
"""
output = ""
@@ -637,8 +702,8 @@ class Machine:
return output
def wait_until_fails(self, command: str, timeout: int = 900) -> str:
- """Wait until a command returns failure.
- Throws an exception on timeout.
+ """
+ Like `wait_until_succeeds`, but repeating the command until it fails.
"""
output = ""
@@ -690,12 +755,19 @@ class Machine:
retry(tty_matches)
def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None:
+ """
+ Simulate typing a sequence of characters on the virtual keyboard,
+ e.g., `send_chars("foobar\n")` will type the string `foobar`
+ followed by the Enter key.
+ """
with self.nested(f"sending keys {repr(chars)}"):
for char in chars:
self.send_key(char, delay, log=False)
def wait_for_file(self, filename: str) -> None:
- """Waits until the file exists in machine's file system."""
+ """
+ Waits until the file exists in the machine's file system.
+ """
def check_file(_: Any) -> bool:
status, _ = self.execute(f"test -e {filename}")
@@ -705,6 +777,11 @@ class Machine:
retry(check_file)
def wait_for_open_port(self, port: int, addr: str = "localhost") -> None:
+ """
+ Wait until a process is listening on the given TCP port and IP address
+ (default `localhost`).
+ """
+
def port_is_open(_: Any) -> bool:
status, _ = self.execute(f"nc -z {addr} {port}")
return status == 0
@@ -713,6 +790,11 @@ class Machine:
retry(port_is_open)
def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None:
+ """
+ Wait until nobody is listening on the given TCP port and IP address
+ (default `localhost`).
+ """
+
def port_is_closed(_: Any) -> bool:
status, _ = self.execute(f"nc -z {addr} {port}")
return status != 0
@@ -751,6 +833,9 @@ class Machine:
# TODO: do we want to bail after a set number of attempts?
while not shell_ready(timeout_secs=30):
self.log("Guest root shell did not produce any data yet...")
+ self.log(
+ " To debug, enter the VM and run 'systemctl status backdoor.service'."
+ )
while True:
chunk = self.shell.recv(1024)
@@ -766,6 +851,10 @@ class Machine:
self.connected = True
def screenshot(self, filename: str) -> None:
+ """
+ Take a picture of the display of the virtual machine, in PNG format.
+ The screenshot will be available in the derivation output.
+ """
if "." not in filename:
filename += ".png"
if "/" not in filename:
@@ -795,8 +884,21 @@ class Machine:
)
def copy_from_host(self, source: str, target: str) -> None:
- """Copy a file from the host into the guest via the `shared_dir` shared
- among all the VMs (using a temporary directory).
+ """
+ Copies a file from host to machine, e.g.,
+ `copy_from_host("myfile", "/etc/my/important/file")`.
+
+ The first argument is the file on the host. Note that the "host" refers
+ to the environment in which the test driver runs, which is typically the
+ Nix build sandbox.
+
+ The second argument is the location of the file on the machine that will
+ be written to.
+
+ The file is copied via the `shared_dir` directory which is shared among
+ all the VMs (using a temporary directory).
+ The access rights bits will mimic the ones from the host file and
+ user:group will be root:root.
"""
host_src = Path(source)
vm_target = Path(target)
@@ -848,12 +950,41 @@ class Machine:
return _perform_ocr_on_screenshot(screenshot_path, model_ids)
def get_screen_text_variants(self) -> List[str]:
+ """
+ Return a list of different interpretations of what is currently
+ visible on the machine's screen using optical character
+ recognition. The number and order of the interpretations is not
+ specified and is subject to change, but if no exception is raised at
+ least one will be returned.
+
+ ::: {.note}
+ This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
+ :::
+ """
return self._get_screen_text_variants([0, 1, 2])
def get_screen_text(self) -> str:
+ """
+ Return a textual representation of what is currently visible on the
+ machine's screen using optical character recognition.
+
+ ::: {.note}
+ This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
+ :::
+ """
return self._get_screen_text_variants([2])[0]
def wait_for_text(self, regex: str) -> None:
+ """
+ Wait until the supplied regular expressions matches the textual
+ contents of the screen by using optical character recognition (see
+ `get_screen_text` and `get_screen_text_variants`).
+
+ ::: {.note}
+ This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`.
+ :::
+ """
+
def screen_matches(last: bool) -> bool:
variants = self.get_screen_text_variants()
for text in variants:
@@ -870,12 +1001,9 @@ class Machine:
def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None:
"""
- Wait for the provided regex to appear on console.
- For each reads,
-
- If timeout is None, timeout is infinite.
-
- `timeout` is in seconds.
+ Wait until the supplied regular expressions match a line of the
+ serial console output.
+ This method is useful when OCR is not possible or inaccurate.
"""
# Buffer the console output, this is needed
# to match multiline regexes.
@@ -903,6 +1031,13 @@ class Machine:
def send_key(
self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True
) -> None:
+ """
+ Simulate pressing keys on the virtual keyboard, e.g.,
+ `send_key("ctrl-alt-delete")`.
+
+ Please also refer to the QEMU documentation for more information on the
+ input syntax: https://en.wikibooks.org/wiki/QEMU/Monitor#sendkey_keys
+ """
key = CHAR_TO_KEY.get(key, key)
context = self.nested(f"sending key {repr(key)}") if log else nullcontext()
with context:
@@ -911,12 +1046,21 @@ class Machine:
time.sleep(delay)
def send_console(self, chars: str) -> None:
+ r"""
+ Send keys to the kernel console. This allows interaction with the systemd
+ emergency mode, for example. Takes a string that is sent, e.g.,
+ `send_console("\n\nsystemctl default\n")`.
+ """
assert self.process
assert self.process.stdin
self.process.stdin.write(chars.encode())
self.process.stdin.flush()
def start(self, allow_reboot: bool = False) -> None:
+ """
+ Start the virtual machine. This method is asynchronous --- it does
+ not wait for the machine to finish booting.
+ """
if self.booted:
return
@@ -974,6 +1118,9 @@ class Machine:
rootlog.log("if you want to keep the VM state, pass --keep-vm-state")
def shutdown(self) -> None:
+ """
+ Shut down the machine, waiting for the VM to exit.
+ """
if not self.booted:
return
@@ -982,6 +1129,9 @@ class Machine:
self.wait_for_shutdown()
def crash(self) -> None:
+ """
+ Simulate a sudden power failure, by telling the VM to exit immediately.
+ """
if not self.booted:
return
@@ -999,8 +1149,8 @@ class Machine:
self.connected = False
def wait_for_x(self) -> None:
- """Wait until it is possible to connect to the X server. Note that
- testing the existence of /tmp/.X11-unix/X0 is insufficient.
+ """
+ Wait until it is possible to connect to the X server.
"""
def check_x(_: Any) -> bool:
@@ -1023,6 +1173,10 @@ class Machine:
).splitlines()
def wait_for_window(self, regexp: str) -> None:
+ """
+ Wait until an X11 window has appeared whose name matches the given
+ regular expression, e.g., `wait_for_window("Terminal")`.
+ """
pattern = re.compile(regexp)
def window_is_visible(last_try: bool) -> bool:
@@ -1043,20 +1197,26 @@ class Machine:
self.succeed(f"sleep {secs}")
def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None:
- """Forward a TCP port on the host to a TCP port on the guest.
+ """
+ Forward a TCP port on the host to a TCP port on the guest.
Useful during interactive testing.
"""
self.send_monitor_command(f"hostfwd_add tcp::{host_port}-:{guest_port}")
def block(self) -> None:
- """Make the machine unreachable by shutting down eth1 (the multicast
- interface used to talk to the other VMs). We keep eth0 up so that
- the test driver can continue to talk to the machine.
+ """
+ Simulate unplugging the Ethernet cable that connects the machine to
+ the other machines.
+ This happens by shutting down eth1 (the multicast interface used to talk
+ to the other VMs). eth0 is kept online to still enable the test driver
+ to communicate with the machine.
"""
self.send_monitor_command("set_link virtio-net-pci.1 off")
def unblock(self) -> None:
- """Make the machine reachable."""
+ """
+ Undo the effect of `block`.
+ """
self.send_monitor_command("set_link virtio-net-pci.1 on")
def release(self) -> None:
diff --git a/third_party/nixpkgs/nixos/lib/testing/driver.nix b/third_party/nixpkgs/nixos/lib/testing/driver.nix
index 444236efb1..23574698c0 100644
--- a/third_party/nixpkgs/nixos/lib/testing/driver.nix
+++ b/third_party/nixpkgs/nixos/lib/testing/driver.nix
@@ -65,7 +65,8 @@ let
echo "${builtins.toString vlanNames}" >> testScriptWithTypes
echo -n "$testScript" >> testScriptWithTypes
- cat -n testScriptWithTypes
+ echo "Running type check (enable/disable: config.skipTypeCheck)"
+ echo "See https://nixos.org/manual/nixos/stable/#test-opt-skipTypeCheck"
mypy --no-implicit-optional \
--pretty \
@@ -79,6 +80,9 @@ let
${testDriver}/bin/generate-driver-symbols
${lib.optionalString (!config.skipLint) ''
+ echo "Linting test script (enable/disable: config.skipLint)"
+ echo "See https://nixos.org/manual/nixos/stable/#test-opt-skipLint"
+
PYFLAKES_BUILTINS="$(
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," pythonizedNames)},
< ${lib.escapeShellArg "driver-symbols"}
diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
index 2eee5cd34d..5e2e054f7c 100644
--- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
+++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix
@@ -42,7 +42,7 @@ let
# looking things up.
makeCacheConf = { }:
let
- makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
+ makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.packages; };
cache = makeCache pkgs.fontconfig;
cache32 = makeCache pkgs.pkgsi686Linux.fontconfig;
in
@@ -51,7 +51,7 @@ let
- ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)}
+ ${concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)}
${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
${cache}
diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix
index 9d41463c94..3b5eaf5b2d 100644
--- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix
+++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix
@@ -9,7 +9,7 @@ let
x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
mkdir -p "$out/share/X11/fonts"
font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
- find ${toString config.fonts.fonts} -regex "$font_regexp" \
+ find ${toString config.fonts.packages} -regex "$font_regexp" \
-exec ln -sf -t "$out/share/X11/fonts" '{}' \;
cd "$out/share/X11/fonts"
${optionalString cfg.decompressFonts ''
diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix
deleted file mode 100644
index 87cf837e7c..0000000000
--- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.fonts;
-
- defaultFonts =
- [ pkgs.dejavu_fonts
- pkgs.freefont_ttf
- pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts
- pkgs.liberation_ttf
- pkgs.unifont
- pkgs.noto-fonts-emoji
- ];
-in
-{
- imports = [
- (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
- ];
-
- options = {
-
- fonts = {
-
- # TODO: find another name for it.
- fonts = mkOption {
- type = types.listOf types.path;
- default = [];
- example = literalExpression "[ pkgs.dejavu_fonts ]";
- description = lib.mdDoc "List of primary font paths.";
- };
-
- enableDefaultFonts = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Enable a basic set of fonts providing several font styles
- and families and reasonable coverage of Unicode.
- '';
- };
- };
-
- };
-
- config = { fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; };
-}
diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix
index c284c4a0b0..c41fcdaaa3 100644
--- a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix
+++ b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix
@@ -3,31 +3,21 @@
with lib;
{
-
options = {
-
- fonts = {
-
- enableGhostscriptFonts = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to add the fonts provided by Ghostscript (such as
- various URW fonts and the “Base-14” Postscript fonts) to the
- list of system fonts, making them available to X11
- applications.
- '';
- };
-
+ fonts.enableGhostscriptFonts = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to add the fonts provided by Ghostscript (such as
+ various URW fonts and the “Base-14” Postscript fonts) to the
+ list of system fonts, making them available to X11
+ applications.
+ '';
};
};
-
config = mkIf config.fonts.enableGhostscriptFonts {
-
- fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
-
+ fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
};
-
}
diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix b/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix
new file mode 100644
index 0000000000..46907d5411
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.fonts;
+in
+{
+ imports = [
+ (lib.mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.packages = [ pkgs.corefonts ]; instead.")
+ (lib.mkRenamedOptionModule [ "fonts" "enableDefaultFonts" ] [ "fonts" "enableDefaultPackages" ])
+ (lib.mkRenamedOptionModule [ "fonts" "fonts" ] [ "fonts" "packages" ])
+ ];
+
+ options = {
+ fonts = {
+ packages = lib.mkOption {
+ type = with lib.types; listOf path;
+ default = [];
+ example = lib.literalExpression "[ pkgs.dejavu_fonts ]";
+ description = lib.mdDoc "List of primary font packages.";
+ };
+
+ enableDefaultPackages = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Enable a basic set of fonts providing several styles
+ and families and reasonable coverage of Unicode.
+ '';
+ };
+ };
+ };
+
+ config = {
+ fonts.packages = lib.mkIf cfg.enableDefaultPackages (with pkgs; [
+ dejavu_fonts
+ freefont_ttf
+ gyre-fonts # TrueType substitutes for standard PostScript fonts
+ liberation_ttf
+ unifont
+ noto-fonts-emoji
+ ]);
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
index 557f17d8b3..3f8e088ede 100644
--- a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
+++ b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
@@ -3,12 +3,13 @@
configuration to work.
See also
- - ./nix.nix
- - ./nix-flakes.nix
+ - ./nix.nix
+ - ./nix-flakes.nix
*/
{ config, lib, ... }:
let
inherit (lib)
+ mkDefault
mkIf
mkOption
stringAfter
@@ -21,13 +22,42 @@ in
{
options = {
nix = {
+ channel = {
+ enable = mkOption {
+ description = lib.mdDoc ''
+ Whether the `nix-channel` command and state files are made available on the machine.
+
+ The following files are initialized when enabled:
+ - `/nix/var/nix/profiles/per-user/root/channels`
+ - `/root/.nix-channels`
+ - `$HOME/.nix-defexpr/channels` (on login)
+
+ Disabling this option will not remove the state files from the system.
+ '';
+ type = types.bool;
+ default = true;
+ };
+ };
+
nixPath = mkOption {
type = types.listOf types.str;
- default = [
- "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
- "nixos-config=/etc/nixos/configuration.nix"
- "/nix/var/nix/profiles/per-user/root/channels"
- ];
+ default =
+ if cfg.channel.enable
+ then [
+ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+ "nixos-config=/etc/nixos/configuration.nix"
+ "/nix/var/nix/profiles/per-user/root/channels"
+ ]
+ else [ ];
+ defaultText = ''
+ if nix.channel.enable
+ then [
+ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+ "nixos-config=/etc/nixos/configuration.nix"
+ "/nix/var/nix/profiles/per-user/root/channels"
+ ]
+ else [];
+ '';
description = lib.mdDoc ''
The default Nix expression search path, used by the Nix
evaluator to look up paths enclosed in angle brackets
@@ -49,22 +79,30 @@ in
config = mkIf cfg.enable {
environment.extraInit =
- ''
+ mkIf cfg.channel.enable ''
if [ -e "$HOME/.nix-defexpr/channels" ]; then
export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
fi
'';
+ environment.extraSetup = mkIf (!cfg.channel.enable) ''
+ rm --force $out/bin/nix-channel
+ '';
+
+ # NIX_PATH has a non-empty default according to Nix docs, so we don't unset
+ # it when empty.
environment.sessionVariables = {
NIX_PATH = cfg.nixPath;
};
- system.activationScripts.nix-channel = stringAfter [ "etc" "users" ]
- ''
+ nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");
+
+ system.activationScripts.nix-channel = mkIf cfg.channel.enable
+ (stringAfter [ "etc" "users" ] ''
# Subscribe the root user to the NixOS channel by default.
if [ ! -e "/root/.nix-channels" ]; then
echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels"
fi
- '';
+ '');
};
}
diff --git a/third_party/nixpkgs/nixos/modules/config/qt.nix b/third_party/nixpkgs/nixos/modules/config/qt.nix
index cf4e9621d7..2b09281e46 100644
--- a/third_party/nixpkgs/nixos/modules/config/qt.nix
+++ b/third_party/nixpkgs/nixos/modules/config/qt.nix
@@ -19,7 +19,7 @@ let
pkgs.qgnomeplatform-qt6
pkgs.adwaita-qt6
]
- else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
+ else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ]
else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ]
else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]
@@ -86,6 +86,7 @@ in
"adwaita-qt"
"adwaita-qt6"
["libsForQt5" "qtstyleplugins"]
+ ["qt6Packages" "qt6gtk2"]
];
description = lib.mdDoc ''
Selects the style to use for Qt applications.
diff --git a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix b/third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix
similarity index 69%
rename from third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix
rename to third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix
index 69673872cf..773891b003 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix
@@ -7,12 +7,15 @@ with lib;
options = {
- hardware.usbWwan = {
+ hardware.usb-modeswitch = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
- Enable this option to support USB WWAN adapters.
+ Enable this option to support certain USB WLAN and WWAN adapters.
+
+ These network adapters initial present themselves as Flash Drives containing their drivers.
+ This option enables automatic switching to the networking mode.
'';
};
};
@@ -20,7 +23,11 @@ with lib;
###### implementation
- config = mkIf config.hardware.usbWwan.enable {
+ imports = [
+ (mkRenamedOptionModule ["hardware" "usbWwan" ] ["hardware" "usb-modeswitch" ])
+ ];
+
+ config = mkIf config.hardware.usb-modeswitch.enable {
# Attaches device specific handlers.
services.udev.packages = with pkgs; [ usb-modeswitch-data ];
diff --git a/third_party/nixpkgs/nixos/modules/hardware/wooting.nix b/third_party/nixpkgs/nixos/modules/hardware/wooting.nix
index 90d046d49f..78bbcb61ac 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/wooting.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/wooting.nix
@@ -2,8 +2,8 @@
with lib;
{
- options.hardware.wooting.enable =
- mkEnableOption (lib.mdDoc "support for Wooting keyboards");
+ options.hardware.wooting.enable = mkEnableOption (lib.mdDoc ''support for Wooting keyboards.
+ Note that users must be in the "input" group for udev rules to apply'');
config = mkIf config.hardware.wooting.enable {
environment.systemPackages = [ pkgs.wootility ];
diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix
index 7251240d26..39952d6c39 100644
--- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix
+++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix
@@ -12,12 +12,34 @@ in
i18n.inputMethod.fcitx5 = {
addons = mkOption {
type = with types; listOf package;
- default = [];
+ default = [ ];
example = literalExpression "with pkgs; [ fcitx5-rime ]";
description = lib.mdDoc ''
Enabled Fcitx5 addons.
'';
};
+ quickPhrase = mkOption {
+ type = with types; attrsOf string;
+ default = { };
+ example = literalExpression ''
+ {
+ smile = "（・∀・）";
+ angry = "(￣ー￣)";
+ }
+ '';
+ description = lib.mdDoc "Quick phrases.";
+ };
+ quickPhraseFiles = mkOption {
+ type = with types; attrsOf path;
+ default = { };
+ example = literalExpression ''
+ {
+ words = ./words.mb;
+ numbers = ./numbers.mb;
+ }
+ '';
+ description = lib.mdDoc "Quick phrase files.";
+ };
};
};
@@ -30,6 +52,16 @@ in
config = mkIf (im.enabled == "fcitx5") {
i18n.inputMethod.package = fcitx5Package;
+ i18n.inputMethod.fcitx5.addons = lib.optionals (cfg.quickPhrase != { }) [
+ (pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb"
+ (lib.concatStringsSep "\n"
+ (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.quickPhrase)))
+ ] ++ lib.optionals (cfg.quickPhraseFiles != { }) [
+ (pkgs.linkFarm "quickPhraseFiles" (lib.mapAttrs'
+ (name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value)
+ cfg.quickPhraseFiles))
+ ];
+
environment.variables = {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
diff --git a/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py b/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py
new file mode 100644
index 0000000000..52f10303eb
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+
+"""Amend systemd-repart definiton files.
+
+In order to avoid Import-From-Derivation (IFD) when building images with
+systemd-repart, the definition files created by Nix need to be amended with the
+store paths from the closure.
+
+This is achieved by adding CopyFiles= instructions to the definition files.
+
+The arbitrary files configured via `contents` are also added to the definition
+files using the same mechanism.
+"""
+
+import json
+import sys
+import shutil
+from pathlib import Path
+
+
+def add_contents_to_definition(
+ definition: Path, contents: dict[str, dict[str, str]] | None
+) -> None:
+ """Add CopyFiles= instructions to a definition for all files in contents."""
+ if not contents:
+ return
+
+ copy_files_lines: list[str] = []
+ for target, options in contents.items():
+ source = options["source"]
+
+ copy_files_lines.append(f"CopyFiles={source}:{target}\n")
+
+ with open(definition, "a") as f:
+ f.writelines(copy_files_lines)
+
+
+def add_closure_to_definition(
+ definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None
+) -> None:
+ """Add CopyFiles= instructions to a definition for all paths in the closure.
+
+ If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path.
+ """
+ if not closure:
+ return
+
+ copy_files_lines: list[str] = []
+ with open(closure, "r") as f:
+ for line in f:
+ if not isinstance(line, str):
+ continue
+
+ source = Path(line.strip())
+ target = str(source.relative_to("/nix/store/"))
+ target = f":{target}" if strip_nix_store_prefix else ""
+
+ copy_files_lines.append(f"CopyFiles={source}{target}\n")
+
+ with open(definition, "a") as f:
+ f.writelines(copy_files_lines)
+
+
+def main() -> None:
+ """Amend the provided repart definitions by adding CopyFiles= instructions.
+
+ For each file specified in the `contents` field of a partition in the
+ partiton config file, a `CopyFiles=` instruction is added to the
+ corresponding definition file.
+
+ The same is done for every store path of the `closure` field.
+
+ Print the path to a directory that contains the amended repart
+ definitions to stdout.
+ """
+ partition_config_file = sys.argv[1]
+ if not partition_config_file:
+ print("No partition config file was supplied.")
+ sys.exit(1)
+
+ repart_definitions = sys.argv[2]
+ if not repart_definitions:
+ print("No repart definitions were supplied.")
+ sys.exit(1)
+
+ with open(partition_config_file, "rb") as f:
+ partition_config = json.load(f)
+
+ if not partition_config:
+ print("Partition config is empty.")
+ sys.exit(1)
+
+ target_dir = Path("amended-repart.d")
+ target_dir.mkdir()
+ shutil.copytree(repart_definitions, target_dir, dirs_exist_ok=True)
+
+ for name, config in partition_config.items():
+ definition = target_dir.joinpath(f"{name}.conf")
+ definition.chmod(0o644)
+
+ contents = config.get("contents")
+ add_contents_to_definition(definition, contents)
+
+ closure = config.get("closure")
+ strip_nix_store_prefix = config.get("stripStorePaths")
+ add_closure_to_definition(definition, closure, strip_nix_store_prefix)
+
+ print(target_dir.absolute())
+
+
+if __name__ == "__main__":
+ main()
diff --git a/third_party/nixpkgs/nixos/modules/image/repart.md b/third_party/nixpkgs/nixos/modules/image/repart.md
new file mode 100644
index 0000000000..6d0675f21a
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/image/repart.md
@@ -0,0 +1,137 @@
+# Building Images via `systemd-repart` {#sec-image-repart}
+
+You can build disk images in NixOS with the `image.repart` option provided by
+the module [image/repart.nix][]. This module uses `systemd-repart` to build the
+images and exposes it's entire interface via the `repartConfig` option.
+
+[image/repart.nix]: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/image/repart.nix
+
+An example of how to build an image:
+
+```nix
+{ config, modulesPath, ... }: {
+
+ imports = [ "${modulesPath}/image/repart.nix" ];
+
+ image.repart = {
+ name = "image";
+ partitions = {
+ "esp" = {
+ contents = {
+ ...
+ };
+ repartConfig = {
+ Type = "esp";
+ ...
+ };
+ };
+ "root" = {
+ storePaths = [ config.system.build.toplevel ];
+ repartConfig = {
+ Type = "root";
+ Label = "nixos";
+ ...
+ };
+ };
+ };
+ };
+
+}
+```
+
+## Nix Store Partition {#sec-image-repart-store-partition}
+
+You can define a partition that only contains the Nix store and then mount it
+under `/nix/store`. Because the `/nix/store` part of the paths is already
+determined by the mount point, you have to set `stripNixStorePrefix = true;` so
+that the prefix is stripped from the paths before copying them into the image.
+
+```nix
+fileSystems."/nix/store".device = "/dev/disk/by-partlabel/nix-store"
+
+image.repart.partitions = {
+ "store" = {
+ storePaths = [ config.system.build.toplevel ];
+ stripNixStorePrefix = true;
+ repartConfig = {
+ Type = "linux-generic";
+ Label = "nix-store";
+ ...
+ };
+ };
+};
+```
+
+## Appliance Image {#sec-image-repart-appliance}
+
+The `image/repart.nix` module can also be used to build self-contained [software
+appliances][].
+
+[software appliances]: https://en.wikipedia.org/wiki/Software_appliance
+
+The generation based update mechanism of NixOS is not suited for appliances.
+Updates of appliances are usually either performed by replacing the entire
+image with a new one or by updating partitions via an A/B scheme. See the
+[Chrome OS update process][chrome-os-update] for an example of how to achieve
+this. The appliance image built in the following example does not contain a
+`configuration.nix` and thus you will not be able to call `nixos-rebuild` from
+this system.
+
+[chrome-os-update]: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/HEAD/README.md
+
+```nix
+let
+ pkgs = import { };
+ efiArch = pkgs.stdenv.hostPlatform.efiArch;
+in
+(pkgs.nixos [
+ ({ config, lib, pkgs, modulesPath, ... }: {
+
+ imports = [ "${modulesPath}/image/repart.nix" ];
+
+ boot.loader.grub.enable = false;
+
+ fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+ image.repart = {
+ name = "image";
+ partitions = {
+ "esp" = {
+ contents = {
+ "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
+ "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+
+ "/loader/entries/nixos.conf".source = pkgs.writeText "nixos.conf" ''
+ title NixOS
+ linux /EFI/nixos/kernel.efi
+ initrd /EFI/nixos/initrd.efi
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+ '';
+
+ "/EFI/nixos/kernel.efi".source =
+ "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
+
+ "/EFI/nixos/initrd.efi".source =
+ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
+ };
+ repartConfig = {
+ Type = "esp";
+ Format = "vfat";
+ SizeMinBytes = "96M";
+ };
+ };
+ "root" = {
+ storePaths = [ config.system.build.toplevel ];
+ repartConfig = {
+ Type = "root";
+ Format = "ext4";
+ Label = "nixos";
+ Minimize = "guess";
+ };
+ };
+ };
+ };
+
+ })
+]).image
+```
diff --git a/third_party/nixpkgs/nixos/modules/image/repart.nix b/third_party/nixpkgs/nixos/modules/image/repart.nix
new file mode 100644
index 0000000000..4362982f5b
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/image/repart.nix
@@ -0,0 +1,209 @@
+# This module exposes options to build a disk image with a GUID Partition Table
+# (GPT). It uses systemd-repart to build the image.
+
+{ config, pkgs, lib, utils, ... }:
+
+let
+ cfg = config.image.repart;
+
+ partitionOptions = {
+ options = {
+ storePaths = lib.mkOption {
+ type = with lib.types; listOf path;
+ default = [ ];
+ description = lib.mdDoc "The store paths to include in the partition.";
+ };
+
+ stripNixStorePrefix = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to strip `/nix/store/` from the store paths. This is useful
+ when you want to build a partition that only contains store paths and
+ is mounted under `/nix/store`.
+ '';
+ };
+
+ contents = lib.mkOption {
+ type = with lib.types; attrsOf (submodule {
+ options = {
+ source = lib.mkOption {
+ type = types.path;
+ description = lib.mdDoc "Path of the source file.";
+ };
+ };
+ });
+ default = { };
+ example = lib.literalExpression '' {
+ "/EFI/BOOT/BOOTX64.EFI".source =
+ "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi";
+
+ "/loader/entries/nixos.conf".source = systemdBootEntry;
+ }
+ '';
+ description = lib.mdDoc "The contents to end up in the filesystem image.";
+ };
+
+ repartConfig = lib.mkOption {
+ type = with lib.types; attrsOf (oneOf [ str int bool ]);
+ example = {
+ Type = "home";
+ SizeMinBytes = "512M";
+ SizeMaxBytes = "2G";
+ };
+ description = lib.mdDoc ''
+ Specify the repart options for a partiton as a structural setting.
+ See
+ for all available options.
+ '';
+ };
+ };
+ };
+in
+{
+ options.image.repart = {
+
+ name = lib.mkOption {
+ type = lib.types.str;
+ description = lib.mdDoc "The name of the image.";
+ };
+
+ seed = lib.mkOption {
+ type = with lib.types; nullOr str;
+ # Generated with `uuidgen`. Random but fixed to improve reproducibility.
+ default = "0867da16-f251-457d-a9e8-c31f9a3c220b";
+ description = lib.mdDoc ''
+ A UUID to use as a seed. You can set this to `null` to explicitly
+ randomize the partition UUIDs.
+ '';
+ };
+
+ split = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Enables generation of split artifacts from partitions. If enabled, for
+ each partition with SplitName= set, a separate output file containing
+ just the contents of that partition is generated.
+ '';
+ };
+
+ partitions = lib.mkOption {
+ type = with lib.types; attrsOf (submodule partitionOptions);
+ default = { };
+ example = lib.literalExpression '' {
+ "10-esp" = {
+ contents = {
+ "/EFI/BOOT/BOOTX64.EFI".source =
+ "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi";
+ }
+ repartConfig = {
+ Type = "esp";
+ Format = "fat";
+ };
+ };
+ "20-root" = {
+ storePaths = [ config.system.build.toplevel ];
+ repartConfig = {
+ Type = "root";
+ Format = "ext4";
+ Minimize = "guess";
+ };
+ };
+ };
+ '';
+ description = lib.mdDoc ''
+ Specify partitions as a set of the names of the partitions with their
+ configuration as the key.
+ '';
+ };
+
+ };
+
+ config = {
+
+ system.build.image =
+ let
+ fileSystemToolMapping = with pkgs; {
+ "vfat" = [ dosfstools mtools ];
+ "ext4" = [ e2fsprogs.bin ];
+ "squashfs" = [ squashfsTools ];
+ "erofs" = [ erofs-utils ];
+ "btrfs" = [ btrfs-progs ];
+ "xfs" = [ xfsprogs ];
+ };
+
+ fileSystems = lib.filter
+ (f: f != null)
+ (lib.mapAttrsToList (_n: v: v.repartConfig.Format or null) cfg.partitions);
+
+ fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;
+
+
+ makeClosure = paths: pkgs.closureInfo { rootPaths = paths; };
+
+ # Add the closure of the provided Nix store paths to cfg.partitions so
+ # that amend-repart-definitions.py can read it.
+ addClosure = _name: partitionConfig: partitionConfig // (
+ lib.optionalAttrs
+ (partitionConfig.storePaths or [ ] != [ ])
+ { closure = "${makeClosure partitionConfig.storePaths}/store-paths"; }
+ );
+
+
+ finalPartitions = lib.mapAttrs addClosure cfg.partitions;
+
+
+ amendRepartDefinitions = pkgs.runCommand "amend-repart-definitions.py"
+ {
+ nativeBuildInputs = with pkgs; [ black ruff mypy ];
+ buildInputs = [ pkgs.python3 ];
+ } ''
+ install ${./amend-repart-definitions.py} $out
+ patchShebangs --host $out
+
+ black --check --diff $out
+ ruff --line-length 88 $out
+ mypy --strict $out
+ '';
+
+ format = pkgs.formats.ini { };
+
+ definitionsDirectory = utils.systemdUtils.lib.definitions
+ "repart.d"
+ format
+ (lib.mapAttrs (_n: v: { Partition = v.repartConfig; }) finalPartitions);
+
+ partitions = pkgs.writeText "partitions.json" (builtins.toJSON finalPartitions);
+ in
+ pkgs.runCommand cfg.name
+ {
+ nativeBuildInputs = with pkgs; [
+ fakeroot
+ systemd
+ ] ++ fileSystemTools;
+ } ''
+ amendedRepartDefinitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory})
+
+ mkdir -p $out
+ cd $out
+
+ fakeroot systemd-repart \
+ --dry-run=no \
+ --empty=create \
+ --size=auto \
+ --seed="${cfg.seed}" \
+ --definitions="$amendedRepartDefinitions" \
+ --split="${lib.boolToString cfg.split}" \
+ --json=pretty \
+ image.raw \
+ | tee repart-output.json
+ '';
+
+ meta = {
+ maintainers = with lib.maintainers; [ nikstur ];
+ doc = ./repart.md;
+ };
+
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh
index 20fec525e7..4e42875c03 100755
--- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh
@@ -206,7 +206,7 @@ if [[ -z $noBootLoader ]]; then
mount --rbind --mkdir / "$mountPoint"
mount --make-rslave "$mountPoint"
/run/current-system/bin/switch-to-configuration boot
- umount -R "$mountPoint" && rmdir "$mountPoint"
+ umount -R "$mountPoint" && (rmdir "$mountPoint" 2>/dev/null || true)
EOF
)"
fi
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
index 54b0f81ee7..4dce4f9980 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
@@ -126,7 +126,7 @@ in
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`).
- { config, pkgs, ... }:
+ { config, lib, pkgs, ... }:
{
imports =
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 97abbe2191..29fcabaefa 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -4,8 +4,8 @@
./config/debug-info.nix
./config/fonts/fontconfig.nix
./config/fonts/fontdir.nix
- ./config/fonts/fonts.nix
./config/fonts/ghostscript.nix
+ ./config/fonts/packages.nix
./config/gnu.nix
./config/gtk/gtk-icon-cache.nix
./config/i18n.nix
@@ -93,8 +93,8 @@
./hardware/tuxedo-keyboard.nix
./hardware/ubertooth.nix
./hardware/uinput.nix
+ ./hardware/usb-modeswitch.nix
./hardware/usb-storage.nix
- ./hardware/usb-wwan.nix
./hardware/video/amdgpu-pro.nix
./hardware/video/bumblebee.nix
./hardware/video/capture/mwprocapture.nix
@@ -221,7 +221,9 @@
./programs/nncp.nix
./programs/noisetorch.nix
./programs/npm.nix
+ ./programs/ns-usbloader.nix
./programs/oblogout.nix
+ ./programs/oddjobd.nix
./programs/openvpn3.nix
./programs/pantheon-tweaks.nix
./programs/partition-manager.nix
@@ -263,6 +265,7 @@
./programs/wayland/river.nix
./programs/wayland/sway.nix
./programs/wayland/waybar.nix
+ ./programs/wayland/wayfire.nix
./programs/weylus.nix
./programs/wireshark.nix
./programs/xastir.nix
@@ -417,6 +420,7 @@
./services/databases/neo4j.nix
./services/databases/openldap.nix
./services/databases/opentsdb.nix
+ ./services/databases/pgbouncer.nix
./services/databases/pgmanage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
@@ -535,6 +539,7 @@
./services/hardware/usbrelayd.nix
./services/hardware/vdr.nix
./services/hardware/keyd.nix
+ ./services/home-automation/ebusd.nix
./services/home-automation/esphome.nix
./services/home-automation/evcc.nix
./services/home-automation/home-assistant.nix
@@ -598,6 +603,7 @@
./services/matrix/mjolnir.nix
./services/matrix/mx-puppet-discord.nix
./services/matrix/pantalaimon.nix
+ ./services/matrix/matrix-sliding-sync.nix
./services/matrix/synapse.nix
./services/misc/airsonic.nix
./services/misc/ananicy.nix
@@ -608,6 +614,7 @@
./services/misc/autorandr.nix
./services/misc/autosuspend.nix
./services/misc/bazarr.nix
+ ./services/misc/bcg.nix
./services/misc/beanstalkd.nix
./services/misc/bees.nix
./services/misc/bepasty.nix
@@ -631,6 +638,7 @@
./services/misc/etcd.nix
./services/misc/etebase-server.nix
./services/misc/etesync-dav.nix
+ ./services/misc/evdevremapkeys.nix
./services/misc/felix.nix
./services/misc/freeswitch.nix
./services/misc/fstrim.nix
@@ -665,6 +673,7 @@
./services/misc/mediatomb.nix
./services/misc/metabase.nix
./services/misc/moonraker.nix
+ ./services/misc/mqtt2influxdb.nix
./services/misc/n8n.nix
./services/misc/nitter.nix
./services/misc/nix-gc.nix
@@ -761,6 +770,7 @@
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
./services/monitoring/opentelemetry-collector.nix
+ ./services/monitoring/osquery.nix
./services/monitoring/parsedmarc.nix
./services/monitoring/prometheus/alertmanager-irc-relay.nix
./services/monitoring/prometheus/alertmanager.nix
@@ -855,7 +865,6 @@
./services/networking/croc.nix
./services/networking/dante.nix
./services/networking/dhcpcd.nix
- ./services/networking/dhcpd.nix
./services/networking/dnscache.nix
./services/networking/dnscrypt-proxy2.nix
./services/networking/dnscrypt-wrapper.nix
@@ -1103,6 +1112,7 @@
./services/search/meilisearch.nix
./services/search/opensearch.nix
./services/search/qdrant.nix
+ ./services/search/typesense.nix
./services/security/aesmd.nix
./services/security/authelia.nix
./services/security/certmgr.nix
@@ -1142,6 +1152,7 @@
./services/security/vaultwarden/default.nix
./services/security/yubikey-agent.nix
./services/system/automatic-timezoned.nix
+ ./services/system/bpftune.nix
./services/system/cachix-agent/default.nix
./services/system/cachix-watch-store.nix
./services/system/cloud-init.nix
@@ -1255,6 +1266,7 @@
./services/web-apps/rss-bridge.nix
./services/web-apps/selfoss.nix
./services/web-apps/shiori.nix
+ ./services/web-apps/slskd.nix
./services/web-apps/snipe-it.nix
./services/web-apps/sogo.nix
./services/web-apps/trilium.nix
@@ -1387,6 +1399,7 @@
./system/boot/systemd/oomd.nix
./system/boot/systemd/repart.nix
./system/boot/systemd/shutdown.nix
+ ./system/boot/systemd/sysupdate.nix
./system/boot/systemd/tmpfiles.nix
./system/boot/systemd/user.nix
./system/boot/systemd/userdbd.nix
diff --git a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix
index 83a8499561..cc01b16960 100644
--- a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix
+++ b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix
@@ -21,7 +21,8 @@ in
../virtualisation/nixos-containers.nix
../services/x11/desktop-managers/xterm.nix
];
- config = { };
+ # swraid's default depends on stateVersion
+ config.boot.swraid.enable = false;
options.boot.isContainer = lib.mkOption { default = false; internal = true; };
}
];
diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix
index 9d5843bd67..a5f4d990bd 100644
--- a/third_party/nixpkgs/nixos/modules/programs/atop.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix
@@ -123,8 +123,8 @@ in
boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
systemd =
let
- mkSystemd = type: cond: name: restartTriggers: {
- ${name} = lib.mkIf cond {
+ mkSystemd = type: name: restartTriggers: {
+ ${name} = {
inherit restartTriggers;
wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ];
};
@@ -134,42 +134,44 @@ in
in
{
packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
- services =
- mkService cfg.atopService.enable "atop" [ atop ]
- // lib.mkIf cfg.atopService.enable {
- # always convert logs to newer version first
- # XXX might trigger TimeoutStart but restarting atop.service will
- # convert remainings logs and start eventually
- atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" ''
- set -e -u
- shopt -s nullglob
- for logfile in "$LOGPATH"/atop_*
- do
- ${atop}/bin/atopconvert "$logfile" "$logfile".new
- # only replace old file if version was upgraded to avoid
- # false positives for atop-rotate.service
- if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
- then
- ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
- else
- ${pkgs.coreutils}/bin/rm -f "$logfile".new
- fi
- done
- '';
- }
- // mkService cfg.atopacctService.enable "atopacct" [ atop ]
- // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ]
- // mkService cfg.atopgpu.enable "atopgpu" [ atop ];
- timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ];
+ services = lib.mkMerge [
+ (lib.mkIf cfg.atopService.enable (lib.recursiveUpdate
+ (mkService "atop" [ atop ])
+ {
+ # always convert logs to newer version first
+ # XXX might trigger TimeoutStart but restarting atop.service will
+ # convert remainings logs and start eventually
+ atop.preStart = ''
+ set -e -u
+ shopt -s nullglob
+ for logfile in "$LOGPATH"/atop_*
+ do
+ ${atop}/bin/atopconvert "$logfile" "$logfile".new
+ # only replace old file if version was upgraded to avoid
+ # false positives for atop-rotate.service
+ if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
+ then
+ ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
+ else
+ ${pkgs.coreutils}/bin/rm -f "$logfile".new
+ fi
+ done
+ '';
+ }))
+ (lib.mkIf cfg.atopacctService.enable (mkService "atopacct" [ atop ]))
+ (lib.mkIf cfg.netatop.enable (mkService "netatop" [ cfg.netatop.package ]))
+ (lib.mkIf cfg.atopgpu.enable (mkService "atopgpu" [ atop ]))
+ ];
+ timers = lib.mkIf cfg.atopRotateTimer.enable (mkTimer "atop-rotate" [ atop ]);
};
security.wrappers = lib.mkIf cfg.setuidWrapper.enable {
- atop =
- { setuid = true;
- owner = "root";
- group = "root";
- source = "${atop}/bin/atop";
- };
+ atop = {
+ setuid = true;
+ owner = "root";
+ group = "root";
+ source = "${atop}/bin/atop";
+ };
};
}
);
diff --git a/third_party/nixpkgs/nixos/modules/programs/firefox.nix b/third_party/nixpkgs/nixos/modules/programs/firefox.nix
index ead048134d..d67bbee9a7 100644
--- a/third_party/nixpkgs/nixos/modules/programs/firefox.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/firefox.nix
@@ -233,7 +233,6 @@ 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/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix
index 478f07d013..8b78d3d9e2 100644
--- a/third_party/nixpkgs/nixos/modules/programs/fish.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix
@@ -37,7 +37,7 @@ let
babelfishTranslate = path: name:
pkgs.runCommandLocal "${name}.fish" {
nativeBuildInputs = [ pkgs.babelfish ];
- } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
+ } "babelfish < ${path} > $out;";
in
diff --git a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix
index 92b8e992e6..faeaa8973f 100644
--- a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix
@@ -6,10 +6,10 @@
with lib; let
cfg = config.programs.hyprland;
- defaultHyprlandPackage = pkgs.hyprland.override {
- enableXWayland = cfg.xwayland.enable;
- hidpiXWayland = cfg.xwayland.hidpi;
- nvidiaPatches = cfg.nvidiaPatches;
+ finalPortalPackage = cfg.portalPackage.override {
+ hyprland-share-picker = pkgs.hyprland-share-picker.override {
+ hyprland = cfg.finalPackage;
+ };
};
in
{
@@ -25,24 +25,25 @@ in
'';
};
- package = mkOption {
- type = types.path;
- default = defaultHyprlandPackage;
- defaultText = literalExpression ''
- pkgs.hyprland.override {
- enableXWayland = config.programs.hyprland.xwayland.enable;
- hidpiXWayland = config.programs.hyprland.xwayland.hidpi;
- nvidiaPatches = config.programs.hyprland.nvidiaPatches;
- }
- '';
- example = literalExpression ".packages..default";
+ package = mkPackageOptionMD pkgs "hyprland" { };
+
+ finalPackage = mkOption {
+ type = types.package;
+ readOnly = true;
+ default = cfg.package.override {
+ enableXWayland = cfg.xwayland.enable;
+ hidpiXWayland = cfg.xwayland.hidpi;
+ nvidiaPatches = cfg.nvidiaPatches;
+ };
+ defaultText = literalExpression
+ "`wayland.windowManager.hyprland.package` with applied configuration";
description = mdDoc ''
- The Hyprland package to use.
- Setting this option will make {option}`programs.hyprland.xwayland` and
- {option}`programs.hyprland.nvidiaPatches` not work.
+ The Hyprland package after applying configuration.
'';
};
+ portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { };
+
xwayland = {
enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
hidpi = mkEnableOption null // {
@@ -57,9 +58,9 @@ in
};
config = mkIf cfg.enable {
- environment.systemPackages = [ cfg.package ];
+ environment.systemPackages = [ cfg.finalPackage ];
- fonts.enableDefaultFonts = mkDefault true;
+ fonts.enableDefaultPackages = mkDefault true;
hardware.opengl.enable = mkDefault true;
programs = {
@@ -69,13 +70,11 @@ in
security.polkit.enable = true;
- services.xserver.displayManager.sessionPackages = [ cfg.package ];
+ services.xserver.displayManager.sessionPackages = [ cfg.finalPackage ];
xdg.portal = {
enable = mkDefault true;
- extraPortals = [
- pkgs.xdg-desktop-portal-hyprland
- ];
+ extraPortals = [ finalPortalPackage ];
};
};
}
diff --git a/third_party/nixpkgs/nixos/modules/programs/miriway.nix b/third_party/nixpkgs/nixos/modules/programs/miriway.nix
index a67e1a17a7..e8a10770b6 100644
--- a/third_party/nixpkgs/nixos/modules/programs/miriway.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/miriway.nix
@@ -66,7 +66,7 @@ in {
};
hardware.opengl.enable = lib.mkDefault true;
- fonts.enableDefaultFonts = lib.mkDefault true;
+ fonts.enableDefaultPackages = lib.mkDefault true;
programs.dconf.enable = lib.mkDefault true;
programs.xwayland.enable = lib.mkDefault true;
diff --git a/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix b/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix
new file mode 100644
index 0000000000..8d0b698d6b
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.programs.ns-usbloader;
+in
+{
+ options = {
+ programs.ns-usbloader = {
+ enable = lib.mkEnableOption (lib.mdDoc "ns-usbloader application with udev rules applied");
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.ns-usbloader ];
+ services.udev.packages = [ pkgs.ns-usbloader ];
+ };
+
+ meta.maintainers = pkgs.ns-usbloader.meta.maintainers;
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix b/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix
new file mode 100644
index 0000000000..b0920d007c
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }:
+
+let
+ cfg = config.programs.oddjobd;
+in
+{
+ options.programs.oddjobd = {
+ enable = lib.mkEnableOption "oddjob";
+ package = lib.mkPackageOption pkgs "oddjob" {};
+ };
+
+ config = lib.mkIf cfg.enable {
+ assertions = [
+ { assertion = false;
+ message = "The oddjob service was found to be broken without NixOS test or maintainer. Please take ownership of this service.";
+ }
+ ];
+ systemd.packages = [ cfg.package ];
+
+ systemd.services.oddjobd = {
+ wantedBy = [ "multi-user.target"];
+ after = [ "network.target"];
+ description = "DBUS Odd-job Daemon";
+ enable = true;
+ documentation = [ "man:oddjobd(8)" "man:oddjobd.conf(5)" ];
+ serviceConfig = {
+ Type = "dbus";
+ BusName = "org.freedesktop.oddjob";
+ ExecStart = "${lib.getBin cfg.package}/bin/oddjobd";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix
new file mode 100644
index 0000000000..d0b280e394
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix
@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ...}:
+let
+ cfg = config.programs.wayfire;
+in
+{
+ meta.maintainers = with lib.maintainers; [ rewine ];
+
+ options.programs.wayfire = {
+ enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots.");
+
+ package = lib.mkPackageOptionMD pkgs "wayfire" { };
+
+ plugins = lib.mkOption {
+ type = lib.types.listOf lib.types.package;
+ default = with pkgs.wayfirePlugins; [ wcm wf-shell ];
+ defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]";
+ example = lib.literalExpression ''
+ with pkgs.wayfirePlugins; [
+ wcm
+ wf-shell
+ wayfire-plugins-extra
+ ];
+ '';
+ description = lib.mdDoc ''
+ Additional plugins to use with the wayfire window manager.
+ '';
+ };
+ };
+
+ config = let
+ finalPackage = pkgs.wayfire-with-plugins.override {
+ wayfire = cfg.package;
+ plugins = cfg.plugins;
+ };
+ in
+ lib.mkIf cfg.enable {
+ environment.systemPackages = [
+ finalPackage
+ ];
+
+ services.xserver.displayManager.sessionPackages = [ finalPackage ];
+
+ xdg.portal = {
+ enable = lib.mkDefault true;
+ wlr.enable = lib.mkDefault true;
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix
index 3cbfef4d61..da117ceae0 100644
--- a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix
@@ -5,7 +5,7 @@
};
hardware.opengl.enable = mkDefault true;
- fonts.enableDefaultFonts = mkDefault true;
+ fonts.enableDefaultPackages = mkDefault true;
programs = {
dconf.enable = mkDefault true;
diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix
index 0e8b823c2b..45014ed3c6 100644
--- a/third_party/nixpkgs/nixos/modules/rename.nix
+++ b/third_party/nixpkgs/nixos/modules/rename.nix
@@ -72,7 +72,6 @@ in
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
- (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
(mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
'')
@@ -115,6 +114,16 @@ in
(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. Please use fcitx5 instead")
+ (mkRemovedOptionModule [ "services" "dhcpd4" ] ''
+ The dhcpd4 module has been removed because ISC DHCP reached its end of life.
+ See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
+ Please switch to a different implementation like kea or dnsmasq.
+ '')
+ (mkRemovedOptionModule [ "services" "dhcpd6" ] ''
+ The dhcpd6 module has been removed because ISC DHCP reached its end of life.
+ See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
+ Please switch to a different implementation like kea or dnsmasq.
+ '')
# Do NOT add any option renames here, see top of the file
];
diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix
index adfca04426..88051de484 100644
--- a/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix
+++ b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix
@@ -62,7 +62,7 @@ config.security.apparmor.includes = {
include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"
r ${pkgs.stdenv.cc.libc}/share/locale/**,
r ${pkgs.stdenv.cc.libc}/share/locale.alias,
- ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"}
+ r ${config.i18n.glibcLocales}/lib/locale/locale-archive,
${etcRule "localtime"}
r ${pkgs.tzdata}/share/zoneinfo/**,
r ${pkgs.stdenv.cc.libc}/share/i18n/**,
@@ -72,7 +72,7 @@ config.security.apparmor.includes = {
# bash inspects filesystems at startup
# and /etc/mtab is linked to /proc/mounts
- @{PROC}/mounts
+ r @{PROC}/mounts,
# system-wide bash configuration
'' + lib.concatMapStringsSep "\n" etcRule [
@@ -211,6 +211,9 @@ config.security.apparmor.includes = {
"abstractions/nis" = ''
include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis"
'';
+ "abstractions/nss-systemd" = ''
+ include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nss-systemd"
+ '';
"abstractions/nvidia" = ''
include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nvidia"
${etcRule "vdpau_wrapper.cfg"}
@@ -279,6 +282,8 @@ config.security.apparmor.includes = {
r /var/lib/acme/*/chain.pem,
r /var/lib/acme/*/fullchain.pem,
+ r /etc/pki/tls/certs/,
+
'' + lib.concatMapStringsSep "\n" etcRule [
"ssl/certs/ca-certificates.crt"
"ssl/certs/ca-bundle.crt"
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
index c6392c679c..348c7b2568 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
+++ b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
@@ -44,5 +44,5 @@ in
};
};
- meta.maintainers = with maintainers; [ SuperSandro2000 ];
+ meta.maintainers = with maintainers; [ ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix
index 0da70112d4..3b44f097ab 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix
@@ -33,7 +33,7 @@ let
}
trap on_exit EXIT
- archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"
+ archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})"
archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
${cfg.preHook}
'' + optionalString cfg.doInit ''
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix
index b34aa3ff50..9e1db23ca2 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix
@@ -32,6 +32,8 @@ in
services.tarsnap = {
enable = mkEnableOption (lib.mdDoc "periodic tarsnap backups");
+ package = mkPackageOption pkgs "tarsnap" { };
+
keyfile = mkOption {
type = types.str;
default = "/root/tarsnap.key";
@@ -307,7 +309,7 @@ in
requires = [ "network-online.target" ];
after = [ "network-online.target" ];
- path = with pkgs; [ iputils tarsnap util-linux ];
+ path = with pkgs; [ iputils gcfg.package util-linux ];
# In order for the persistent tarsnap timer to work reliably, we have to
# make sure that the tarsnap server is reachable after systemd starts up
@@ -318,7 +320,7 @@ in
'';
script = let
- tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+ tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"'';
run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
${optionalString cfg.verbose "-v"} \
${optionalString cfg.explicitSymlinks "-H"} \
@@ -355,10 +357,10 @@ in
description = "Tarsnap restore '${name}'";
requires = [ "network-online.target" ];
- path = with pkgs; [ iputils tarsnap util-linux ];
+ path = with pkgs; [ iputils gcfg.package util-linux ];
script = let
- tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+ tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"'';
lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)";
run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
cachedir = escapeShellArg cfg.cachedir;
@@ -402,6 +404,6 @@ in
{ text = configFile name cfg;
}) gcfg.archives;
- environment.systemPackages = [ pkgs.tarsnap ];
+ environment.systemPackages = [ gcfg.package ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix
index 83b372f594..9bf3a28583 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix
@@ -6,9 +6,6 @@ let
defaultGroup = "patroni";
format = pkgs.formats.yaml { };
- #boto doesn't support python 3.10 yet
- patroni = pkgs.patroni.override { pythonPackages = pkgs.python39Packages; };
-
configFileName = "patroni-${cfg.scope}-${cfg.name}.yaml";
configFile = format.generate configFileName cfg.settings;
in
@@ -224,7 +221,7 @@ in
script = ''
${concatStringsSep "\n" (attrValues (mapAttrs (name: path: ''export ${name}="$(< ${escapeShellArg path})"'') cfg.environmentFiles))}
- exec ${patroni}/bin/patroni ${configFile}
+ exec ${pkgs.patroni}/bin/patroni ${configFile}
'';
serviceConfig = mkMerge [
@@ -252,7 +249,7 @@ in
'';
environment.systemPackages = [
- patroni
+ pkgs.patroni
cfg.postgresqlPackage
(mkIf cfg.raft pkgs.python310Packages.pysyncobj)
];
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 1879fef966..51475171bf 100644
--- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
+++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
@@ -31,6 +31,7 @@ in
type = types.package;
default = pkgs.boinc;
defaultText = literalExpression "pkgs.boinc";
+ example = literalExpression "pkgs.boinc-headless";
description = lib.mdDoc ''
Which BOINC package to use.
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix
index a40b939a16..a35ca41680 100644
--- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix
+++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix
@@ -1,64 +1,49 @@
{ config, lib, pkgs, ... }:
-with lib;
-
let
cfg = config.services.buildkite-agents;
- mkHookOption = { name, description, example ? null }: {
- inherit name;
- value = mkOption {
- default = null;
- description = lib.mdDoc description;
- type = types.nullOr types.lines;
- } // (lib.optionalAttrs (example != null) { inherit example; });
- };
- mkHookOptions = hooks: listToAttrs (map mkHookOption hooks);
-
- hooksDir = cfg: let
- mkHookEntry = name: value: ''
- cat > $out/${name} <<'EOF'
- #! ${pkgs.runtimeShell}
- set -e
- ${value}
- EOF
- chmod 755 $out/${name}
+ hooksDir = hooks:
+ let
+ mkHookEntry = name: text: ''
+ ln --symbolic ${pkgs.writeShellApplication { inherit name text; }}/bin/${name} $out/${name}
+ '';
+ in
+ pkgs.runCommandLocal "buildkite-agent-hooks" { } ''
+ mkdir $out
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkHookEntry hooks)}
'';
- in pkgs.runCommand "buildkite-agent-hooks" { preferLocalBuild = true; } ''
- mkdir $out
- ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))}
- '';
buildkiteOptions = { name ? "", config, ... }: {
options = {
- enable = mkOption {
+ enable = lib.mkOption {
default = true;
- type = types.bool;
+ type = lib.types.bool;
description = lib.mdDoc "Whether to enable this buildkite agent";
};
- package = mkOption {
+ package = lib.mkOption {
default = pkgs.buildkite-agent;
- defaultText = literalExpression "pkgs.buildkite-agent";
+ defaultText = lib.literalExpression "pkgs.buildkite-agent";
description = lib.mdDoc "Which buildkite-agent derivation to use";
- type = types.package;
+ type = lib.types.package;
};
- dataDir = mkOption {
+ dataDir = lib.mkOption {
default = "/var/lib/buildkite-agent-${name}";
description = lib.mdDoc "The workdir for the agent";
- type = types.str;
+ type = lib.types.str;
};
- runtimePackages = mkOption {
+ runtimePackages = lib.mkOption {
default = [ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ];
- defaultText = literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]";
+ defaultText = lib.literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]";
description = lib.mdDoc "Add programs to the buildkite-agent environment";
- type = types.listOf types.package;
+ type = lib.types.listOf lib.types.package;
};
- tokenPath = mkOption {
- type = types.path;
+ tokenPath = lib.mkOption {
+ type = lib.types.path;
description = lib.mdDoc ''
The token from your Buildkite "Agents" page.
@@ -67,25 +52,25 @@ let
'';
};
- name = mkOption {
- type = types.str;
+ name = lib.mkOption {
+ type = lib.types.str;
default = "%hostname-${name}-%n";
description = lib.mdDoc ''
The name of the agent as seen in the buildkite dashboard.
'';
};
- tags = mkOption {
- type = types.attrsOf (types.either types.str (types.listOf types.str));
- default = {};
- example = { queue = "default"; docker = "true"; ruby2 ="true"; };
+ tags = lib.mkOption {
+ type = lib.types.attrsOf (lib.types.either lib.types.str (lib.types.listOf lib.types.str));
+ default = { };
+ example = { queue = "default"; docker = "true"; ruby2 = "true"; };
description = lib.mdDoc ''
Tags for the agent.
'';
};
- extraConfig = mkOption {
- type = types.lines;
+ extraConfig = lib.mkOption {
+ type = lib.types.lines;
default = "";
example = "debug=true";
description = lib.mdDoc ''
@@ -93,8 +78,8 @@ let
'';
};
- privateSshKeyPath = mkOption {
- type = types.nullOr types.path;
+ privateSshKeyPath = lib.mkOption {
+ type = lib.types.nullOr lib.types.path;
default = null;
## maximum care is taken so that secrets (ssh keys and the CI token)
## don't end up in the Nix store.
@@ -108,67 +93,25 @@ let
'';
};
- hooks = mkHookOptions [
- { name = "checkout";
- description = ''
- The `checkout` hook script will replace the default checkout routine of the
- bootstrap.sh script. You can use this hook to do your own SCM checkout
- behaviour
- ''; }
- { name = "command";
- description = ''
- The `command` hook script will replace the default implementation of running
- the build command.
- ''; }
- { name = "environment";
- description = ''
- The `environment` hook will run before all other commands, and can be used
- to set up secrets, data, etc. Anything exported in hooks will be available
- to the build script.
+ hooks = lib.mkOption {
+ type = lib.types.attrsOf lib.types.lines;
+ default = { };
+ example = lib.literalExpression ''
+ {
+ environment = '''
+ export SECRET_VAR=`head -1 /run/keys/secret`
+ ''';
+ }'';
+ description = lib.mdDoc ''
+ "Agent" hooks to install.
+ See for possible options.
+ '';
+ };
- Note: the contents of this file will be copied to the world-readable
- Nix store.
- '';
- example = ''
- export SECRET_VAR=`head -1 /run/keys/secret`
- ''; }
- { name = "post-artifact";
- description = ''
- The `post-artifact` hook will run just after artifacts are uploaded
- ''; }
- { name = "post-checkout";
- description = ''
- The `post-checkout` hook will run after the bootstrap script has checked out
- your projects source code.
- ''; }
- { name = "post-command";
- description = ''
- The `post-command` hook will run after the bootstrap script has run your
- build commands
- ''; }
- { name = "pre-artifact";
- description = ''
- The `pre-artifact` hook will run just before artifacts are uploaded
- ''; }
- { name = "pre-checkout";
- description = ''
- The `pre-checkout` hook will run just before your projects source code is
- checked out from your SCM provider
- ''; }
- { name = "pre-command";
- description = ''
- The `pre-command` hook will run just before your build command runs
- ''; }
- { name = "pre-exit";
- description = ''
- The `pre-exit` hook will run just before your build job finishes
- ''; }
- ];
-
- hooksPath = mkOption {
- type = types.path;
- default = hooksDir config;
- defaultText = literalMD "generated from {option}`services.buildkite-agents..hooks`";
+ hooksPath = lib.mkOption {
+ type = lib.types.path;
+ default = hooksDir config.hooks;
+ defaultText = lib.literalMD "generated from {option}`services.buildkite-agents..hooks`";
description = lib.mdDoc ''
Path to the directory storing the hooks.
Consider using {option}`services.buildkite-agents..hooks.`
@@ -176,10 +119,10 @@ let
'';
};
- shell = mkOption {
- type = types.str;
+ shell = lib.mkOption {
+ type = lib.types.str;
default = "${pkgs.bash}/bin/bash -e -c";
- defaultText = literalExpression ''"''${pkgs.bash}/bin/bash -e -c"'';
+ defaultText = lib.literalExpression ''"''${pkgs.bash}/bin/bash -e -c"'';
description = lib.mdDoc ''
Command that buildkite-agent 3 will execute when it spawns a shell.
'';
@@ -190,9 +133,9 @@ let
mapAgents = function: lib.mkMerge (lib.mapAttrsToList function enabledAgents);
in
{
- options.services.buildkite-agents = mkOption {
- type = types.attrsOf (types.submodule buildkiteOptions);
- default = {};
+ options.services.buildkite-agents = lib.mkOption {
+ type = lib.types.attrsOf (lib.types.submodule buildkiteOptions);
+ default = { };
description = lib.mdDoc ''
Attribute set of buildkite agents.
The attribute key is combined with the hostname and a unique integer to
@@ -213,23 +156,24 @@ in
};
});
config.users.groups = mapAgents (name: cfg: {
- "buildkite-agent-${name}" = {};
+ "buildkite-agent-${name}" = { };
});
config.systemd.services = mapAgents (name: cfg: {
- "buildkite-agent-${name}" =
- { description = "Buildkite Agent";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- path = cfg.runtimePackages ++ [ cfg.package pkgs.coreutils ];
- environment = config.networking.proxy.envVars // {
- HOME = cfg.dataDir;
- NIX_REMOTE = "daemon";
- };
+ "buildkite-agent-${name}" = {
+ description = "Buildkite Agent";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ path = cfg.runtimePackages ++ [ cfg.package pkgs.coreutils ];
+ environment = config.networking.proxy.envVars // {
+ HOME = cfg.dataDir;
+ NIX_REMOTE = "daemon";
+ };
- ## NB: maximum care is taken so that secrets (ssh keys and the CI token)
- ## don't end up in the Nix store.
- preStart = let
+ ## NB: maximum care is taken so that secrets (ssh keys and the CI token)
+ ## don't end up in the Nix store.
+ preStart =
+ let
sshDir = "${cfg.dataDir}/.ssh";
tagStr = name: value:
if lib.isList value
@@ -237,44 +181,39 @@ in
else "${name}=${value}";
tagsStr = lib.concatStringsSep "," (lib.mapAttrsToList tagStr cfg.tags);
in
- optionalString (cfg.privateSshKeyPath != null) ''
- mkdir -m 0700 -p "${sshDir}"
- install -m600 "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa"
- '' + ''
- cat > "${cfg.dataDir}/buildkite-agent.cfg" < "${cfg.dataDir}/buildkite-agent.cfg" <' are mutually exclusive.
- '';
- }
- ]);
-
- imports = [
- (mkRemovedOptionModule [ "services" "buildkite-agent"] "services.buildkite-agent has been upgraded from version 2 to version 3 and moved to an attribute set at services.buildkite-agents. Please consult the 20.03 release notes for more information.")
- ];
+ config.assertions = mapAgents (name: cfg: [{
+ assertion = cfg.hooksPath != hooksDir cfg.hooks -> cfg.hooks == { };
+ message = ''
+ Options `services.buildkite-agents.${name}.hooksPath' and
+ `services.buildkite-agents.${name}.hooks.' are mutually exclusive.
+ '';
+ }]);
}
diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix
index a9a587b41e..e4d54b0cb0 100644
--- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -210,9 +210,7 @@ in {
preStart =
let replacePlugins =
- if cfg.plugins == null
- then ""
- else
+ optionalString (cfg.plugins != null) (
let pluginCmds = lib.attrsets.mapAttrsToList
(n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")
cfg.plugins;
@@ -220,7 +218,7 @@ in {
rm -r ${cfg.home}/plugins || true
mkdir -p ${cfg.home}/plugins
${lib.strings.concatStringsSep "\n" pluginCmds}
- '';
+ '');
in ''
rm -rf ${cfg.home}/war
${replacePlugins}
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix
new file mode 100644
index 0000000000..1aec03c114
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix
@@ -0,0 +1,632 @@
+{ lib, pkgs, config, ... } :
+
+with lib;
+
+let
+ cfg = config.services.pgbouncer;
+
+ confFile = pkgs.writeTextFile {
+ name = "pgbouncer.ini";
+ text = ''
+ [databases]
+ ${concatStringsSep "\n"
+ (mapAttrsToList (dbname : settings : "${dbname} = ${settings}") cfg.databases)}
+
+ [users]
+ ${concatStringsSep "\n"
+ (mapAttrsToList (username : settings : "${username} = ${settings}") cfg.users)}
+
+ [peers]
+ ${concatStringsSep "\n"
+ (mapAttrsToList (peerid : settings : "${peerid} = ${settings}") cfg.peers)}
+
+ [pgbouncer]
+ # general
+ ${optionalString (cfg.ignoreStartupParameters != null) "ignore_startup_parameters = ${cfg.ignoreStartupParameters}"}
+ listen_port = ${toString cfg.listenPort}
+ ${optionalString (cfg.listenAddress != null) "listen_addr = ${cfg.listenAddress}"}
+ pool_mode = ${cfg.poolMode}
+ max_client_conn = ${toString cfg.maxClientConn}
+ default_pool_size = ${toString cfg.defaultPoolSize}
+ max_user_connections = ${toString cfg.maxUserConnections}
+ max_db_connections = ${toString cfg.maxDbConnections}
+
+ #auth
+ auth_type = ${cfg.authType}
+ ${optionalString (cfg.authHbaFile != null) "auth_hba_file = ${cfg.authHbaFile}"}
+ ${optionalString (cfg.authFile != null) "auth_file = ${cfg.authFile}"}
+ ${optionalString (cfg.authUser != null) "auth_user = ${cfg.authUser}"}
+ ${optionalString (cfg.authQuery != null) "auth_query = ${cfg.authQuery}"}
+ ${optionalString (cfg.authDbname != null) "auth_dbname = ${cfg.authDbname}"}
+
+ # TLS
+ ${optionalString (cfg.tls.client != null) ''
+ client_tls_sslmode = ${cfg.tls.client.sslmode}
+ client_tls_key_file = ${cfg.tls.client.keyFile}
+ client_tls_cert_file = ${cfg.tls.client.certFile}
+ client_tls_ca_file = ${cfg.tls.client.caFile}
+ ''}
+ ${optionalString (cfg.tls.server != null) ''
+ server_tls_sslmode = ${cfg.tls.server.sslmode}
+ server_tls_key_file = ${cfg.tls.server.keyFile}
+ server_tls_cert_file = ${cfg.tls.server.certFile}
+ server_tls_ca_file = ${cfg.tls.server.caFile}
+ ''}
+
+ # log
+ ${optionalString (cfg.logFile != null) "logfile = ${cfg.homeDir}/${cfg.logFile}"}
+ ${optionalString (cfg.syslog != null) ''
+ syslog = ${if cfg.syslog.enable then "1" else "0"}
+ syslog_ident = ${cfg.syslog.syslogIdent}
+ syslog_facility = ${cfg.syslog.syslogFacility}
+ ''}
+ ${optionalString (cfg.verbose != null) "verbose = ${toString cfg.verbose}"}
+
+ # console access
+ ${optionalString (cfg.adminUsers != null) "admin_users = ${cfg.adminUsers}"}
+ ${optionalString (cfg.statsUsers != null) "stats_users = ${cfg.statsUsers}"}
+
+ # linux
+ pidfile = /run/pgbouncer/pgbouncer.pid
+
+ # extra
+ ${cfg.extraConfig}
+ '';
+ };
+
+in {
+
+ options.services.pgbouncer = {
+
+ # NixOS settings
+
+ enable = mkEnableOption (lib.mdDoc "PostgreSQL connection pooler");
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.pgbouncer;
+ defaultText = literalExpression "pkgs.pgbouncer";
+ description = lib.mdDoc ''
+ The pgbouncer package to use.
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to automatically open the specified TCP port in the firewall.
+ '';
+ };
+
+ # Generic settings
+
+ logFile = mkOption {
+ type = types.nullOr types.str;
+ default = "pgbouncer.log";
+ description = lib.mdDoc ''
+ Specifies the log file.
+ Either this or syslog has to be specified.
+ '';
+ };
+
+ listenAddress = mkOption {
+ type = types.nullOr types.commas;
+ example = "*";
+ default = null;
+ description = lib.mdDoc ''
+ Specifies a list (comma-separated) of addresses where to listen for TCP connections.
+ You may also use * meaning “listen on all addresses”.
+ When not set, only Unix socket connections are accepted.
+
+ Addresses can be specified numerically (IPv4/IPv6) or by name.
+ '';
+ };
+
+ listenPort = mkOption {
+ type = types.port;
+ default = 6432;
+ description = lib.mdDoc ''
+ Which port to listen on. Applies to both TCP and Unix sockets.
+ '';
+ };
+
+ poolMode = mkOption {
+ type = types.enum [ "session" "transaction" "statement" ];
+ default = "session";
+ description = lib.mdDoc ''
+ Specifies when a server connection can be reused by other clients.
+
+ session
+ Server is released back to pool after client disconnects. Default.
+ transaction
+ Server is released back to pool after transaction finishes.
+ statement
+ Server is released back to pool after query finishes.
+ Transactions spanning multiple statements are disallowed in this mode.
+ '';
+ };
+
+ maxClientConn = mkOption {
+ type = types.int;
+ default = 100;
+ description = lib.mdDoc ''
+ Maximum number of client connections allowed.
+
+ When this setting is increased, then the file descriptor limits in the operating system
+ might also have to be increased. Note that the number of file descriptors potentially
+ used is more than maxClientConn. If each user connects under its own user name to the server,
+ the theoretical maximum used is:
+ maxClientConn + (max pool_size * total databases * total users)
+
+ If a database user is specified in the connection string (all users connect under the same user name),
+ the theoretical maximum is:
+ maxClientConn + (max pool_size * total databases)
+
+ The theoretical maximum should never be reached, unless somebody deliberately crafts a special load for it.
+ Still, it means you should set the number of file descriptors to a safely high number.
+ '';
+ };
+
+ defaultPoolSize = mkOption {
+ type = types.int;
+ default = 20;
+ description = lib.mdDoc ''
+ How many server connections to allow per user/database pair.
+ Can be overridden in the per-database configuration.
+ '';
+ };
+
+ maxDbConnections = mkOption {
+ type = types.int;
+ default = 0;
+ description = lib.mdDoc ''
+ Do not allow more than this many server connections per database (regardless of user).
+ This considers the PgBouncer database that the client has connected to,
+ not the PostgreSQL database of the outgoing connection.
+
+ This can also be set per database in the [databases] section.
+
+ Note that when you hit the limit, closing a client connection to one pool will
+ not immediately allow a server connection to be established for another pool,
+ because the server connection for the first pool is still open.
+ Once the server connection closes (due to idle timeout),
+ a new server connection will immediately be opened for the waiting pool.
+
+ 0 = unlimited
+ '';
+ };
+
+ maxUserConnections = mkOption {
+ type = types.int;
+ default = 0;
+ description = lib.mdDoc ''
+ Do not allow more than this many server connections per user (regardless of database).
+ This considers the PgBouncer user that is associated with a pool,
+ which is either the user specified for the server connection
+ or in absence of that the user the client has connected as.
+
+ This can also be set per user in the [users] section.
+
+ Note that when you hit the limit, closing a client connection to one pool
+ will not immediately allow a server connection to be established for another pool,
+ because the server connection for the first pool is still open.
+ Once the server connection closes (due to idle timeout), a new server connection
+ will immediately be opened for the waiting pool.
+
+ 0 = unlimited
+ '';
+ };
+
+ ignoreStartupParameters = mkOption {
+ type = types.nullOr types.commas;
+ example = "extra_float_digits";
+ default = null;
+ description = lib.mdDoc ''
+ By default, PgBouncer allows only parameters it can keep track of in startup packets:
+ client_encoding, datestyle, timezone and standard_conforming_strings.
+
+ All others parameters will raise an error.
+ To allow others parameters, they can be specified here, so that PgBouncer knows that
+ they are handled by the admin and it can ignore them.
+
+ If you need to specify multiple values, use a comma-separated list.
+
+ IMPORTANT: When using prometheus-pgbouncer-exporter, you need:
+ extra_float_digits
+
+ '';
+ };
+
+ # Section [databases]
+ databases = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ exampledb = "host=/run/postgresql/ port=5432 auth_user=exampleuser dbname=exampledb sslmode=require";
+ bardb = "host=localhost dbname=bazdb";
+ foodb = "host=host1.example.com port=5432";
+ };
+ description = lib.mdDoc ''
+ Detailed information about PostgreSQL database definitions:
+
+ '';
+ };
+
+ # Section [users]
+ users = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ user1 = "pool_mode=session";
+ };
+ description = lib.mdDoc ''
+ Optional.
+
+ Detailed information about PostgreSQL user definitions:
+
+ '';
+ };
+
+ # Section [peers]
+ peers = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ "1" = "host=host1.example.com";
+ "2" = "host=/tmp/pgbouncer-2 port=5555";
+ };
+ description = lib.mdDoc ''
+ Optional.
+
+ Detailed information about PostgreSQL database definitions:
+
+ '';
+ };
+
+ # Authentication settings
+ authType = mkOption {
+ type = types.enum [ "cert" "md5" "scram-sha-256" "plain" "trust" "any" "hba" "pam" ];
+ default = "md5";
+ description = lib.mdDoc ''
+ How to authenticate users.
+
+ cert
+ Client must connect over TLS connection with a valid client certificate.
+ The user name is then taken from the CommonName field from the certificate.
+ md5
+ Use MD5-based password check. This is the default authentication method.
+ authFile may contain both MD5-encrypted and plain-text passwords.
+ If md5 is configured and a user has a SCRAM secret, then SCRAM authentication is used automatically instead.
+ scram-sha-256
+ Use password check with SCRAM-SHA-256. authFile has to contain SCRAM secrets or plain-text passwords.
+ plain
+ The clear-text password is sent over the wire. Deprecated.
+ trust
+ No authentication is done. The user name must still exist in authFile.
+ any
+ Like the trust method, but the user name given is ignored.
+ Requires that all databases are configured to log in as a specific user.
+ Additionally, the console database allows any user to log in as admin.
+ hba
+ The actual authentication type is loaded from authHbaFile.
+ This allows different authentication methods for different access paths,
+ for example: connections over Unix socket use the peer auth method, connections over TCP must use TLS.
+ pam
+ PAM is used to authenticate users, authFile is ignored.
+ This method is not compatible with databases using the authUser option.
+ The service name reported to PAM is “pgbouncer”. pam is not supported in the HBA configuration file.
+ '';
+ };
+
+ authHbaFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/secrets/pgbouncer_hba";
+ description = lib.mdDoc ''
+ HBA configuration file to use when authType is hba.
+
+ See HBA file format details:
+
+ '';
+ };
+
+ authFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/secrets/pgbouncer_authfile";
+ description = lib.mdDoc ''
+ The name of the file to load user names and passwords from.
+
+ See section Authentication file format details:
+
+
+ Most authentication types require that either authFile or authUser be set;
+ otherwise there would be no users defined.
+ '';
+ };
+
+ authUser = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "pgbouncer";
+ description = lib.mdDoc ''
+ If authUser is set, then any user not specified in authFile will be queried
+ through the authQuery query from pg_shadow in the database, using authUser.
+ The password of authUser will be taken from authFile.
+ (If the authUser does not require a password then it does not need to be defined in authFile.)
+
+ Direct access to pg_shadow requires admin rights.
+ It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead.
+ '';
+ };
+
+ authQuery = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "SELECT usename, passwd FROM pg_shadow WHERE usename=$1";
+ description = lib.mdDoc ''
+ Query to load user's password from database.
+
+ Direct access to pg_shadow requires admin rights.
+ It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead.
+
+ Note that the query is run inside the target database.
+ So if a function is used, it needs to be installed into each database.
+ '';
+ };
+
+ authDbname = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "authdb";
+ description = lib.mdDoc ''
+ Database name in the [database] section to be used for authentication purposes.
+ This option can be either global or overriden in the connection string if this parameter is specified.
+ '';
+ };
+
+ # TLS settings
+ tls.client = mkOption {
+ type = types.nullOr (types.submodule {
+ options = {
+ sslmode = mkOption {
+ type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ];
+ default = "disable";
+ description = lib.mdDoc ''
+ TLS mode to use for connections from clients.
+ TLS connections are disabled by default.
+
+ When enabled, tls.client.keyFile and tls.client.certFile
+ must be also configured to set up the key and certificate
+ PgBouncer uses to accept client connections.
+
+ disable
+ Plain TCP. If client requests TLS, it's ignored. Default.
+ allow
+ If client requests TLS, it is used. If not, plain TCP is used.
+ If the client presents a client certificate, it is not validated.
+ prefer
+ Same as allow.
+ require
+ Client must use TLS. If not, the client connection is rejected.
+ If the client presents a client certificate, it is not validated.
+ verify-ca
+ Client must use TLS with valid client certificate.
+ verify-full
+ Same as verify-ca
+ '';
+ };
+ certFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer.key";
+ description = lib.mdDoc "Path to certificate for private key. Clients can validate it";
+ };
+ keyFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer.crt";
+ description = lib.mdDoc "Path to private key for PgBouncer to accept client connections";
+ };
+ caFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer.crt";
+ description = lib.mdDoc "Path to root certificate file to validate client certificates";
+ };
+ };
+ });
+ default = null;
+ description = lib.mdDoc ''
+
+ '';
+ };
+
+ tls.server = mkOption {
+ type = types.nullOr (types.submodule {
+ options = {
+ sslmode = mkOption {
+ type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ];
+ default = "disable";
+ description = lib.mdDoc ''
+ TLS mode to use for connections to PostgreSQL servers.
+ TLS connections are disabled by default.
+
+ disable
+ Plain TCP. TLS is not even requested from the server. Default.
+ allow
+ FIXME: if server rejects plain, try TLS?
+ prefer
+ TLS connection is always requested first from PostgreSQL.
+ If refused, the connection will be established over plain TCP.
+ Server certificate is not validated.
+ require
+ Connection must go over TLS. If server rejects it, plain TCP is not attempted.
+ Server certificate is not validated.
+ verify-ca
+ Connection must go over TLS and server certificate must be valid according to tls.server.caFile.
+ Server host name is not checked against certificate.
+ verify-full
+ Connection must go over TLS and server certificate must be valid according to tls.server.caFile.
+ Server host name must match certificate information.
+ '';
+ };
+ certFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer_server.key";
+ description = lib.mdDoc "Certificate for private key. PostgreSQL server can validate it.";
+ };
+ keyFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer_server.crt";
+ description = lib.mdDoc "Private key for PgBouncer to authenticate against PostgreSQL server.";
+ };
+ caFile = mkOption {
+ type = types.path;
+ example = "/secrets/pgbouncer_server.crt";
+ description = lib.mdDoc "Root certificate file to validate PostgreSQL server certificates.";
+ };
+ };
+ });
+ default = null;
+ description = lib.mdDoc ''
+
+ '';
+ };
+
+ # Log settings
+ syslog = mkOption {
+ type = types.nullOr (types.submodule {
+ options = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Toggles syslog on/off.
+ '';
+ };
+ syslogIdent = mkOption {
+ type = types.str;
+ default = "pgbouncer";
+ description = lib.mdDoc ''
+ Under what name to send logs to syslog.
+ '';
+ };
+ syslogFacility = mkOption {
+ type = types.enum [ "auth" "authpriv" "daemon" "user" "local0" "local1" "local2" "local3" "local4" "local5" "local6" "local7" ];
+ default = "daemon";
+ description = lib.mdDoc ''
+ Under what facility to send logs to syslog.
+ '';
+ };
+ };
+ });
+ default = null;
+ description = lib.mdDoc ''
+
+ '';
+ };
+
+ verbose = lib.mkOption {
+ type = lib.types.int;
+ default = 0;
+ description = lib.mdDoc ''
+ Increase verbosity. Mirrors the “-v” switch on the command line.
+ '';
+ };
+
+ # Console access control
+ adminUsers = mkOption {
+ type = types.nullOr types.commas;
+ default = null;
+ description = lib.mdDoc ''
+ Comma-separated list of database users that are allowed to connect and run all commands on the console.
+ Ignored when authType is any, in which case any user name is allowed in as admin.
+ '';
+ };
+
+ statsUsers = mkOption {
+ type = types.nullOr types.commas;
+ default = null;
+ description = lib.mdDoc ''
+ Comma-separated list of database users that are allowed to connect and run read-only queries on the console.
+ That means all SHOW commands except SHOW FDS.
+ '';
+ };
+
+ # Linux settings
+ openFilesLimit = lib.mkOption {
+ type = lib.types.int;
+ default = 65536;
+ description = lib.mdDoc ''
+ Maximum number of open files.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "pgbouncer";
+ description = lib.mdDoc ''
+ The user pgbouncer is run as.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "pgbouncer";
+ description = lib.mdDoc ''
+ The group pgbouncer is run as.
+ '';
+ };
+
+ homeDir = mkOption {
+ type = types.path;
+ default = "/var/lib/pgbouncer";
+ description = lib.mdDoc ''
+ Specifies the home directory.
+ '';
+ };
+
+ # Extra settings
+ extraConfig = mkOption {
+ type = types.lines;
+ description = lib.mdDoc ''
+ Any additional text to be appended to config.ini
+ .
+ '';
+ default = "";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users.groups.${cfg.group} = { };
+ users.users.${cfg.user} = {
+ description = "PgBouncer service user";
+ group = cfg.group;
+ home = cfg.homeDir;
+ createHome = true;
+ isSystemUser = true;
+ };
+
+ systemd.services.pgbouncer = {
+ description = "PgBouncer - PostgreSQL connection pooler";
+ wants = [ "postgresql.service" ];
+ after = [ "postgresql.service" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "forking";
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart = "${pkgs.pgbouncer}/bin/pgbouncer -d ${confFile}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
+ RuntimeDirectory = "pgbouncer";
+ PIDFile = "/run/pgbouncer/pgbouncer.pid";
+ LimitNOFILE = cfg.openFilesLimit;
+ };
+ };
+
+ networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+ };
+
+ meta.maintainers = [ maintainers._1000101 ];
+
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix
index a7016bbee3..0acaf0fd00 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix
+++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix
@@ -404,8 +404,8 @@ in
{
log_connections = true;
log_statement = "all";
- logging_collector = true
- log_disconnections = true
+ logging_collector = true;
+ log_disconnections = true;
log_destination = lib.mkForce "syslog";
}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix
index 2be46e47d6..fe3a101597 100644
--- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix
+++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix
@@ -96,7 +96,7 @@ in
environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ];
- environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor");
+ environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "emacseditor");
};
meta.doc = ./emacs.md;
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix
index c53dbf4777..5c058f1f0a 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix
@@ -71,12 +71,16 @@ in
environment.systemPackages = [ pkgs.udisks2 ];
- environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // {
- # We need to make sure /etc/libblockdev/conf.d is populated to avoid
+ environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
+ let
+ libblockdev = pkgs.udisks2.libblockdev;
+ majorVer = versions.major libblockdev.version;
+ in {
+ # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
# warnings
- "libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg";
- "libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg";
- };
+ "libblockdev/${majorVer}/conf.d/00-default.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/00-default.cfg";
+ "libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg";
+ });
security.polkit.enable = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix
new file mode 100644
index 0000000000..519d116e0e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix
@@ -0,0 +1,270 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.ebusd;
+
+ package = pkgs.ebusd;
+
+ arguments = [
+ "${package}/bin/ebusd"
+ "--foreground"
+ "--updatecheck=off"
+ "--device=${cfg.device}"
+ "--port=${toString cfg.port}"
+ "--configpath=${cfg.configpath}"
+ "--scanconfig=${cfg.scanconfig}"
+ "--log=main:${cfg.logs.main}"
+ "--log=network:${cfg.logs.network}"
+ "--log=bus:${cfg.logs.bus}"
+ "--log=update:${cfg.logs.update}"
+ "--log=other:${cfg.logs.other}"
+ "--log=all:${cfg.logs.all}"
+ ] ++ lib.optionals cfg.readonly [
+ "--readonly"
+ ] ++ lib.optionals cfg.mqtt.enable [
+ "--mqtthost=${cfg.mqtt.host}"
+ "--mqttport=${toString cfg.mqtt.port}"
+ "--mqttuser=${cfg.mqtt.user}"
+ "--mqttpass=${cfg.mqtt.password}"
+ ] ++ lib.optionals cfg.mqtt.home-assistant [
+ "--mqttint=${package}/etc/ebusd/mqtt-hassio.cfg"
+ "--mqttjson"
+ ] ++ lib.optionals cfg.mqtt.retain [
+ "--mqttretain"
+ ] ++ cfg.extraArguments;
+
+ usesDev = hasPrefix "/" cfg.device;
+
+ command = concatStringsSep " " arguments;
+
+in
+{
+ meta.maintainers = with maintainers; [ nathan-gs ];
+
+ options.services.ebusd = {
+ enable = mkEnableOption (lib.mdDoc "ebusd service");
+
+ device = mkOption {
+ type = types.str;
+ default = "";
+ example = "IP:PORT";
+ description = lib.mdDoc ''
+ Use DEV as eBUS device [/dev/ttyUSB0].
+ This can be either:
+ enh:DEVICE or enh:IP:PORT for enhanced device (only adapter v3 and newer),
+ ens:DEVICE for enhanced high speed serial device (only adapter v3 and newer with firmware since 20220731),
+ DEVICE for serial device (normal speed, for all other serial adapters like adapter v2 as well as adapter v3 in non-enhanced mode), or
+ [udp:]IP:PORT for network device.
+ https://github.com/john30/ebusd/wiki/2.-Run#device-options
+ '';
+ };
+
+ port = mkOption {
+ default = 8888;
+ type = types.port;
+ description = lib.mdDoc ''
+ The port on which to listen on
+ '';
+ };
+
+ readonly = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Only read from device, never write to it
+ '';
+ };
+
+ configpath = mkOption {
+ type = types.str;
+ default = "https://cfg.ebusd.eu/";
+ description = lib.mdDoc ''
+ Read CSV config files from PATH (local folder or HTTPS URL) [https://cfg.ebusd.eu/]
+ '';
+ };
+
+ scanconfig = mkOption {
+ type = types.str;
+ default = "full";
+ description = lib.mdDoc ''
+ Pick CSV config files matching initial scan ("none" or empty for no initial scan message, "full" for full scan, or a single hex address to scan, default is to send a broadcast ident message).
+ If combined with --checkconfig, you can add scan message data as arguments for checking a particular scan configuration, e.g. "FF08070400/0AB5454850303003277201". For further details on this option,
+ see [Automatic configuration](https://github.com/john30/ebusd/wiki/4.7.-Automatic-configuration).
+ '';
+ };
+
+ logs = {
+ main = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+
+ network = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+
+ bus = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+
+ update = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+
+ other = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+
+ all = mkOption {
+ type = types.enum [ "error" "notice" "info" "debug"];
+ default = "info";
+ description = lib.mdDoc ''
+ Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice].
+ '';
+ };
+ };
+
+ mqtt = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Adds support for MQTT
+ '';
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = lib.mdDoc ''
+ Connect to MQTT broker on HOST.
+ '';
+ };
+
+ port = mkOption {
+ default = 1883;
+ type = types.port;
+ description = lib.mdDoc ''
+ The port on which to connect to MQTT
+ '';
+ };
+
+ home-assistant = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Adds the Home Assistant topics to MQTT, read more at [MQTT Integration](https://github.com/john30/ebusd/wiki/MQTT-integration)
+ '';
+ };
+
+ retain = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Set the retain flag on all topics instead of only selected global ones
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ description = lib.mdDoc ''
+ The MQTT user to use
+ '';
+ };
+
+ password = mkOption {
+ type = types.str;
+ description = lib.mdDoc ''
+ The MQTT password.
+ '';
+ };
+
+ };
+
+ extraArguments = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = lib.mdDoc ''
+ Extra arguments to the ebus daemon
+ '';
+ };
+
+ };
+
+ config = mkIf (cfg.enable) {
+
+ systemd.services.ebusd = {
+ description = "EBUSd Service";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ ExecStart = command;
+ DynamicUser = true;
+ Restart = "on-failure";
+
+ # Hardening
+ CapabilityBoundingSet = "";
+ DeviceAllow = lib.optionals usesDev [
+ cfg.device
+ ] ;
+ DevicePolicy = "closed";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = false;
+ NoNewPrivileges = true;
+ PrivateDevices = usesDev;
+ PrivateUsers = true;
+ PrivateTmp = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProcSubset = "pid";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SupplementaryGroups = [
+ "dialout"
+ ];
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service @pkey"
+ "~@privileged @resources"
+ ];
+ UMask = "0077";
+ };
+ };
+
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix
index abe0b93e41..0b8b1d7194 100644
--- a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix
+++ b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix
@@ -451,6 +451,7 @@ in {
"eufylife_ble"
"esphome"
"fjaraskupan"
+ "gardena_bluetooth"
"govee_ble"
"homekit_controller"
"inkbird"
diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix
index 5526df785c..d153ffc2ac 100644
--- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix
+++ b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix
@@ -12,16 +12,14 @@ let
configFile = pkgs.runCommand "matrix-appservice-irc.yml" {
# Because this program will be run at build time, we need `nativeBuildInputs`
- nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ];
+ nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) pkgs.remarshal ];
preferLocalBuild = true;
config = builtins.toJSON cfg.settings;
passAsFile = [ "config" ];
} ''
# The schema is given as yaml, we need to convert it to json
- python -c 'import json; import yaml; import sys; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' \
- < ${pkg}/lib/node_modules/matrix-appservice-irc/config.schema.yml \
- > config.schema.json
+ remarshal --if yaml --of json -i ${pkg}/config.schema.yml -o config.schema.json
python -m jsonschema config.schema.json -i $configPath
cp "$configPath" "$out"
'';
@@ -215,7 +213,10 @@ in {
LockPersonality = true;
RestrictRealtime = true;
PrivateMounts = true;
- SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap";
+ SystemCallFilter = [
+ "@system-service @pkey"
+ "~@privileged @resources"
+ ];
SystemCallArchitectures = "native";
# AF_UNIX is required to connect to a postgres socket.
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix
index c8d89ed33f..16c4f571da 100644
--- a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix
+++ b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix
@@ -138,10 +138,12 @@ in
"~@privileged"
];
StateDirectory = "matrix-conduit";
+ StateDirectoryMode = "0700";
ExecStart = "${cfg.package}/bin/conduit";
Restart = "on-failure";
RestartSec = 10;
StartLimitBurst = 5;
+ UMask = "077";
};
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix
new file mode 100644
index 0000000000..9bf4de3317
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix
@@ -0,0 +1,96 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.matrix-synapse.sliding-sync;
+in
+{
+ options.services.matrix-synapse.sliding-sync = {
+ enable = lib.mkEnableOption (lib.mdDoc "sliding sync");
+
+ package = lib.mkPackageOption pkgs "matrix-sliding-sync" { };
+
+ settings = lib.mkOption {
+ type = lib.types.submodule {
+ freeformType = with lib.types; attrsOf str;
+ options = {
+ SYNCV3_SERVER = lib.mkOption {
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`.
+ '';
+ };
+
+ SYNCV3_DB = lib.mkOption {
+ type = lib.types.str;
+ default = "postgresql:///matrix-sliding-sync?host=/run/postgresql";
+ description = lib.mdDoc ''
+ The postgres connection string.
+ Refer to .
+ '';
+ };
+
+ SYNCV3_BINDADDR = lib.mkOption {
+ type = lib.types.str;
+ default = "127.0.0.1:8009";
+ example = "[::]:8008";
+ description = lib.mdDoc "The interface and port to listen on.";
+ };
+
+ SYNCV3_LOG_LEVEL = lib.mkOption {
+ type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ];
+ default = "info";
+ description = lib.mdDoc "The level of verbosity for messages logged.";
+ };
+ };
+ };
+ default = { };
+ description = ''
+ Freeform environment variables passed to the sliding sync proxy.
+ Refer to for all supported values.
+ '';
+ };
+
+ createDatabase = lib.mkOption {
+ type = lib.types.bool;
+ default = true;
+ description = lib.mdDoc ''
+ Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync`
+ and the database `matrix-sliding-sync` exist.
+ '';
+ };
+
+ environmentFile = lib.mkOption {
+ type = lib.types.str;
+ description = lib.mdDoc ''
+ Environment file as defined in {manpage}`systemd.exec(5)`.
+
+ This must contain the {env}`SYNCV3_SECRET` variable which should
+ be generated with {command}`openssl rand -hex 32`.
+ '';
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ services.postgresql = lib.optionalAttrs cfg.createDatabase {
+ enable = true;
+ ensureDatabases = [ "matrix-sliding-sync" ];
+ ensureUsers = [ rec {
+ name = "matrix-sliding-sync";
+ ensurePermissions."DATABASE \"${name}\"" = "ALL PRIVILEGES";
+ } ];
+ };
+
+ systemd.services.matrix-sliding-sync = {
+ after = lib.optional cfg.createDatabase "postgresql.service";
+ wantedBy = [ "multi-user.target" ];
+ environment = cfg.settings;
+ serviceConfig = {
+ DynamicUser = true;
+ EnvironmentFile = cfg.environmentFile;
+ ExecStart = lib.getExe cfg.package;
+ StateDirectory = "matrix-sliding-sync";
+ WorkingDirectory = "%S/matrix-sliding-sync";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix
index 202bd4dfca..57ff02df7d 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix
@@ -1,14 +1,12 @@
{ config, pkgs, lib, ... }:
-
-with lib;
-
let
+ inherit (lib) mkOption types mdDoc mkIf;
cfg = config.services.atuin;
in
{
options = {
services.atuin = {
- enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
+ enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
openRegistration = mkOption {
type = types.bool;
@@ -50,16 +48,28 @@ in
createLocally = mkOption {
type = types.bool;
default = true;
- description = lib.mdDoc "Create the database and database user locally.";
+ description = mdDoc "Create the database and database user locally.";
+ };
+
+ uri = mkOption {
+ type = types.str;
+ default = "postgresql:///atuin?host=/run/postgresql";
+ example = "postgresql://atuin@localhost:5432/atuin";
+ description = mdDoc "URI to the database";
};
};
};
};
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.database.createLocally -> config.services.postgresql.enable;
+ message = "Postgresql must be enabled to create a local database";
+ }
+ ];
- # enable postgres to host atuin db
- services.postgresql = {
+ services.postgresql = mkIf cfg.database.createLocally {
enable = true;
ensureUsers = [{
name = "atuin";
@@ -73,7 +83,7 @@ in
systemd.services.atuin = {
description = "atuin server";
requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];
- after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ;
+ after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
@@ -81,20 +91,55 @@ in
RuntimeDirectory = "atuin";
RuntimeDirectoryMode = "0700";
DynamicUser = true;
+
+ # Hardening
+ CapabilityBoundingSet = "";
+ LockPersonality = true;
+ NoNewPrivileges = true;
+ MemoryDenyWriteExecute = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ PrivateTmp = true;
+ PrivateUsers = true;
+ ProcSubset = "pid";
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "full";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ # Required for connecting to database sockets,
+ "AF_UNIX"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "~@privileged"
+ ];
+ UMask = "0077";
};
environment = {
ATUIN_HOST = cfg.host;
ATUIN_PORT = toString cfg.port;
ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
- ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration;
- ATUIN_DB_URI = mkIf cfg.database.createLocally "postgresql:///atuin";
+ ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;
+ ATUIN_DB_URI = cfg.database.uri;
ATUIN_PATH = cfg.path;
ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
};
};
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
-
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix
new file mode 100644
index 0000000000..214c89dbfe
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix
@@ -0,0 +1,175 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+
+with lib;
+
+let
+ cfg = config.services.bcg;
+ configFile = (pkgs.formats.yaml {}).generate "bcg.conf.yaml" (
+ filterAttrsRecursive (n: v: v != null) {
+ inherit (cfg) device name mqtt;
+ retain_node_messages = cfg.retainNodeMessages;
+ qos_node_messages = cfg.qosNodeMessages;
+ base_topic_prefix = cfg.baseTopicPrefix;
+ automatic_remove_kit_from_names = cfg.automaticRemoveKitFromNames;
+ automatic_rename_kit_nodes = cfg.automaticRenameKitNodes;
+ automatic_rename_generic_nodes = cfg.automaticRenameGenericNodes;
+ automatic_rename_nodes = cfg.automaticRenameNodes;
+ }
+ );
+in
+{
+ options = {
+ services.bcg = {
+ enable = mkEnableOption (mdDoc "BigClown gateway");
+ package = mkOption {
+ default = pkgs.python3Packages.bcg;
+ defaultText = literalExpression "pkgs.python3Packages.bcg";
+ description = mdDoc "Which bcg derivation to use.";
+ type = types.package;
+ };
+ environmentFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ example = [ "/run/keys/bcg.env" ];
+ description = mdDoc ''
+ File to load as environment file. Environment variables from this file
+ will be interpolated into the config file using envsubst with this
+ syntax: `$ENVIRONMENT` or `''${VARIABLE}`.
+ This is useful to avoid putting secrets into the nix store.
+ '';
+ };
+ verbose = mkOption {
+ type = types.enum ["CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG"];
+ default = "WARNING";
+ description = mdDoc "Verbosity level.";
+ };
+ device = mkOption {
+ type = types.str;
+ description = mdDoc "Device name to configure gateway to use.";
+ };
+ name = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc ''
+ Name for the device.
+
+ Supported variables:
+ * `{ip}` IP address
+ * `{id}` The ID of the connected usb-dongle or core-module
+
+ `null` can be used for automatic detection from gateway firmware.
+ '';
+ };
+ mqtt = {
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = mdDoc "Host where MQTT server is running.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1883;
+ description = mdDoc "Port of MQTT server.";
+ };
+ username = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "MQTT server access username.";
+ };
+ password = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "MQTT server access password.";
+ };
+ cafile = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Certificate Authority file for MQTT server access.";
+ };
+ certfile = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Certificate file for MQTT server access.";
+ };
+ keyfile = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Key file for MQTT server access.";
+ };
+ };
+ retainNodeMessages = mkOption {
+ type = types.bool;
+ default = false;
+ description = mdDoc "Specify that node messages should be retaied in MQTT broker.";
+ };
+ qosNodeMessages = mkOption {
+ type = types.int;
+ default = 1;
+ description = mdDoc "Set the guarantee of MQTT message delivery.";
+ };
+ baseTopicPrefix = mkOption {
+ type = types.str;
+ default = "";
+ description = mdDoc "Topic prefix added to all MQTT messages.";
+ };
+ automaticRemoveKitFromNames = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Automatically remove kits.";
+ };
+ automaticRenameKitNodes = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Automatically rename kit's nodes.";
+ };
+ automaticRenameGenericNodes = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Automatically rename generic nodes.";
+ };
+ automaticRenameNodes = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Automatically rename all nodes.";
+ };
+ rename = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ description = mdDoc "Rename nodes to different name.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [
+ python3Packages.bcg
+ python3Packages.bch
+ ];
+
+ systemd.services.bcg = let
+ envConfig = cfg.environmentFiles != [];
+ finalConfig = if envConfig
+ then "$RUNTIME_DIRECTORY/bcg.config.yaml"
+ else configFile;
+ in {
+ description = "BigClown Gateway";
+ wantedBy = [ "multi-user.target" ];
+ wants = mkIf config.services.mosquitto.enable [ "mosquitto.service" ];
+ after = [ "network-online.target" ];
+ preStart = ''
+ umask 077
+ ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}"
+ '';
+ serviceConfig = {
+ EnvironmentFile = cfg.environmentFiles;
+ ExecStart="${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}";
+ RuntimeDirectory = "bcg";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix
index fced106cb3..a6fbfee73b 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix
@@ -11,7 +11,7 @@ let
mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')
(foldAttrs (n: a: [n] ++ a) [] cfg.hardware);
mergedConfig = with builtins;
- mapAttrsToList (n: v: ''"${n}": ${if isBool v then "" else ''"''}${convType v}${if isBool v then "" else ''"''}'')
+ mapAttrsToList (n: v: ''"${n}": ${if isBool v then convType v else ''"${convType v}"''}'')
cfg.config;
cgminerConfig = pkgs.writeText "cgminer.conf" ''
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix b/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix
new file mode 100644
index 0000000000..11ea6a5f03
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix
@@ -0,0 +1,59 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ format = pkgs.formats.yaml { };
+ cfg = config.services.evdevremapkeys;
+
+in
+{
+ options.services.evdevremapkeys = {
+ enable = mkEnableOption (lib.mdDoc ''evdevremapkeys'');
+
+ settings = mkOption {
+ type = format.type;
+ default = { };
+ description = lib.mdDoc ''
+ config.yaml for evdevremapkeys
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ boot.kernelModules = [ "uinput" ];
+ services.udev.extraRules = ''
+ KERNEL=="uinput", MODE="0660", GROUP="input"
+ '';
+ users.groups.evdevremapkeys = { };
+ users.users.evdevremapkeys = {
+ description = "evdevremapkeys service user";
+ group = "evdevremapkeys";
+ extraGroups = [ "input" ];
+ isSystemUser = true;
+ };
+ systemd.services.evdevremapkeys = {
+ description = "evdevremapkeys";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig =
+ let
+ config = format.generate "config.yaml" cfg.settings;
+ in
+ {
+ ExecStart = "${pkgs.evdevremapkeys}/bin/evdevremapkeys --config-file ${config}";
+ User = "evdevremapkeys";
+ Group = "evdevremapkeys";
+ StateDirectory = "evdevremapkeys";
+ Restart = "always";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateNetwork = true;
+ PrivateTmp = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectKernelTunables = true;
+ ProtectSystem = true;
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix
index 945009f005..ec88de6da3 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix
@@ -15,6 +15,7 @@ let
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
+ WORK_PATH = ${cfg.stateDir}
${generators.toINI {} cfg.settings}
@@ -439,6 +440,8 @@ in
lfs = mkIf cfg.lfs.enable {
PATH = cfg.lfs.contentDir;
};
+
+ packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload";
};
services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
@@ -583,7 +586,7 @@ in
Restart = "always";
# Runtime directory and mode
RuntimeDirectory = "gitea";
- RuntimeDirectoryMode = "0750";
+ RuntimeDirectoryMode = "0755";
# Proc filesystem
ProcSubset = "pid";
ProtectProc = "invisible";
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
index a497fbb300..c5e38b4988 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
@@ -1635,7 +1635,7 @@ in {
"gitlab-config.service"
"gitlab-db-config.service"
] ++ optional (cfg.databaseHost == "") "postgresql.service";
- wantedBy = [ "gitlab.target" ];
+ requiredBy = [ "gitlab.target" ];
partOf = [ "gitlab.target" ];
environment = gitlabEnv;
path = with pkgs; [
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix
index fa172ed277..9bf7e4aab8 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix
@@ -6,16 +6,16 @@ let
cfg = config.services.gogs;
opt = options.services.gogs;
configFile = pkgs.writeText "app.ini" ''
- APP_NAME = ${cfg.appName}
+ BRAND_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
[database]
- DB_TYPE = ${cfg.database.type}
+ TYPE = ${cfg.database.type}
HOST = ${cfg.database.host}:${toString cfg.database.port}
NAME = ${cfg.database.name}
USER = ${cfg.database.user}
- PASSWD = #dbpass#
+ PASSWORD = #dbpass#
PATH = ${cfg.database.path}
[repository]
@@ -25,7 +25,7 @@ let
DOMAIN = ${cfg.domain}
HTTP_ADDR = ${cfg.httpAddress}
HTTP_PORT = ${toString cfg.httpPort}
- ROOT_URL = ${cfg.rootUrl}
+ EXTERNAL_URL = ${cfg.rootUrl}
[session]
COOKIE_NAME = session
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix
new file mode 100644
index 0000000000..621f51a4e7
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix
@@ -0,0 +1,253 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+
+with lib;
+
+let
+ cfg = config.services.mqtt2influxdb;
+ filterNull = filterAttrsRecursive (n: v: v != null);
+ configFile = (pkgs.formats.yaml {}).generate "mqtt2influxdb.config.yaml" (
+ filterNull {
+ inherit (cfg) mqtt influxdb;
+ points = map filterNull cfg.points;
+ }
+ );
+
+ pointType = types.submodule {
+ options = {
+ measurement = mkOption {
+ type = types.str;
+ description = mdDoc "Name of the measurement";
+ };
+ topic = mkOption {
+ type = types.str;
+ description = mdDoc "MQTT topic to subscribe to.";
+ };
+ fields = mkOption {
+ type = types.submodule {
+ options = {
+ value = mkOption {
+ type = types.str;
+ default = "$.payload";
+ description = mdDoc "Value to be picked up";
+ };
+ type = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Type to be picked up";
+ };
+ };
+ };
+ description = mdDoc "Field selector.";
+ };
+ tags = mkOption {
+ type = with types; attrsOf str;
+ default = {};
+ description = mdDoc "Tags applied";
+ };
+ };
+ };
+
+ defaultPoints = [
+ {
+ measurement = "temperature";
+ topic = "node/+/thermometer/+/temperature";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ channel = "$.topic[3]";
+ };
+ }
+ {
+ measurement = "relative-humidity";
+ topic = "node/+/hygrometer/+/relative-humidity";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ channel = "$.topic[3]";
+ };
+ }
+ {
+ measurement = "illuminance";
+ topic = "node/+/lux-meter/0:0/illuminance";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ };
+ }
+ {
+ measurement = "pressure";
+ topic = "node/+/barometer/0:0/pressure";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ };
+ }
+ {
+ measurement = "co2";
+ topic = "node/+/co2-meter/-/concentration";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ };
+ }
+ {
+ measurement = "voltage";
+ topic = "node/+/battery/+/voltage";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ };
+ }
+ {
+ measurement = "button";
+ topic = "node/+/push-button/+/event-count";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ channel = "$.topic[3]";
+ };
+ }
+ {
+ measurement = "tvoc";
+ topic = "node/+/voc-lp-sensor/0:0/tvoc";
+ fields.value = "$.payload";
+ tags = {
+ id = "$.topic[1]";
+ };
+ }
+ ];
+in {
+ options = {
+ services.mqtt2influxdb = {
+ enable = mkEnableOption (mdDoc "BigClown MQTT to InfluxDB bridge.");
+ environmentFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ example = [ "/run/keys/mqtt2influxdb.env" ];
+ description = mdDoc ''
+ File to load as environment file. Environment variables from this file
+ will be interpolated into the config file using envsubst with this
+ syntax: `$ENVIRONMENT` or `''${VARIABLE}`.
+ This is useful to avoid putting secrets into the nix store.
+ '';
+ };
+ mqtt = {
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = mdDoc "Host where MQTT server is running.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1883;
+ description = mdDoc "MQTT server port.";
+ };
+ username = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Username used to connect to the MQTT server.";
+ };
+ password = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc ''
+ MQTT password.
+
+ It is highly suggested to use here replacement through
+ environmentFiles as otherwise the password is put world readable to
+ the store.
+ '';
+ };
+ cafile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = mdDoc "Certification Authority file for MQTT";
+ };
+ certfile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = mdDoc "Certificate file for MQTT";
+ };
+ keyfile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = mdDoc "Key file for MQTT";
+ };
+ };
+ influxdb = {
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = mdDoc "Host where InfluxDB server is running.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 8086;
+ description = mdDoc "InfluxDB server port";
+ };
+ database = mkOption {
+ type = types.str;
+ description = mdDoc "Name of the InfluxDB database.";
+ };
+ username = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc "Username for InfluxDB login.";
+ };
+ password = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = mdDoc ''
+ Password for InfluxDB login.
+
+ It is highly suggested to use here replacement through
+ environmentFiles as otherwise the password is put world readable to
+ the store.
+ '';
+ };
+ ssl = mkOption {
+ type = types.bool;
+ default = false;
+ description = mdDoc "Use SSL to connect to the InfluxDB server.";
+ };
+ verify_ssl = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Verify SSL certificate when connecting to the InfluxDB server.";
+ };
+ };
+ points = mkOption {
+ type = types.listOf pointType;
+ default = defaultPoints;
+ description = mdDoc "Points to bridge from MQTT to InfluxDB.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.bigclown-mqtt2influxdb = let
+ envConfig = cfg.environmentFiles != [];
+ finalConfig = if envConfig
+ then "$RUNTIME_DIRECTORY/mqtt2influxdb.config.yaml"
+ else configFile;
+ in {
+ description = "BigClown MQTT to InfluxDB bridge";
+ wantedBy = ["multi-user.target"];
+ wants = mkIf config.services.mosquitto.enable ["mosquitto.service"];
+ preStart = ''
+ umask 077
+ ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}"
+ '';
+ serviceConfig = {
+ EnvironmentFile = cfg.environmentFiles;
+ ExecStart = "${cfg.package}/bin/mqtt2influxdb -dc ${finalConfig}";
+ RuntimeDirectory = "mqtt2influxdb";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix
index 8fe628a408..1845d8ad29 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix
@@ -26,14 +26,11 @@ let
lib.mapAttrs (_: toString) cfg.extraConfig
);
- manage =
- let
- setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
- in
- pkgs.writeShellScript "manage" ''
- ${setupEnv}
- exec ${pkg}/bin/paperless-ngx "$@"
- '';
+ manage = pkgs.writeShellScript "manage" ''
+ set -o allexport # Export the following env vars
+ ${lib.toShellVars env}
+ exec ${pkg}/bin/paperless-ngx "$@"
+ '';
# Secure the services
defaultServiceConfig = {
@@ -172,19 +169,32 @@ in
description = lib.mdDoc "Web interface port.";
};
+ # FIXME this should become an RFC42-style settings attr
extraConfig = mkOption {
type = types.attrs;
default = { };
description = lib.mdDoc ''
Extra paperless config options.
- See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html)
+ See [the documentation](https://docs.paperless-ngx.com/configuration/)
for available options.
+
+ Note that some options such as `PAPERLESS_CONSUMER_IGNORE_PATTERN` expect JSON values. Use `builtins.toJSON` to ensure proper quoting.
+ '';
+ example = literalExpression ''
+ {
+ PAPERLESS_OCR_LANGUAGE = "deu+eng";
+
+ PAPERLESS_DBHOST = "/run/postgresql";
+
+ PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ];
+
+ PAPERLESS_OCR_USER_ARGS = builtins.toJSON {
+ optimize = 1;
+ pdfa_image_compression = "lossless";
+ };
+ };
'';
- example = {
- PAPERLESS_OCR_LANGUAGE = "deu+eng";
- PAPERLESS_DBHOST = "/run/postgresql";
- };
};
user = mkOption {
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix
index d4391bc49e..580a009a0a 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix
@@ -8,13 +8,13 @@ let
settingsFormat = pkgs.formats.ini {
listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {});
mkKeyValue = k: v:
- if v == null then ""
- else generators.mkKeyValueDefault {
+ optionalString (v != null)
+ (generators.mkKeyValueDefault {
mkValueString = v:
if v == true then "yes"
else if v == false then "no"
else generators.mkValueStringDefault {} v;
- } "=" k v;
+ } "=" k v);
};
configIniOfService = srv: settingsFormat.generate "sourcehut-${srv}-config.ini"
# Each service needs access to only a subset of sections (and secrets).
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix
index 7c7a3b464a..f83c82bbb7 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix
@@ -135,7 +135,7 @@ in {
ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0";
};
restartTriggers = [
- config.environment.etc."sssd/sssd.conf".source
+ settingsFileUnsubstituted
];
};
systemd.sockets.sssd-kcm = {
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix
index 9461bd3f35..f37f268992 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix
@@ -375,7 +375,7 @@ in
# Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if
# it's not available.
- fonts.fonts = [ pkgs.dejavu_fonts ];
+ fonts.packages = [ pkgs.dejavu_fonts ];
systemd.timers.munin-cron = {
description = "batch Munin master programs";
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix
index ebfbbf8f37..89a842023c 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix
@@ -225,7 +225,7 @@ in {
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" ''
- while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
+ while [ "$(${cfg.package}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
'';
TimeoutStopSec = cfg.deadlineBeforeStopSec;
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix
new file mode 100644
index 0000000000..4f6c2557a6
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix
@@ -0,0 +1,97 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.osquery;
+ dirname = path: with lib.strings; with lib.lists; concatStringsSep "/"
+ (init (splitString "/" (normalizePath path)));
+
+ # conf is the osquery configuration file used when the --config_plugin=filesystem.
+ # filesystem is the osquery default value for the config_plugin flag.
+ conf = pkgs.writeText "osquery.conf" (builtins.toJSON cfg.settings);
+
+ # flagfile is the file containing osquery command line flags to be
+ # provided to the application using the special --flagfile option.
+ flagfile = pkgs.writeText "osquery.flags"
+ (concatStringsSep "\n"
+ (mapAttrsToList (name: value: "--${name}=${value}")
+ # Use the conf derivation if not otherwise specified.
+ ({ config_path = conf; } // cfg.flags)));
+
+ osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
+ mkdir -p $out/bin
+ makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \
+ --add-flags "--flagfile ${flagfile} --disable-database"
+ '';
+in
+{
+ options.services.osquery = {
+ enable = mkEnableOption (mdDoc "osqueryd daemon");
+
+ settings = mkOption {
+ default = { };
+ description = mdDoc ''
+ Configuration to be written to the osqueryd JSON configuration file.
+ To understand the configuration format, refer to https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-components.
+ '';
+ example = {
+ options.utc = false;
+ };
+ type = types.attrs;
+ };
+
+ flags = mkOption {
+ default = { };
+ description = mdDoc ''
+ Attribute set of flag names and values to be written to the osqueryd flagfile.
+ For more information, refer to https://osquery.readthedocs.io/en/stable/installation/cli-flags.
+ '';
+ example = {
+ config_refresh = "10";
+ };
+ type = with types;
+ submodule {
+ freeformType = attrsOf str;
+ options = {
+ database_path = mkOption {
+ default = "/var/lib/osquery/osquery.db";
+ readOnly = true;
+ description = mdDoc "Path used for the database file.";
+ type = path;
+ };
+ logger_path = mkOption {
+ default = "/var/log/osquery";
+ readOnly = true;
+ description = mdDoc "Base directory used for logging.";
+ type = path;
+ };
+ pidfile = mkOption {
+ default = "/run/osquery/osqueryd.pid";
+ readOnly = true;
+ description = mdDoc "Path used for pid file.";
+ type = path;
+ };
+ };
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ osqueryi ];
+ systemd.services.osqueryd = {
+ after = [ "network.target" "syslog.service" ];
+ description = "The osquery daemon";
+ serviceConfig = {
+ ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}";
+ PIDFile = cfg.flags.pidfile;
+ LogsDirectory = cfg.flags.logger_path;
+ StateDirectory = dirname cfg.flags.database_path;
+ Restart = "always";
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+ systemd.tmpfiles.rules = [
+ "d ${dirname (cfg.flags.pidfile)} 0755 root root -"
+ ];
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
index 55c4f4aa48..9adbe31d84 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
@@ -37,5 +37,6 @@ in {
] ++ extraFlags);
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
index e02acad3ec..f95412efd7 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix
@@ -104,12 +104,12 @@ in
LoadCredential = "configFile:${computedConfigFile}";
ExecStart = ''
${cfg.package}/bin/pve_exporter \
- --${if cfg.collectors.status == true then "" else "no-"}collector.status \
- --${if cfg.collectors.version == true then "" else "no-"}collector.version \
- --${if cfg.collectors.node == true then "" else "no-"}collector.node \
- --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \
- --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \
- --${if cfg.collectors.config == true then "" else "no-"}collector.config \
+ --${optionalString (!cfg.collectors.status) "no-"}collector.status \
+ --${optionalString (!cfg.collectors.version) "no-"}collector.version \
+ --${optionalString (!cfg.collectors.node) "no-"}collector.node \
+ --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \
+ --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \
+ --${optionalString (!cfg.collectors.config) "no-"}collector.config \
%d/configFile \
${toString cfg.port} ${cfg.listenAddress}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
index 24407f05de..ad60079621 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix
@@ -11,13 +11,6 @@ in {
enable = mkEnableOption (lib.mdDoc ''
Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
to be found by Web Service Discovery Clients like Windows.
-
- ::: {.note}
- If you use the firewall consider adding the following:
-
- networking.firewall.allowedTCPPorts = [ 5357 ];
- networking.firewall.allowedUDPPorts = [ 3702 ];
- :::
'');
interface = mkOption {
type = types.nullOr types.str;
@@ -31,6 +24,13 @@ in {
example = 2;
description = lib.mdDoc "Hop limit for multicast packets (default = 1).";
};
+ openFirewall = mkOption {
+ description = lib.mdDoc ''
+ Whether to open the required firewall ports in the firewall.
+ '';
+ default = false;
+ type = lib.types.bool;
+ };
workgroup = mkOption {
type = types.nullOr types.str;
default = null;
@@ -120,5 +120,10 @@ in {
SystemCallFilter = "~@cpu-emulation @debug @mount @obsolete @privileged @resources";
};
};
+
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ 5357 ];
+ allowedUDPPorts = [ 3702 ];
+ };
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix
index 1428856764..d44a46b35a 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix
@@ -8,8 +8,7 @@ let
settingsFile = pkgs.writeText "biboumi.cfg" (
generators.toKeyValue {
mkKeyValue = k: v:
- if v == null then ""
- else generators.mkKeyValueDefault {} "=" k v;
+ lib.optionalString (v != null) (generators.mkKeyValueDefault {} "=" k v);
} cfg.settings);
need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024;
in
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
index 77e0b3f8af..9deeb7694d 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
@@ -61,7 +61,7 @@ in
checkPhase = optionalString cfg.checkConfig ''
ln -s $out bird2.conf
${cfg.preCheckConfig}
- ${pkgs.bird}/bin/bird -d -p -c bird2.conf
+ ${pkgs.buildPackages.bird}/bin/bird -d -p -c bird2.conf
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
index 5a19475161..80085da927 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
@@ -239,7 +239,7 @@ in
after = [ "network-online.target" ];
bindsTo = [ "network-online.target" ];
- preStart = if cfg.confFile != null then "" else ''
+ preStart = optionalString (cfg.confFile == null) ''
[ -e /etc/cjdns.keys ] && source /etc/cjdns.keys
if [ -z "$CJDNS_PRIVATE_KEY" ]; then
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix
deleted file mode 100644
index a981a255c3..0000000000
--- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg4 = config.services.dhcpd4;
- cfg6 = config.services.dhcpd6;
-
- writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf"
- ''
- default-lease-time 600;
- max-lease-time 7200;
- ${optionalString (!cfg.authoritative) "not "}authoritative;
- ddns-update-style interim;
- log-facility local1; # see dhcpd.nix
-
- ${cfg.extraConfig}
-
- ${lib.concatMapStrings
- (machine: ''
- host ${machine.hostName} {
- hardware ethernet ${machine.ethernetAddress};
- fixed-address${
- optionalString (postfix == "6") postfix
- } ${machine.ipAddress};
- }
- '')
- cfg.machines
- }
- '';
-
- dhcpdService = postfix: cfg:
- let
- configFile =
- if cfg.configFile != null
- then cfg.configFile
- else writeConfig postfix cfg;
- leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
- args = [
- "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
- "-pf" "/run/dhcpd${postfix}/dhcpd.pid"
- "-cf" configFile
- "-lf" leaseFile
- ] ++ cfg.extraFlags
- ++ cfg.interfaces;
- in
- optionalAttrs cfg.enable {
- "dhcpd${postfix}" = {
- description = "DHCPv${postfix} server";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
-
- preStart = "touch ${leaseFile}";
- serviceConfig = {
- ExecStart = concatMapStringsSep " " escapeShellArg args;
- Type = "forking";
- Restart = "always";
- DynamicUser = true;
- User = "dhcpd";
- Group = "dhcpd";
- AmbientCapabilities = [
- "CAP_NET_RAW" # to send ICMP messages
- "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67)
- ];
- StateDirectory = "dhcpd${postfix}";
- RuntimeDirectory = "dhcpd${postfix}";
- PIDFile = "/run/dhcpd${postfix}/dhcpd.pid";
- };
- };
- };
-
- machineOpts = { ... }: {
-
- options = {
-
- hostName = mkOption {
- type = types.str;
- example = "foo";
- description = lib.mdDoc ''
- Hostname which is assigned statically to the machine.
- '';
- };
-
- ethernetAddress = mkOption {
- type = types.str;
- example = "00:16:76:9a:32:1d";
- description = lib.mdDoc ''
- MAC address of the machine.
- '';
- };
-
- ipAddress = mkOption {
- type = types.str;
- example = "192.168.1.10";
- description = lib.mdDoc ''
- IP address of the machine.
- '';
- };
-
- };
- };
-
- dhcpConfig = postfix: {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to enable the DHCPv${postfix} server.
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- example = ''
- option subnet-mask 255.255.255.0;
- option broadcast-address 192.168.1.255;
- option routers 192.168.1.5;
- option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
- option domain-name "example.org";
- subnet 192.168.1.0 netmask 255.255.255.0 {
- range 192.168.1.100 192.168.1.200;
- }
- '';
- description = lib.mdDoc ''
- Extra text to be appended to the DHCP server configuration
- file. Currently, you almost certainly need to specify something
- there, such as the options specifying the subnet mask, DNS servers,
- etc.
- '';
- };
-
- extraFlags = mkOption {
- type = types.listOf types.str;
- default = [];
- description = lib.mdDoc ''
- Additional command line flags to be passed to the dhcpd daemon.
- '';
- };
-
- configFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = lib.mdDoc ''
- The path of the DHCP server configuration file. If no file
- is specified, a file is generated using the other options.
- '';
- };
-
- interfaces = mkOption {
- type = types.listOf types.str;
- default = ["eth0"];
- description = lib.mdDoc ''
- The interfaces on which the DHCP server should listen.
- '';
- };
-
- machines = mkOption {
- type = with types; listOf (submodule machineOpts);
- default = [];
- example = [
- { hostName = "foo";
- ethernetAddress = "00:16:76:9a:32:1d";
- ipAddress = "192.168.1.10";
- }
- { hostName = "bar";
- ethernetAddress = "00:19:d1:1d:c4:9a";
- ipAddress = "192.168.1.11";
- }
- ];
- description = lib.mdDoc ''
- A list mapping Ethernet addresses to IPv${postfix} addresses for the
- DHCP server.
- '';
- };
-
- authoritative = mkOption {
- type = types.bool;
- default = true;
- description = lib.mdDoc ''
- Whether the DHCP server shall send DHCPNAK messages to misconfigured
- clients. If this is not done, clients may be unable to get a correct
- IP address after changing subnets until their old lease has expired.
- '';
- };
-
- };
-
-in
-
-{
-
- imports = [
- (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
- ] ++ flip map [ "4" "6" ] (postfix:
- mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] ''
- The DHCP server state directory is now managed with the systemd's DynamicUser mechanism.
- This means the directory is named after the service (dhcpd${postfix}), created under
- /var/lib/private/ and symlinked to /var/lib/.
- ''
- );
-
- ###### interface
-
- options = {
-
- services.dhcpd4 = dhcpConfig "4";
- services.dhcpd6 = dhcpConfig "6";
-
- };
-
-
- ###### implementation
-
- config = mkIf (cfg4.enable || cfg6.enable) {
-
- systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6;
-
- warnings = [
- ''
- The dhcpd4 and dhcpd6 modules will be removed from NixOS 23.11, because ISC DHCP reached its end of life.
- See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
- Please switch to a different implementation like kea, systemd-networkd or dnsmasq.
- ''
- ];
- };
-
-}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix
index 45e32dc3b3..924abfc295 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix
@@ -921,9 +921,7 @@ in {
};
config = let
- bss = bssSubmod.name;
bssCfg = bssSubmod.config;
-
pairwiseCiphers =
concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers
++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"]));
@@ -964,9 +962,9 @@ in {
} // optionalAttrs (bssCfg.bssid != null) {
bssid = bssCfg.bssid;
} // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) {
- accept_mac_file = "/run/hostapd/${bss}.mac.allow";
+ accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";
} // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) {
- deny_mac_file = "/run/hostapd/${bss}.mac.deny";
+ deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";
} // optionalAttrs (bssCfg.authentication.mode == "none") {
wpa = mkDefault 0;
} // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
@@ -1051,7 +1049,6 @@ in {
};
config.settings = let
- radio = radioSubmod.name;
radioCfg = radioSubmod.config;
in {
driver = radioCfg.driver;
@@ -1268,6 +1265,7 @@ in {
"AF_INET6"
"AF_NETLINK"
"AF_UNIX"
+ "AF_PACKET"
];
RestrictNamespaces = true;
RestrictRealtime = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix
index 785729d8f7..db4d2f7f0b 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix
@@ -14,8 +14,8 @@ let
nonchars = filter (x : !(elem x.value chars))
(imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str));
in
- if length nonchars == 0 then ""
- else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;
+ lib.optionalString (nonchars != [ ])
+ (substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str);
indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));
configText = indent (toString cfg.configSetup);
connectionText = concatStrings (mapAttrsToList (n: v:
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
index a4fd2fd7c8..c53d86c0ba 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
@@ -42,12 +42,15 @@ let
};
passwordFile = mkOption {
- type = uniq (nullOr types.path);
+ type = uniq (nullOr path);
example = "/path/to/file";
default = null;
description = lib.mdDoc ''
Specifies the path to a file containing the
clear text password for the MQTT user.
+ The file is securely passed to mosquitto by
+ leveraging systemd credentials. No special
+ permissions need to be set on this file.
'';
};
@@ -64,7 +67,7 @@ let
};
hashedPasswordFile = mkOption {
- type = uniq (nullOr types.path);
+ type = uniq (nullOr path);
example = "/path/to/file";
default = null;
description = mdDoc ''
@@ -73,6 +76,9 @@ let
To generate hashed password install the `mosquitto`
package and use `mosquitto_passwd`, then remove the
`username:` prefix from the generated file.
+ The file is securely passed to mosquitto by
+ leveraging systemd credentials. No special
+ permissions need to be set on this file.
'';
};
@@ -102,15 +108,43 @@ let
message = "Cannot set more than one password option for user ${n} in ${prefix}";
}) users;
- makePasswordFile = users: path:
+ listenerScope = index: "listener-${toString index}";
+ userScope = prefix: index: "${prefix}-user-${toString index}";
+ credentialID = prefix: credential: "${prefix}-${credential}";
+
+ toScopedUsers = listenerScope: users: pipe users [
+ attrNames
+ (imap0 (index: user: nameValuePair user
+ (users.${user} // { scope = userScope listenerScope index; })
+ ))
+ listToAttrs
+ ];
+
+ userCredentials = user: credentials: pipe credentials [
+ (filter (credential: user.${credential} != null))
+ (map (credential: "${credentialID user.scope credential}:${user.${credential}}"))
+ ];
+ usersCredentials = listenerScope: users: credentials: pipe users [
+ (toScopedUsers listenerScope)
+ (mapAttrsToList (_: user: userCredentials user credentials))
+ concatLists
+ ];
+ systemdCredentials = listeners: listenerCredentials: pipe listeners [
+ (imap0 (index: listener: listenerCredentials (listenerScope index) listener))
+ concatLists
+ ];
+
+ makePasswordFile = listenerScope: users: path:
let
- makeLines = store: file:
+ makeLines = store: file: let
+ scopedUsers = toScopedUsers listenerScope users;
+ in
mapAttrsToList
- (n: u: "addLine ${escapeShellArg n} ${escapeShellArg u.${store}}")
- (filterAttrs (_: u: u.${store} != null) users)
+ (name: user: ''addLine ${escapeShellArg name} "''$(systemd-creds cat ${credentialID user.scope store})"'')
+ (filterAttrs (_: user: user.${store} != null) scopedUsers)
++ mapAttrsToList
- (n: u: "addFile ${escapeShellArg n} ${escapeShellArg "${u.${file}}"}")
- (filterAttrs (_: u: u.${file} != null) users);
+ (name: user: ''addFile ${escapeShellArg name} "''${CREDENTIALS_DIRECTORY}/${credentialID user.scope file}"'')
+ (filterAttrs (_: user: user.${file} != null) scopedUsers);
plainLines = makeLines "password" "passwordFile";
hashedLines = makeLines "hashedPassword" "hashedPasswordFile";
in
@@ -581,6 +615,19 @@ in
ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ # Credentials
+ SetCredential = let
+ listenerCredentials = listenerScope: listener:
+ usersCredentials listenerScope listener.users [ "password" "hashedPassword" ];
+ in
+ systemdCredentials cfg.listeners listenerCredentials;
+
+ LoadCredential = let
+ listenerCredentials = listenerScope: listener:
+ usersCredentials listenerScope listener.users [ "passwordFile" "hashedPasswordFile" ];
+ in
+ systemdCredentials cfg.listeners listenerCredentials;
+
# Hardening
CapabilityBoundingSet = "";
DevicePolicy = "closed";
@@ -653,7 +700,7 @@ in
concatStringsSep
"\n"
(imap0
- (idx: listener: makePasswordFile listener.users "${cfg.dataDir}/passwd-${toString idx}")
+ (idx: listener: makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}")
cfg.listeners);
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix
index ebade7aa8e..20c2eff11e 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix
@@ -19,8 +19,8 @@ let
welcometext="${cfg.welcometext}"
port=${toString cfg.port}
- ${if cfg.hostName == "" then "" else "host="+cfg.hostName}
- ${if cfg.password == "" then "" else "serverpassword="+cfg.password}
+ ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
+ ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
bandwidth=${toString cfg.bandwidth}
users=${toString cfg.users}
@@ -32,17 +32,17 @@ let
bonjour=${boolToString cfg.bonjour}
sendversion=${boolToString cfg.sendVersion}
- ${if cfg.registerName == "" then "" else "registerName="+cfg.registerName}
- ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}
- ${if cfg.registerUrl == "" then "" else "registerUrl="+cfg.registerUrl}
- ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}
+ ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
+ ${optionalString (cfg.registerPassword == "") "registerPassword=${cfg.registerPassword}"}
+ ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
+ ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
certrequired=${boolToString cfg.clientCertRequired}
- ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
- ${if cfg.sslKey == "" then "" else "sslKey="+cfg.sslKey}
- ${if cfg.sslCa == "" then "" else "sslCA="+cfg.sslCa}
+ ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
+ ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
+ ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
- ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
+ ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
${cfg.extraConfig}
'';
@@ -355,5 +355,37 @@ in
'';
destination = "/share/dbus-1/system.d/murmur.conf";
})];
+
+ security.apparmor.policies."bin.mumble-server".profile = ''
+ include
+
+ ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} {
+ include
+ include
+ include
+ include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}"
+ pix ${cfg.package}/bin/.mumble-server-wrapped,
+
+ r ${config.environment.etc."os-release".source},
+ r ${config.environment.etc."lsb-release".source},
+ owner rwk /var/lib/murmur/murmur.sqlite,
+ owner rw /var/lib/murmur/murmur.sqlite-journal,
+ owner r /var/lib/murmur/,
+ r /run/murmur/murmurd.pid,
+ r /run/murmur/murmurd.ini,
+ r ${configFile},
+ '' + optionalString (cfg.logFile != null) ''
+ rw ${cfg.logFile},
+ '' + optionalString (cfg.sslCert != "") ''
+ r ${cfg.sslCert},
+ '' + optionalString (cfg.sslKey != "") ''
+ r ${cfg.sslKey},
+ '' + optionalString (cfg.sslCa != "") ''
+ r ${cfg.sslCa},
+ '' + optionalString (cfg.dbus != null) ''
+ dbus bus=${cfg.dbus}
+ '' + ''
+ }
+ '';
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix
index 3b28cec83c..e28f96f7a6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix
@@ -461,6 +461,8 @@ in {
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
+ # ppp isn't able to mkdir that directory at runtime
+ "d /run/pppd/lock 0700 root root -"
];
systemd.services.NetworkManager = {
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix
index 09f3bdc7ae..6db728e7aa 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix
@@ -137,8 +137,8 @@ let
'';
yesOrNo = b: if b then "yes" else "no";
- maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"'';
- maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}'';
+ maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"'';
+ maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}'';
forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
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 af64969c2f..129e420555 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
@@ -165,9 +165,7 @@ in
${lsh}/sbin/lshd --daemonic \
--password-helper="${lsh}/sbin/lsh-pam-checkpw" \
-p ${toString portNumber} \
- ${if interfaces == [] then ""
- else (concatStrings (map (i: "--interface=\"${i}\"")
- interfaces))} \
+ ${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \
-h "${hostKey}" \
${optionalString (!syslog) "--no-syslog" } \
${if passwordAuthentication then "--password" else "--no-password" } \
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix
index 69b45eb02d..346b50700c 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix
@@ -7,31 +7,33 @@ let
opt = options.services.syncthing;
defaultUser = "syncthing";
defaultGroup = defaultUser;
+ settingsFormat = pkgs.formats.json { };
+ cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings;
- devices = mapAttrsToList (name: device: {
+ devices = mapAttrsToList (_: device: device // {
deviceID = device.id;
- inherit (device) name addresses introducer autoAcceptFolders;
- }) cfg.devices;
+ }) cfg.settings.devices;
- folders = mapAttrsToList ( _: folder: {
- inherit (folder) path id label type;
- devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
- rescanIntervalS = folder.rescanInterval;
- fsWatcherEnabled = folder.watch;
- fsWatcherDelayS = folder.watchDelay;
- ignorePerms = folder.ignorePerms;
- ignoreDelete = folder.ignoreDelete;
- versioning = folder.versioning;
- }) (filterAttrs (
- _: folder:
+ folders = mapAttrsToList (_: folder: folder //
+ throwIf (folder?rescanInterval || folder?watch || folder?watchDelay) ''
+ The options services.syncthing.settings.folders..{rescanInterval,watch,watchDelay}
+ were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead.
+ '' {
+ devices = map (device:
+ if builtins.isString device then
+ { deviceId = cfg.settings.devices.${device}.id; }
+ else
+ device
+ ) folder.devices;
+ }) (filterAttrs (_: folder:
folder.enable
- ) cfg.folders);
+ ) cfg.settings.folders);
- updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
+ jq = "${pkgs.jq}/bin/jq";
+ updateConfig = pkgs.writers.writeBash "merge-syncthing-config" (''
set -efu
# be careful not to leak secrets in the filesystem or in process listings
-
umask 0077
# get the api key by parsing the config.xml
@@ -49,25 +51,85 @@ let
--retry 1000 --retry-delay 1 --retry-all-errors \
"$@"
}
+ '' +
- # query the old config
- old_cfg=$(curl ${cfg.guiAddress}/rest/config)
-
- # generate the new config by merging with the NixOS config options
- new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
- "devices": ('${escapeShellArg (builtins.toJSON devices)}'${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}),
- "folders": ('${escapeShellArg (builtins.toJSON folders)}'${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"})
- } * '${escapeShellArg (builtins.toJSON cfg.extraOptions)})
-
- # send the new config
- curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
-
+ /* Syncthing's rest API for the folders and devices is almost identical.
+ Hence we iterate them using lib.pipe and generate shell commands for both at
+ the sime time. */
+ (lib.pipe {
+ # The attributes below are the only ones that are different for devices /
+ # folders.
+ devs = {
+ new_conf_IDs = map (v: v.id) devices;
+ GET_IdAttrName = "deviceID";
+ override = cfg.overrideDevices;
+ conf = devices;
+ baseAddress = "${cfg.guiAddress}/rest/config/devices";
+ };
+ dirs = {
+ new_conf_IDs = map (v: v.id) folders;
+ GET_IdAttrName = "id";
+ override = cfg.overrideFolders;
+ conf = folders;
+ baseAddress = "${cfg.guiAddress}/rest/config/folders";
+ };
+ } [
+ # Now for each of these attributes, write the curl commands that are
+ # identical to both folders and devices.
+ (mapAttrs (conf_type: s:
+ # We iterate the `conf` list now, and run a curl -X POST command for each, that
+ # should update that device/folder only.
+ lib.pipe s.conf [
+ # Quoting https://docs.syncthing.net/rest/config.html:
+ #
+ # > PUT takes an array and POST a single object. In both cases if a
+ # given folder/device already exists, it’s replaced, otherwise a new
+ # one is added.
+ #
+ # What's not documented, is that using PUT will remove objects that
+ # don't exist in the array given. That's why we use here `POST`, and
+ # only if s.override == true then we DELETE the relevant folders
+ # afterwards.
+ (map (new_cfg: ''
+ curl -d ${lib.escapeShellArg (builtins.toJSON new_cfg)} -X POST ${s.baseAddress}
+ ''))
+ (lib.concatStringsSep "\n")
+ ]
+ /* If we need to override devices/folders, we iterate all currently configured
+ IDs, via another `curl -X GET`, and we delete all IDs that are not part of
+ the Nix configured list of IDs
+ */
+ + lib.optionalString s.override ''
+ old_conf_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} --raw-output '.[].${s.GET_IdAttrName}')"
+ for id in ''${old_conf_${conf_type}_ids}; do
+ if echo ${lib.concatStringsSep " " s.new_conf_IDs} | grep -q $id; then
+ continue
+ else
+ curl -X DELETE ${s.baseAddress}/$id
+ fi
+ done
+ ''
+ ))
+ builtins.attrValues
+ (lib.concatStringsSep "\n")
+ ]) +
+ /* Now we update the other settings defined in cleanedConfig which are not
+ "folders" or "devices". */
+ (lib.pipe cleanedConfig [
+ builtins.attrNames
+ (lib.subtractLists ["folders" "devices"])
+ (map (subOption: ''
+ curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} \
+ ${cfg.guiAddress}/rest/config/${subOption}
+ ''))
+ (lib.concatStringsSep "\n")
+ ]) + ''
# restart Syncthing if required
if curl ${cfg.guiAddress}/rest/config/restart-required |
- ${pkgs.jq}/bin/jq -e .requiresRestart > /dev/null; then
+ ${jq} -e .requiresRestart > /dev/null; then
curl -X POST ${cfg.guiAddress}/rest/system/restart
fi
- '';
+ '');
in {
###### interface
options = {
@@ -99,287 +161,282 @@ in {
default = true;
description = mdDoc ''
Whether to delete the devices which are not configured via the
- [devices](#opt-services.syncthing.devices) option.
+ [devices](#opt-services.syncthing.settings.devices) option.
If set to `false`, devices added via the web
interface will persist and will have to be deleted manually.
'';
};
- devices = mkOption {
- default = {};
- description = mdDoc ''
- Peers/devices which Syncthing should communicate with.
-
- Note that you can still add devices manually, but those changes
- will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices)
- is enabled.
- '';
- example = {
- bigbox = {
- id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
- addresses = [ "tcp://192.168.0.10:51820" ];
- };
- };
- type = types.attrsOf (types.submodule ({ name, ... }: {
- options = {
-
- name = mkOption {
- type = types.str;
- default = name;
- description = lib.mdDoc ''
- The name of the device.
- '';
- };
-
- addresses = mkOption {
- type = types.listOf types.str;
- default = [];
- description = lib.mdDoc ''
- The addresses used to connect to the device.
- If this is left empty, dynamic configuration is attempted.
- '';
- };
-
- id = mkOption {
- type = types.str;
- description = mdDoc ''
- The device ID. See .
- '';
- };
-
- introducer = mkOption {
- type = types.bool;
- default = false;
- description = mdDoc ''
- Whether the device should act as an introducer and be allowed
- to add folders on this computer.
- See .
- '';
- };
-
- autoAcceptFolders = mkOption {
- type = types.bool;
- default = false;
- description = mdDoc ''
- Automatically create or share folders that this device advertises at the default path.
- See .
- '';
- };
-
- };
- }));
- };
-
overrideFolders = mkOption {
type = types.bool;
default = true;
description = mdDoc ''
Whether to delete the folders which are not configured via the
- [folders](#opt-services.syncthing.folders) option.
+ [folders](#opt-services.syncthing.settings.folders) option.
If set to `false`, folders added via the web
interface will persist and will have to be deleted manually.
'';
};
- folders = mkOption {
- default = {};
- description = mdDoc ''
- Folders which should be shared by Syncthing.
-
- Note that you can still add folders manually, but those changes
- will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders)
- is enabled.
- '';
- example = literalExpression ''
- {
- "/home/user/sync" = {
- id = "syncme";
- devices = [ "bigbox" ];
- };
- }
- '';
- type = types.attrsOf (types.submodule ({ name, ... }: {
+ settings = mkOption {
+ type = types.submodule {
+ freeformType = settingsFormat.type;
options = {
-
- enable = mkOption {
- type = types.bool;
- default = true;
- description = lib.mdDoc ''
- Whether to share this folder.
- This option is useful when you want to define all folders
- in one place, but not every machine should share all folders.
- '';
- };
-
- path = mkOption {
- # TODO for release 23.05: allow relative paths again and set
- # working directory to cfg.dataDir
- type = types.str // {
- check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/");
- description = types.str.description + " starting with / or ~/";
- };
- default = name;
- description = lib.mdDoc ''
- The path to the folder which should be shared.
- Only absolute paths (starting with `/`) and paths relative to
- the [user](#opt-services.syncthing.user)'s home directory
- (starting with `~/`) are allowed.
- '';
- };
-
- id = mkOption {
- type = types.str;
- default = name;
- description = lib.mdDoc ''
- The ID of the folder. Must be the same on all devices.
- '';
- };
-
- label = mkOption {
- type = types.str;
- default = name;
- description = lib.mdDoc ''
- The label of the folder.
- '';
- };
-
- devices = mkOption {
- type = types.listOf types.str;
- default = [];
+ # global options
+ options = mkOption {
+ default = {};
description = mdDoc ''
- The devices this folder should be shared with. Each device must
- be defined in the [devices](#opt-services.syncthing.devices) option.
+ The options element contains all other global configuration options
'';
- };
-
- versioning = mkOption {
- default = null;
- description = mdDoc ''
- How to keep changed/deleted files with Syncthing.
- There are 4 different types of versioning with different parameters.
- See .
- '';
- example = literalExpression ''
- [
- {
- versioning = {
- type = "simple";
- params.keep = "10";
- };
- }
- {
- versioning = {
- type = "trashcan";
- params.cleanoutDays = "1000";
- };
- }
- {
- versioning = {
- type = "staggered";
- fsPath = "/syncthing/backup";
- params = {
- cleanInterval = "3600";
- maxAge = "31536000";
- };
- };
- }
- {
- versioning = {
- type = "external";
- params.versionsPath = pkgs.writers.writeBash "backup" '''
- folderpath="$1"
- filepath="$2"
- rm -rf "$folderpath/$filepath"
- ''';
- };
- }
- ]
- '';
- type = with types; nullOr (submodule {
+ type = types.submodule ({ name, ... }: {
+ freeformType = settingsFormat.type;
options = {
- type = mkOption {
- type = enum [ "external" "simple" "staggered" "trashcan" ];
- description = mdDoc ''
- The type of versioning.
- See .
+ localAnnounceEnabled = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = lib.mdDoc ''
+ Whether to send announcements to the local LAN, also use such announcements to find other devices.
'';
};
- fsPath = mkOption {
- default = "";
- type = either str path;
- description = mdDoc ''
- Path to the versioning folder.
- See .
+
+ localAnnouncePort = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = lib.mdDoc ''
+ The port on which to listen and send IPv4 broadcast announcements to.
'';
};
- params = mkOption {
- type = attrsOf (either str path);
- description = mdDoc ''
- The parameters for versioning. Structure depends on
- [versioning.type](#opt-services.syncthing.folders._name_.versioning.type).
- See .
+
+ relaysEnabled = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = lib.mdDoc ''
+ When true, relays will be connected to and potentially used for device to device connections.
+ '';
+ };
+
+ urAccepted = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = lib.mdDoc ''
+ Whether the user has accepted to submit anonymous usage data.
+ The default, 0, mean the user has not made a choice, and Syncthing will ask at some point in the future.
+ "-1" means no, a number above zero means that that version of usage reporting has been accepted.
+ '';
+ };
+
+ limitBandwidthInLan = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = lib.mdDoc ''
+ Whether to apply bandwidth limits to devices in the same broadcast domain as the local device.
+ '';
+ };
+
+ maxFolderConcurrency = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = lib.mdDoc ''
+ This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning.
+ The mechanism is described in detail in a [separate chapter](https://docs.syncthing.net/advanced/option-max-concurrency.html).
'';
};
};
});
};
- rescanInterval = mkOption {
- type = types.int;
- default = 3600;
- description = lib.mdDoc ''
- How often the folder should be rescanned for changes.
- '';
- };
-
- type = mkOption {
- type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ];
- default = "sendreceive";
- description = lib.mdDoc ''
- Whether to only send changes for this folder, only receive them
- or both. `receiveencrypted` can be used for untrusted devices. See
- for reference.
- '';
- };
-
- watch = mkOption {
- type = types.bool;
- default = true;
- description = lib.mdDoc ''
- Whether the folder should be watched for changes by inotify.
- '';
- };
-
- watchDelay = mkOption {
- type = types.int;
- default = 10;
- description = lib.mdDoc ''
- The delay after an inotify event is triggered.
- '';
- };
-
- ignorePerms = mkOption {
- type = types.bool;
- default = true;
- description = lib.mdDoc ''
- Whether to ignore permission changes.
- '';
- };
-
- ignoreDelete = mkOption {
- type = types.bool;
- default = false;
+ # device settings
+ devices = mkOption {
+ default = {};
description = mdDoc ''
- Whether to skip deleting files that are deleted by peers.
- See .
- '';
- };
- };
- }));
- };
+ Peers/devices which Syncthing should communicate with.
- extraOptions = mkOption {
- type = types.addCheck (pkgs.formats.json {}).type isAttrs;
+ Note that you can still add devices manually, but those changes
+ will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices)
+ is enabled.
+ '';
+ example = {
+ bigbox = {
+ id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
+ addresses = [ "tcp://192.168.0.10:51820" ];
+ };
+ };
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ freeformType = settingsFormat.type;
+ options = {
+
+ name = mkOption {
+ type = types.str;
+ default = name;
+ description = lib.mdDoc ''
+ The name of the device.
+ '';
+ };
+
+ id = mkOption {
+ type = types.str;
+ description = mdDoc ''
+ The device ID. See .
+ '';
+ };
+
+ autoAcceptFolders = mkOption {
+ type = types.bool;
+ default = false;
+ description = mdDoc ''
+ Automatically create or share folders that this device advertises at the default path.
+ See .
+ '';
+ };
+
+ };
+ }));
+ };
+
+ # folder settings
+ folders = mkOption {
+ default = {};
+ description = mdDoc ''
+ Folders which should be shared by Syncthing.
+
+ Note that you can still add folders manually, but those changes
+ will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders)
+ is enabled.
+ '';
+ example = literalExpression ''
+ {
+ "/home/user/sync" = {
+ id = "syncme";
+ devices = [ "bigbox" ];
+ };
+ }
+ '';
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ freeformType = settingsFormat.type;
+ options = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = lib.mdDoc ''
+ Whether to share this folder.
+ This option is useful when you want to define all folders
+ in one place, but not every machine should share all folders.
+ '';
+ };
+
+ path = mkOption {
+ # TODO for release 23.05: allow relative paths again and set
+ # working directory to cfg.dataDir
+ type = types.str // {
+ check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/");
+ description = types.str.description + " starting with / or ~/";
+ };
+ default = name;
+ description = lib.mdDoc ''
+ The path to the folder which should be shared.
+ Only absolute paths (starting with `/`) and paths relative to
+ the [user](#opt-services.syncthing.user)'s home directory
+ (starting with `~/`) are allowed.
+ '';
+ };
+
+ id = mkOption {
+ type = types.str;
+ default = name;
+ description = lib.mdDoc ''
+ The ID of the folder. Must be the same on all devices.
+ '';
+ };
+
+ label = mkOption {
+ type = types.str;
+ default = name;
+ description = lib.mdDoc ''
+ The label of the folder.
+ '';
+ };
+
+ devices = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = mdDoc ''
+ The devices this folder should be shared with. Each device must
+ be defined in the [devices](#opt-services.syncthing.settings.devices) option.
+ '';
+ };
+
+ versioning = mkOption {
+ default = null;
+ description = mdDoc ''
+ How to keep changed/deleted files with Syncthing.
+ There are 4 different types of versioning with different parameters.
+ See .
+ '';
+ example = literalExpression ''
+ [
+ {
+ versioning = {
+ type = "simple";
+ params.keep = "10";
+ };
+ }
+ {
+ versioning = {
+ type = "trashcan";
+ params.cleanoutDays = "1000";
+ };
+ }
+ {
+ versioning = {
+ type = "staggered";
+ fsPath = "/syncthing/backup";
+ params = {
+ cleanInterval = "3600";
+ maxAge = "31536000";
+ };
+ };
+ }
+ {
+ versioning = {
+ type = "external";
+ params.versionsPath = pkgs.writers.writeBash "backup" '''
+ folderpath="$1"
+ filepath="$2"
+ rm -rf "$folderpath/$filepath"
+ ''';
+ };
+ }
+ ]
+ '';
+ type = with types; nullOr (submodule {
+ freeformType = settingsFormat.type;
+ options = {
+ type = mkOption {
+ type = enum [ "external" "simple" "staggered" "trashcan" ];
+ description = mdDoc ''
+ The type of versioning.
+ See .
+ '';
+ };
+ };
+ });
+ };
+
+ copyOwnershipFromParent = mkOption {
+ type = types.bool;
+ default = false;
+ description = mdDoc ''
+ On Unix systems, tries to copy file/folder ownership from the parent directory (the directory it’s located in).
+ Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
+ '';
+ };
+ };
+ }));
+ };
+
+ };
+ };
default = {};
description = mdDoc ''
Extra configuration options for Syncthing.
@@ -530,6 +587,10 @@ in {
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
It can be enabled on a per-folder basis through the web interface.
'')
+ (mkRenamedOptionModule [ "services" "syncthing" "extraOptions" ] [ "services" "syncthing" "settings" ])
+ (mkRenamedOptionModule [ "services" "syncthing" "folders" ] [ "services" "syncthing" "settings" "folders" ])
+ (mkRenamedOptionModule [ "services" "syncthing" "devices" ] [ "services" "syncthing" "settings" "devices" ])
+ (mkRenamedOptionModule [ "services" "syncthing" "options" ] [ "services" "syncthing" "settings" "options" ])
] ++ map (o:
mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ]
) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"];
@@ -615,9 +676,7 @@ in {
];
};
};
- syncthing-init = mkIf (
- cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
- ) {
+ syncthing-init = mkIf (cleanedConfig != {}) {
description = "Syncthing configuration updater";
requisite = [ "syncthing.service" ];
after = [ "syncthing.service" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix
index 6eeee71e83..f308b7e331 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix
@@ -29,12 +29,7 @@ in {
description = lib.mdDoc "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
};
- package = mkOption {
- type = types.package;
- default = pkgs.tailscale;
- defaultText = literalExpression "pkgs.tailscale";
- description = lib.mdDoc "The package to use for tailscale";
- };
+ package = lib.mkPackageOptionMD pkgs "tailscale" {};
useRoutingFeatures = mkOption {
type = types.enum [ "none" "client" "server" "both" ];
@@ -49,6 +44,22 @@ in {
When set to `server` or `both`, IP forwarding will be enabled.
'';
};
+
+ authKeyFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/run/secrets/tailscale_key";
+ description = lib.mdDoc ''
+ A file containing the auth key.
+ '';
+ };
+
+ extraUpFlags = mkOption {
+ description = lib.mdDoc "Extra flags to pass to {command}`tailscale up`.";
+ type = types.listOf types.str;
+ default = [];
+ example = ["--ssh"];
+ };
};
config = mkIf cfg.enable {
@@ -82,6 +93,21 @@ in {
stopIfChanged = false;
};
+ systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) {
+ after = ["tailscale.service"];
+ wants = ["tailscale.service"];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ script = ''
+ status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
+ if [[ $status != Connected* ]]; then
+ ${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
+ fi
+ '';
+ };
+
boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {
"net.ipv4.conf.all.forwarding" = mkOverride 97 true;
"net.ipv6.conf.all.forwarding" = mkOverride 97 true;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix
index 1454a7431c..170d392bf2 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix
@@ -12,7 +12,7 @@ in
config = lib.mkIf cfg.enable {
systemd.packages = [ cfg.package ];
systemd.services.twingate = {
- preStart = "cp -r -n ${cfg.package}/etc/twingate/. /etc/twingate/";
+ preStart = "cp -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/";
wantedBy = [ "multi-user.target" ];
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix
index ed7f1dadd3..218b440aab 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix
@@ -121,7 +121,7 @@ in
icons.enable = true;
};
- fonts.enableDefaultFonts = mkDefault true;
+ fonts.enableDefaultPackages = mkDefault true;
systemd = {
services.xrdp = {
diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix
index f1d2f462a7..47bd358f97 100644
--- a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix
+++ b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.fcron;
- queuelen = if cfg.queuelen == null then "" else "-q ${toString cfg.queuelen}";
+ queuelen = optionalString (cfg.queuelen != null) "-q ${toString cfg.queuelen}";
# Duplicate code, also found in cron.nix. Needs deduplication.
systemCronJobs =
diff --git a/third_party/nixpkgs/nixos/modules/services/search/typesense.nix b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix
new file mode 100644
index 0000000000..856c3cad22
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix
@@ -0,0 +1,125 @@
+{ config, lib, pkgs, ... }: let
+ inherit
+ (lib)
+ concatMapStringsSep
+ generators
+ mdDoc
+ mkEnableOption
+ mkIf
+ mkOption
+ mkPackageOption
+ optionalString
+ types
+ ;
+
+ cfg = config.services.typesense;
+ settingsFormatIni = pkgs.formats.ini {
+ listToValue = concatMapStringsSep " " (generators.mkValueStringDefault { });
+ mkKeyValue = generators.mkKeyValueDefault
+ {
+ mkValueString = v:
+ if v == null then ""
+ else generators.mkValueStringDefault { } v;
+ }
+ "=";
+ };
+ configFile = settingsFormatIni.generate "typesense.ini" cfg.settings;
+in {
+ options.services.typesense = {
+ enable = mkEnableOption "typesense";
+ package = mkPackageOption pkgs "typesense" {};
+
+ apiKeyFile = mkOption {
+ type = types.path;
+ description = ''
+ Sets the admin api key for typesense. Always use this option
+ instead of {option}`settings.server.api-key` to prevent the key
+ from being written to the world-readable nix store.
+ '';
+ };
+
+ settings = mkOption {
+ description = mdDoc "Typesense configuration. Refer to [the documentation](https://typesense.org/docs/0.24.1/api/server-configuration.html) for supported values.";
+ default = {};
+ type = types.submodule {
+ freeformType = settingsFormatIni.type;
+ options.server = {
+ data-dir = mkOption {
+ type = types.str;
+ default = "/var/lib/typesense";
+ description = mdDoc "Path to the directory where data will be stored on disk.";
+ };
+
+ api-address = mkOption {
+ type = types.str;
+ description = mdDoc "Address to which Typesense API service binds.";
+ };
+
+ api-port = mkOption {
+ type = types.port;
+ default = 8108;
+ description = mdDoc "Port on which the Typesense API service listens.";
+ };
+ };
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.typesense = {
+ description = "Typesense search engine";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ script = ''
+ export TYPESENSE_API_KEY=$(cat ${cfg.apiKeyFile})
+ exec ${cfg.package}/bin/typesense-server --config ${configFile}
+ '';
+
+ serviceConfig = {
+ Restart = "on-failure";
+ DynamicUser = true;
+ User = "typesense";
+ Group = "typesense";
+
+ StateDirectory = "typesense";
+ StateDirectoryMode = "0700";
+
+ # Hardening
+ CapabilityBoundingSet = "";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateUsers = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProcSubset = "pid";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ "AF_UNIX"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "~@privileged"
+ ];
+ UMask = "0077";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
index cea2a56bdc..6fb9f71a48 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
@@ -122,8 +122,8 @@ in
};
log_level = lib.mkOption {
description = lib.mdDoc "Log level of the server.";
- default = "default";
- type = lib.types.enum [ "default" "verbose" "perfbasic" "perffull" ];
+ default = "info";
+ type = lib.types.enum [ "info" "debug" "trace" ];
};
role = lib.mkOption {
description = lib.mdDoc "The role of this server. This affects the replication relationship and thereby available features.";
@@ -236,17 +236,23 @@ in
{
StateDirectory = "kanidm";
StateDirectoryMode = "0700";
+ RuntimeDirectory = "kanidmd";
ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
User = "kanidm";
Group = "kanidm";
+ BindPaths = [
+ # To create the socket
+ "/run/kanidmd:/run/kanidmd"
+ ];
+
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" ];
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
TemporaryFileSystem = "/:ro";
}
];
@@ -273,6 +279,8 @@ in
"-/etc/static/kanidm"
"-/etc/ssl"
"-/etc/static/ssl"
+ "-/etc/passwd"
+ "-/etc/group"
];
BindPaths = [
# To create the socket
@@ -327,6 +335,9 @@ in
# These paths are hardcoded
environment.etc = lib.mkMerge [
+ (lib.mkIf cfg.enableServer {
+ "kanidm/server.toml".source = serverConfigFile;
+ })
(lib.mkIf options.services.kanidm.clientSettings.isDefined {
"kanidm/config".source = clientConfigFile;
})
diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix
index 98ab8595bd..d22e6b5b40 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix
@@ -121,7 +121,7 @@ in {
The available configuration options can be found in
[the environment template file](https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template).
- See ()[#opt-services.vaultwarden.environmentFile) for how
+ See [](#opt-services.vaultwarden.environmentFile) for how
to set up access to the Admin UI to invite initial users.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix b/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix
new file mode 100644
index 0000000000..d656a19c0a
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.services.bpftune;
+in
+{
+ meta = {
+ maintainers = with lib.maintainers; [ nickcao ];
+ };
+
+ options = {
+ services.bpftune = {
+ enable = lib.mkEnableOption (lib.mdDoc "bpftune BPF driven auto-tuning");
+
+ package = lib.mkPackageOptionMD pkgs "bpftune" { };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ systemd.packages = [ cfg.package ];
+ systemd.services.bpftune.wantedBy = [ "multi-user.target" ];
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix
index 0d6bec8883..c9df20196d 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix
@@ -168,14 +168,16 @@ in
systemd.packages = [ nixPackage ];
- systemd.tmpfiles =
- if (isNixAtLeast "2.8") then {
+ systemd.tmpfiles = mkMerge [
+ (mkIf (isNixAtLeast "2.8") {
packages = [ nixPackage ];
- } else {
+ })
+ (mkIf (!isNixAtLeast "2.8") {
rules = [
"d /nix/var/nix/daemon-socket 0755 root root - -"
];
- };
+ })
+ ];
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix
index 1d98e7ddac..0a12ef48d0 100644
--- a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix
@@ -111,7 +111,7 @@ in {
fonts = mkIf (cfg.fonts != null) {
fontconfig.enable = true;
- fonts = map (f: f.package) cfg.fonts;
+ packages = map (f: f.package) cfg.fonts;
};
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
index 217637cbeb..8db2bfae80 100644
--- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
+++ b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
@@ -322,6 +322,16 @@ in
'';
};
+ systemd.services.nginx.serviceConfig.SupplementaryGroups = [
+ "frigate"
+ ];
+
+ users.users.frigate = {
+ isSystemUser = true;
+ group = "frigate";
+ };
+ users.groups.frigate = {};
+
systemd.services.frigate = {
after = [
"go2rtc.service"
@@ -349,15 +359,18 @@ in
serviceConfig = {
ExecStart = "${cfg.package.python.interpreter} -m frigate";
- DynamicUser = true;
User = "frigate";
+ Group = "frigate";
+
+ UMask = "0027";
StateDirectory = "frigate";
- UMask = "0077";
+ StateDirectoryMode = "0750";
# Caches
PrivateTmp = true;
CacheDirectory = "frigate";
+ CacheDirectoryMode = "0750";
BindPaths = [
"/migrations:${cfg.package}/share/frigate/migrations:ro"
diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix
index 330dce1d0c..cf4c0798cd 100644
--- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix
+++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix
@@ -23,6 +23,15 @@ in {
example = ["-d"];
};
+ options.services.cage.environment = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ WLR_LIBINPUT_NO_DEVICES = "1";
+ };
+ description = lib.mdDoc "Additional environment variables to pass to Cage.";
+ };
+
options.services.cage.program = mkOption {
type = types.path;
default = "${pkgs.xterm}/bin/xterm";
@@ -79,6 +88,7 @@ in {
# Set up a full (custom) user session for the user, required by Cage.
PAMName = "cage";
};
+ environment = cfg.environment;
};
security.polkit.enable = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix
index da2cf93d7f..9261de8d43 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix
@@ -308,6 +308,8 @@ in
pools.cloudlog = {
inherit (cfg) user;
group = config.services.nginx.group;
+ # cloudlog is currently broken on php 8.2
+ phpPackage = pkgs.php81;
settings = {
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix
index f1d71f1744..138e2f3f1b 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix
@@ -104,6 +104,7 @@ in {
'';
services.phpfpm.pools.engelsystem = {
+ phpPackage = pkgs.php81;
user = "engelsystem";
settings = {
"listen.owner" = config.services.nginx.user;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix
index 89e29f7ccb..ffc05d0e41 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix
@@ -7,7 +7,7 @@ let
poolName = "freshrss";
in
{
- meta.maintainers = with maintainers; [ etu stunkymonkey ];
+ meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
options.services.freshrss = {
enable = mkEnableOption (mdDoc "FreshRSS feed reader");
@@ -27,7 +27,8 @@ in
};
passwordFile = mkOption {
- type = types.path;
+ type = types.nullOr types.path;
+ default = null;
description = mdDoc "Password for the defaultUser for FreshRSS.";
example = "/run/secrets/freshrss";
};
@@ -120,7 +121,13 @@ in
user = mkOption {
type = types.str;
default = "freshrss";
- description = lib.mdDoc "User under which Freshrss runs.";
+ description = lib.mdDoc "User under which FreshRSS runs.";
+ };
+
+ authType = mkOption {
+ type = types.enum [ "form" "http_auth" "none" ];
+ default = "form";
+ description = mdDoc "Authentication type for FreshRSS.";
};
};
@@ -160,6 +167,14 @@ in
};
in
mkIf cfg.enable {
+ assertions = mkIf (cfg.authType == "form") [
+ {
+ assertion = cfg.passwordFile != null;
+ message = ''
+ `passwordFile` must be supplied when using "form" authentication!
+ '';
+ }
+ ];
# Set up a Nginx virtual host.
services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
@@ -227,7 +242,7 @@ in
settingsFlags = concatStringsSep " \\\n "
(mapAttrsToList (k: v: "${k} ${toString v}") {
"--default_user" = ''"${cfg.defaultUser}"'';
- "--auth_type" = ''"form"'';
+ "--auth_type" = ''"${cfg.authType}"'';
"--base_url" = ''"${cfg.baseUrl}"'';
"--language" = ''"${cfg.language}"'';
"--db-type" = ''"${cfg.database.type}"'';
@@ -255,20 +270,30 @@ in
FRESHRSS_DATA_PATH = cfg.dataDir;
};
- script = ''
- # do installation or reconfigure
- if test -f ${cfg.dataDir}/config.php; then
- # reconfigure with settings
- ./cli/reconfigure.php ${settingsFlags}
- ./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
- else
- # check correct folders in data folder
- ./cli/prepare.php
- # install with settings
- ./cli/do-install.php ${settingsFlags}
- ./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
- fi
- '';
+ script =
+ let
+ userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"'';
+ updateUserScript = optionalString (cfg.authType == "form") ''
+ ./cli/update-user.php ${userScriptArgs}
+ '';
+ createUserScript = optionalString (cfg.authType == "form") ''
+ ./cli/create-user.php ${userScriptArgs}
+ '';
+ in
+ ''
+ # do installation or reconfigure
+ if test -f ${cfg.dataDir}/config.php; then
+ # reconfigure with settings
+ ./cli/reconfigure.php ${settingsFlags}
+ ${updateUserScript}
+ else
+ # check correct folders in data folder
+ ./cli/prepare.php
+ # install with settings
+ ./cli/do-install.php ${settingsFlags}
+ ${createUserScript}
+ fi
+ '';
};
systemd.services.freshrss-updater = {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
index e2014a9b7e..bfa5fd5aff 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix
@@ -1,8 +1,8 @@
{ config, lib, pkgs, ... }:
-with lib;
-
let
+ inherit (lib) literalExpression mdDoc mkEnableOption mkIf mkOption mkPackageOptionMD mkRenamedOptionModule types versionAtLeast;
+
cfg = config.services.hedgedoc;
# 21.03 will not be an official release - it was instead 21.05. This
@@ -32,6 +32,7 @@ in
];
options.services.hedgedoc = {
+ package = mkPackageOptionMD pkgs "hedgedoc" { };
enable = mkEnableOption (lib.mdDoc "the HedgeDoc Markdown Editor");
groups = mkOption {
@@ -107,6 +108,13 @@ in
{option}`protocolUseSSL`.
'';
};
+ enableStatsApi = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Enables or disables the /status and /metrics endpoint.
+ '';
+ };
hsts = {
enable = mkOption {
type = types.bool;
@@ -1018,16 +1026,6 @@ in
`HedgeDoc` is running.
'';
};
-
- package = mkOption {
- type = types.package;
- default = pkgs.hedgedoc;
- defaultText = literalExpression "pkgs.hedgedoc";
- description = lib.mdDoc ''
- Package that provides HedgeDoc.
- '';
- };
-
};
config = mkIf cfg.enable {
@@ -1060,7 +1058,7 @@ in
serviceConfig = {
WorkingDirectory = cfg.workDir;
StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ];
- ExecStart = "${cfg.package}/bin/hedgedoc";
+ ExecStart = "${lib.getExe cfg.package}";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [
"CMD_CONFIG_FILE=${cfg.workDir}/config.json"
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix
index e875be47fb..8823da0100 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix
@@ -62,7 +62,7 @@ let
port = cfg.database.port;
# Blank for unix sockets, see
# https://github.com/will/crystal-pg/blob/1548bb255210/src/pq/conninfo.cr#L100-L108
- host = if cfg.database.host == null then "" else cfg.database.host;
+ host = lib.optionalString (cfg.database.host != null) cfg.database.host;
# Not needed because peer authentication is enabled
password = lib.mkIf (cfg.database.host == null) "";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix
index 8be1fd3055..f419b75cf7 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix
@@ -16,7 +16,7 @@ let
DB_HOSTNAME=${cfg.database.host}
DB_USERNAME=${cfg.database.user}
# NOTE: file_get_contents adds newline at the end of returned string
- DB_PASSWORD=${if cfg.database.passwordFile == null then "" else "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}
+ DB_PASSWORD=${optionalString (cfg.database.passwordFile != null) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}
DB_DATABASE=${cfg.database.name}
DB_PORT=${toString cfg.database.port}
SESS_EXPIRATION=864000
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 a8ad4c50f2..6dfba907fb 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgs, config, utils, ... }:
with lib;
let
cfg = config.services.lemmy;
@@ -41,6 +41,30 @@ in
default = null;
description = lib.mdDoc "The connection URI to use. Takes priority over the configuration file if set.";
};
+
+ uriFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = lib.mdDoc "File which contains the database uri.";
+ };
+ };
+
+ pictrsApiKeyFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = lib.mdDoc "File which contains the value of `pictrs.api_key`.";
+ };
+
+ smtpPasswordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = lib.mdDoc "File which contains the value of `email.smtp_password`.";
+ };
+
+ adminPasswordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = lib.mdDoc "File which contains the value of `setup.admin_password`.";
};
settings = mkOption {
@@ -76,17 +100,20 @@ in
};
};
};
-
- secretFile = mkOption {
- type = with types; nullOr path;
- default = null;
- description = lib.mdDoc "Path to a secret JSON configuration file which is merged at runtime with the one generated from {option}`services.lemmy.settings`.";
- };
};
config =
+ let
+ secretOptions = {
+ pictrsApiKeyFile = { setting = [ "pictrs" "api_key" ]; path = cfg.pictrsApiKeyFile; };
+ smtpPasswordFile = { setting = [ "email" "smtp_password" ]; path = cfg.smtpPasswordFile; };
+ adminPasswordFile = { setting = [ "setup" "admin_password" ]; path = cfg.adminPasswordFile; };
+ uriFile = { setting = [ "database" "uri" ]; path = cfg.database.uriFile; };
+ };
+ secrets = lib.filterAttrs (option: data: data.path != null) secretOptions;
+ in
lib.mkIf cfg.enable {
- services.lemmy.settings = (mapAttrs (name: mkDefault)
+ services.lemmy.settings = lib.attrsets.recursiveUpdate (mapAttrs (name: mkDefault)
{
bind = "127.0.0.1";
tls_enabled = true;
@@ -104,14 +131,15 @@ in
rate_limit.image = 6;
rate_limit.image_per_second = 3600;
} // {
- database = mapAttrs (name: mkDefault) {
- user = "lemmy";
- host = "/run/postgresql";
- port = 5432;
- database = "lemmy";
- pool_size = 5;
- };
- });
+ database = mapAttrs (name: mkDefault) {
+ user = "lemmy";
+ host = "/run/postgresql";
+ port = 5432;
+ database = "lemmy";
+ pool_size = 5;
+ };
+ }) (lib.foldlAttrs (acc: option: data: acc // lib.setAttrByPath data.setting { _secret = option; }) {} secrets);
+ # the option name is the id of the credential loaded by LoadCredential
services.postgresql = mkIf cfg.database.createLocally {
enable = true;
@@ -202,16 +230,19 @@ in
assertion = (!(hasAttrByPath ["federation"] cfg.settings)) && (!(hasAttrByPath ["federation" "enabled"] cfg.settings));
message = "`services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect";
}
+ {
+ assertion = cfg.database.uriFile != null -> cfg.database.uri == null && !cfg.database.createLocally;
+ message = "specifying a database uri while also specifying a database uri file is not allowed";
+ }
];
systemd.services.lemmy = let
- configFile = settingsFormat.generate "config.hjson" cfg.settings;
- mergedConfig = "/run/lemmy/config.hjson";
+ substitutedConfig = "/run/lemmy/config.hjson";
in {
description = "Lemmy server";
environment = {
- LEMMY_CONFIG_LOCATION = if cfg.secretFile == null then configFile else mergedConfig;
+ LEMMY_CONFIG_LOCATION = if secrets == {} then settingsFormat.generate "config.hjson" cfg.settings else substitutedConfig;
LEMMY_DATABASE_URL = if cfg.database.uri != null then cfg.database.uri else (mkIf (cfg.database.createLocally) "postgres:///lemmy?host=/run/postgresql&user=lemmy");
};
@@ -226,21 +257,20 @@ in
requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];
- path = mkIf (cfg.secretFile != null) [ pkgs.jq ];
-
- # merge the two configs and prevent others from reading the result
+ # substitute secrets and prevent others from reading the result
# if somehow $CREDENTIALS_DIRECTORY is not set we fail
- preStart = mkIf (cfg.secretFile != null) ''
+ preStart = mkIf (secrets != {}) ''
set -u
- umask 177
- jq --slurp '.[0] * .[1]' ${lib.escapeShellArg configFile} "$CREDENTIALS_DIRECTORY/secretFile" > ${lib.escapeShellArg mergedConfig}
+ umask u=rw,g=,o=
+ cd "$CREDENTIALS_DIRECTORY"
+ ${utils.genJqSecretsReplacementSnippet cfg.settings substitutedConfig}
'';
serviceConfig = {
DynamicUser = true;
RuntimeDirectory = "lemmy";
ExecStart = "${cfg.server.package}/bin/lemmy_server";
- LoadCredential = mkIf (cfg.secretFile != null) "secretFile:${toString cfg.secretFile}";
+ LoadCredential = lib.foldlAttrs (acc: option: data: acc ++ [ "${option}:${toString data.path}" ]) [] secrets;
PrivateTmp = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
index 7cc8ce10ff..3374c746ad 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix
@@ -130,5 +130,17 @@ in
environment = cfg.config;
};
environment.systemPackages = [ cfg.package ];
+
+ security.apparmor.policies."bin.miniflux".profile = ''
+ include
+ ${cfg.package}/bin/miniflux {
+ include
+ include
+ include
+ include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
+ r ${cfg.package}/bin/miniflux,
+ r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,
+ }
+ '';
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix
index 58c110c951..c67562d389 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix
@@ -12,22 +12,9 @@ in
services.nexus = {
enable = mkEnableOption (lib.mdDoc "Sonatype Nexus3 OSS service");
- package = mkOption {
- type = types.package;
- default = pkgs.nexus;
- defaultText = literalExpression "pkgs.nexus";
- description = lib.mdDoc "Package which runs Nexus3";
- };
+ package = lib.mkPackageOption pkgs "nexus" { };
- jdkPackage = mkOption {
- type = types.package;
- default = pkgs.openjdk8;
- defaultText = literalExample "pkgs.openjdk8";
- example = literalExample "pkgs.openjdk8";
- description = ''
- The JDK package to use.
- '';
- };
+ jdkPackage = lib.mkPackageOption pkgs "openjdk8" { };
user = mkOption {
type = types.str;
@@ -114,8 +101,7 @@ in
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;
- group = cfg.group;
- home = cfg.home;
+ inherit (cfg) group home;
createHome = true;
};
@@ -132,7 +118,7 @@ in
NEXUS_USER = cfg.user;
NEXUS_HOME = cfg.home;
- INSTALL4J_JAVA_HOME = "${cfg.jdkPackage}";
+ INSTALL4J_JAVA_HOME = cfg.jdkPackage;
VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts;
};
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 4826b2cab6..17e170c33d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix
@@ -348,7 +348,7 @@ in {
};
redis = {
hostname = "${toString cfg.redis.host}";
- port = (if cfg.redis.port == null then "" else cfg.redis.port);
+ port = (lib.optionalString (cfg.redis.port != null) cfg.redis.port);
};
storage = {
tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/";
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix
new file mode 100644
index 0000000000..33353a5944
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix
@@ -0,0 +1,211 @@
+{ lib, pkgs, config, ... }:
+
+let
+ settingsFormat = pkgs.formats.yaml {};
+in {
+ options.services.slskd = with lib; with types; {
+ enable = mkEnableOption "enable slskd";
+
+ rotateLogs = mkEnableOption "enable an unit and timer that will rotate logs in /var/slskd/logs";
+
+ package = mkPackageOptionMD pkgs "slskd" { };
+
+ nginx = mkOption {
+ description = lib.mdDoc "options for nginx";
+ example = {
+ enable = true;
+ domain = "example.com";
+ contextPath = "/slskd";
+ };
+ type = submodule ({name, config, ...}: {
+ options = {
+ enable = mkEnableOption "enable nginx as a reverse proxy";
+
+ domainName = mkOption {
+ type = str;
+ description = "Domain you want to use";
+ };
+ contextPath = mkOption {
+ type = types.path;
+ default = "/";
+ description = lib.mdDoc ''
+ The context path, i.e., the last part of the slskd
+ URL. Typically '/' or '/slskd'. Default '/'
+ '';
+ };
+ };
+ });
+ };
+
+ environmentFile = mkOption {
+ type = path;
+ description = ''
+ Path to a file containing secrets.
+ It must at least contain the variable `SLSKD_SLSK_PASSWORD`
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = bool;
+ description = ''
+ Whether to open the firewall for services.slskd.settings.listen_port";
+ '';
+ default = false;
+ };
+
+ settings = mkOption {
+ description = lib.mdDoc ''
+ Configuration for slskd, see
+ [available options](https://github.com/slskd/slskd/blob/master/docs/config.md)
+ `APP_DIR` is set to /var/lib/slskd, where default download & incomplete directories,
+ log and databases will be created.
+ '';
+ default = {};
+ type = submodule {
+ freeformType = settingsFormat.type;
+ options = {
+
+ soulseek = {
+ username = mkOption {
+ type = str;
+ description = "Username on the Soulseek Network";
+ };
+ listen_port = mkOption {
+ type = port;
+ description = "Port to use for communication on the Soulseek Network";
+ default = 50000;
+ };
+ };
+
+ web = {
+ port = mkOption {
+ type = port;
+ default = 5001;
+ description = "The HTTP listen port";
+ };
+ url_base = mkOption {
+ type = path;
+ default = config.services.slskd.nginx.contextPath;
+ defaultText = "config.services.slskd.nginx.contextPath";
+ description = lib.mdDoc ''
+ The context path, i.e., the last part of the slskd URL
+ '';
+ };
+ };
+
+ shares = {
+ directories = mkOption {
+ type = listOf str;
+ description = lib.mdDoc ''
+ Paths to your shared directories. See
+ [documentation](https://github.com/slskd/slskd/blob/master/docs/config.md#directories)
+ for advanced usage
+ '';
+ };
+ };
+
+ directories = {
+ incomplete = mkOption {
+ type = nullOr path;
+ description = "Directory where downloading files are stored";
+ defaultText = "/incomplete";
+ default = null;
+ };
+ downloads = mkOption {
+ type = nullOr path;
+ description = "Directory where downloaded files are stored";
+ defaultText = "/downloads";
+ default = null;
+ };
+ };
+ };
+ };
+ };
+ };
+
+ config = let
+ cfg = config.services.slskd;
+
+ confWithoutNullValues = (lib.filterAttrs (key: value: value != null) cfg.settings);
+
+ configurationYaml = settingsFormat.generate "slskd.yml" confWithoutNullValues;
+
+ in lib.mkIf cfg.enable {
+
+ users = {
+ users.slskd = {
+ isSystemUser = true;
+ group = "slskd";
+ };
+ groups.slskd = {};
+ };
+
+ # Reverse proxy configuration
+ services.nginx.enable = true;
+ services.nginx.virtualHosts."${cfg.nginx.domainName}" = {
+ forceSSL = true;
+ enableACME = true;
+ locations = {
+ "${cfg.nginx.contextPath}" = {
+ proxyPass = "http://localhost:${toString cfg.settings.web.port}";
+ proxyWebsockets = true;
+ };
+ };
+ };
+
+ # Hide state & logs
+ systemd.tmpfiles.rules = [
+ "d /var/lib/slskd/data 0750 slskd slskd - -"
+ "d /var/lib/slskd/logs 0750 slskd slskd - -"
+ ];
+
+ systemd.services.slskd = {
+ description = "A modern client-server application for the Soulseek file sharing network";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "simple";
+ User = "slskd";
+ EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
+ StateDirectory = "slskd";
+ ExecStart = "${cfg.package}/bin/slskd --app-dir /var/lib/slskd --config ${configurationYaml}";
+ Restart = "on-failure";
+ ReadOnlyPaths = map (d: builtins.elemAt (builtins.split "[^/]*(/.+)" d) 1) cfg.settings.shares.directories;
+ LockPersonality = true;
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ PrivateTmp = true;
+ PrivateUsers = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictNamespaces = true;
+ RestrictSUIDSGID = true;
+ };
+ };
+
+ networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.settings.soulseek.listen_port;
+
+ systemd.services.slskd-rotatelogs = lib.mkIf cfg.rotateLogs {
+ description = "Rotate slskd logs";
+ serviceConfig = {
+ Type = "oneshot";
+ User = "slskd";
+ ExecStart = [
+ "${pkgs.findutils}/bin/find /var/lib/slskd/logs/ -type f -mtime +10 -delete"
+ "${pkgs.findutils}/bin/find /var/lib/slskd/logs/ -type f -mtime +1 -exec ${pkgs.gzip}/bin/gzip -q {} ';'"
+ ];
+ };
+ startAt = "daily";
+ };
+
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix
index 5e5d947282..9427eff35d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix
@@ -232,8 +232,8 @@ in {
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
- proxy_buffer_size 4k;
- proxy_buffers 4 32k;
+ proxy_buffer_size 64k;
+ proxy_buffers 8 64k;
proxy_busy_buffers_size 64k;
proxy_temp_file_write_size 64k;
client_max_body_size 50m;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 5042fbf1f8..e9f42c4118 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.lighttpd.cgit;
- pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir;
+ pathPrefix = optionalString (stringLength cfg.subdir != 0) ("/" + cfg.subdir);
configFile = pkgs.writeText "cgitrc"
''
# default paths to static assets
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 e87159ba99..fccc31b511 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
@@ -261,23 +261,6 @@ let
${proxyCachePathConfig}
- ${optionalString cfg.statusPage ''
- server {
- listen ${toString cfg.defaultHTTPListenPort};
- ${optionalString enableIPv6 "listen [::]:${toString cfg.defaultHTTPListenPort};" }
-
- server_name localhost;
-
- location /nginx_status {
- stub_status on;
- access_log off;
- allow 127.0.0.1;
- ${optionalString enableIPv6 "allow ::1;"}
- deny all;
- }
- }
- ''}
-
${vhosts}
${cfg.appendHttpConfig}
@@ -352,7 +335,7 @@ let
+ ";"))
+ "
listen ${addr}:${toString port} "
- + optionalString (ssl && vhost.http2) "http2 "
+ + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 "
+ optionalString ssl "ssl "
+ optionalString vhost.default "default_server "
+ optionalString vhost.reuseport "reuseport "
@@ -362,7 +345,9 @@ let
redirectListen = filter (x: !x.ssl) defaultListen;
- acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) ''
+ # The acme-challenge location doesn't need to be added if we are not using any automated
+ # certificate provisioning and can also be omitted when we use a certificate obtained via a DNS-01 challenge
+ acmeLocation = optionalString (vhost.enableACME || (vhost.useACMEHost != null && config.security.acme.certs.${vhost.useACMEHost}.dnsProvider == null)) ''
# Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx)
# We use ^~ here, so that we don't check any regexes (which could
# otherwise easily override this intended match accidentally).
@@ -395,6 +380,9 @@ let
server {
${concatMapStringsSep "\n" listenString hostListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
+ ${optionalString (hasSSL && vhost.http2 && !oldHTTP2) ''
+ http2 on;
+ ''}
${optionalString (hasSSL && vhost.quic) ''
http3 ${if vhost.http3 then "on" else "off"};
http3_hq ${if vhost.http3_hq then "on" else "off"};
@@ -478,6 +466,8 @@ let
);
mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix;
+
+ oldHTTP2 = versionOlder cfg.package.version "1.25.1";
in
{
@@ -1175,6 +1165,21 @@ in
services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli
++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd;
+ services.nginx.virtualHosts.localhost = mkIf cfg.statusPage {
+ listenAddresses = lib.mkDefault ([
+ "0.0.0.0"
+ ] ++ lib.optional enableIPv6 "[::]");
+ locations."/nginx_status" = {
+ extraConfig = ''
+ stub_status on;
+ access_log off;
+ allow 127.0.0.1;
+ ${optionalString enableIPv6 "allow ::1;"}
+ deny all;
+ '';
+ };
+ };
+
systemd.services.nginx = {
description = "Nginx Web Server";
wantedBy = [ "multi-user.target" ];
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 b7341d4d8b..a734bc288c 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
@@ -156,7 +156,7 @@ in {
++ cfg.sessionPath;
# Fonts.
- fonts.fonts = mkDefault [
+ fonts.packages = mkDefault [
pkgs.noto-fonts
pkgs.hack-font
];
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index c7755aca4b..b3cbe4c324 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -218,7 +218,7 @@ in
qt.style = "adwaita";
# Default Fonts
- fonts.fonts = with pkgs; [
+ fonts.packages = with pkgs; [
source-code-pro # Default monospace font in 3.32
ubuntu_font_family # required for default theme
];
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix
index 70be6ed7c0..b2369e2426 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -67,7 +67,7 @@ in
networking.networkmanager.enable = mkDefault true;
programs.dconf.enable = mkDefault true;
- fonts.fonts = with pkgs; [ noto-fonts ];
+ fonts.packages = with pkgs; [ noto-fonts ];
xdg.mime.enable = true;
xdg.menus.enable = true;
xdg.icons.enable = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 2de5d845d6..1512b5fdf8 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -92,7 +92,7 @@ in
environment.etc."X11/xkb".source = xcfg.xkbDir;
- fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];
+ fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix
index 79b2e7c6ea..5d950f7d7f 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -432,7 +432,7 @@ in
isSystem = true;
};
- fonts.fonts = with pkgs; [
+ fonts.packages = with pkgs; [
cantarell-fonts
dejavu_fonts
source-code-pro # Default monospace font in 3.32
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 e87ae5ae81..d8a47e93af 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
@@ -199,6 +199,7 @@ in
gnome.adwaita-icon-theme
gtk3.out # for gtk-launch program
onboard
+ orca # elementary/greeter#668
qgnomeplatform
sound-theme-freedesktop
xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
@@ -265,7 +266,7 @@ in
qt.style = "adwaita";
# Default Fonts
- fonts.fonts = with pkgs; [
+ fonts.packages = with pkgs; [
inter
open-dyslexic
open-sans
@@ -306,7 +307,7 @@ in
])) config.environment.pantheon.excludePackages;
# needed by screenshot
- fonts.fonts = [
+ fonts.packages = [
pkgs.pantheon.elementary-redacted-script
];
})
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix
index 3cfa6e044b..e4cd9fd99e 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix
@@ -100,7 +100,7 @@ let
};
};
- optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}";
+ optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}";
renderPhocOutput = name: output: let
modelines = if builtins.isList output.modeline
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 38f932ffb4..15a510fd8f 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
@@ -332,7 +332,7 @@ in
# Enable GTK applications to load SVG icons
services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
- fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ];
+ fonts.packages = with pkgs; [ cfg.notoPackage hack-font ];
fonts.fontconfig.defaultFonts = {
monospace = [ "Hack" "Noto Sans Mono" ];
sansSerif = [ "Noto Sans" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
index eee1f63ebd..191b3690c0 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
with lib;
let
cfg = config.services.xserver.desktopManager.xfce;
+ excludePackages = config.environment.xfce.excludePackages;
in
{
@@ -69,10 +70,17 @@ in
description = lib.mdDoc "Enable the XFCE screensaver.";
};
};
+
+ environment.xfce.excludePackages = mkOption {
+ default = [];
+ example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]";
+ type = types.listOf types.package;
+ description = lib.mdDoc "Which packages XFCE should exclude from the default environment";
+ };
};
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs.xfce // pkgs; [
+ environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [
glib # for gsettings
gtk3.out # gtk-update-icon-cache
@@ -121,7 +129,7 @@ in
] ++ optionals (!cfg.noDesktop) [
xfce4-panel
xfdesktop
- ] ++ optional cfg.enableScreensaver xfce4-screensaver;
+ ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
programs.xfconf.enable = true;
programs.thunar.enable = true;
@@ -165,9 +173,9 @@ in
programs.zsh.vteIntegration = mkDefault true;
# Systemd services
- systemd.packages = with pkgs.xfce; [
+ systemd.packages = utils.removePackagesByName (with pkgs.xfce; [
xfce4-notifyd
- ];
+ ]) excludePackages;
security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
};
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
index 4456374cc5..ee9b4016c8 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
@@ -142,7 +142,7 @@ in
theme
];
- fonts.fonts = [ font ];
+ fonts.packages = [ font ];
environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf;
};
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
index 53d9c99b47..c2e6da4b45 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix
@@ -22,7 +22,7 @@ let
};
fontsForXServer =
- config.fonts.fonts ++
+ config.fonts.packages ++
# We don't want these fonts in fonts.conf, because then modern,
# fontconfig-based applications will get horrible bitmapped
# Helvetica fonts. It's better to get a substitution (like Nimbus
@@ -883,8 +883,8 @@ in
${cfg.extraConfig}
'';
- fonts.enableDefaultFonts = mkDefault true;
- fonts.fonts = [
+ fonts.enableDefaultPackages = mkDefault true;
+ fonts.packages = [
(if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
pkgs.xorg.fontmiscmisc
];
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 e8bbf1d040..1d95742fac 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix
@@ -7,8 +7,8 @@ let
cfg = config.boot.initrd.network;
dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
- doDhcp = config.networking.useDHCP || dhcpInterfaces != [];
- dhcpIfShellExpr = if config.networking.useDHCP
+ doDhcp = cfg.udhcpc.enable || dhcpInterfaces != [];
+ dhcpIfShellExpr = if config.networking.useDHCP || cfg.udhcpc.enable
then "$(ls /sys/class/net/ | grep -v ^lo$)"
else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces;
@@ -79,13 +79,24 @@ in
'';
};
+ boot.initrd.network.udhcpc.enable = mkOption {
+ default = config.networking.useDHCP;
+ defaultText = "networking.useDHCP";
+ type = types.bool;
+ description = lib.mdDoc ''
+ Enables the udhcpc service during stage 1 of the boot process. This
+ defaults to {option}`networking.useDHCP`. Therefore, this useful if
+ useDHCP is off but the initramfs should do dhcp.
+ '';
+ };
+
boot.initrd.network.udhcpc.extraArgs = mkOption {
default = [];
type = types.listOf types.str;
description = lib.mdDoc ''
- Additional command-line arguments passed verbatim to udhcpc if
- {option}`boot.initrd.network.enable` and {option}`networking.useDHCP`
- are enabled.
+ Additional command-line arguments passed verbatim to
+ udhcpc if {option}`boot.initrd.network.enable` and
+ {option}`boot.initrd.network.udhcpc.enable` are enabled.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
index 31e9ec626c..e618070f0d 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
@@ -70,11 +70,10 @@ let
let
val = if item.freeform != null then item.freeform else item.tristate;
in
- if val == null
- then ""
- else if (item.optional)
+ optionalString (val != null)
+ (if (item.optional)
then "${key}? ${mkValue val}\n"
- else "${key} ${mkValue val}\n";
+ else "${key} ${mkValue val}\n");
mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg);
in mkConf exprs;
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 b57e343d2a..8f2f578e30 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
@@ -40,7 +40,10 @@ let
backgroundColor = f cfg.backgroundColor;
entryOptions = f cfg.entryOptions;
subEntryOptions = f cfg.subEntryOptions;
- grub = f grub;
+ # PC platforms (like x86_64-linux) have a non-EFI target (`grubTarget`), but other platforms
+ # (like aarch64-linux) have an undefined `grubTarget`. Avoid providing the path to a non-EFI
+ # GRUB on those platforms.
+ grub = f (if (grub.grubTarget or "") != "" then grub else "");
grubTarget = f (grub.grubTarget or "");
shell = "${pkgs.runtimeShell}";
fullName = lib.getName realGrub;
@@ -65,8 +68,8 @@ let
[ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ]
++ optional cfg.efiSupport efibootmgr
++ optionals cfg.useOSProber [ busybox os-prober ]);
- font = if cfg.font == null then ""
- else (if lib.last (lib.splitString "." cfg.font) == "pf2"
+ font = lib.optionalString (cfg.font != null) (
+ if lib.last (lib.splitString "." cfg.font) == "pf2"
then cfg.font
else "${convertedFont}");
});
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
index c5fc259e26..6d0afcc57f 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
@@ -171,7 +171,7 @@ let
"batadv"
])
(assertByteFormat "MTUBytes")
- (assertMacAddress "MACAddress")
+ (assertNetdevMacAddress "MACAddress")
];
sectionVLAN = checkUnitConfig "VLAN" [
@@ -223,6 +223,7 @@ let
"PortRange"
"FlowLabel"
"IPDoNotFragment"
+ "Independent"
])
(assertInt "VNI")
(assertRange "VNI" 1 16777215)
@@ -242,6 +243,7 @@ let
(assertInt "FlowLabel")
(assertRange "FlowLabel" 0 1048575)
(assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"]))
+ (assertValueOneOf "Independent" boolValues)
];
sectionTunnel = checkUnitConfig "Tunnel" [
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 eec3461de7..7aaa3f85bf 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
@@ -91,7 +91,7 @@ let
# we just copy what we need from Glibc and use patchelf to make it
# work.
extraUtils = pkgs.runCommand "extra-utils"
- { nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
+ { nativeBuildInputs = with pkgs.buildPackages; [ nukeReferences bintools ];
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
}
''
@@ -122,7 +122,7 @@ let
# code, using default options and effectively ignore security relevant
# ZFS properties such as `setuid=off` and `exec=off` (unless manually
# duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose).
- copy_bin_and_libs ${pkgs.util-linux}/bin/mount
+ copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs
''}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
index 9557cf45d5..ac55461107 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
@@ -597,6 +597,11 @@ in
# drop-in in /etc, it does apply.
overrideStrategy = "asDropin";
};
+ systemd.services."systemd-mkswap@" = {
+ restartIfChanged = false;
+ path = [ pkgs.util-linux ];
+ overrideStrategy = "asDropin";
+ };
systemd.services.systemd-random-seed.restartIfChanged = false;
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-update-utmp.restartIfChanged = false;
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix
index e81b3e4ff2..2431c68ea1 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix
@@ -1,28 +1,15 @@
-{ config, pkgs, lib, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
let
cfg = config.systemd.repart;
initrdCfg = config.boot.initrd.systemd.repart;
- writeDefinition = name: partitionConfig: pkgs.writeText
- "${name}.conf"
- (lib.generators.toINI { } { Partition = partitionConfig; });
+ format = pkgs.formats.ini { };
- listOfDefinitions = lib.mapAttrsToList
- writeDefinition
- (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions);
-
- # Create a directory in the store that contains a copy of all definition
- # files. This is then passed to systemd-repart in the initrd so it can access
- # the definition files after the sysroot has been mounted but before
- # activation. This needs a hard copy of the files and not just symlinks
- # because otherwise the files do not show up in the sysroot.
- definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } ''
- mkdir -p $out
- ${(lib.concatStringsSep "\n"
- (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)
- )}
- '';
+ definitionsDirectory = utils.systemdUtils.lib.definitions
+ "repart.d"
+ format
+ (lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions);
in
{
options = {
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
index b4b750fa9a..d7300e940a 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
@@ -30,7 +30,11 @@ in {
};
config = lib.mkIf cfg.enable {
- systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
+ systemd.shutdownRamfs.contents = {
+ "/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
+ "/etc/initrd-release".source = config.environment.etc.os-release.source;
+ "/etc/os-release".source = config.environment.etc.os-release.source;
+ };
systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"];
systemd.mounts = [{
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix
new file mode 100644
index 0000000000..b1914a9c4e
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -0,0 +1,136 @@
+{ config, lib, pkgs, utils, ... }:
+
+let
+ cfg = config.systemd.sysupdate;
+
+ format = pkgs.formats.ini { };
+
+ definitionsDirectory = utils.systemdUtils.lib.definitions
+ "sysupdate.d"
+ format
+ cfg.transfers;
+in
+{
+ options.systemd.sysupdate = {
+
+ enable = lib.mkEnableOption (lib.mdDoc "systemd-sysupdate") // {
+ description = lib.mdDoc ''
+ Atomically update the host OS, container images, portable service
+ images or other sources.
+
+ If enabled, updates are triggered in regular intervals via a
+ `systemd.timer` unit.
+
+ Please see
+
+ for more details.
+ '';
+ };
+
+ timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // {
+ default = { };
+ description = lib.mdDoc ''
+ The timer configuration for performing the update.
+
+ By default, the upstream configuration is used:
+
+ '';
+ };
+
+ reboot = {
+ enable = lib.mkEnableOption (lib.mdDoc "automatically rebooting after an update") // {
+ description = lib.mdDoc ''
+ Whether to automatically reboot after an update.
+
+ If set to `true`, the system will automatically reboot via a
+ `systemd.timer` unit but only after a new version was installed.
+
+ This uses a unit completely separate from the one performing the
+ update because it is typically advisable to download updates
+ regularly while the system is up, but delay reboots until the
+ appropriate time (i.e. typically at night).
+
+ Set this to `false` if you do not want to reboot after an update. This
+ is useful when you update a container image or another source where
+ rebooting is not necessary in order to finalize the update.
+ '';
+ };
+
+ timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // {
+ default = { };
+ description = lib.mdDoc ''
+ The timer configuration for rebooting after an update.
+
+ By default, the upstream configuration is used:
+
+ '';
+ };
+ };
+
+ transfers = lib.mkOption {
+ type = with lib.types; attrsOf format.type;
+ default = { };
+ example = {
+ "10-uki.conf" = {
+ Transfer = {
+ ProtectVersion = "%A";
+ };
+
+ Source = {
+ Type = "url-file";
+ Path = "https://download.example.com/";
+ MatchPattern = "nixos_@v.efi.xz";
+ };
+
+ Target = {
+ Type = "regular-file";
+ Path = "/EFI/Linux";
+ PathRelativeTo = "boot";
+ MatchPattern = ''
+ nixos_@v+@l-@d.efi"; \
+ nixos_@v+@l.efi \
+ nixos_@v.efi
+ '';
+ Mode = "0444";
+ TriesLeft = 3;
+ TriesDone = 0;
+ InstancesMax = 2;
+ };
+ };
+ };
+ description = lib.mdDoc ''
+ Specify transfers as a set of the names of the transfer files as the
+ key and the configuration as its value. The configuration can use all
+ upstream options. See
+
+ for all available options.
+ '';
+ };
+
+ };
+
+ config = lib.mkIf cfg.enable {
+
+ systemd.additionalUpstreamSystemUnits = [
+ "systemd-sysupdate.service"
+ "systemd-sysupdate.timer"
+ "systemd-sysupdate-reboot.service"
+ "systemd-sysupdate-reboot.timer"
+ ];
+
+ systemd.timers = {
+ "systemd-sysupdate" = {
+ wantedBy = [ "timers.target" ];
+ timerConfig = cfg.timerConfig;
+ };
+ "systemd-sysupdate-reboot" = lib.mkIf cfg.reboot.enable {
+ wantedBy = [ "timers.target" ];
+ timerConfig = cfg.reboot.timerConfig;
+ };
+ };
+
+ environment.etc."sysupdate.d".source = definitionsDirectory;
+ };
+
+ meta.maintainers = with lib.maintainers; [ nikstur ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix
index 92e1b08739..1b6398d2f9 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix
@@ -42,7 +42,7 @@ let
writeTmpfiles = { rules, user ? null }:
let
- suffix = if user == null then "" else "-${user}";
+ suffix = optionalString (user != null) "-${user}";
in
pkgs.writeTextFile {
name = "nixos-user-tmpfiles.d${suffix}";
diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix
index cfb9c39458..ea61e7384e 100644
--- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix
+++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix
@@ -173,7 +173,7 @@ in
config = {
target = mkDefault name;
source = mkIf (config.text != null) (
- let name' = "etc-" + baseNameOf name;
+ let name' = "etc-" + lib.replaceStrings ["/"] ["-"] name;
in mkDerivedConfig options.text (pkgs.writeText name')
);
};
diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
index 72b937f373..21d604bee6 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix
@@ -110,17 +110,18 @@ let
createImportService = { pool, systemd, force, prefix ? "" }:
nameValuePair "zfs-import-${pool}" {
description = "Import ZFS pool \"${pool}\"";
- # we need systemd-udev-settle to ensure devices are available
+ # We wait for systemd-udev-settle to ensure devices are available,
+ # but don't *require* it, because mounts shouldn't be killed if it's stopped.
# In the future, hopefully someone will complete this:
# https://github.com/zfsonlinux/zfs/pull/4943
- requires = [ "systemd-udev-settle.service" ];
+ wants = [ "systemd-udev-settle.service" ];
after = [
"systemd-udev-settle.service"
"systemd-modules-load.service"
"systemd-ask-password-console.service"
];
- wantedBy = (getPoolMounts prefix pool) ++ [ "local-fs.target" ];
- before = (getPoolMounts prefix pool) ++ [ "local-fs.target" ];
+ requiredBy = getPoolMounts prefix pool ++ [ "zfs-import.target" ];
+ before = getPoolMounts prefix pool ++ [ "zfs-import.target" ];
unitConfig = {
DefaultDependencies = "no";
};
@@ -628,6 +629,8 @@ in
force = cfgZfs.forceImportRoot;
prefix = "/sysroot";
}) rootPools);
+ targets.zfs-import.wantedBy = [ "zfs.target" ];
+ targets.zfs.wantedBy = [ "initrd.target" ];
extraBin = {
# zpool and zfs are already in thanks to fsPackages
awk = "${pkgs.gawk}/bin/awk";
@@ -739,15 +742,7 @@ in
map createSyncService allPools ++
map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
- systemd.targets.zfs-import =
- let
- services = map (pool: "zfs-import-${pool}.service") dataPools;
- in
- {
- requires = services;
- after = services;
- wantedBy = [ "zfs.target" ];
- };
+ systemd.targets.zfs-import.wantedBy = [ "zfs.target" ];
systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
})
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
index 046b8e2f79..20f47a76c8 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
@@ -158,6 +158,15 @@ in
Docker package to be used in the module.
'';
};
+
+ extraPackages = mkOption {
+ type = types.listOf types.package;
+ default = [ ];
+ example = literalExpression "with pkgs; [ criu ]";
+ description = lib.mdDoc ''
+ Extra packages to add to PATH for the docker daemon process.
+ '';
+ };
};
###### implementation
@@ -194,7 +203,8 @@ in
};
path = [ pkgs.kmod ] ++ optional (cfg.storageDriver == "zfs") pkgs.zfs
- ++ optional cfg.enableNvidia pkgs.nvidia-docker;
+ ++ optional cfg.enableNvidia pkgs.nvidia-docker
+ ++ cfg.extraPackages;
};
systemd.sockets.docker = {
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
index 22e336c895..e22ba9a0ae 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
@@ -91,7 +91,7 @@ in {
Enables the (experimental) LXD UI.
'');
- package = mkPackageOption pkgs.lxd "ui" { };
+ package = mkPackageOption pkgs.lxd-unwrapped "ui" { };
};
};
};
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
index c3fae4bac4..ec0b713e58 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
@@ -206,6 +206,11 @@ in
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
+ systemd.timers.podman-prune.timerConfig = lib.mkIf cfg.autoPrune.enable {
+ Persistent = true;
+ RandomizedDelaySec = 1800;
+ };
+
systemd.tmpfiles.packages = [
# The /run/podman rule interferes with our podman group, so we remove
# it and let the systemd socket logic take care of it.
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
index 1074b02d0e..62778f2626 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
@@ -69,6 +69,34 @@ with lib;
VM name
'';
};
+ additionalSpace = mkOption {
+ type = types.str;
+ default = "512M";
+ example = "2048M";
+ description = lib.mdDoc ''
+ additional disk space to be added to the image if diskSize "auto"
+ is used.
+ '';
+ };
+ bootSize = mkOption {
+ type = types.str;
+ default = "256M";
+ example = "512M";
+ description = lib.mdDoc ''
+ Size of the boot partition. Is only used if partitionTableType is
+ either "efi" or "hybrid".
+ '';
+ };
+ diskSize = mkOption {
+ type = types.str;
+ default = "auto";
+ example = "20480";
+ description = lib.mdDoc ''
+ The size of the disk, in megabytes.
+ if "auto" size is calculated based on the contents copied to it and
+ additionalSpace is taken into account.
+ '';
+ };
net0 = mkOption {
type = types.commas;
default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1";
@@ -169,7 +197,7 @@ with lib;
];
system.build.VMA = import ../../lib/make-disk-image.nix {
name = "proxmox-${cfg.filenameSuffix}";
- inherit partitionTableType;
+ inherit (cfg) partitionTableType;
postVM = let
# Build qemu with PVE's patch that adds support for the VMA format
vma = (pkgs.qemu_kvm.override {
@@ -236,6 +264,7 @@ with lib;
mkdir -p $out/nix-support
echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" >> $out/nix-support/hydra-build-products
'';
+ inherit (cfg.qemuConf) additionalSpace diskSize bootSize;
format = "raw";
inherit config lib pkgs;
};
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 723b030072..3b4a39f5ff 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -89,6 +89,7 @@ in {
extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};
lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {};
node-name = runTest ./nixos-test-driver/node-name.nix;
+ busybox = runTest ./nixos-test-driver/busybox.nix;
};
# NixOS vm tests and non-vm unit tests
@@ -111,6 +112,7 @@ in {
anuko-time-tracker = handleTest ./anuko-time-tracker.nix {};
apcupsd = handleTest ./apcupsd.nix {};
apfs = runTest ./apfs.nix;
+ appliance-repart-image = runTest ./appliance-repart-image.nix;
apparmor = handleTest ./apparmor.nix {};
atd = handleTest ./atd.nix {};
atop = handleTest ./atop.nix {};
@@ -138,6 +140,7 @@ in {
borgbackup = handleTest ./borgbackup.nix {};
botamusique = handleTest ./botamusique.nix {};
bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
+ bpftune = handleTest ./bpftune.nix {};
breitbandmessung = handleTest ./breitbandmessung.nix {};
brscan5 = handleTest ./brscan5.nix {};
btrbk = handleTest ./btrbk.nix {};
@@ -202,6 +205,7 @@ in {
couchdb = handleTest ./couchdb.nix {};
cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {};
cups-pdf = handleTest ./cups-pdf.nix {};
+ curl-impersonate = handleTest ./curl-impersonate.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
darling = handleTest ./darling.nix {};
@@ -531,11 +535,12 @@ in {
nginx-http3 = handleTest ./nginx-http3.nix {};
nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
nginx-njs = handleTest ./nginx-njs.nix {};
+ nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
nginx-sso = handleTest ./nginx-sso.nix {};
+ nginx-status-page = handleTest ./nginx-status-page.nix {};
nginx-variants = handleTest ./nginx-variants.nix {};
- nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};
nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {};
nitter = handleTest ./nitter.nix {};
nix-ld = handleTest ./nix-ld.nix {};
@@ -576,6 +581,7 @@ in {
openvscode-server = handleTest ./openvscode-server.nix {};
orangefs = handleTest ./orangefs.nix {};
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
+ osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {};
osrm-backend = handleTest ./osrm-backend.nix {};
overlayfs = handleTest ./overlayfs.nix {};
pacemaker = handleTest ./pacemaker.nix {};
@@ -597,6 +603,7 @@ in {
peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};
peroxide = handleTest ./peroxide.nix {};
pgadmin4 = handleTest ./pgadmin4.nix {};
+ pgbouncer = handleTest ./pgbouncer.nix {};
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
phosh = handleTest ./phosh.nix {};
@@ -726,6 +733,7 @@ in {
switchTest = handleTest ./switch-test.nix {};
sympa = handleTest ./sympa.nix {};
syncthing = handleTest ./syncthing.nix {};
+ syncthing-no-settings = handleTest ./syncthing-no-settings.nix {};
syncthing-init = handleTest ./syncthing-init.nix {};
syncthing-relay = handleTest ./syncthing-relay.nix {};
systemd = handleTest ./systemd.nix {};
@@ -766,6 +774,7 @@ in {
systemd-portabled = handleTest ./systemd-portabled.nix {};
systemd-repart = handleTest ./systemd-repart.nix {};
systemd-shutdown = handleTest ./systemd-shutdown.nix {};
+ systemd-sysupdate = runTest ./systemd-sysupdate.nix;
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {};
systemd-misc = handleTest ./systemd-misc.nix {};
@@ -804,6 +813,7 @@ in {
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
tuxguitar = handleTest ./tuxguitar.nix {};
twingate = runTest ./twingate.nix;
+ typesense = handleTest ./typesense.nix {};
ucarp = handleTest ./ucarp.nix {};
udisks2 = handleTest ./udisks2.nix {};
ulogd = handleTest ./ulogd.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix b/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix
new file mode 100644
index 0000000000..3f256db846
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix
@@ -0,0 +1,116 @@
+# Tests building and running a GUID Partition Table (GPT) appliance image.
+# "Appliance" here means that the image does not contain the normal NixOS
+# infrastructure of a system profile and cannot be re-built via
+# `nixos-rebuild`.
+
+{ lib, ... }:
+
+let
+ rootPartitionLabel = "root";
+
+ bootLoaderConfigPath = "/loader/entries/nixos.conf";
+ kernelPath = "/EFI/nixos/kernel.efi";
+ initrdPath = "/EFI/nixos/initrd.efi";
+in
+{
+ name = "appliance-gpt-image";
+
+ meta.maintainers = with lib.maintainers; [ nikstur ];
+
+ nodes.machine = { config, lib, pkgs, ... }: {
+
+ imports = [ ../modules/image/repart.nix ];
+
+ virtualisation.directBoot.enable = false;
+ virtualisation.mountHostNixStore = false;
+ virtualisation.useEFIBoot = true;
+
+ # Disable boot loaders because we install one "manually".
+ # TODO(raitobezarius): revisit this when #244907 lands
+ boot.loader.grub.enable = false;
+
+ virtualisation.fileSystems = lib.mkForce {
+ "/" = {
+ device = "/dev/disk/by-partlabel/${rootPartitionLabel}";
+ fsType = "ext4";
+ };
+ };
+
+ image.repart = {
+ name = "appliance-gpt-image";
+ partitions = {
+ "esp" = {
+ contents =
+ let
+ efiArch = config.nixpkgs.hostPlatform.efiArch;
+ in
+ {
+ "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
+ "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+
+ # TODO: create an abstraction for Boot Loader Specification (BLS) entries.
+ "${bootLoaderConfigPath}".source = pkgs.writeText "nixos.conf" ''
+ title NixOS
+ linux ${kernelPath}
+ initrd ${initrdPath}
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+ '';
+
+ "${kernelPath}".source =
+ "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
+
+ "${initrdPath}".source =
+ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
+ };
+ repartConfig = {
+ Type = "esp";
+ Format = "vfat";
+ # Minimize = "guess" seems to not work very vell for vfat
+ # partitons. It's better to set a sensible default instead. The
+ # aarch64 kernel seems to generally be a little bigger than the
+ # x86_64 kernel. To stay on the safe side, leave some more slack
+ # for every platform other than x86_64.
+ SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
+ };
+ };
+ "root" = {
+ storePaths = [ config.system.build.toplevel ];
+ repartConfig = {
+ Type = "root";
+ Format = config.fileSystems."/".fsType;
+ Label = rootPartitionLabel;
+ Minimize = "guess";
+ };
+ };
+ };
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ import os
+ import subprocess
+ import tempfile
+
+ tmp_disk_image = tempfile.NamedTemporaryFile()
+
+ subprocess.run([
+ "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img",
+ "create",
+ "-f",
+ "qcow2",
+ "-b",
+ "${nodes.machine.system.build.image}/image.raw",
+ "-F",
+ "raw",
+ tmp_disk_image.name,
+ ])
+
+ # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image.
+ os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name
+
+ bootctl_status = machine.succeed("bootctl status")
+ assert "${bootLoaderConfigPath}" in bootctl_status
+ assert "${kernelPath}" in bootctl_status
+ assert "${initrdPath}" in bootctl_status
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/atuin.nix b/third_party/nixpkgs/nixos/tests/atuin.nix
index 9f23a3cf67..3164c83c68 100644
--- a/third_party/nixpkgs/nixos/tests/atuin.nix
+++ b/third_party/nixpkgs/nixos/tests/atuin.nix
@@ -14,6 +14,8 @@ in
server =
{ ... }:
{
+ services.postgresql.enable = true;
+
services.atuin = {
enable = true;
port = testPort;
diff --git a/third_party/nixpkgs/nixos/tests/binary-cache.nix b/third_party/nixpkgs/nixos/tests/binary-cache.nix
index 0809e59e5a..bc1c6fb9a2 100644
--- a/third_party/nixpkgs/nixos/tests/binary-cache.nix
+++ b/third_party/nixpkgs/nixos/tests/binary-cache.nix
@@ -1,16 +1,14 @@
-import ./make-test-python.nix ({ lib, ... }:
-
-with lib;
+import ./make-test-python.nix ({ lib, pkgs, ... }:
{
name = "binary-cache";
- meta.maintainers = with maintainers; [ thomasjm ];
+ meta.maintainers = with lib.maintainers; [ thomasjm ];
nodes.machine =
{ pkgs, ... }: {
imports = [ ../modules/installer/cd-dvd/channel.nix ];
- environment.systemPackages = with pkgs; [python3];
- system.extraDependencies = with pkgs; [hello.inputDerivation];
+ environment.systemPackages = [ pkgs.python3 ];
+ system.extraDependencies = [ pkgs.hello.inputDerivation ];
nix.extraOptions = ''
experimental-features = nix-command
'';
diff --git a/third_party/nixpkgs/nixos/tests/bpftune.nix b/third_party/nixpkgs/nixos/tests/bpftune.nix
new file mode 100644
index 0000000000..c17bbcd110
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/bpftune.nix
@@ -0,0 +1,20 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+
+ name = "bpftune";
+
+ meta = {
+ maintainers = with lib.maintainers; [ nickcao ];
+ };
+
+ nodes = {
+ machine = { pkgs, ... }: {
+ services.bpftune.enable = true;
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("bpftune.service")
+ machine.wait_for_console_text("bpftune works")
+ '';
+
+})
diff --git a/third_party/nixpkgs/nixos/tests/budgie.nix b/third_party/nixpkgs/nixos/tests/budgie.nix
index b1b0e618c8..34ee1e303d 100644
--- a/third_party/nixpkgs/nixos/tests/budgie.nix
+++ b/third_party/nixpkgs/nixos/tests/budgie.nix
@@ -32,7 +32,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
in
''
with subtest("Wait for login"):
- machine.wait_for_x()
+ # wait_for_x() checks graphical-session.target, which is expected to be
+ # inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is
+ # done on upstream.
+ # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16
+ #
+ # Previously this was unconditionally touched by xsessionWrapper but was
+ # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
+ # machine.wait_for_x()
+ machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
diff --git a/third_party/nixpkgs/nixos/tests/buildkite-agents.nix b/third_party/nixpkgs/nixos/tests/buildkite-agents.nix
index 2c5593323e..a5abfdb5e2 100644
--- a/third_party/nixpkgs/nixos/tests/buildkite-agents.nix
+++ b/third_party/nixpkgs/nixos/tests/buildkite-agents.nix
@@ -1,10 +1,8 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ lib, pkgs, ... }:
{
name = "buildkite-agent";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ flokli ];
- };
+ meta.maintainers = with lib.maintainers; [ flokli ];
nodes.machine = { pkgs, ... }: {
services.buildkite-agents = {
diff --git a/third_party/nixpkgs/nixos/tests/cage.nix b/third_party/nixpkgs/nixos/tests/cage.nix
index db1b785467..3b49185124 100644
--- a/third_party/nixpkgs/nixos/tests/cage.nix
+++ b/third_party/nixpkgs/nixos/tests/cage.nix
@@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
imports = [ ./common/user-account.nix ];
- fonts.fonts = with pkgs; [ dejavu_fonts ];
+ fonts.packages = with pkgs; [ dejavu_fonts ];
services.cage = {
enable = true;
diff --git a/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix b/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix
new file mode 100644
index 0000000000..fb8d07b118
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+pkgs.runCommand "gpg-keyring" { nativeBuildInputs = [ pkgs.gnupg ]; } ''
+ mkdir -p $out
+ export GNUPGHOME=$out
+ cat > foo < $out/pubkey.gpg
+''
diff --git a/third_party/nixpkgs/nixos/tests/cups-pdf.nix b/third_party/nixpkgs/nixos/tests/cups-pdf.nix
index 957b0296a7..5602193b04 100644
--- a/third_party/nixpkgs/nixos/tests/cups-pdf.nix
+++ b/third_party/nixpkgs/nixos/tests/cups-pdf.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
nodes.machine = { pkgs, ... }: {
imports = [ ./common/user-account.nix ];
environment.systemPackages = [ pkgs.poppler_utils ];
- fonts.fonts = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf
+ fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf
services.printing.cups-pdf.enable = true;
services.printing.cups-pdf.instances = {
opt = {};
diff --git a/third_party/nixpkgs/nixos/tests/curl-impersonate.nix b/third_party/nixpkgs/nixos/tests/curl-impersonate.nix
new file mode 100644
index 0000000000..7954e9e558
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/curl-impersonate.nix
@@ -0,0 +1,157 @@
+/*
+ Test suite for curl-impersonate
+
+ Abstract:
+ Uses the test suite from the curl-impersonate source repo which:
+
+ 1. Performs requests with libcurl and captures the TLS client-hello
+ packets with tcpdump to compare against known-good signatures
+ 2. Spins up an nghttpd2 server to test client HTTP/2 headers against
+ known-good headers
+
+ See https://github.com/lwthiker/curl-impersonate/tree/main/tests/signatures
+ for details.
+
+ Notes:
+ - We need to have our own web server running because the tests expect to be able
+ to hit domains like wikipedia.org and the sandbox has no internet
+ - We need to be able to do (verifying) TLS handshakes without internet access.
+ We do that by creating a trusted CA and issuing a cert that includes
+ all of the test domains as subject-alternative names and then spoofs the
+ hostnames in /etc/hosts.
+*/
+
+import ./make-test-python.nix ({ pkgs, lib, ... }: let
+ # Update with domains in TestImpersonate.TEST_URLS if needed from:
+ # https://github.com/lwthiker/curl-impersonate/blob/main/tests/test_impersonate.py
+ domains = [
+ "www.wikimedia.org"
+ "www.wikipedia.org"
+ "www.mozilla.org"
+ "www.apache.org"
+ "www.kernel.org"
+ "git-scm.com"
+ ];
+
+ tls-certs = let
+ # Configure CA with X.509 v3 extensions that would be trusted by curl
+ ca-cert-conf = pkgs.writeText "curl-impersonate-ca.cnf" ''
+ basicConstraints = critical, CA:TRUE
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid:always, issuer:always
+ keyUsage = critical, cRLSign, digitalSignature, keyCertSign
+ '';
+
+ # Configure leaf certificate with X.509 v3 extensions that would be trusted
+ # by curl and set subject-alternative names for test domains
+ tls-cert-conf = pkgs.writeText "curl-impersonate-tls.cnf" ''
+ basicConstraints = critical, CA:FALSE
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid:always, issuer:always
+ keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment, keyAgreement
+ extendedKeyUsage = critical, serverAuth
+ subjectAltName = @alt_names
+
+ [alt_names]
+ ${lib.concatStringsSep "\n" (lib.imap0 (idx: domain: "DNS.${toString idx} = ${domain}") domains)}
+ '';
+ in pkgs.runCommand "curl-impersonate-test-certs" {
+ nativeBuildInputs = [ pkgs.openssl ];
+ } ''
+ # create CA certificate and key
+ openssl req -newkey rsa:4096 -keyout ca-key.pem -out ca-csr.pem -nodes -subj '/CN=curl-impersonate-ca.nixos.test'
+ openssl x509 -req -sha512 -in ca-csr.pem -key ca-key.pem -out ca.pem -extfile ${ca-cert-conf} -days 36500
+ openssl x509 -in ca.pem -text
+
+ # create server certificate and key
+ openssl req -newkey rsa:4096 -keyout key.pem -out csr.pem -nodes -subj '/CN=curl-impersonate.nixos.test'
+ openssl x509 -req -sha512 -in csr.pem -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out cert.pem -extfile ${tls-cert-conf} -days 36500
+ openssl x509 -in cert.pem -text
+
+ # output CA cert and server cert and key
+ mkdir -p $out
+ cp key.pem cert.pem ca.pem $out
+ '';
+
+ # Test script
+ curl-impersonate-test = let
+ # Build miniature libcurl client used by test driver
+ minicurl = pkgs.runCommandCC "minicurl" {
+ buildInputs = [ pkgs.curl ];
+ } ''
+ mkdir -p $out/bin
+ $CC -Wall -Werror -o $out/bin/minicurl ${pkgs.curl-impersonate.src}/tests/minicurl.c `curl-config --libs`
+ '';
+ in pkgs.writeShellScript "curl-impersonate-test" ''
+ set -euxo pipefail
+
+ # Test driver requirements
+ export PATH="${with pkgs; lib.makeBinPath [
+ bash
+ coreutils
+ python3Packages.pytest
+ nghttp2
+ tcpdump
+ ]}"
+ export PYTHONPATH="${with pkgs.python3Packages; makePythonPath [
+ pyyaml
+ pytest-asyncio
+ dpkt
+ ]}"
+
+ # Prepare test root prefix
+ mkdir -p usr/{bin,lib}
+ cp -rs ${pkgs.curl-impersonate}/* ${minicurl}/* usr/
+
+ cp -r ${pkgs.curl-impersonate.src}/tests ./
+
+ # Run tests
+ cd tests
+ pytest . --install-dir ../usr --capture-interface eth1
+ '';
+in {
+ name = "curl-impersonate";
+
+ meta = with lib.maintainers; {
+ maintainers = [ lilyinstarlight ];
+ };
+
+ nodes = {
+ web = { nodes, pkgs, lib, config, ... }: {
+ networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+ services = {
+ nginx = {
+ enable = true;
+ virtualHosts."curl-impersonate.nixos.test" = {
+ default = true;
+ addSSL = true;
+ sslCertificate = "${tls-certs}/cert.pem";
+ sslCertificateKey = "${tls-certs}/key.pem";
+ };
+ };
+ };
+ };
+
+ curl = { nodes, pkgs, lib, config, ... }: {
+ networking.extraHosts = lib.concatStringsSep "\n" (map (domain: "${nodes.web.networking.primaryIPAddress} ${domain}") domains);
+
+ security.pki.certificateFiles = [ "${tls-certs}/ca.pem" ];
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ start_all()
+
+ with subtest("Wait for network"):
+ web.wait_for_unit("network-online.target")
+ curl.wait_for_unit("network-online.target")
+
+ with subtest("Wait for web server"):
+ web.wait_for_unit("nginx.service")
+ web.wait_for_open_port(443)
+
+ with subtest("Run curl-impersonate tests"):
+ curl.succeed("${curl-impersonate-test}")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/deepin.nix b/third_party/nixpkgs/nixos/tests/deepin.nix
index acec27ca1c..7b2e2430f3 100644
--- a/third_party/nixpkgs/nixos/tests/deepin.nix
+++ b/third_party/nixpkgs/nixos/tests/deepin.nix
@@ -1,9 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "deepin";
- meta = with lib; {
- maintainers = teams.deepin.members;
- };
+ meta.maintainers = lib.teams.deepin.members;
nodes.machine = { ... }: {
imports = [
diff --git a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix
index 664afc9bf4..d8c6ea0f72 100644
--- a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix
+++ b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix
@@ -7,8 +7,8 @@ import ./make-test-python.nix ({ lib, ... }:
];
nodes.machine = { config, pkgs, ... }: {
- fonts.enableDefaultFonts = true; # Background fonts
- fonts.fonts = with pkgs; [
+ fonts.enableDefaultPackages = true; # Background fonts
+ fonts.packages = with pkgs; [
noto-fonts-emoji
cantarell-fonts
twitter-color-emoji
diff --git a/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix b/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix
new file mode 100644
index 0000000000..d0ec3da316
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix
@@ -0,0 +1,20 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+ name = "freshrss";
+ meta.maintainers = with lib.maintainers; [ mattchrist ];
+
+ nodes.machine = { pkgs, ... }: {
+ services.freshrss = {
+ enable = true;
+ baseUrl = "http://localhost";
+ dataDir = "/srv/freshrss";
+ authType = "http_auth";
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_open_port(80)
+ response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
+ assert 'Account: testuser' in response, "http_auth method didn't work."
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/gitea.nix b/third_party/nixpkgs/nixos/tests/gitea.nix
index 2285bb5a42..b747659de8 100644
--- a/third_party/nixpkgs/nixos/tests/gitea.nix
+++ b/third_party/nixpkgs/nixos/tests/gitea.nix
@@ -37,9 +37,25 @@ let
package = giteaPackage;
settings.service.DISABLE_REGISTRATION = true;
settings."repository.signing".SIGNING_KEY = signingPrivateKeyId;
+ settings.actions.ENABLED = true;
};
environment.systemPackages = [ giteaPackage pkgs.gnupg pkgs.jq ];
services.openssh.enable = true;
+
+ specialisation.runner = {
+ inheritParentConfig = true;
+
+ configuration.services.gitea-actions-runner.instances."test" = {
+ enable = true;
+ name = "ci";
+ url = "http://localhost:3000";
+ labels = [
+ # don't require docker/podman
+ "native:host"
+ ];
+ tokenFile = "/var/lib/gitea/runner_token";
+ };
+ };
};
client1 = { config, pkgs, ... }: {
environment.systemPackages = [ pkgs.git ];
@@ -49,8 +65,9 @@ let
};
};
- testScript = let
+ testScript = { nodes, ... }: let
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
+ serverSystem = nodes.server.system.build.toplevel;
in ''
GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no"
REPO = "gitea@server:test/repo"
@@ -121,14 +138,18 @@ let
client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}")
client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"')
- server.succeed(
+ server.wait_until_succeeds(
'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits '
+ '-H "Accept: application/json" | jq length)" = "1"'
)
- client1.shutdown()
- client2.shutdown()
- server.shutdown()
+ with subtest("Testing runner registration"):
+ server.succeed(
+ "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/gitea/runner_token"
+ )
+ server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test")
+ server.wait_for_unit("gitea-runner-test.service")
+ server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'")
'';
});
in
diff --git a/third_party/nixpkgs/nixos/tests/gnome-flashback.nix b/third_party/nixpkgs/nixos/tests/gnome-flashback.nix
index 70569db797..876d36477c 100644
--- a/third_party/nixpkgs/nixos/tests/gnome-flashback.nix
+++ b/third_party/nixpkgs/nixos/tests/gnome-flashback.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
nodes.machine = { nodes, ... }:
let
- user = nodes.machine.config.users.users.alice;
+ user = nodes.machine.users.users.alice;
in
{ imports = [ ./common/user-account.nix ];
@@ -27,12 +27,20 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
};
testScript = { nodes, ... }: let
- user = nodes.machine.config.users.users.alice;
+ user = nodes.machine.users.users.alice;
uid = toString user.uid;
xauthority = "/run/user/${uid}/gdm/Xauthority";
in ''
with subtest("Login to GNOME Flashback with GDM"):
- machine.wait_for_x()
+ # wait_for_x() checks graphical-session.target, which is expected to be
+ # inactive on gnome-flashback before #228946 (i.e. systemd managed
+ # gnome-session) is done.
+ # https://github.com/NixOS/nixpkgs/pull/208060
+ #
+ # Previously this was unconditionally touched by xsessionWrapper but was
+ # changed in #233981 (we have GNOME-Flashback:GNOME in XDG_CURRENT_DESKTOP).
+ # machine.wait_for_x()
+ machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
# Wait for alice to be logged in"
machine.wait_for_unit("default.target", "${user.name}")
machine.wait_for_file("${xauthority}")
diff --git a/third_party/nixpkgs/nixos/tests/hibernate.nix b/third_party/nixpkgs/nixos/tests/hibernate.nix
index cd8c436ee2..296aa9ba68 100644
--- a/third_party/nixpkgs/nixos/tests/hibernate.nix
+++ b/third_party/nixpkgs/nixos/tests/hibernate.nix
@@ -8,128 +8,48 @@
with import ../lib/testing-python.nix { inherit system pkgs; };
-let
- # System configuration of the installed system, which is used for the actual
- # hibernate testing.
- installedConfig = with pkgs.lib; {
- imports = [
- ../modules/testing/test-instrumentation.nix
- ../modules/profiles/qemu-guest.nix
- ../modules/profiles/minimal.nix
- ];
-
- hardware.enableAllFirmware = mkForce false;
- documentation.nixos.enable = false;
- boot.loader.grub.device = "/dev/vda";
-
- systemd.services.backdoor.conflicts = [ "sleep.target" ];
-
- powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";
-
- fileSystems."/" = {
- device = "/dev/vda2";
- fsType = "ext3";
- };
- swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ];
- boot.resumeDevice = mkIf systemdStage1 "/dev/vda1";
- boot.initrd.systemd = mkIf systemdStage1 {
- enable = true;
- emergencyAccess = true;
- };
- };
- installedSystem = (import ../lib/eval-config.nix {
- inherit system;
- modules = [ installedConfig ];
- }).config.system.build.toplevel;
-in makeTest {
+makeTest {
name = "hibernate";
nodes = {
- # System configuration used for installing the installedConfig from above.
machine = { config, lib, pkgs, ... }: {
imports = [
- ../modules/profiles/installation-device.nix
- ../modules/profiles/base.nix
./common/auto-format-root-device.nix
];
- nix.settings = {
- substituters = lib.mkForce [];
- hashed-mirrors = null;
- connect-timeout = 1;
- };
+ systemd.services.backdoor.conflicts = [ "sleep.target" ];
+ powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";
- virtualisation.diskSize = 8 * 1024;
- virtualisation.emptyDiskImages = [
- # Small root disk for installer
- 512
- ];
- virtualisation.rootDevice = "/dev/vdb";
+ virtualisation.emptyDiskImages = [ (2 * config.virtualisation.memorySize) ];
+ virtualisation.useNixStoreImage = true;
+
+ swapDevices = lib.mkOverride 0 [ { device = "/dev/vdc"; options = [ "x-systemd.makefs" ]; } ];
+ boot.resumeDevice = "/dev/vdc";
+ boot.initrd.systemd.enable = systemdStage1;
};
};
- # 9P doesn't support reconnection to virtio transport after a hibernation.
- # Therefore, machine just hangs on any Nix store access.
- # To avoid this, we install NixOS onto a temporary disk with everything we need
- # included into the store.
+ testScript = ''
+ # Drop in file that checks if we un-hibernated properly (and not booted fresh)
+ machine.wait_for_unit("default.target")
+ machine.succeed(
+ "mkdir /run/test",
+ "mount -t ramfs -o size=1m ramfs /run/test",
+ "echo not persisted to disk > /run/test/suspended",
+ )
- testScript =
- ''
- def create_named_machine(name):
- machine = create_machine(
- {
- "qemuFlags": "-cpu max ${
- if system == "x86_64-linux" then "-m 1024"
- else "-m 768 -enable-kvm -machine virt,gic-version=host"}",
- "hdaInterface": "virtio",
- "hda": "vm-state-machine/machine.qcow2",
- "name": name,
- }
- )
- driver.machines.append(machine)
- return machine
+ # Hibernate machine
+ machine.execute("systemctl hibernate >&2 &", check_return=False)
+ machine.wait_for_shutdown()
+ # Restore machine from hibernation, validate our ramfs file is there.
+ machine.start()
+ machine.succeed("grep 'not persisted to disk' /run/test/suspended")
- # Install NixOS
- machine.start()
- machine.succeed(
- # Partition /dev/vda
- "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
- + " mkpart primary linux-swap 1M 1024M"
- + " mkpart primary ext2 1024M -1s",
- "udevadm settle",
- "mkfs.ext3 -L nixos /dev/vda2",
- "mount LABEL=nixos /mnt",
- "mkswap /dev/vda1 -L swap",
- # Install onto /mnt
- "nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration",
- "nixos-install --root /mnt --system ${installedSystem} --no-root-passwd --no-channel-copy >&2",
- )
- machine.shutdown()
-
- # Start up
- hibernate = create_named_machine("hibernate")
-
- # Drop in file that checks if we un-hibernated properly (and not booted fresh)
- hibernate.succeed(
- "mkdir /run/test",
- "mount -t ramfs -o size=1m ramfs /run/test",
- "echo not persisted to disk > /run/test/suspended",
- )
-
- # Hibernate machine
- hibernate.execute("systemctl hibernate >&2 &", check_return=False)
- hibernate.wait_for_shutdown()
-
- # Restore machine from hibernation, validate our ramfs file is there.
- resume = create_named_machine("resume")
- resume.start()
- resume.succeed("grep 'not persisted to disk' /run/test/suspended")
-
- # Ensure we don't restore from hibernation when booting again
- resume.crash()
- resume.wait_for_unit("default.target")
- resume.fail("grep 'not persisted to disk' /run/test/suspended")
- '';
+ # Ensure we don't restore from hibernation when booting again
+ machine.crash()
+ machine.wait_for_unit("default.target")
+ machine.fail("grep 'not persisted to disk' /run/test/suspended")
+ '';
}
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 017de68820..17b6c21ff1 100644
--- a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
+++ b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
@@ -1,12 +1,10 @@
-import ../make-test-python.nix ({ lib, ... }:
+import ../make-test-python.nix ({ lib, pkgs, ... }:
{
name = "initrd-network-ssh";
- meta = with lib.maintainers; {
- maintainers = [ willibutz emily ];
- };
+ meta.maintainers = with lib.maintainers; [ willibutz emily ];
- nodes = with lib; {
+ nodes = {
server =
{ config, ... }:
{
@@ -17,7 +15,7 @@ import ../make-test-python.nix ({ lib, ... }:
enable = true;
ssh = {
enable = true;
- authorizedKeys = [ (readFile ./id_ed25519.pub) ];
+ authorizedKeys = [ (lib.readFile ./id_ed25519.pub) ];
port = 22;
hostKeys = [ ./ssh_host_ed25519_key ];
};
@@ -37,12 +35,12 @@ import ../make-test-python.nix ({ lib, ... }:
{
environment.etc = {
knownHosts = {
- text = concatStrings [
+ text = lib.concatStrings [
"server,"
- "${toString (head (splitString " " (
- toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
+ "${toString (lib.head (lib.splitString " " (
+ toString (lib.elemAt (lib.splitString "\n" config.networking.extraHosts) 2)
)))} "
- "${readFile ./ssh_host_ed25519_key.pub}"
+ "${lib.readFile ./ssh_host_ed25519_key.pub}"
];
};
sshKey = {
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
index 78a6325a24..e87edb2007 100644
--- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
@@ -107,5 +107,6 @@ in
malcontent = callInstalledTest ./malcontent.nix {};
ostree = callInstalledTest ./ostree.nix {};
pipewire = callInstalledTest ./pipewire.nix {};
+ upower = callInstalledTest ./upower.nix {};
xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};
}
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix b/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix
new file mode 100644
index 0000000000..a8e777a555
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix
@@ -0,0 +1,9 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.upower;
+
+ testConfig = {
+ services.upower.enable = true;
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix
index 4f4b915188..56ba85b76e 100644
--- a/third_party/nixpkgs/nixos/tests/installer.nix
+++ b/third_party/nixpkgs/nixos/tests/installer.nix
@@ -11,16 +11,20 @@ let
# The configuration to install.
makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi
- , extraConfig, forceGrubReinstallCount ? 0
+ , extraConfig, forceGrubReinstallCount ? 0, flake ? false
}:
pkgs.writeText "configuration.nix" ''
{ config, lib, pkgs, modulesPath, ... }:
{ imports =
[ ./hardware-configuration.nix
-
+ ${if flake
+ then "" # Still included, but via installer/flake.nix
+ else ""}
];
+ networking.hostName = "thatworked";
+
documentation.enable = false;
# To ensure that we can rebuild the grub configuration on the nixos-rebuild
@@ -67,7 +71,7 @@ let
# partitions and filesystems.
testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi
, grubIdentifier, preBootCommands, postBootCommands, extraConfig
- , testSpecialisationConfig
+ , testSpecialisationConfig, testFlakeSwitch
}:
let iface = "virtio";
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
@@ -86,9 +90,14 @@ let
qemu_flags = {"qemuFlags": assemble_qemu_flags()}
+ import os
+
+ image_dir = machine.state_dir
+ disk_image = os.path.join(image_dir, "machine.qcow2")
+
hd_flags = {
"hdaInterface": "${iface}",
- "hda": "vm-state-machine/machine.qcow2",
+ "hda": disk_image,
}
${optionalString isEfi ''
hd_flags.update(
@@ -232,6 +241,11 @@ let
machine = create_machine_named("boot-after-rebuild-switch")
${preBootCommands}
machine.wait_for_unit("network.target")
+
+ # Sanity check, is it the configuration.nix we generated?
+ hostname = machine.succeed("hostname").strip()
+ assert hostname == "thatworked"
+
${postBootCommands}
machine.shutdown()
@@ -270,6 +284,84 @@ let
with subtest("We should find a file named /etc/gitconfig"):
machine.succeed("test -e /etc/gitconfig")
+ ${postBootCommands}
+ machine.shutdown()
+ ''
+ + optionalString testFlakeSwitch ''
+ ${preBootCommands}
+ machine.start()
+
+ with subtest("Configure system with flake"):
+ # TODO: evaluate as user?
+ machine.succeed("""
+ mkdir /root/my-config
+ mv /etc/nixos/hardware-configuration.nix /root/my-config/
+ mv /etc/nixos/secret /root/my-config/
+ rm /etc/nixos/configuration.nix
+ """)
+ machine.copy_from_host_via_shell(
+ "${makeConfig {
+ inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig;
+ forceGrubReinstallCount = 1;
+ flake = true;
+ }}",
+ "/root/my-config/configuration.nix",
+ )
+ machine.copy_from_host_via_shell(
+ "${./installer/flake.nix}",
+ "/root/my-config/flake.nix",
+ )
+ machine.succeed("""
+ # for some reason the image does not have `pkgs.path`, so
+ # we use readlink to find a Nixpkgs source.
+ pkgs=$(readlink -f /nix/var/nix/profiles/per-user/root/channels)/nixos
+ if ! [[ -e $pkgs/pkgs/top-level/default.nix ]]; then
+ echo 1>&2 "$pkgs does not seem to be a nixpkgs source. Please fix the test so that pkgs points to a nixpkgs source.";
+ exit 1;
+ fi
+ sed -e s^@nixpkgs@^$pkgs^ -i /root/my-config/flake.nix
+ """)
+
+ with subtest("Switch to flake based config"):
+ machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz")
+
+ ${postBootCommands}
+ machine.shutdown()
+
+ ${preBootCommands}
+ machine.start()
+
+ machine.wait_for_unit("multi-user.target")
+
+ with subtest("nix-channel command is not available anymore"):
+ machine.succeed("! which nix-channel")
+
+ # Note that the channel profile is still present on disk, but configured
+ # not to be used.
+ with subtest("builtins.nixPath is now empty"):
+ machine.succeed("""
+ [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]]
+ """)
+
+ with subtest(" does not resolve"):
+ machine.succeed("""
+ ! nix-instantiate '' --eval --expr
+ """)
+
+ with subtest("Evaluate flake config in fresh env without nix-channel"):
+ machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz")
+
+ with subtest("Evaluate flake config in fresh env without channel profiles"):
+ machine.succeed("""
+ (
+ exec 1>&2
+ rm -v /root/.nix-channels
+ rm -vrf ~/.nix-defexpr
+ rm -vrf /nix/var/nix/profiles/per-user/root/channels*
+ )
+ """)
+ machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz")
+
${postBootCommands}
machine.shutdown()
'';
@@ -282,6 +374,7 @@ let
, grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false
, enableOCR ? false, meta ? {}
, testSpecialisationConfig ? false
+ , testFlakeSwitch ? false
}:
makeTest {
inherit enableOCR;
@@ -334,6 +427,7 @@ let
# The test cannot access the network, so any packages we
# need must be included in the VM.
system.extraDependencies = with pkgs; [
+ bintools
brotli
brotli.dev
brotli.lib
@@ -387,7 +481,7 @@ let
testScript = testScriptFun {
inherit bootLoader createPartitions preBootCommands postBootCommands
grubDevice grubIdentifier grubUseEfi extraConfig
- testSpecialisationConfig;
+ testSpecialisationConfig testFlakeSwitch;
};
};
@@ -439,6 +533,10 @@ let
'';
};
+ simple-test-config-flake = simple-test-config // {
+ testFlakeSwitch = true;
+ };
+
simple-uefi-grub-config = {
createPartitions = ''
machine.succeed(
@@ -493,6 +591,8 @@ in {
# one big filesystem partition.
simple = makeInstallerTest "simple" simple-test-config;
+ switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake;
+
# Test cloned configurations with the simple grub configuration
simpleSpecialised = makeInstallerTest "simpleSpecialised" (simple-test-config // specialisation-test-extraconfig);
diff --git a/third_party/nixpkgs/nixos/tests/installer/flake.nix b/third_party/nixpkgs/nixos/tests/installer/flake.nix
new file mode 100644
index 0000000000..4bbef44e34
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/installer/flake.nix
@@ -0,0 +1,20 @@
+# This file gets copied into the installation
+
+{
+ # To keep things simple, we'll use an absolute path dependency here.
+ inputs.nixpkgs.url = "@nixpkgs@";
+
+ outputs = { nixpkgs, ... }: {
+
+ nixosConfigurations.xyz = nixpkgs.lib.nixosSystem {
+ modules = [
+ ./configuration.nix
+ ( nixpkgs + "/nixos/modules/testing/test-instrumentation.nix" )
+ {
+ # We don't need nix-channel anymore
+ nix.channel.enable = false;
+ }
+ ];
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/jenkins.nix b/third_party/nixpkgs/nixos/tests/jenkins.nix
index a1ede6dc91..a8f6210006 100644
--- a/third_party/nixpkgs/nixos/tests/jenkins.nix
+++ b/third_party/nixpkgs/nixos/tests/jenkins.nix
@@ -73,8 +73,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = { nodes, ... }:
let
- configWithoutJobs = "${nodes.master.config.system.build.toplevel}/specialisation/noJenkinsJobs";
- jenkinsPort = nodes.master.config.services.jenkins.port;
+ configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs";
+ jenkinsPort = nodes.master.services.jenkins.port;
jenkinsUrl = "http://localhost:${toString jenkinsPort}";
in ''
start_all()
diff --git a/third_party/nixpkgs/nixos/tests/kanidm.nix b/third_party/nixpkgs/nixos/tests/kanidm.nix
index 673a65174d..3f5bca3977 100644
--- a/third_party/nixpkgs/nixos/tests/kanidm.nix
+++ b/third_party/nixpkgs/nixos/tests/kanidm.nix
@@ -67,9 +67,10 @@ import ./make-test-python.nix ({ pkgs, ... }:
''
start_all()
server.wait_for_unit("kanidm.service")
+ client.wait_for_unit("network-online.target")
with subtest("Test HTTP interface"):
- server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")
+ server.wait_until_succeeds("curl -Lsf https://${serverDomain} | grep Kanidm")
with subtest("Test LDAP interface"):
server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'")
@@ -80,15 +81,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
client.succeed("kanidm logout")
with subtest("Recover idm_admin account"):
- # Must stop the server for account recovery or else kanidmd fails with
- # "unable to lock kanidm exclusive lock at /var/lib/kanidm/kanidm.db.klock".
- server.succeed("systemctl stop kanidm")
idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'")
- server.succeed("systemctl start kanidm")
with subtest("Test unixd connection"):
client.wait_for_unit("kanidm-unixd.service")
- # TODO: client.wait_for_file("/run/kanidm-unixd/sock")
+ client.wait_for_file("/run/kanidm-unixd/sock")
client.wait_until_succeeds("kanidm-unix status | grep working!")
with subtest("Test user creation"):
diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix
index 76deb0f0aa..e4a8e06df1 100644
--- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix
+++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix
@@ -9,7 +9,7 @@ let
testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: {
name = "kernel-${linuxPackages.kernel.version}";
meta = with pkgs.lib.maintainers; {
- maintainers = [ nequissimus atemu ];
+ maintainers = [ nequissimus atemu ma27 ];
};
nodes.machine = { ... }:
@@ -31,8 +31,12 @@ let
linux_5_10_hardened
linux_5_15_hardened
linux_6_1_hardened
- linux_6_3_hardened
linux_6_4_hardened
+ linux_rt_5_4
+ linux_rt_5_10
+ linux_rt_5_15
+ linux_rt_6_1
+ linux_libre
linux_testing;
};
diff --git a/third_party/nixpkgs/nixos/tests/keymap.nix b/third_party/nixpkgs/nixos/tests/keymap.nix
index 0bde21093b..cc45824667 100644
--- a/third_party/nixpkgs/nixos/tests/keymap.nix
+++ b/third_party/nixpkgs/nixos/tests/keymap.nix
@@ -29,10 +29,10 @@ let
mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest {
name = "keymap-${layout}";
- machine.console.keyMap = mkOverride 900 layout;
- machine.services.xserver.desktopManager.xterm.enable = false;
- machine.services.xserver.layout = mkOverride 900 layout;
- machine.imports = [ ./common/x11.nix extraConfig ];
+ nodes.machine.console.keyMap = mkOverride 900 layout;
+ nodes.machine.services.xserver.desktopManager.xterm.enable = false;
+ nodes.machine.services.xserver.layout = mkOverride 900 layout;
+ nodes.machine.imports = [ ./common/x11.nix extraConfig ];
testScript = ''
import json
@@ -201,4 +201,33 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
extraConfig.console.keyMap = "de";
extraConfig.services.xserver.layout = "de";
};
+
+ custom = {
+ tests = {
+ us.qwerty = [ "a" "b" "g" "d" "z" "shift-2" "shift-3" ];
+ us.expect = [ "a" "b" "g" "d" "z" "@" "#" ];
+ greek.qwerty = map (x: "alt_r-${x}")
+ [ "a" "b" "g" "d" "z" ];
+ greek.expect = [ "α" "β" "γ" "δ" "ζ" ];
+ };
+
+ extraConfig.console.useXkbConfig = true;
+ extraConfig.services.xserver.layout = "us-greek";
+ extraConfig.services.xserver.extraLayouts.us-greek =
+ { description = "US layout with alt-gr greek";
+ languages = [ "eng" ];
+ symbolsFile = pkgs.writeText "us-greek" ''
+ xkb_symbols "us-greek"
+ {
+ include "us(basic)"
+ include "level3(ralt_switch)"
+ key { [ a, A, Greek_alpha ] };
+ key { [ b, B, Greek_beta ] };
+ key { [ g, G, Greek_gamma ] };
+ key { [ d, D, Greek_delta ] };
+ key { [ z, Z, Greek_zeta ] };
+ };
+ '';
+ };
+ };
}
diff --git a/third_party/nixpkgs/nixos/tests/lemmy.nix b/third_party/nixpkgs/nixos/tests/lemmy.nix
index 8845777322..de2c4938fe 100644
--- a/third_party/nixpkgs/nixos/tests/lemmy.nix
+++ b/third_party/nixpkgs/nixos/tests/lemmy.nix
@@ -26,17 +26,11 @@ in
admin_email = "mightyiam@example.com";
};
};
- secretFile = /etc/lemmy-config.hjson;
+ adminPasswordFile = /etc/lemmy-admin-password.txt;
caddy.enable = true;
};
- environment.etc."lemmy-config.hjson".text = ''
- {
- "setup": {
- "admin_password": "ThisIsWhatIUseEverywhereTryIt"
- }
- }
- '';
+ environment.etc."lemmy-admin-password.txt".text = "ThisIsWhatIUseEverywhereTryIt";
networking.firewall.allowedTCPPorts = [ 80 ];
diff --git a/third_party/nixpkgs/nixos/tests/miniflux.nix b/third_party/nixpkgs/nixos/tests/miniflux.nix
index be3e7abb6a..a3af53db0e 100644
--- a/third_party/nixpkgs/nixos/tests/miniflux.nix
+++ b/third_party/nixpkgs/nixos/tests/miniflux.nix
@@ -25,6 +25,7 @@ in
default =
{ ... }:
{
+ security.apparmor.enable = true;
services.miniflux = {
enable = true;
inherit adminCredentialsFile;
@@ -34,6 +35,7 @@ in
withoutSudo =
{ ... }:
{
+ security.apparmor.enable = true;
services.miniflux = {
enable = true;
inherit adminCredentialsFile;
@@ -44,6 +46,7 @@ in
customized =
{ ... }:
{
+ security.apparmor.enable = true;
services.miniflux = {
enable = true;
config = {
@@ -63,6 +66,7 @@ in
default.succeed(
"curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
+ default.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
withoutSudo.wait_for_unit("miniflux.service")
withoutSudo.wait_for_open_port(${toString defaultPort})
@@ -70,6 +74,7 @@ in
withoutSudo.succeed(
"curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
+ withoutSudo.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
customized.wait_for_unit("miniflux.service")
customized.wait_for_open_port(${toString port})
@@ -77,5 +82,6 @@ in
customized.succeed(
"curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
+ customized.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/miriway.nix b/third_party/nixpkgs/nixos/tests/miriway.nix
index 9000e92781..f12c4d5ecc 100644
--- a/third_party/nixpkgs/nixos/tests/miriway.nix
+++ b/third_party/nixpkgs/nixos/tests/miriway.nix
@@ -83,7 +83,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
};
- fonts.fonts = [ pkgs.inconsolata ];
+ fonts.packages = [ pkgs.inconsolata ];
};
enableOCR = true;
diff --git a/third_party/nixpkgs/nixos/tests/mumble.nix b/third_party/nixpkgs/nixos/tests/mumble.nix
index 2b5cc20163..8eee454721 100644
--- a/third_party/nixpkgs/nixos/tests/mumble.nix
+++ b/third_party/nixpkgs/nixos/tests/mumble.nix
@@ -20,6 +20,7 @@ in
nodes = {
server = { config, ... }: {
+ security.apparmor.enable = true;
services.murmur.enable = true;
services.murmur.registerName = "NixOS tests";
services.murmur.password = "$MURMURD_PASSWORD";
@@ -81,5 +82,8 @@ in
server.sleep(5) # wait to get screenshot
client1.screenshot("screen1")
client2.screenshot("screen2")
+
+ # check if apparmor denied anything
+ server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix
index 05fed0f4b4..46fc715d08 100644
--- a/third_party/nixpkgs/nixos/tests/networking.nix
+++ b/third_party/nixpkgs/nixos/tests/networking.nix
@@ -29,23 +29,49 @@ let
ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ];
})));
};
- services.dhcpd4 = {
- enable = true;
- interfaces = map (n: "eth${toString n}") vlanIfs;
- extraConfig = flip concatMapStrings vlanIfs (n: ''
- subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
- option routers 192.168.${toString n}.1;
- range 192.168.${toString n}.3 192.168.${toString n}.254;
- }
- '')
- ;
- machines = flip map vlanIfs (vlan:
- {
- hostName = "client${toString vlan}";
- ethernetAddress = qemu-common.qemuNicMac vlan 1;
- ipAddress = "192.168.${toString vlan}.2";
- }
- );
+ services.kea = {
+ dhcp4 = {
+ enable = true;
+ settings = {
+ interfaces-config = {
+ interfaces = map (n: "eth${toString n}") vlanIfs;
+ dhcp-socket-type = "raw";
+ service-sockets-require-all = true;
+ service-sockets-max-retries = 5;
+ service-sockets-retry-wait-time = 2500;
+ };
+ subnet4 = map (n: {
+ id = n;
+ subnet = "192.168.${toString n}.0/24";
+ pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }];
+ option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }];
+
+ reservations = [{
+ hw-address = qemu-common.qemuNicMac n 1;
+ hostname = "client${toString n}";
+ ip-address = "192.168.${toString n}.2";
+ }];
+ }) vlanIfs;
+ };
+ };
+ dhcp6 = {
+ enable = true;
+ settings = {
+ interfaces-config = {
+ interfaces = map (n: "eth${toString n}") vlanIfs;
+ service-sockets-require-all = true;
+ service-sockets-max-retries = 5;
+ service-sockets-retry-wait-time = 2500;
+ };
+
+ subnet6 = map (n: {
+ id = n;
+ subnet = "fd00:1234:5678:${toString n}::/64";
+ interface = "eth${toString n}";
+ pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }];
+ }) vlanIfs;
+ };
+ };
};
services.radvd = {
enable = true;
@@ -61,17 +87,6 @@ let
};
'');
};
- services.dhcpd6 = {
- enable = true;
- interfaces = map (n: "eth${toString n}") vlanIfs;
- extraConfig = ''
- authoritative;
- '' + flip concatMapStrings vlanIfs (n: ''
- subnet6 fd00:1234:5678:${toString n}::/64 {
- range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2;
- }
- '');
- };
};
testCases = {
@@ -117,8 +132,9 @@ let
client.wait_for_unit("network.target")
router.wait_for_unit("network-online.target")
- with subtest("Make sure dhcpcd is not started"):
- client.fail("systemctl status dhcpcd.service")
+ with subtest("Make sure DHCP server is not started"):
+ client.fail("systemctl status kea-dhcp4-server.service")
+ client.fail("systemctl status kea-dhcp6-server.service")
with subtest("Test vlan 1"):
client.wait_until_succeeds("ping -c 1 192.168.1.1")
@@ -1035,7 +1051,7 @@ let
testScript = ''
machine.succeed("udevadm settle")
print(machine.succeed("ip link show dev enCustom"))
- machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01")
+ machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01")
'';
};
};
diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
index e17f701c54..db5cee9f65 100644
--- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
+++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix
@@ -14,12 +14,12 @@ in {
client = { ... }: {
services.davfs2.enable = true;
system.activationScripts.davfs2-secrets = ''
- echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets
+ echo "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}" > /tmp/davfs2-secrets
chmod 600 /tmp/davfs2-secrets
'';
virtualisation.fileSystems = {
"/mnt/dav" = {
- device = "http://nextcloud/remote.php/webdav/";
+ device = "http://nextcloud/remote.php/dav/files/${adminuser}";
fsType = "davfs";
options = let
davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets");
@@ -70,7 +70,7 @@ in {
withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
#!${pkgs.runtimeShell}
export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
- export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+ export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}"
export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix b/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix
index 659a4311cd..92beb869eb 100644
--- a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix
+++ b/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix
@@ -33,7 +33,7 @@ in {
withRcloneEnv = host: pkgs.writeScript "with-rclone-env" ''
#!${pkgs.runtimeShell}
export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
- export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/webdav/"
+ export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/dav/files/${adminuser}"
export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
index 915fa58ab1..e638f2e5b8 100644
--- a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
@@ -1,6 +1,6 @@
args@{ nextcloudVersion ? 27, ... }:
(import ../make-test-python.nix ({ pkgs, ...}: let
- username = "custom_admin_username";
+ adminuser = "custom_admin_username";
# This will be used both for redis and postgresql
pass = "hunter2";
# Don't do this at home, use a file outside of the nix store instead
@@ -34,9 +34,9 @@ in {
config = {
dbtype = "pgsql";
dbname = "nextcloud";
- dbuser = username;
+ dbuser = adminuser;
dbpassFile = passFile;
- adminuser = username;
+ adminuser = adminuser;
adminpassFile = passFile;
};
secretFile = "/etc/nextcloud-secrets.json";
@@ -66,9 +66,9 @@ in {
systemd.services.postgresql.postStart = pkgs.lib.mkAfter ''
password=$(cat ${passFile})
${config.services.postgresql.package}/bin/psql < foo < $out/pubkey.gpg
- '');
+ gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; };
nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''
mkdir -p $out
diff --git a/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix b/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix
index dad8167f19..ca6754046f 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix
@@ -22,6 +22,6 @@ in {
machine.wait_for_console_text("Unmounting '/oldroot'")
machine.wait_for_console_text("${msg}")
# Don't try to sync filesystems
- machine.booted = False
+ machine.wait_for_shutdown()
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix b/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix
new file mode 100644
index 0000000000..37811605db
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix
@@ -0,0 +1,66 @@
+# Tests downloading a signed update aritfact from a server to a target machine.
+# This test does not rely on the `systemd.timer` units provided by the
+# `systemd-sysupdate` module but triggers the `systemd-sysupdate` service
+# manually to make the test more robust.
+
+{ lib, pkgs, ... }:
+
+let
+ gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; };
+in
+{
+ name = "systemd-sysupdate";
+
+ meta.maintainers = with lib.maintainers; [ nikstur ];
+
+ nodes = {
+ server = { pkgs, ... }: {
+ networking.firewall.enable = false;
+ services.nginx = {
+ enable = true;
+ virtualHosts."server" = {
+ root = pkgs.runCommand "sysupdate-artifacts" { buildInputs = [ pkgs.gnupg ]; } ''
+ mkdir -p $out
+ cd $out
+
+ echo "nixos" > nixos_1.efi
+ sha256sum nixos_1.efi > SHA256SUMS
+
+ export GNUPGHOME="$(mktemp -d)"
+ cp -R ${gpgKeyring}/* $GNUPGHOME
+
+ gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS
+ '';
+ };
+ };
+ };
+
+ target = {
+ systemd.sysupdate = {
+ enable = true;
+ transfers = {
+ "uki" = {
+ Source = {
+ Type = "url-file";
+ Path = "http://server/";
+ MatchPattern = "nixos_@v.efi";
+ };
+ Target = {
+ Path = "/boot/EFI/Linux";
+ MatchPattern = "nixos_@v.efi";
+ };
+ };
+ };
+ };
+
+ environment.etc."systemd/import-pubring.gpg".source = "${gpgKeyring}/pubkey.gpg";
+ };
+ };
+
+ testScript = ''
+ server.wait_for_unit("nginx.service")
+
+ target.succeed("systemctl start systemd-sysupdate")
+ assert "nixos" in target.wait_until_succeeds("cat /boot/EFI/Linux/nixos_1.efi", timeout=5)
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix
index 4269d05056..6d76cc8e57 100644
--- a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix
+++ b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix
@@ -35,6 +35,8 @@ let tests = {
darktile.pkg = p: p.darktile;
+ deepin-terminal.pkg = p: p.deepin.deepin-terminal;
+
eterm.pkg = p: p.eterm;
eterm.executable = "Eterm";
eterm.pinkValue = "#D40055";
@@ -72,6 +74,9 @@ let tests = {
qterminal.pkg = p: p.lxqt.qterminal;
qterminal.kill = true;
+ rio.pkg = p: p.rio;
+ rio.cmd = "rio -e $command";
+
roxterm.pkg = p: p.roxterm;
roxterm.cmd = "roxterm -e $command";
@@ -118,7 +123,7 @@ in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}
maintainers = [ jjjollyjim ];
};
- machine = { pkgsInner, ... }:
+ nodes.machine = { pkgsInner, ... }:
{
imports = [ ./common/x11.nix ./common/user-account.nix ];
diff --git a/third_party/nixpkgs/nixos/tests/twingate.nix b/third_party/nixpkgs/nixos/tests/twingate.nix
index 8c7161b6fa..f8bede09d9 100644
--- a/third_party/nixpkgs/nixos/tests/twingate.nix
+++ b/third_party/nixpkgs/nixos/tests/twingate.nix
@@ -6,5 +6,9 @@
testScript = { nodes, ... }: ''
machine.wait_for_unit("twingate.service")
machine.succeed("twingate --version | grep '${nodes.machine.services.twingate.package.version}' >&2")
+ machine.succeed("twingate config log-level 'debug'")
+ machine.systemctl("restart twingate.service")
+ machine.succeed("grep 'debug' /etc/twingate/log_level.conf >&2")
+ machine.succeed("twingate config log-level | grep 'debug' >&2")
'';
}
diff --git a/third_party/nixpkgs/nixos/tests/typesense.nix b/third_party/nixpkgs/nixos/tests/typesense.nix
new file mode 100644
index 0000000000..4f07a2e194
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/typesense.nix
@@ -0,0 +1,23 @@
+import ./make-test-python.nix ({ pkgs, ... }: let
+ testPort = 8108;
+in {
+ name = "typesense";
+ meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
+
+ nodes.machine = { ... }: {
+ services.typesense = {
+ enable = true;
+ apiKeyFile = pkgs.writeText "typesense-api-key" "dummy";
+ settings.server = {
+ api-port = testPort;
+ api-address = "0.0.0.0";
+ };
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("typesense.service")
+ machine.wait_for_open_port(${toString testPort})
+ assert machine.succeed("curl --fail http://localhost:${toString testPort}/health") == '{"ok":true}'
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/vscodium.nix b/third_party/nixpkgs/nixos/tests/vscodium.nix
index 3eda8b6cfb..d817ce927f 100644
--- a/third_party/nixpkgs/nixos/tests/vscodium.nix
+++ b/third_party/nixpkgs/nixos/tests/vscodium.nix
@@ -8,7 +8,7 @@ let
environment.variables.NIXOS_OZONE_WL = "1";
environment.variables.DISPLAY = "do not use";
- fonts.fonts = with pkgs; [ dejavu_fonts ];
+ fonts.packages = with pkgs; [ dejavu_fonts ];
};
xorg = { pkgs, ... }: {
imports = [ ./common/user-account.nix ./common/x11.nix ];
diff --git a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix
index 4f000df922..8c701ca7d5 100644
--- a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix
+++ b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix
@@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}:
ssid = "nixos-test-mixed";
authentication = {
mode = "wpa3-sae-transition";
+ saeAddToMacAllow = true;
saePasswordsFile = pkgs.writeText "password" "reproducibility";
wpaPasswordFile = pkgs.writeText "password" "reproducibility";
};
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 36d9ea7fb8..c479ebe7ee 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 = "18.0";
+ version = "20.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-06mfTvt0BXHUGZG2rnEbuOPIP+jD76mQZTo+m4b4lo4=";
+ sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix
index 80db9e85d3..9740c2f718 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix
@@ -21,9 +21,13 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ gtk4 alsa-lib ];
+ postInstall = ''
+ substituteInPlace $out/share/applications/vu.b4.${pname}.desktop \
+ --replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/${pname}"
+ '';
# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
index 0cb33062bd..e805dd1f90 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix
@@ -1,11 +1,13 @@
{ stdenv
, lib
, fetchFromGitHub
+, gitUpdater
, pkg-config
, qmake
, qt5compat ? null
, qtbase
, qttools
+, qtwayland
, rtaudio
, rtmidi
, wrapQtAppsHook
@@ -13,16 +15,16 @@
assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "bambootracker";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
- rev = "v${version}";
+ rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw=";
+ hash = "sha256-rn6PNxVsLEXz8q3nvMMhKV1/Woq2CxROf0qsQJykyUs=";
};
postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
@@ -41,14 +43,16 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase
- rtaudio
rtmidi
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ qtwayland
] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [
qt5compat
- ];
+ ] ++ rtaudio.buildInputs;
qmakeFlags = [
- "CONFIG+=system_rtaudio"
+ # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075
+ # "CONFIG+=system_rtaudio"
"CONFIG+=system_rtmidi"
];
@@ -64,6 +68,12 @@ stdenv.mkDerivation rec {
wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker
'';
+ passthru = {
+ updateScript = gitUpdater {
+ rev-prefix = "v";
+ };
+ };
+
meta = with lib; {
description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
homepage = "https://bambootracker.github.io/BambooTracker/";
@@ -71,4 +81,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
new file mode 100644
index 0000000000..75aef2b279
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -0,0 +1,126 @@
+{ stdenv
+, fetchurl
+, alsa-lib
+, atk
+, cairo
+, dpkg
+, ffmpeg
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, harfbuzz
+, lib
+, libglvnd
+, libjack2
+, libjpeg
+, libxkbcommon
+, makeWrapper
+, pango
+, pipewire
+, pulseaudio
+, wrapGAppsHook
+, xdg-utils
+, xorg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bitwig-studio";
+ version = "5.0.4";
+
+ src = fetchurl {
+ url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
+ sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y=";
+ };
+
+ nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
+
+ unpackCmd = ''
+ mkdir -p root
+ dpkg-deb -x $curSrc root
+ '';
+
+ dontBuild = true;
+ dontWrapGApps = true; # we only want $gappsWrapperArgs here
+
+ buildInputs = with xorg; [
+ alsa-lib
+ atk
+ cairo
+ freetype
+ gdk-pixbuf
+ glib
+ gtk3
+ harfbuzz
+ libglvnd
+ libjack2
+ # libjpeg8 is required for converting jpeg's to colour palettes
+ libjpeg
+ libxcb
+ libXcursor
+ libX11
+ libXtst
+ libxkbcommon
+ pango
+ pipewire
+ pulseaudio
+ stdenv.cc.cc.lib
+ xcbutil
+ xcbutilwm
+ zlib
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ cp -r opt/bitwig-studio $out/libexec
+ ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
+ cp -r usr/share $out/share
+ substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
+ $out/share/applications/com.bitwig.BitwigStudio.desktop \
+ --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ # patchelf fails to set rpath on BitwigStudioEngine, so we use
+ # the LD_LIBRARY_PATH way
+
+ find $out -type f -executable \
+ -not -name '*.so.*' \
+ -not -name '*.so' \
+ -not -name '*.jar' \
+ -not -name 'jspawnhelper' \
+ -not -path '*/resources/*' | \
+ while IFS= read -r f ; do
+ patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
+ # make xdg-open overrideable at runtime
+ wrapProgram $f \
+ "''${gappsWrapperArgs[@]}" \
+ --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
+ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
+ --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}"
+ done
+
+ find $out -type f -executable -name 'jspawnhelper' | \
+ while IFS= read -r f ; do
+ patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
+ done
+ '';
+
+ meta = with lib; {
+ description = "A digital audio workstation";
+ longDescription = ''
+ Bitwig Studio is a multi-platform music-creation system for
+ production, performance and DJing, with a focus on flexible
+ editing tools and a super-fast workflow.
+ '';
+ homepage = "https://www.bitwig.com/";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ bfortz michalrus mrVanDalo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix
index ebf72588df..a5d1a783b4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix
@@ -107,5 +107,6 @@ mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
+ mainProgram = "cadence";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix
index 752e1d2dfc..e898f17d93 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ offline mirrexagon ];
platforms = platforms.linux;
+ mainProgram = "cava";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
index 17495ead35..8f15b7d611 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "cmusfm";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = pname;
rev = "v${version}";
- sha256 = "1px2is80jdxchg8cpn5cizg6jvcbzyxl0qzs3bn0k3d10qjvdww5";
+ sha256 = "sha256-CA585ZpkxMMLgzv81QB2kKMFg5R5CwKS9xAYrU+pAxs=";
};
configureFlags = lib.optional libnotifySupport "--enable-libnotify"
diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix
index 7e27bf7837..80018ecc39 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config
-, libjack2, gettext, intltool, guile_2_0, lilypond
+, libjack2, gettext, intltool, guile_2_2, lilypond
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
, portaudio, portmidi, fftw, wrapGAppsHook }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile
+ libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile
aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
index faffd14576..ac286d499f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
@@ -107,5 +107,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
+ mainProgram = "easyeffects";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix
index d53c0ac1ca..5e62399c8a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix
@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aske ];
platforms = platforms.all;
+ mainProgram = "espeak-ng";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix
index 81a2646ad7..89d6845237 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix
@@ -2,31 +2,35 @@
, stdenv
, fetchzip
, autoPatchelfHook
+, dotnet-runtime
+, ffmpeg
+, libglvnd
, makeWrapper
-, mono
, openal
-, libGL
}:
stdenv.mkDerivation rec {
pname = "famistudio";
- version = "4.0.6";
+ version = "4.1.1";
src = fetchzip {
url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
stripRoot = false;
- sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4=";
+ hash = "sha256-fRNjboCfymBhr7Eg5ENnO1fchX0oTdeaJJ0SC3BKTVI=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
buildInputs = [
- mono
+ dotnet-runtime
+ ffmpeg
+ libglvnd
openal
- libGL
];
dontConfigure = true;
@@ -38,9 +42,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib/famistudio}
mv * $out/lib/famistudio
- makeWrapper ${mono}/bin/mono $out/bin/famistudio \
- --add-flags $out/lib/famistudio/FamiStudio.exe \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
+ makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \
+ --add-flags $out/lib/famistudio/FamiStudio.dll \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \
+ --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
# Bundled openal lib freezes the application
rm $out/lib/famistudio/libopenal32.so
diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix
deleted file mode 100644
index 81ce11b9ea..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix
+++ /dev/null
@@ -1,207 +0,0 @@
-{ lib, stdenv
-, coreutils
-, fetchurl
-, makeWrapper
-, pkg-config
-}:
-
-with lib.strings;
-
-let
-
- version = "0.9.90";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
- sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna";
- };
-
- meta = with lib; {
- homepage = "https://faust.grame.fr/";
- downloadPage = "https://sourceforge.net/projects/faudiostream/files/";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ magnetophon pmahoney ];
- };
-
- faust = stdenv.mkDerivation {
- pname = "faust";
- inherit version;
-
- inherit src;
-
- nativeBuildInputs = [ makeWrapper ];
-
- passthru = {
- inherit wrap wrapWithBuildEnv;
- };
-
- preConfigure = ''
- makeFlags="$makeFlags prefix=$out"
-
- # The faust makefiles use 'system ?= $(shell uname -s)' but nix
- # defines 'system' env var, so undefine that so faust detects the
- # correct system.
- unset system
- '';
-
- # Remove most faust2appl scripts since they won't run properly
- # without additional paths setup. See faust.wrap,
- # faust.wrapWithBuildEnv.
- postInstall = ''
- # syntax error when eval'd directly
- pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
- (shopt -s extglob; rm "$out"/bin/$pattern)
- '';
-
- postFixup = ''
- # Set faustpath explicitly.
- substituteInPlace "$out"/bin/faustpath \
- --replace "/usr/local /usr /opt /opt/local" "$out"
-
- # The 'faustoptflags' is 'source'd into other faust scripts and
- # not used as an executable, so patch 'uname' usage directly
- # rather than use makeWrapper.
- substituteInPlace "$out"/bin/faustoptflags \
- --replace uname "${coreutils}/bin/uname"
-
- # wrapper for scripts that don't need faust.wrap*
- for script in "$out"/bin/faust2*; do
- wrapProgram "$script" \
- --prefix PATH : "$out"/bin
- done
- '';
-
- meta = meta // {
- description = "A functional programming language for realtime audio signal processing";
- longDescription = ''
- FAUST (Functional Audio Stream) is a functional programming
- language specifically designed for real-time signal processing
- and synthesis. FAUST targets high-performance signal processing
- applications and audio plug-ins for a variety of platforms and
- standards.
- The Faust compiler translates DSP specifications into very
- efficient C++ code. Thanks to the notion of architecture,
- FAUST programs can be easily deployed on a large variety of
- audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
- puredata, csound, supercollider, pure, vst, coreaudio) without
- any change to the FAUST code.
-
- This package has just the compiler, libraries, and headers.
- Install faust2* for specific faust2appl scripts.
- '';
- };
-
- };
-
- # Default values for faust2appl.
- faust2ApplBase =
- { baseName
- , dir ? "tools/faust2appls"
- , scripts ? [ baseName ]
- , ...
- }@args:
-
- args // {
- name = "${baseName}-${version}";
-
- inherit src;
-
- dontBuild = true;
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p "$out/bin"
- for script in ${concatStringsSep " " scripts}; do
- cp "${dir}/$script" "$out/bin/"
- done
-
- runHook postInstall
- '';
-
- postInstall = ''
- # For the faust2appl script, change 'faustpath' and
- # 'faustoptflags' to absolute paths.
- for script in "$out"/bin/*; do
- substituteInPlace "$script" \
- --replace ". faustpath" ". '${faust}/bin/faustpath'" \
- --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'"
- done
- '';
-
- meta = meta // {
- description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing";
- };
- };
-
- # Some 'faust2appl' scripts, such as faust2alsa, run faust to
- # generate cpp code, then invoke the c++ compiler to build the code.
- # This builder wraps these scripts in parts of the stdenv such that
- # when the scripts are called outside any nix build, they behave as
- # if they were running inside a nix build in terms of compilers and
- # paths being configured (e.g. rpath is set so that compiled
- # binaries link to the libs inside the nix store)
- #
- # The function takes two main args: the appl name (e.g.
- # 'faust2alsa') and an optional list of propagatedBuildInputs. It
- # returns a derivation that contains only the bin/${appl} script,
- # wrapped up so that it will run as if it was inside a nix build
- # with those build inputs.
- #
- # The build input 'faust' is automatically added to the
- # propagatedBuildInputs.
- wrapWithBuildEnv =
- { baseName
- , propagatedBuildInputs ? [ ]
- , ...
- }@args:
-
- stdenv.mkDerivation ((faust2ApplBase args) // {
-
- nativeBuildInputs = [ pkg-config makeWrapper ];
-
- propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
-
- postFixup = ''
-
- # export parts of the build environment
- for script in "$out"/bin/*; do
- wrapProgram "$script" \
- --set FAUSTLIB "${faust}/lib/faust" \
- --set FAUSTINC "${faust}/include/faust" \
- --prefix PATH : "$PATH" \
- --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
- --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \
- --set NIX_LDFLAGS "$NIX_LDFLAGS"
- done
- '';
- });
-
- # Builder for 'faust2appl' scripts, such as faust2firefox that
- # simply need to be wrapped with some dependencies on PATH.
- #
- # The build input 'faust' is automatically added to the PATH.
- wrap =
- { baseName
- , runtimeInputs ? [ ]
- , ...
- }@args:
-
- let
-
- runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs));
-
- in stdenv.mkDerivation ((faust2ApplBase args) // {
-
- nativeBuildInputs = [ makeWrapper ];
-
- postFixup = ''
- for script in "$out"/bin/*; do
- wrapProgram "$script" --prefix PATH : "${runtimePath}"
- done
- '';
-
- });
-
-in faust
diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix
new file mode 100644
index 0000000000..b8b28f4768
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, meta
+, fetchurl
+, unzip
+, mpv
+, electron_24
+, makeDesktopItem
+, makeWrapper
+, pname
+, appname
+, version
+}:
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
+ hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
+ };
+
+ nativeBuildInputs = [ makeWrapper unzip ];
+
+ # Installs mpv as a requirement
+ propagatedBuildInputs = [ mpv ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/{Applications/${appname}.app,bin}
+ cp -R . $out/Applications/${appname}.app
+ makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
+ runHook postInstall
+ '';
+
+ shellHook = ''
+ set -x
+ export LD_LIBRARY_PATH=${mpv}/lib
+ set +x
+ '';
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix
new file mode 100644
index 0000000000..f9a670dbfa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, callPackage
+, ...
+}@args:
+
+let
+ extraArgs = removeAttrs args [ "callPackage" ];
+
+ pname = "feishin";
+ version = "0.2.0";
+ appname = "Feishin";
+
+ meta = with lib; {
+ description = "Full-featured Subsonic/Jellyfin compatible desktop music player";
+ homepage = "https://github.com/jeffvli/feishin";
+ changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}";
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ license = licenses.mit;
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ maintainers = with maintainers; [ onny ];
+ };
+
+in if stdenv.isDarwin
+then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; })
+else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; })
diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix
new file mode 100644
index 0000000000..08adc69bb7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, meta
+, lib
+, fetchurl
+, mpv
+, graphicsmagick
+, electron_24
+, makeDesktopItem
+, makeWrapper
+, pname
+, appname
+, version
+}:
+
+let
+ icon = fetchurl {
+ url =
+ "https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png";
+ sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I=";
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "feishin";
+ desktopName = "Feishin";
+ comment = "Full-featured Subsonic/Jellyfin compatible desktop music player";
+ icon = "feishin";
+ exec = "feishin %u";
+ categories = [ "Audio" ];
+ mimeTypes = [ "x-scheme-handler/feishin" ];
+ };
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
+ hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE=";
+ };
+
+
+ nativeBuildInputs = [ makeWrapper graphicsmagick ];
+
+ # Installs mpv as a requirement
+ propagatedBuildInputs = [ mpv ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mkdir -p $out/share
+ cp -r resources $out/share/${pname}/
+ cp -r locales $out/share/${pname}/
+
+ makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/app.asar
+ install -m 444 -D "${desktopItem}/share/applications/"* \
+ -t $out/share/applications/
+ for size in 16 24 32 48 64 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+ gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png
+ done
+ runHook postInstall
+ '';
+
+ shellHook = ''
+ set -x
+ export LD_LIBRARY_PATH=${mpv}/lib
+ set +x
+ '';
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
index 41ee34847a..503e72dfe0 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,19 +1,29 @@
-{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
+{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPackages, pkg-config, cmake
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices
}:
stdenv.mkDerivation rec {
pname = "fluidsynth";
- version = "2.3.2";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
- sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM=";
+ sha256 = "sha256-RqhlpvMbRSwdcY2uuFAdJnihN3aObcLVMuvCZ294dgo=";
};
+ patches = [
+ # Fixes bad CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_LIBDIR concatenation for Darwin install name dir
+ # Remove when PR merged & in release
+ (fetchpatch {
+ name = "0001-Fix-incorrect-way-of-turning-CMAKE_INSTALL_LIBDIR-absolute.patch";
+ url = "https://github.com/FluidSynth/fluidsynth/pull/1261/commits/03cd38dd909fc24aa39553d869afbb4024416de8.patch";
+ hash = "sha256-nV+MbFttnbNBO4zWnPLpnnEuoiESkV9BGFlUS9tQQfk=";
+ })
+ ];
+
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
@@ -24,8 +34,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-Denable-framework=off"
- # set CMAKE_INSTALL_NAME_DIR to correct value on darwin
- "-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock
index 0c91dab0bd..ee4b4ac20a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock
@@ -3,103 +3,108 @@
version = 3
[[package]]
-name = "aho-corasick"
-version = "0.7.18"
+name = "addr2line"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
[[package]]
name = "ammonia"
-version = "3.1.2"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35"
+checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170"
dependencies = [
- "html5ever",
- "lazy_static",
+ "html5ever 0.26.0",
"maplit",
- "markup5ever_rcdom",
- "matches",
+ "once_cell",
"tendril",
"url",
]
[[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "android-tzdata"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
- "winapi",
+ "libc",
]
[[package]]
name = "anyhow"
-version = "1.0.52"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
-
-[[package]]
-name = "atk"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba"
-dependencies = [
- "atk-sys",
- "bitflags",
- "glib 0.14.8",
- "libc",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea"
-dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "libc",
- "system-deps 3.2.0",
-]
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "atom_syndication"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fb6a0b39c6517edafe46f8137e53c51742425a4dae1c73ee12264a37ad7541"
+checksum = "ca96cb38e3d8236f1573a84bbc55e130bd1ae07df770e36d0cf221ea7a50e36c"
dependencies = [
"chrono",
- "derive_builder 0.10.2",
+ "derive_builder",
"diligent-date-parser",
"never",
"quick-xml",
]
[[package]]
-name = "atty"
-version = "0.2.14"
+name = "atomic_refcell"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
+checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bitflags"
@@ -108,60 +113,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
-name = "bumpalo"
-version = "3.8.0"
+name = "bitflags"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
[[package]]
-name = "byteorder"
-version = "1.4.3"
+name = "bumpalo"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytes"
-version = "1.1.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-rs"
-version = "0.14.9"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
+checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-sys-rs",
- "glib 0.14.8",
+ "glib 0.17.10",
"libc",
+ "once_cell",
"thiserror",
]
[[package]]
name = "cairo-sys-rs"
-version = "0.14.9"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
+checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1"
dependencies = [
- "glib-sys 0.14.0",
+ "glib-sys 0.17.10",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "cc"
-version = "1.0.72"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-expr"
-version = "0.8.1"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
+checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -172,22 +179,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.19"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
- "libc",
- "num-integer",
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
"num-traits",
- "time",
+ "time 0.1.45",
+ "wasm-bindgen",
"winapi",
]
[[package]]
name = "core-foundation"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
"core-foundation-sys",
"libc",
@@ -195,15 +204,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 = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -211,9 +220,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -222,105 +231,69 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
+ "autocfg",
"cfg-if",
"crossbeam-utils",
- "lazy_static",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
- "lazy_static",
]
[[package]]
name = "ctor"
-version = "0.1.21"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "darling"
-version = "0.10.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
- "darling_core 0.10.2",
- "darling_macro 0.10.2",
-]
-
-[[package]]
-name = "darling"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c"
-dependencies = [
- "darling_core 0.12.4",
- "darling_macro 0.12.4",
+ "darling_core",
+ "darling_macro",
]
[[package]]
name = "darling_core"
-version = "0.10.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
- "strsim 0.9.3",
- "syn",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn",
+ "strsim",
+ "syn 1.0.109",
]
[[package]]
name = "darling_macro"
-version = "0.10.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
- "darling_core 0.10.2",
+ "darling_core",
"quote",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
-dependencies = [
- "darling_core 0.12.4",
- "quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -335,162 +308,164 @@ dependencies = [
[[package]]
name = "derive_builder"
-version = "0.9.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
-dependencies = [
- "darling 0.10.2",
- "derive_builder_core 0.9.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
-version = "0.9.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
+checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
dependencies = [
- "darling 0.10.2",
+ "darling",
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5"
-dependencies = [
- "darling 0.12.4",
- "proc-macro2",
- "quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "derive_builder_macro"
-version = "0.10.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
+checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
dependencies = [
- "derive_builder_core 0.10.2",
- "syn",
+ "derive_builder_core",
+ "syn 1.0.109",
]
[[package]]
name = "diesel"
-version = "1.4.8"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d"
+checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c"
dependencies = [
- "byteorder",
"chrono",
"diesel_derives",
"libsqlite3-sys",
"r2d2",
+ "time 0.3.22",
]
[[package]]
name = "diesel_derives"
-version = "1.4.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
+checksum = "74398b79d81e52e130d991afeed9c86034bb1b7735f46d2f5bf7deb261d80303"
dependencies = [
+ "diesel_table_macro_syntax",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
]
[[package]]
name = "diesel_migrations"
-version = "1.4.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
+checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac"
dependencies = [
+ "diesel",
"migrations_internals",
"migrations_macros",
]
[[package]]
-name = "diff"
-version = "0.1.12"
+name = "diesel_table_macro_syntax"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5"
+dependencies = [
+ "syn 2.0.23",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "diligent-date-parser"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d0fd95c7c02e2d6c588c6c5628466fff9bdde4b8c6196465e087b08e792720"
+checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182"
dependencies = [
"chrono",
]
-[[package]]
-name = "dirs"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
[[package]]
name = "either"
-version = "1.6.1"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "encoding_rs"
-version = "0.8.30"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if",
]
[[package]]
name = "env_logger"
-version = "0.7.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
- "atty",
"humantime",
+ "is-terminal",
"log",
"regex",
"termcolor",
]
[[package]]
-name = "field-offset"
-version = "0.3.4"
+name = "equivalent"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
"rustc_version",
@@ -519,19 +494,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.0.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
- "matches",
"percent-encoding",
]
[[package]]
name = "fragile"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "fuchsia-cprng"
@@ -541,9 +515,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "futf"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
dependencies = [
"mac",
"new_debug_unreachable",
@@ -551,9 +525,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -566,9 +540,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -576,15 +550,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -593,38 +567,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
]
[[package]]
name = "futures-sink"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.19"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -639,61 +613,63 @@ dependencies = [
]
[[package]]
-name = "gdk"
-version = "0.14.3"
+name = "gdk-pixbuf"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b"
+checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib 0.17.10",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.17.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb"
+dependencies = [
+ "gio-sys",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
+dependencies = [
+ "bitflags 1.3.2",
"cairo-rs",
"gdk-pixbuf",
- "gdk-sys",
+ "gdk4-sys",
"gio",
- "glib 0.14.8",
+ "glib 0.17.10",
"libc",
"pango",
]
[[package]]
-name = "gdk-pixbuf"
-version = "0.14.0"
+name = "gdk4-sys"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib 0.14.8",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
-dependencies = [
- "gio-sys",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "libc",
- "system-deps 3.2.0",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e"
+checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"libc",
"pango-sys",
"pkg-config",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
@@ -709,13 +685,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.3"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
@@ -736,184 +712,255 @@ dependencies = [
]
[[package]]
-name = "gio"
-version = "0.14.8"
+name = "gimli"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
+[[package]]
+name = "gio"
+version = "0.17.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
+ "futures-util",
"gio-sys",
- "glib 0.14.8",
+ "glib 0.17.10",
"libc",
"once_cell",
+ "pin-project-lite",
+ "smallvec",
"thiserror",
]
[[package]]
name = "gio-sys"
-version = "0.14.0"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
+checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
"winapi",
]
[[package]]
name = "glib"
-version = "0.10.3"
+version = "0.15.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5"
+checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
- "futures-util",
- "glib-macros 0.10.1",
- "glib-sys 0.10.1",
- "gobject-sys 0.10.0",
+ "glib-macros 0.15.13",
+ "glib-sys 0.15.10",
+ "gobject-sys 0.15.10",
"libc",
"once_cell",
+ "smallvec",
+ "thiserror",
]
[[package]]
name = "glib"
-version = "0.14.8"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
+checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
- "glib-macros 0.14.1",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "futures-util",
+ "gio-sys",
+ "glib-macros 0.17.10",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"libc",
+ "memchr",
"once_cell",
"smallvec",
+ "thiserror",
]
[[package]]
name = "glib-macros"
-version = "0.10.1"
+version = "0.15.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039"
+checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
dependencies = [
"anyhow",
"heck",
- "itertools 0.9.0",
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-macros"
-version = "0.14.1"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
+checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26"
dependencies = [
"anyhow",
"heck",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-sys"
-version = "0.10.1"
+version = "0.15.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1"
+checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
dependencies = [
"libc",
- "system-deps 1.3.2",
+ "system-deps",
]
[[package]]
name = "glib-sys"
-version = "0.14.0"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
+checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0"
dependencies = [
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "glob"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gobject-sys"
-version = "0.10.0"
+version = "0.15.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c"
+checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
dependencies = [
- "glib-sys 0.10.1",
+ "glib-sys 0.15.10",
"libc",
- "system-deps 1.3.2",
+ "system-deps",
]
[[package]]
name = "gobject-sys"
-version = "0.14.0"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
+checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062"
dependencies = [
- "glib-sys 0.14.0",
+ "glib-sys 0.17.10",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.17.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9"
+dependencies = [
+ "glib 0.17.10",
+ "graphene-sys",
+ "libc",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.17.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d"
+dependencies = [
+ "glib-sys 0.17.10",
+ "libc",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "gdk4",
+ "glib 0.17.10",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk4-sys",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
+ "graphene-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
]
[[package]]
name = "gstreamer"
-version = "0.17.4"
+version = "0.20.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6a255f142048ba2c4a4dce39106db1965abe355d23f4b5335edea43a553faa4"
+checksum = "3113531138b4e41968e33fd003a0d1a635ef6e0cbc309dd5004123000863ac54"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"futures-channel",
"futures-core",
"futures-util",
- "glib 0.14.8",
+ "glib 0.17.10",
"gstreamer-sys",
"libc",
"muldiv",
"num-integer",
"num-rational",
"once_cell",
+ "option-operations",
"paste",
"pretty-hex",
+ "smallvec",
"thiserror",
]
[[package]]
name = "gstreamer-base"
-version = "0.17.2"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715"
+checksum = "0b8ff5dfbf7bcaf1466a385b836bad0d8da25759f121458727fdda1f771c69b3"
dependencies = [
- "bitflags",
+ "atomic_refcell",
+ "bitflags 1.3.2",
"cfg-if",
- "glib 0.14.8",
+ "glib 0.17.10",
"gstreamer",
"gstreamer-base-sys",
"libc",
@@ -921,25 +968,25 @@ dependencies = [
[[package]]
name = "gstreamer-base-sys"
-version = "0.17.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27"
+checksum = "26114ed96f6668380f5a1554128159e98e06c3a7a8460f216d7cd6dce28f928c"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"gstreamer-sys",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "gstreamer-player"
-version = "0.17.0"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a"
+checksum = "ec5e04059f117b82ca64c40901610ca9ac1734383437c9fb69afba26c9ebf5a3"
dependencies = [
- "bitflags",
- "glib 0.14.8",
+ "bitflags 1.3.2",
+ "glib 0.17.10",
"gstreamer",
"gstreamer-player-sys",
"gstreamer-video",
@@ -949,40 +996,40 @@ dependencies = [
[[package]]
name = "gstreamer-player-sys"
-version = "0.17.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5"
+checksum = "15321aaaf3bb247b4af3e09456a62dc17f030515d6328377a34081d9ed5803c0"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"gstreamer-sys",
"gstreamer-video-sys",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "gstreamer-sys"
-version = "0.17.3"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e"
+checksum = "e56fe047adef7d47dbafa8bc1340fddb53c325e16574763063702fc94b5786d2"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "gstreamer-video"
-version = "0.17.2"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3447ee95c8e79daec0b163260cf6a3de9bc19ff47a01b533787f900074a3476"
+checksum = "dce97769effde2d779dc4f7037b37106457b74e53f2a711bddc90b30ffeb7e06"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"futures-channel",
- "glib 0.14.8",
+ "glib 0.17.10",
"gstreamer",
"gstreamer-base",
"gstreamer-video-sys",
@@ -992,79 +1039,79 @@ dependencies = [
[[package]]
name = "gstreamer-video-sys"
-version = "0.17.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7"
+checksum = "66ddb6112d438aac0004d2db6053a572f92b1c5e0e9d6ff6c71d9245f7f73e46"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"gstreamer-base-sys",
"gstreamer-sys",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
-name = "gtk"
-version = "0.14.3"
+name = "gtk4"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c"
+checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
dependencies = [
- "atk",
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"field-offset",
"futures-channel",
- "gdk",
"gdk-pixbuf",
+ "gdk4",
"gio",
- "glib 0.14.8",
- "gtk-sys",
- "gtk3-macros",
+ "glib 0.17.10",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
"libc",
"once_cell",
"pango",
- "pkg-config",
]
[[package]]
-name = "gtk-sys"
-version = "0.14.0"
+name = "gtk4-macros"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e"
-dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "libc",
- "pango-sys",
- "system-deps 3.2.0",
-]
-
-[[package]]
-name = "gtk3-macros"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79"
+checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f"
dependencies = [
"anyhow",
- "heck",
- "proc-macro-crate 1.1.0",
+ "proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
]
[[package]]
name = "h2"
-version = "0.3.9"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
dependencies = [
"bytes",
"fnv",
@@ -1072,7 +1119,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
- "indexmap",
+ "indexmap 1.9.3",
"slab",
"tokio",
"tokio-util",
@@ -1081,69 +1128,94 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "heck"
-version = "0.3.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.1.19"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
dependencies = [
- "libc",
+ "windows-sys",
]
[[package]]
name = "html2text"
-version = "0.2.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1"
+checksum = "74cda84f06c1cc83476f79ae8e2e892b626bdadafcb227baec54c918cadc18a0"
dependencies = [
- "html5ever",
- "markup5ever_rcdom",
+ "html5ever 0.26.0",
+ "markup5ever 0.11.0",
+ "tendril",
"unicode-width",
+ "xml5ever 0.17.0",
]
[[package]]
name = "html5ever"
-version = "0.25.1"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
+checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
dependencies = [
"log",
"mac",
- "markup5ever",
+ "markup5ever 0.10.1",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
name = "http"
-version = "0.2.6"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.1",
+ "itoa",
]
[[package]]
name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
@@ -1152,9 +1224,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.5.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
@@ -1170,18 +1242,15 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
[[package]]
name = "humantime"
-version = "1.3.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.16"
+version = "0.14.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
"bytes",
"futures-channel",
@@ -1192,7 +1261,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 0.4.8",
+ "itoa",
"pin-project-lite",
"socket2",
"tokio",
@@ -1214,6 +1283,29 @@ dependencies = [
"tokio-native-tls",
]
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -1222,23 +1314,32 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.2.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
- "matches",
"unicode-bidi",
"unicode-normalization",
]
[[package]]
name = "indexmap"
-version = "1.7.0"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
]
[[package]]
@@ -1250,47 +1351,64 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys",
+]
+
[[package]]
name = "ipnet"
-version = "2.3.1"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
-name = "itertools"
-version = "0.9.0"
+name = "is-docker"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
dependencies = [
- "either",
+ "once_cell",
]
[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
+name = "is-terminal"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
+dependencies = [
+ "hermit-abi",
+ "rustix 0.38.2",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
[[package]]
name = "itoa"
-version = "1.0.1"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
[[package]]
name = "js-sys"
-version = "0.3.55"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
@@ -1302,66 +1420,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
-name = "libc"
-version = "0.2.112"
+name = "libadwaita"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-
-[[package]]
-name = "libdbus-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf"
dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "libhandy"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcf9c79ec810a62f442ffd568d2de233983dc91c160abee4949b67a647024ed"
-dependencies = [
- "bitflags",
- "gdk",
+ "bitflags 1.3.2",
"gdk-pixbuf",
+ "gdk4",
"gio",
- "glib 0.14.8",
- "gtk",
- "lazy_static",
+ "glib 0.17.10",
+ "gtk4",
+ "libadwaita-sys",
"libc",
- "libhandy-sys",
"pango",
]
[[package]]
-name = "libhandy-sys"
-version = "0.8.0"
+name = "libadwaita-sys"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1938b93a8f29417992c452b7f43e7eff8a9f8d25b7f0bc923ae9d75b50a9cde3"
+checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404"
dependencies = [
- "gdk-pixbuf-sys",
- "gdk-sys",
+ "gdk4-sys",
"gio-sys",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "gtk-sys",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
+ "gtk4-sys",
"libc",
"pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+dependencies = [
"pkg-config",
- "system-deps 3.2.0",
]
[[package]]
name = "libsqlite3-sys"
-version = "0.22.2"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
dependencies = [
"pkg-config",
"vcpkg",
]
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+
[[package]]
name = "locale_config"
version = "0.2.3"
@@ -1375,21 +1502,19 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.5"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
+ "autocfg",
"scopeguard",
]
[[package]]
name = "log"
-version = "0.4.14"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "mac"
@@ -1410,8 +1535,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
dependencies = [
"log",
- "phf",
- "phf_codegen",
+ "phf 0.8.0",
+ "phf_codegen 0.8.0",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
+dependencies = [
+ "log",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
"string_cache",
"string_cache_codegen",
"tendril",
@@ -1423,113 +1562,105 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
dependencies = [
- "html5ever",
- "markup5ever",
+ "html5ever 0.25.2",
+ "markup5ever 0.10.1",
"tendril",
- "xml5ever",
+ "xml5ever 0.16.2",
]
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
[[package]]
name = "memchr"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "migrations_internals"
-version = "1.4.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860"
+checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada"
dependencies = [
- "diesel",
+ "serde",
+ "toml",
]
[[package]]
name = "migrations_macros"
-version = "1.4.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
+checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08"
dependencies = [
"migrations_internals",
"proc-macro2",
"quote",
- "syn",
]
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
-version = "2.0.3"
+version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime",
"unicase",
]
[[package]]
-name = "mio"
-version = "0.7.14"
+name = "miniz_oxide"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
+ "adler",
]
[[package]]
-name = "miow"
-version = "0.3.7"
+name = "mio"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
- "winapi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
]
[[package]]
name = "mpris-player"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07"
+checksum = "be832ec9171fdaf43609d02bb552f4129ba6eacd184bb25186e2906dbd3cf098"
dependencies = [
"dbus",
- "glib 0.10.3",
+ "glib 0.15.12",
]
[[package]]
name = "muldiv"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3"
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
[[package]]
name = "native-tls"
-version = "0.2.8"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
dependencies = [
"lazy_static",
"libc",
@@ -1555,20 +1686,11 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
@@ -1576,9 +1698,9 @@ dependencies = [
[[package]]
name = "num-rational"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
"autocfg",
"num-integer",
@@ -1587,66 +1709,87 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
-version = "1.13.1"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
-name = "once_cell"
-version = "1.9.0"
+name = "object"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "open"
-version = "2.0.2"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176ee4b630d174d2da8241336763bb459281dddc0f4d87f72c3b1efc9a6109b7"
+checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
dependencies = [
+ "is-wsl",
+ "libc",
"pathdiff",
- "winapi",
]
[[package]]
name = "openssl"
-version = "0.10.38"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
"once_cell",
+ "openssl-macros",
"openssl-sys",
]
[[package]]
-name = "openssl-probe"
-version = "0.1.4"
+name = "openssl-macros"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.23",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.72"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -1654,22 +1797,32 @@ dependencies = [
]
[[package]]
-name = "output_vt100"
-version = "0.1.2"
+name = "option-operations"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
+checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
+dependencies = [
+ "paste",
+]
+
+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
dependencies = [
"winapi",
]
[[package]]
name = "pango"
-version = "0.14.8"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
+checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48"
dependencies = [
- "bitflags",
- "glib 0.14.8",
+ "bitflags 1.3.2",
+ "gio",
+ "glib 0.17.10",
"libc",
"once_cell",
"pango-sys",
@@ -1677,46 +1830,44 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.14.0"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
+checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195"
dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys 0.17.10",
+ "gobject-sys 0.17.10",
"libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
name = "parking_lot"
-version = "0.11.2"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
- "instant",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
-version = "0.8.5"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if",
- "instant",
"libc",
"redox_syscall",
"smallvec",
- "winapi",
+ "windows-targets",
]
[[package]]
name = "paste"
-version = "1.0.6"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
+checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
[[package]]
name = "pathdiff"
@@ -1726,18 +1877,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
[[package]]
name = "percent-encoding"
-version = "2.1.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "phf"
@@ -1745,7 +1887,16 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
+]
+
+[[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",
]
[[package]]
@@ -1754,8 +1905,18 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
]
[[package]]
@@ -1764,10 +1925,20 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [
- "phf_shared",
+ "phf_shared 0.8.0",
"rand 0.7.3",
]
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared 0.10.0",
+ "rand 0.8.5",
+]
+
[[package]]
name = "phf_shared"
version = "0.8.0"
@@ -1778,10 +1949,19 @@ dependencies = [
]
[[package]]
-name = "pin-project-lite"
-version = "0.2.8"
+name = "phf_shared"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -1791,9 +1971,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.24"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "podcasts-data"
@@ -1804,7 +1984,7 @@ dependencies = [
"base64",
"chrono",
"crossbeam-channel",
- "derive_builder 0.9.0",
+ "derive_builder",
"diesel",
"diesel_migrations",
"futures",
@@ -1812,14 +1992,14 @@ dependencies = [
"http",
"hyper",
"hyper-tls",
- "lazy_static",
"log",
"maplit",
"mime_guess",
"native-tls",
"num_cpus",
+ "once_cell",
"pretty_assertions",
- "rand 0.8.4",
+ "rand 0.8.5",
"rayon",
"reqwest",
"rfc822_sanitizer",
@@ -1840,22 +2020,19 @@ dependencies = [
"chrono",
"crossbeam-channel",
"fragile",
- "gdk",
- "gdk-pixbuf",
"gettext-rs",
- "gio",
- "glib 0.14.8",
+ "glob",
"gstreamer",
"gstreamer-player",
- "gtk",
+ "gtk4",
"html2text",
- "html5ever",
+ "html5ever 0.25.2",
"humansize",
- "lazy_static",
- "libhandy",
+ "libadwaita",
"log",
"markup5ever_rcdom",
"mpris-player",
+ "once_cell",
"open",
"podcasts-data",
"pretty_assertions",
@@ -1870,9 +2047,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "precomputed-hash"
@@ -1882,27 +2059,27 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "pretty-hex"
-version = "0.2.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131"
+checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
[[package]]
name = "pretty_assertions"
-version = "1.0.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
dependencies = [
- "ansi_term",
"ctor",
"diff",
"output_vt100",
+ "yansi",
]
[[package]]
name = "pretty_env_logger"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
+checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
dependencies = [
"env_logger",
"log",
@@ -1910,21 +2087,12 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "0.1.5"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
- "toml",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
-dependencies = [
- "thiserror",
- "toml",
+ "once_cell",
+ "toml_edit",
]
[[package]]
@@ -1936,7 +2104,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1953,24 +2121,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
dependencies = [
- "unicode-xid",
+ "unicode-ident",
]
-[[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.22.0"
+version = "0.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
+checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
dependencies = [
"encoding_rs",
"memchr",
@@ -1978,18 +2140,18 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.14"
+version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
dependencies = [
"proc-macro2",
]
[[package]]
name = "r2d2"
-version = "0.8.9"
+version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
+checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
dependencies = [
"log",
"parking_lot",
@@ -2019,20 +2181,19 @@ dependencies = [
"libc",
"rand_chacha 0.2.2",
"rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "rand_hc",
"rand_pcg",
]
[[package]]
name = "rand"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha 0.3.1",
- "rand_core 0.6.3",
- "rand_hc 0.3.1",
+ "rand_core 0.6.4",
]
[[package]]
@@ -2052,7 +2213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
]
[[package]]
@@ -2081,11 +2242,11 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.10",
]
[[package]]
@@ -2097,15 +2258,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
[[package]]
name = "rand_pcg"
version = "0.2.1"
@@ -2117,26 +2269,23 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.5.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
- "autocfg",
- "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.9.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "lazy_static",
"num_cpus",
]
@@ -2151,28 +2300,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.10"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
-dependencies = [
- "getrandom 0.2.3",
- "redox_syscall",
+ "bitflags 1.3.2",
]
[[package]]
name = "regex"
-version = "1.5.4"
+version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
dependencies = [
"aho-corasick",
"memchr",
@@ -2181,9 +2320,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.25"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "remove_dir_all"
@@ -2196,25 +2335,26 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.11.8"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c4e0a76dc12a116108933f6301b95e83634e0c47b0afbed6abbaa0601e99258"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
"base64",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
+ "h2",
"http",
"http-body",
"hyper",
"hyper-tls",
"ipnet",
"js-sys",
- "lazy_static",
"log",
"mime",
"native-tls",
+ "once_cell",
"percent-encoding",
"pin-project-lite",
"serde",
@@ -2222,6 +2362,7 @@ dependencies = [
"serde_urlencoded",
"tokio",
"tokio-native-tls",
+ "tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -2231,9 +2372,9 @@ dependencies = [
[[package]]
name = "rfc822_sanitizer"
-version = "0.3.4"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae57cb2820842d1ba94ba719453fffc6f8ab953059e133a04e2bf4016b3c4f9"
+checksum = "d95e6ac0e635800681025bddc2fa6747cf1159bb897223a74e481ec54b4f5d44"
dependencies = [
"chrono",
"lazy_static",
@@ -2242,46 +2383,78 @@ dependencies = [
[[package]]
name = "rss"
-version = "2.0.0"
+version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e19e299f301be17927a7c05b8fa1c621e3227e6c3a0da65492701642901ff7"
+checksum = "9acf62e0f3f4b52f61d3a12d6279e3f0b90d4811b0ae888eabdf61a2e7c03a95"
dependencies = [
"atom_syndication",
- "derive_builder 0.10.2",
+ "derive_builder",
"never",
"quick-xml",
]
[[package]]
-name = "rustc_version"
-version = "0.3.3"
+name = "rustc-demangle"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]]
-name = "ryu"
-version = "1.0.9"
+name = "rustix"
+version = "0.37.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.3",
+ "windows-sys",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
[[package]]
name = "schannel"
-version = "0.1.19"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "lazy_static",
- "winapi",
+ "windows-sys",
]
[[package]]
name = "scheduled-thread-pool"
-version = "0.2.5"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
dependencies = [
"parking_lot",
]
@@ -2294,11 +2467,11 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
-version = "2.4.2"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -2307,9 +2480,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.4.2"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -2317,74 +2490,88 @@ 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-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.133"
+version = "1.0.166"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
+checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.166"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.23",
+]
[[package]]
name = "serde_json"
-version = "1.0.74"
+version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
+checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
dependencies = [
- "itoa 1.0.1",
+ "itoa",
"ryu",
"serde",
]
[[package]]
-name = "serde_urlencoded"
-version = "0.7.0"
+name = "serde_spanned"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 0.4.8",
+ "itoa",
"ryu",
"serde",
]
[[package]]
name = "siphasher"
-version = "0.3.7"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]]
name = "slab"
-version = "0.4.5"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
[[package]]
name = "smallvec"
-version = "1.7.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
-version = "0.4.2"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
"winapi",
@@ -2392,36 +2579,30 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.8.2"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
- "lazy_static",
"new_debug_unreachable",
+ "once_cell",
"parking_lot",
- "phf_shared",
+ "phf_shared 0.10.0",
"precomputed-hash",
"serde",
]
[[package]]
name = "string_cache_codegen"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
"proc-macro2",
"quote",
]
-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
[[package]]
name = "strsim"
version = "0.10.0"
@@ -2429,85 +2610,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
-name = "strum"
-version = "0.18.0"
+name = "syn"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
-
-[[package]]
-name = "strum"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
-
-[[package]]
-name = "strum_macros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "heck",
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
+ "unicode-ident",
]
[[package]]
name = "syn"
-version = "1.0.84"
+version = "2.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
+checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
dependencies = [
"proc-macro2",
"quote",
- "unicode-xid",
+ "unicode-ident",
]
[[package]]
name = "system-deps"
-version = "1.3.2"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
- "heck",
- "pkg-config",
- "strum 0.18.0",
- "strum_macros 0.18.0",
- "thiserror",
- "toml",
- "version-compare 0.0.10",
-]
-
-[[package]]
-name = "system-deps"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
-dependencies = [
- "anyhow",
"cfg-expr",
"heck",
- "itertools 0.10.3",
"pkg-config",
- "strum 0.21.0",
- "strum_macros 0.21.1",
- "thiserror",
"toml",
- "version-compare 0.0.11",
+ "version-compare",
]
+[[package]]
+name = "target-lexicon"
+version = "0.12.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
+
[[package]]
name = "tempdir"
version = "0.3.7"
@@ -2520,23 +2662,23 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.2.0"
+version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
dependencies = [
+ "autocfg",
"cfg-if",
- "libc",
- "rand 0.8.4",
+ "fastrand",
"redox_syscall",
- "remove_dir_all",
- "winapi",
+ "rustix 0.37.22",
+ "windows-sys",
]
[[package]]
name = "tendril"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
dependencies = [
"futf",
"mac",
@@ -2545,90 +2687,120 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.2"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
-version = "1.0.30"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
]
[[package]]
name = "time"
-version = "0.1.43"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
"libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]]
-name = "tinyvec"
-version = "1.5.1"
+name = "time"
+version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+dependencies = [
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+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"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.15.0"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
+ "autocfg",
+ "backtrace",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
+ "socket2",
"tokio-macros",
- "winapi",
+ "windows-sys",
]
[[package]]
name = "tokio-macros"
-version = "1.7.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
]
[[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",
@@ -2636,38 +2808,63 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.6.9"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
- "log",
"pin-project-lite",
"tokio",
+ "tracing",
]
[[package]]
name = "toml"
-version = "0.5.8"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
-name = "tower-service"
-version = "0.3.1"
+name = "toml_edit"
+version = "0.19.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.29"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"pin-project-lite",
@@ -2676,24 +2873,18 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.21"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
- "lazy_static",
+ "once_cell",
]
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "unicase"
@@ -2706,46 +2897,39 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.7"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
[[package]]
name = "unicode-normalization"
-version = "0.1.19"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
[[package]]
name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "url"
-version = "2.2.2"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
"idna",
- "matches",
"percent-encoding",
]
@@ -2763,15 +2947,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version-compare"
-version = "0.0.10"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1"
-
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
[[package]]
name = "version_check"
@@ -2781,11 +2959,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "want"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
dependencies = [
- "log",
"try-lock",
]
@@ -2797,15 +2974,21 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+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.78"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2813,24 +2996,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
- "lazy_static",
"log",
+ "once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
"cfg-if",
"js-sys",
@@ -2840,9 +3023,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2850,28 +3033,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.23",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "web-sys"
-version = "0.3.55"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2909,28 +3092,112 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "winreg"
-version = "0.7.0"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
[[package]]
name = "xdg"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803"
+checksum = "688597db5a750e9cad4511cb94729a078e274308099a0382b5b8203bbc767fee"
dependencies = [
- "dirs",
+ "home",
]
[[package]]
name = "xml-rs"
-version = "0.8.4"
+version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336"
[[package]]
name = "xml5ever"
@@ -2940,6 +3207,23 @@ checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
dependencies = [
"log",
"mac",
- "markup5ever",
- "time",
+ "markup5ever 0.10.1",
+ "time 0.1.45",
]
+
+[[package]]
+name = "xml5ever"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.11.0",
+]
+
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index b5889bcf63..2cbdeaad8c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -2,48 +2,36 @@
, lib
, rustPlatform
, fetchFromGitLab
-, fetchpatch
, cargo
, meson
, ninja
, gettext
-, python3
, pkg-config
, rustc
, glib
-, libhandy
-, gtk3
+, gtk4
+, libadwaita
, appstream-glib
, desktop-file-utils
, dbus
, openssl
, sqlite
, gst_all_1
-, wrapGAppsHook
+, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "gnome-podcasts";
- version = "0.5.1";
+ version = "0.6.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "podcasts";
rev = version;
- sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h";
+ hash = "sha256-jnuy2UUPklfOYObSJPSqNhqqrfUP7N80pPmnw0rlB9A=";
};
- patches = [
- # Fix build with meson 0.61, can be removed on next release.
- # podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
- # podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
- (fetchpatch {
- url = "https://gitlab.gnome.org/World/podcasts/-/commit/6614bb62ecbec7c3b18ea7fe44beb50fe7942b27.patch";
- sha256 = "3TVKFV9V6Ofdajgkdc+j+yxsU21C4JWSc6GjLExSM00=";
- })
- ];
-
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
@@ -55,21 +43,19 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
- gettext
- python3
cargo
rustPlatform.cargoSetupHook
rustc
- wrapGAppsHook
- glib
+ wrapGAppsHook4
+ appstream-glib
+ desktop-file-utils
];
buildInputs = [
- appstream-glib
- desktop-file-utils
glib
- gtk3
- libhandy
+ gtk4
+ libadwaita
+ gettext
dbus
openssl
sqlite
@@ -82,11 +68,6 @@ stdenv.mkDerivation rec {
# tests require network
doCheck = false;
- postPatch = ''
- chmod +x scripts/compile-gschema.py # patchShebangs requires executable file
- patchShebangs scripts/compile-gschema.py scripts/cargo.sh scripts/test.sh
- '';
-
meta = with lib; {
description = "Listen to your favorite podcasts";
homepage = "https://wiki.gnome.org/Apps/Podcasts";
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 208b2154b1..185139da2a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
@@ -9,18 +9,18 @@
buildGoModule rec {
pname = "go-musicfox";
- version = "4.1.2";
+ version = "4.1.4";
src = fetchFromGitHub {
owner = "go-musicfox";
repo = pname;
rev = "v${version}";
- hash = "sha256-ushJZKZPIUo6IO33E9A/CneLHHrE6MtdwpCYR4ivHmo=";
+ hash = "sha256-z4zyLHflmaX5k69KvPTISRIEHVjDmEGZenNXfYd3UUk=";
};
deleteVendor = true;
- vendorHash = "sha256-xzLUWqzDVT+Htw/BHygOJM16uQvWXopyxxHBZQKcOQ8=";
+ vendorHash = "sha256-S1OIrcn55wm/b7B3lz55guuS+mrv5MswNMO2UyfgjRc=";
subPackages = [ "cmd/musicfox.go" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
index c293c3384d..76a1ce2d27 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
+ mainProgram = "helvum";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
index ef0385d511..24aec647c5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, lib
-, mkDerivation
, fetchFromGitHub
, pipewire
, pulseaudio
@@ -20,18 +19,16 @@
assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable one and only one of pulseaudio or pipewire support";
-let
- pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]);
-in
- mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "jamesdsp";
- version = "2.5.1";
+ version = "2.6.0";
+
src = fetchFromGitHub rec {
owner = "Audio4Linux";
repo = "JDSP4Linux";
fetchSubmodules = true;
rev = version;
- hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4=";
+ hash = "sha256-pogBpmGlqQnkXMdp5HbMYISjwMJalSPvEV9MDHj8aec=";
};
nativeBuildInputs = [
@@ -54,7 +51,9 @@ in
gst_all_1.gstreamer
];
- qtWrapperArgs = lib.optionals usePulseaudio [ "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${pluginPath}" ];
+ preFixup = lib.optionals usePulseaudio ''
+ qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ '';
qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
index 590c695577..0bdd80a960 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jagrosh/MusicBot";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ ];
inherit (jre_headless.meta) platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index 005bef77d4..34dbf0318a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux;
+ mainProgram = "lollypop";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
index 7f5e26e8b2..a306b2e8c5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
@@ -1,49 +1,85 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper
-, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, gitUpdater
+, alsa-lib
+, cmake
+, Cocoa
+, CoreAudio
+, Foundation
+, libjack2
+, lhasa
+, makeWrapper
+, perl
+, pkg-config
+, rtmidi
+, SDL2
+, zlib
+, zziplib
+}:
-stdenv.mkDerivation rec {
- version = "1.03.00";
+stdenv.mkDerivation (finalAttrs: {
pname = "milkytracker";
+ version = "1.04.00";
src = fetchFromGitHub {
- owner = "milkytracker";
- repo = "MilkyTracker";
- rev = "v${version}";
- sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk";
+ owner = "milkytracker";
+ repo = "MilkyTracker";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-ta4eV/FGBfgTppJwDam0OKQ7udtlinbWly/FPCE+Qss=";
};
patches = [
+ # Fix crash after querying midi ports
+ # Remove when version > 1.04.00
(fetchpatch {
- name = "CVE-2022-34927.patch";
- url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch";
- hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU=";
+ url = "https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d.patch";
+ hash = "sha256-CmnIwmGGnsnlRrvVAXe2zaQf1CFMB5BJPKmiwGOHgGY=";
})
];
- postPatch = ''
- # https://github.com/milkytracker/MilkyTracker/issues/262
- substituteInPlace CMakeLists.txt \
- --replace 'CMAKE_CXX_STANDARD 98' 'CMAKE_CXX_STANDARD 11'
- '';
+ strictDeps = true;
- nativeBuildInputs = [ cmake pkg-config makeWrapper ];
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ pkg-config
+ ];
- buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ];
+ buildInputs = [
+ lhasa
+ libjack2
+ perl
+ rtmidi
+ SDL2
+ zlib
+ zziplib
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ alsa-lib
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ Cocoa
+ CoreAudio
+ Foundation
+ ];
- # Somehow this does not get set automatically
- cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
-
- postInstall = ''
+ postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml
'';
+ passthru.updateScript = gitUpdater {
+ rev-prefix = "v";
+ };
+
meta = with lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = "https://milkytracker.org/";
license = licenses.gpl3Plus;
- platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = with maintainers; [];
+ platforms = platforms.unix;
+ # ibtool -> real Xcode -> I can't get that, and Ofborg can't test that
+ broken = stdenv.hostPlatform.isDarwin;
+ maintainers = with maintainers; [ OPNA2608 ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix
index 832bd59c4d..2ff8accecb 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
- sourceRoot = "source/src";
+ sourceRoot = "${finalAttrs.src.name}/src";
postPatch = ''
echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h
diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
index bd98c85aa4..4a70f96994 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
- version = "10.16";
+ version = "10.17";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
- sha256 = "sha256-gRI2tzcybJx4ju2LCVc21Gb1ppd40qSA1J0TxNEk/Qs=";
+ sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98=";
stripRoot = false;
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix
index cebf08f190..9f7d8a06e2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
+ mainProgram = "mpc";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix
index 35fe314958..92f66d375d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix
@@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ apfelkuchen6 ];
+ mainProgram = "mpdevil";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix
index 5663070d7d..01940bfc4f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p";
};
- sourceRoot = "source/muse3";
+ sourceRoot = "${src.name}/muse3";
patches = [ ./fix-parallel-building.patch ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
deleted file mode 100644
index 652adb03b6..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, fetchurl, undmg }:
-
-let
- versionComponents = [ "4" "0" "1" ];
- appName = "MuseScore ${builtins.head versionComponents}";
- ref = "230121751";
-in
-
-stdenv.mkDerivation rec {
- pname = "musescore-darwin";
- version = lib.concatStringsSep "." versionComponents;
-
- # The disk image contains the .app and a symlink to /Applications.
- sourceRoot = "${appName}.app";
-
- src = fetchurl {
- url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg";
- hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo=";
- };
-
- buildInputs = [ undmg ];
- installPhase = ''
- mkdir -p "$out/Applications/${appName}.app"
- cp -R . "$out/Applications/${appName}.app"
- chmod a+x "$out/Applications/${appName}.app/Contents/MacOS/mscore"
- '';
-
- meta = with lib; {
- description = "Music notation and composition software";
- homepage = "https://musescore.org/";
- license = licenses.gpl3Only;
- platforms = platforms.darwin;
- maintainers = [];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
index 15828d2572..ecc2ccf875 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
@@ -1,55 +1,146 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja
-, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac
-, qtquickcontrols2, qtscript, qtsvg, qttools
-, qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, wrapQtAppsHook
+, pkg-config
+, ninja
+, alsa-lib
+, alsa-plugins
+, freetype
+, libjack2
+, lame
+, libogg
+, libpulseaudio
+, libsndfile
+, libvorbis
+, portaudio
+, portmidi
+, qtbase
+, qtdeclarative
+, qtgraphicaleffects
+, flac
+, qtquickcontrols
+, qtquickcontrols2
+, qtscript
+, qtsvg
+, qtxmlpatterns
+, qtnetworkauth
+, qtx11extras
, nixosTests
+, darwin
}:
-mkDerivation rec {
+let
+ stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+ # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv
+ # from Qt and the 11.0 SDK frameworks.
+ portaudio' = if stdenv.isDarwin then portaudio.override {
+ stdenv = stdenv';
+ inherit (darwin.apple_sdk_11_0.frameworks)
+ AudioUnit
+ AudioToolbox
+ CoreAudio
+ CoreServices
+ Carbon
+ ;
+ } else portaudio;
+in stdenv'.mkDerivation rec {
pname = "musescore";
- version = "4.0.2";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
- sha256 = "sha256-3NSHUdTyAC/WOhkB6yBrqtV3LV4Hl1m3poB3ojtJMfs=";
+ sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo=";
};
patches = [
- # See https://github.com/musescore/MuseScore/issues/15571
+ # Upstream from some reason wants to install qml files from qtbase in
+ # installPhase, this patch removes this behavior. See:
+ # https://github.com/musescore/MuseScore/issues/18665
(fetchpatch {
- url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch";
- hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw=";
+ url = "https://github.com/doronbehar/MuseScore/commit/f48448a3ede46f5a7ef470940072fbfb6742487c.patch";
+ hash = "sha256-UEc7auscnW0KMfWkLKQtm+UstuTNsuFeoNJYIidIlwM=";
})
];
cmakeFlags = [
- "-DMUSESCORE_BUILD_CONFIG=release"
- # Disable the _usage_ of the `/bin/crashpad_handler` utility. See:
- # https://github.com/musescore/MuseScore/pull/15577
- "-DBUILD_CRASHPAD_CLIENT=OFF"
+ "-DMUSESCORE_BUILD_MODE=release"
+ # Disable the build and usage of the `/bin/crashpad_handler` utility - it's
+ # not useful on NixOS, see:
+ # https://github.com/musescore/MuseScore/issues/15571
+ "-DMUE_BUILD_CRASHPAD_CLIENT=OFF"
# Use our freetype
"-DUSE_SYSTEM_FREETYPE=ON"
+ # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake,
+ # upstream defaults to compiling to x86_64 only, unless this cmake flag is
+ # set
+ "-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON"
+ # Don't bundle qt qml files, relevant really only for darwin, but we set
+ # this for all platforms anyway.
+ "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF"
];
qtWrapperArgs = [
# MuseScore JACK backend loads libjack at runtime.
- "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}"
+ "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}"
+ ] ++ lib.optionals (stdenv.isLinux) [
+ "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib"
+ ] ++ lib.optionals (!stdenv.isDarwin) [
# There are some issues with using the wayland backend, see:
# https://musescore.org/en/node/321936
"--set-default QT_QPA_PLATFORM xcb"
];
- nativeBuildInputs = [ cmake pkg-config ninja ];
+ # HACK `propagatedSandboxProfile` does not appear to actually propagate the
+ # sandbox profile from `qtbase`, see:
+ # https://github.com/NixOS/nixpkgs/issues/237458
+ sandboxProfile = toString qtbase.__propagatedSandboxProfile or null;
+
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ cmake
+ pkg-config
+ ninja
+ ];
buildInputs = [
- alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
- portaudio portmidi flac # tesseract
- qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2
- qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras
+ libjack2
+ freetype
+ lame
+ libogg
+ libpulseaudio
+ libsndfile
+ libvorbis
+ portaudio'
+ portmidi
+ flac
+ qtbase
+ qtdeclarative
+ qtgraphicaleffects
+ qtquickcontrols
+ qtquickcontrols2
+ qtscript
+ qtsvg
+ qtxmlpatterns
+ qtnetworkauth
+ qtx11extras
+ ] ++ lib.optionals stdenv.isLinux [
+ alsa-lib
];
+ postInstall = ''
+ # Remove unneeded bundled libraries and headers
+ rm -r $out/{include,lib}
+ '' + lib.optionalString stdenv.isDarwin ''
+ mkdir -p "$out/Applications"
+ mv "$out/mscore.app" "$out/Applications/mscore.app"
+ mkdir -p $out/bin
+ ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore.
+ '';
+
passthru.tests = nixosTests.musescore;
meta = with lib; {
@@ -57,9 +148,9 @@ mkDerivation rec {
homepage = "https://musescore.org/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ vandenoever turion doronbehar ];
- # Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg
- # file in ./darwin.nix in the meantime.
- platforms = platforms.linux;
+ # on aarch64-linux:
+ # error: cannot convert '' to 'float32x4_t' in assignment
+ broken = (stdenv.isLinux && stdenv.isAarch64);
mainProgram = "mscore";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
index e97bb2c130..e88ce8c9e3 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
+ mainProgram = "ncmpcpp";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
index 069c60c0f8..f98f45a1b5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.13.3";
+ version = "0.13.4";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0=";
+ hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg=";
};
- cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A=";
+ cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw=";
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
index 50af298c2a..0fd4e15861 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
@@ -10,24 +10,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
[[package]]
-name = "anyhow"
-version = "1.0.66"
+name = "android-tzdata"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "async-channel"
-version = "1.7.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -36,9 +51,9 @@ dependencies = [
[[package]]
name = "atomic_refcell"
-version = "0.1.8"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d"
+checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
[[package]]
name = "atty"
@@ -59,15 +74,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "base64"
-version = "0.13.1"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "bit_field"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bitflags"
@@ -83,15 +92,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
-version = "1.12.1"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
@@ -101,25 +110,19 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
-
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-rs"
-version = "0.16.1"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c"
+checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
dependencies = [
"bitflags",
"cairo-sys-rs",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"thiserror",
@@ -127,11 +130,11 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d"
+checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"system-deps",
]
@@ -144,17 +147,21 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
[[package]]
name = "cc"
-version = "1.0.73"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+dependencies = [
+ "libc",
+]
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -163,6 +170,21 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "time 0.1.45",
+ "wasm-bindgen",
+ "winapi",
+]
+
[[package]]
name = "color_quant"
version = "1.1.0"
@@ -171,13 +193,47 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "concurrent-queue"
-version = "1.2.4"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
- "cache-padded",
+ "crossbeam-utils",
]
+[[package]]
+name = "cookie"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+dependencies = [
+ "percent-encoding",
+ "time 0.3.25",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5a18f35792056f8c7c2de9c002e7e4fe44c7b5f66e7d99f46468dbb730a7ea7"
+dependencies = [
+ "cookie",
+ "idna 0.3.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time 0.3.25",
+ "url",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
[[package]]
name = "crc32fast"
version = "1.3.2"
@@ -187,55 +243,15 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
[[package]]
name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
[[package]]
name = "curl"
version = "0.4.44"
@@ -253,9 +269,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.58+curl-7.86.0"
+version = "0.4.65+curl-8.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e"
+checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
dependencies = [
"cc",
"libc",
@@ -278,25 +294,25 @@ dependencies = [
]
[[package]]
-name = "either"
-version = "1.8.0"
+name = "deranged"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
[[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",
]
[[package]]
name = "env_logger"
-version = "0.9.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
"humantime",
@@ -305,27 +321,18 @@ dependencies = [
"termcolor",
]
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
[[package]]
name = "event-listener"
version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-[[package]]
-name = "exr"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded"
-dependencies = [
- "bit_field",
- "flume",
- "half",
- "lebe",
- "miniz_oxide 0.6.2",
- "smallvec",
- "threadpool",
-]
-
[[package]]
name = "fastrand"
version = "1.8.0"
@@ -336,10 +343,19 @@ dependencies = [
]
[[package]]
-name = "field-offset"
-version = "0.3.4"
+name = "fdeflate"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
"rustc_version",
@@ -347,25 +363,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.24"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
- "miniz_oxide 0.5.4",
-]
-
-[[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",
+ "miniz_oxide",
]
[[package]]
@@ -391,39 +394,33 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
[[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",
]
[[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",
@@ -432,15 +429,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",
@@ -453,32 +450,26 @@ 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.28",
]
-[[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-core",
"futures-macro",
@@ -490,57 +481,57 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.16.0"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6"
+checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2"
+checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
dependencies = [
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "gdk4"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358"
+checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9"
dependencies = [
"bitflags",
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"pango",
]
[[package]]
name = "gdk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2"
+checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"pango-sys",
"pkg-config",
@@ -549,15 +540,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
- "wasi",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
@@ -580,21 +569,11 @@ dependencies = [
"temp-dir",
]
-[[package]]
-name = "gif"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
[[package]]
name = "gio"
-version = "0.16.2"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1debf8d0315d69be0153aa76249db3c858ef69b7778ad3cc669e6d370c485"
+checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
dependencies = [
"bitflags",
"futures-channel",
@@ -602,7 +581,7 @@ dependencies = [
"futures-io",
"futures-util",
"gio-sys",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"pin-project-lite",
@@ -612,12 +591,12 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c"
+checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
"winapi",
@@ -634,7 +613,7 @@ dependencies = [
"futures-core",
"futures-executor",
"futures-task",
- "glib-macros 0.15.11",
+ "glib-macros 0.15.13",
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
@@ -645,9 +624,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.16.2"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5abffa711471e015eb93d65d6ea20e7e9f6f7951fc0a1042280439319b2de06"
+checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba"
dependencies = [
"bitflags",
"futures-channel",
@@ -656,9 +635,9 @@ dependencies = [
"futures-task",
"futures-util",
"gio-sys",
- "glib-macros 0.16.0",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-macros 0.16.8",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"once_cell",
"smallvec",
@@ -667,9 +646,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.11"
+version = "0.15.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
+checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
dependencies = [
"anyhow",
"heck",
@@ -677,14 +656,14 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-macros"
-version = "0.16.0"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572"
+checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b"
dependencies = [
"anyhow",
"heck",
@@ -692,7 +671,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -707,9 +686,9 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021"
+checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
dependencies = [
"libc",
"system-deps",
@@ -728,33 +707,33 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3"
+checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "graphene-rs"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8"
+checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
dependencies = [
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-sys",
"libc",
]
[[package]]
name = "graphene-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163"
+checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"pkg-config",
"system-deps",
@@ -762,14 +741,14 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55"
+checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491"
dependencies = [
"bitflags",
"cairo-rs",
"gdk4",
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-rs",
"gsk4-sys",
"libc",
@@ -778,14 +757,14 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d"
+checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"graphene-sys",
"libc",
"pango-sys",
@@ -794,16 +773,16 @@ dependencies = [
[[package]]
name = "gstreamer"
-version = "0.19.1"
+version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e428081934c617115320750b7827f8f13131d9c3ae90b647c14a5d6019f47b4"
+checksum = "85fc926d081923c840403ec5ec3b2157a7cd236a2587c3031a4f0206f13ed500"
dependencies = [
"bitflags",
"cfg-if",
"futures-channel",
"futures-core",
"futures-util",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer-sys",
"libc",
"muldiv",
@@ -818,14 +797,14 @@ dependencies = [
[[package]]
name = "gstreamer-base"
-version = "0.19.1"
+version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "326674197c010e91a98d0f55a032abe22b1fd932456dbcdc3415450b4b653817"
+checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0"
dependencies = [
"atomic_refcell",
"bitflags",
"cfg-if",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
"gstreamer-base-sys",
"libc",
@@ -833,40 +812,40 @@ dependencies = [
[[package]]
name = "gstreamer-base-sys"
-version = "0.19.0"
+version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd55d3858fa65a99286c1cbe8db001f4ce5cff6a038f1c1253f5d99f840970de"
+checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-sys",
"libc",
"system-deps",
]
[[package]]
-name = "gstreamer-player"
-version = "0.19.0"
+name = "gstreamer-play"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796e053b45803544c37a150ae6cbedc8019bc5f410dff78aa6041e7a1a969f2b"
+checksum = "7788ccf29b0311c272c7144e425bff8f15af38bcaca44b7e2229f4d36a266093"
dependencies = [
"bitflags",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
- "gstreamer-player-sys",
+ "gstreamer-play-sys",
"gstreamer-video",
"libc",
"once_cell",
]
[[package]]
-name = "gstreamer-player-sys"
-version = "0.19.0"
+name = "gstreamer-play-sys"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7930b84f995cf393906ee8499d7bf643aba1899ace61e20fee0ea416ad532f32"
+checksum = "a347e1ef8b62364451312f440c233a55ddaec94539d058553335677fa4bb151c"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-sys",
"gstreamer-video-sys",
"libc",
@@ -875,26 +854,26 @@ dependencies = [
[[package]]
name = "gstreamer-sys"
-version = "0.19.0"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbaafc66df32b334d4aa28025fd5d83cadc971e1910205e140ea070f4ac4834f"
+checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "gstreamer-video"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b96daff8a3d853588e61207afac81a4879f3972430f6609721601ab757d7fd"
+checksum = "eb19dcbdd5436483e764318bef157070f192acc5b1199e85878723a9ce33d4e3"
dependencies = [
"bitflags",
"cfg-if",
"futures-channel",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
"gstreamer-base",
"gstreamer-video-sys",
@@ -904,12 +883,12 @@ dependencies = [
[[package]]
name = "gstreamer-video-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066ee44cd8d84f19a18c646128c1890878c034d3fb9f34d8d5f07311bbd9f41f"
+checksum = "7546bc798c898f2083330d81a7efff48f65a31b03873f410538032d26ec0cdc7"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-base-sys",
"gstreamer-sys",
"libc",
@@ -918,9 +897,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.5.1"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47223ddb27033731b71ea841d1b878bd87a275a865f1df60b41505f9e4933d64"
+checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e"
dependencies = [
"bitflags",
"cairo-rs",
@@ -929,7 +908,7 @@ dependencies = [
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-rs",
"gsk4",
"gtk4-macros",
@@ -941,30 +920,30 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.5.0"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b"
+checksum = "42829d621396a69b352d80b952dfcb4ecb4272506b2e10a65457013af1b395a4"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c"
+checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk4-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"graphene-sys",
"gsk4-sys",
"libc",
@@ -973,19 +952,16 @@ dependencies = [
]
[[package]]
-name = "half"
-version = "2.1.0"
+name = "hashbrown"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554"
-dependencies = [
- "crunchy",
-]
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[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"
@@ -1004,18 +980,18 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "html-escape"
-version = "0.2.11"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e7479fa1ef38eb49fb6a42c426be515df2d063f06cb8efd3e50af073dbc26c"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
dependencies = [
"utf8-width",
]
[[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",
@@ -1034,6 +1010,29 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "idna"
version = "0.3.0"
@@ -1045,22 +1044,37 @@ dependencies = [
]
[[package]]
-name = "image"
-version = "0.24.4"
+name = "idna"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
"num-rational",
"num-traits",
"png",
- "scoped_threadpool",
- "tiff",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
]
[[package]]
@@ -1102,24 +1116,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
-dependencies = [
- "rayon",
-]
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "js-sys"
-version = "0.3.60"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
@@ -1130,24 +1135,18 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
-
[[package]]
name = "libadwaita"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3"
+checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
dependencies = [
"bitflags",
"futures-channel",
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"gtk4",
"libadwaita-sys",
"libc",
@@ -1157,14 +1156,14 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952"
+checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
dependencies = [
"gdk4-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gtk4-sys",
"libc",
"pango-sys",
@@ -1173,15 +1172,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.137"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libdbus-sys"
-version = "0.2.2"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
dependencies = [
"pkg-config",
]
@@ -1198,9 +1197,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.8"
+version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
"libc",
@@ -1221,24 +1220,11 @@ dependencies = [
"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"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "malloc_buf"
@@ -1257,35 +1243,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
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"
-version = "0.5.4"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
+ "simd-adler32",
]
[[package]]
@@ -1300,23 +1278,14 @@ dependencies = [
[[package]]
name = "muldiv"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3"
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
[[package]]
name = "netease-cloud-music-api"
-version = "1.0.2"
-source = "git+https://github.com/gmg137/netease-cloud-music-api.git#08e08044a0726bcd2e0d01035b972cb7f7b56ae8"
+version = "1.2.0"
+source = "git+https://github.com/gmg137/netease-cloud-music-api.git?tag=1.2.0#519ab225a64a57e7a21b1060390d3bd6c651d1a8"
dependencies = [
"anyhow",
"base64",
@@ -1333,15 +1302,16 @@ dependencies = [
[[package]]
name = "netease-cloud-music-gtk4"
-version = "2.0.3"
+version = "2.2.0"
dependencies = [
"anyhow",
+ "chrono",
+ "cookie_store",
"env_logger",
"fastrand",
- "fragile",
"gettext-rs",
"gstreamer",
- "gstreamer-player",
+ "gstreamer-play",
"gtk4",
"libadwaita",
"log",
@@ -1375,23 +1345,13 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "objc"
version = "0.2.7"
@@ -1423,15 +1383,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "openssl"
-version = "0.10.42"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
"bitflags",
"cfg-if",
@@ -1444,13 +1404,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.28",
]
[[package]]
@@ -1461,11 +1421,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.77"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -1483,13 +1442,13 @@ dependencies = [
[[package]]
name = "pango"
-version = "0.16.0"
+version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798"
+checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
dependencies = [
"bitflags",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"pango-sys",
@@ -1497,69 +1456,59 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d"
+checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[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 = "paste"
-version = "1.0.9"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -1569,41 +1518,44 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "png"
-version = "0.17.6"
+version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
+checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
dependencies = [
"bitflags",
"crc32fast",
+ "fdeflate",
"flate2",
- "miniz_oxide 0.5.4",
+ "miniz_oxide",
]
[[package]]
name = "polling"
-version = "2.4.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
+ "bitflags",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "winapi",
+ "pin-project-lite",
+ "windows-sys",
]
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "pretty-hex"
@@ -1613,13 +1565,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
[[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]]
@@ -1631,7 +1582,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1648,18 +1599,34 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
[[package]]
-name = "qrcode-generator"
-version = "4.1.6"
+name = "psl-types"
+version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501c33c9127afb867693646b38817bf63a9a756d4b66aefbc5c0d7e5e8c3125a"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
+[[package]]
+name = "publicsuffix"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+dependencies = [
+ "idna 0.3.0",
+ "psl-types",
+]
+
+[[package]]
+name = "qrcode-generator"
+version = "4.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76"
dependencies = [
"html-escape",
"image",
@@ -1674,9 +1641,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@@ -1711,35 +1678,11 @@ dependencies = [
"getrandom",
]
-[[package]]
-name = "rayon"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
@@ -1748,90 +1691,65 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+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 = "ryu"
-version = "1.0.11"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "schannel"
-version = "0.1.20"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "lazy_static",
"windows-sys",
]
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.18"
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 = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
[[package]]
name = "serde"
-version = "1.0.147"
+version = "1.0.181"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.147"
+version = "1.0.181"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "serde_json"
-version = "1.0.87"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -1839,10 +1757,25 @@ dependencies = [
]
[[package]]
-name = "slab"
-version = "0.4.7"
+name = "serde_spanned"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
@@ -1860,34 +1793,36 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "socket2"
-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 = "spin"
-version = "0.9.4"
+name = "syn"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "lock_api",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
]
[[package]]
name = "syn"
-version = "1.0.103"
+version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@@ -1896,9 +1831,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
"cfg-expr",
"heck",
@@ -1907,6 +1842,12 @@ dependencies = [
"version-compare",
]
+[[package]]
+name = "target-lexicon"
+version = "0.12.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+
[[package]]
name = "temp-dir"
version = "0.1.11"
@@ -1915,51 +1856,70 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[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.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[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 = "tiff"
-version = "0.7.3"
+name = "time"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
+ "deranged",
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+dependencies = [
+ "time-core",
]
[[package]]
@@ -1973,17 +1933,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.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
]
[[package]]
@@ -2001,20 +1986,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
]
@@ -2029,23 +2014,17 @@ dependencies = [
"tracing",
]
-[[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.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
@@ -2058,12 +2037,12 @@ dependencies = [
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
- "idna",
+ "idna 0.4.0",
"percent-encoding",
]
@@ -2087,9 +2066,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version-compare"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
[[package]]
name = "version_check"
@@ -2103,6 +2082,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+[[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"
@@ -2111,9 +2096,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2121,24 +2106,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2146,37 +2131,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "weezl"
-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",
-]
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "winapi"
@@ -2210,44 +2180,85 @@ 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-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+dependencies = [
+ "windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807"
+dependencies = [
+ "memchr",
+]
diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
index 8a83da7ff5..9a9d9ee8cc 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
@@ -23,22 +23,26 @@
stdenv.mkDerivation rec {
pname = "netease-cloud-music-gtk";
- version = "2.0.3";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "gmg137";
repo = pname;
rev = version;
- hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc=";
+ hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "netease-cloud-music-api-1.0.2" = "sha256-7Yp2ZBg5wHnDPtdPLwZQnqcSlVuGCrXpV5M/dp/IaOE=";
+ "netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY=";
};
};
+ postPatch = ''
+ cp ${./Cargo.lock} Cargo.lock
+ '';
+
nativeBuildInputs = [
meson
ninja
@@ -75,5 +79,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ diffumist ];
mainProgram = "netease-cloud-music-gtk4";
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix
index fb13ac6ece..56ef666428 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Ogg Opus tags editor";
platforms = platforms.all;
broken = stdenv.isDarwin;
- maintainers = with maintainers; [ kmein SuperSandro2000 ];
+ maintainers = with maintainers; [ kmein ];
license = licenses.bsd3;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
index d57c56a2ad..5cec295d0a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar globin ];
platforms = platforms.linux;
+ mainProgram = "pavucontrol";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix
index e528cc8ade..e13573cf05 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix
@@ -1,8 +1,33 @@
-{ lib, stdenv, curl, jq, htmlq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
+{ lib
+, stdenv
+, curl
+, jq
+, htmlq
+, xorg
+, alsa-lib
+, freetype
+, p7zip
+, autoPatchelfHook
+, writeShellScript
+, zlib
+, libjack2
+, makeWrapper
+, copyDesktopItems
+, makeDesktopItem
+, librsvg
+}:
let
- versionForFile = v: builtins.replaceStrings ["."] [""] v;
+ versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v;
- mkPianoteq = { name, src, version, archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit", ... }:
+ mkPianoteq =
+ { name
+ , mainProgram
+ , startupWMClass
+ , src
+ , version
+ , archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit"
+ , ...
+ }:
stdenv.mkDerivation rec {
inherit src version;
@@ -14,18 +39,34 @@ let
nativeBuildInputs = [
autoPatchelfHook
+ copyDesktopItems
makeWrapper
+ librsvg
];
buildInputs = [
stdenv.cc.cc.lib
- xorg.libX11 # libX11.so.6
- xorg.libXext # libXext.so.6
- alsa-lib # libasound.so.2
- freetype # libfreetype.so.6
+ xorg.libX11 # libX11.so.6
+ xorg.libXext # libXext.so.6
+ alsa-lib # libasound.so.2
+ freetype # libfreetype.so.6
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = pname;
+ exec = ''"${mainProgram}"'';
+ desktopName = mainProgram;
+ icon = "pianoteq";
+ comment = meta.description;
+ categories = [ "AudioVideo" "Audio" "Recorder" ];
+ startupNotify = false;
+ inherit startupWMClass;
+ })
];
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mv -t $out/bin Pianoteq*/${archdir}/*
for f in $out/bin/Pianoteq*; do
@@ -41,18 +82,31 @@ let
}
fi
done
+ install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
+ for size in 16 22 32 48 64 128 256; do
+ dir=$out/share/icons/hicolor/"$size"x"$size"/apps
+ mkdir -p $dir
+ rsvg-convert \
+ --keep-aspect-ratio \
+ --width $size \
+ --height $size \
+ --output $dir/pianoteq.png \
+ ${./pianoteq.svg}
+ done
+ runHook postInstall
'';
meta = with lib; {
homepage = "https://www.modartt.com/pianoteq";
description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments";
license = licenses.unfree;
+ inherit mainProgram;
platforms = [ "x86_64-linux" "aarch64-linux" ];
- maintainers = [ maintainers.mausch ];
+ maintainers = with maintainers; [ mausch ners ];
};
};
- fetchWithCurlScript = { name, sha256, script, impureEnvVars ? [] }:
+ fetchWithCurlScript = { name, hash, script, impureEnvVars ? [ ] }:
stdenv.mkDerivation {
inherit name;
builder = writeShellScript "builder.sh" ''
@@ -81,7 +135,7 @@ let
'';
nativeBuildInputs = [ curl ];
outputHashAlgo = "sha256";
- outputHash = sha256;
+ outputHash = hash;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ impureEnvVars ++ [
# This variable allows the user to pass additional options to curl
@@ -89,9 +143,9 @@ let
];
};
- fetchPianoteqTrial = { name, sha256 }:
+ fetchPianoteqTrial = { name, hash }:
fetchWithCurlScript {
- inherit name sha256;
+ inherit name hash;
script = ''
html=$(
"''${curl[@]}" --silent --request GET \
@@ -122,9 +176,9 @@ let
'';
};
- fetchPianoteqWithLogin = { name, sha256 }:
+ fetchPianoteqWithLogin = { name, hash }:
fetchWithCurlScript {
- inherit name sha256;
+ inherit name hash;
impureEnvVars = [ "NIX_MODARTT_USERNAME" "NIX_MODARTT_PASSWORD" ];
@@ -164,39 +218,58 @@ let
'';
};
-in {
+in
+{
# TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec {
name = "stage-trial";
- version = "8.0.8";
+ mainProgram = "Pianoteq 8 STAGE";
+ startupWMClass = "Pianoteq STAGE Trial";
+ version = "8.1.1";
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
- sha256 = "sha256-dp0bTzzh4aQ2KQ3z9zk+3meKQY4YRYQ86rccHd3+hAQ=";
+ hash = "sha256-jMGv95WiD7UHAuSzKgauLhlsNvO/RWVrHd2Yf3kiUTo=";
};
};
standard-trial = mkPianoteq rec {
name = "standard-trial";
- version = "8.0.8";
+ mainProgram = "Pianoteq 8";
+ startupWMClass = "Pianoteq Trial";
+ version = "8.1.1";
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
- sha256 = "sha256-LSrnrjkEhsX9TirUUFs9tNqH2A3cTt3I7YTfcTT6EP8=";
+ hash = "sha256-pL4tJMV8OTVLT4fwABcImWO+iaVe9gCdDN3rbkL+noc=";
};
};
stage-6 = mkPianoteq rec {
name = "stage-6";
+ mainProgram = "Pianoteq 6 STAGE";
+ startupWMClass = "Pianoteq STAGE";
version = "6.7.3";
archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
- sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
+ hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
};
};
stage-7 = mkPianoteq rec {
name = "stage-7";
+ mainProgram = "Pianoteq 7 STAGE";
+ startupWMClass = "Pianoteq STAGE";
version = "7.3.0";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
- sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
+ hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
+ };
+ };
+ standard-8 = mkPianoteq rec {
+ name = "standard-8";
+ mainProgram = "Pianoteq 8";
+ startupWMClass = "Pianoteq";
+ version = "8.1.1";
+ src = fetchPianoteqWithLogin {
+ name = "pianoteq_linux_v${versionForFile version}.7z";
+ hash = "sha256-vWvo+ctJ0yN6XeJZZVhA3Ul9eWJWAh7Qo54w0TpOiVw=";
};
};
# TODO other paid binaries, I don't own that so I don't know their hash.
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg
new file mode 100644
index 0000000000..0e410d0ff8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix
index 8f11ec809c..e92319127d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libjack2
];
- sourceRoot = "source/picoloop";
+ sourceRoot = "${src.name}/picoloop";
makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
index 111f97969e..d39b0217dc 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix
@@ -2,12 +2,12 @@
let
pname = "plexamp";
- version = "4.7.4";
+ version = "4.8.2";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha512 = "TZ7JNSrUtsqnH+fWIcd1v4fY0jPnMV7nqV/QsbD7ZpqIBCkN3R9WQvc/E9gah163Ab40g9CmdghTGo3v8VW2Rw==";
+ sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA==";
};
appimageContents = appimageTools.extractType2 {
@@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
- changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/50";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh b/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh
index 9671ccab02..470068755d 100755
--- a/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nix wget nix-prefetch-github jq coreutils
+#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils
# shellcheck shell=bash
@@ -27,15 +27,12 @@ fi
version="unstable-$(date +%F)"
# Sources
-src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .sha256)
+src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash)
# Cargo.lock
src="https://raw.githubusercontent.com/jpochyla/psst/$rev"
wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock
-# Use friendlier hashes
-src_hash=$(nix hash to-sri --type sha256 "$src_hash")
-
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix
sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix
sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
index 12230d0601..c4955e15e8 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
@@ -5,14 +5,14 @@
mkDerivation rec {
pname = "qpwgraph";
- version = "0.4.4";
+ version = "0.5.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
- sha256 = "sha256-9HgxFqwmRG2mJy9aTT0MeWdtE+YKG6rU8g24IZFHSRY=";
+ sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18=";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -29,6 +29,6 @@ mkDerivation rec {
homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ kanashimia exi ];
+ maintainers = with maintainers; [ kanashimia exi Scrumplex ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
index ef0c514bce..0ddebe704f 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.80";
+ version = "6.81";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
- x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg=";
- aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI=";
+ x86_64-linux = "sha256-Zzt/g96yAztE0NjVa4uaWXBckSvnGxP0K87Hmq82Mi0=";
+ aarch64-linux = "sha256-PNUUm7xNpPRyQaZm9YDXysJ1yo/IzxUz+kqI6/Z6fpo=";
}.${stdenv.hostPlatform.system};
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix
index acb7ae6e43..97f9b4f028 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "roomeqwizard";
- version = "5.20.5";
+ version = "5.20.13";
src = fetchurl {
- url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
- sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";
+ url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
+ sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix
index d853676264..95fe9c5880 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix
@@ -68,7 +68,7 @@ mkDerivation rec {
buildInputs = [ taglib ] ++ runtimeDeps;
# encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
# add runt-time deps to PATH
postInstall = ''
wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix
new file mode 100644
index 0000000000..e211a57366
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, unzip
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "soundsource";
+ version = "5.6.0";
+
+ src = fetchurl {
+ url = "https://web.archive.org/web/20230707140658/https://rogueamoeba.com/soundsource/download/SoundSource.zip";
+ sha256 = "1avm1jr75mjbps0fad3glshrwl42vnhc0f9sak038ny85f3apyi0";
+ };
+ dontUnpack = true;
+
+ nativeBuildInputs = [ unzip ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/Applications
+ unzip -d $out/Applications $src
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Sound controller for macOS";
+ homepage = "https://rogueamoeba.com/soundsource";
+ license = licenses.unfree;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ maintainers = with maintainers; [ emilytrau Enzime ];
+ platforms = platforms.darwin;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
index 8bce5c83a6..415bf352ca 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix
@@ -12,7 +12,7 @@ let
pname = "rnnoise-nu";
version = "unstable-07-10-2019";
src = speech-denoiser-src;
- sourceRoot = "source/rnnoise";
+ sourceRoot = "${speech-denoiser-src.name}/rnnoise";
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ];
installTargets = [ "install-rnnoise-nu" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix
index 1935b3fcf2..d9a0babb68 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
description = "Native Spotify client for the GNOME desktop";
homepage = "https://github.com/xou816/spot";
license = licenses.mit;
- maintainers = with maintainers; [ tomfitzhenry ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
index 7fcb3aad71..69c260a7bd 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
@@ -9,17 +9,17 @@
stdenv.mkDerivation {
inherit pname;
- version = "1.1.97.962.g24733a46";
+ version = "1.2.15.828.g79f41970";
src = if stdenv.isAarch64 then (
fetchurl {
- url = "https://web.archive.org/web/20221101120432/https://download.scdn.co/SpotifyARM64.dmg";
- sha256 = "sha256-8WDeVRgaZXuUa95PNa15Cuul95ynklBaZpuq+U1eGTU=";
+ url = "https://web.archive.org/web/20230710021420/https://download.scdn.co/SpotifyARM64.dmg";
+ sha256 = "sha256-1X0Mln47uYs5l1t+5BFBk5lLnXZgnSqZLX41yA91I0s=";
})
else (
fetchurl {
- url = "https://web.archive.org/web/20221101120647/https://download.scdn.co/Spotify.dmg";
- sha256 = "sha256-uPpD8Hv70FlaSjtt9rq5ntI64agxG8+/LNEvRe4ocJ4=";
+ url = "https://web.archive.org/web/20230710021726/https://download.scdn.co/Spotify.dmg";
+ sha256 = "sha256-CmKZx8Ad0w6STBN0O4Sc4XqidOM6fCl74u2sI8w+Swk=";
});
nativeBuildInputs = [ undmg ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 398d3a6ad9..df6d762c65 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -15,6 +15,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "spotify";
};
in if stdenv.isDarwin
diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh
index d12213f834..0a53ef9881 100755
--- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh
@@ -12,8 +12,7 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then
exit 0
fi
-srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .sha256)
-srcHash=$(nix hash to-sri --type sha256 "$srcHash")
+srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .hash)
update-source-version squeezelite "$latestVersion" "$srcHash" --rev="${latestRev}"
diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index ee9cf4ff3d..25193d1b78 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
@@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ peterhoeg ];
# upstream says darwin should work but they lack maintainers as of 0.6.6
platforms = platforms.linux;
+ mainProgram = "strawberry";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
index efac517024..4360defc18 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
+ mainProgram = "tageditor";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix
index e507618830..9cd9946be6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw=";
};
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
nativeBuildInputs = [
cmake
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
index 8e6ab17fbd..04dd28e0b5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
@@ -49,14 +49,14 @@
stdenv.mkDerivation rec {
pname = "tenacity";
- version = "1.3-beta2";
+ version = "1.3.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "tenacityteam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9gWoqFa87neIvRnezWI3RyCAOU4wKEHPn/Hgj3/fol0=";
+ sha256 = "sha256-wesnay+UQiPSDaRuSo86MgHdElN4s0rPIvokZhKM7GI=";
};
postPatch = ''
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- rm $out/audacity
+ rm $out/tenacity
wrapProgram "$out/bin/tenacity" \
--suffix AUDACITY_PATH : "$out/share/tenacity" \
--suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix
index 93922313dd..e70f952175 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix
@@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "transcribe";
- version = "9.21";
+ version = "9.25";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchzip
{
- url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.21.0.tar.gz";
- sha256 = "sha256-M0hOJOsTTRxPef8rTO+/KpiP4lr8mtplS9KITaFOFPA=";
+ url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz";
+ sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I=";
}
else throw "Platform not supported";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix
index e92b2f1318..eb179bfa54 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix
@@ -95,6 +95,6 @@ in python3.pkgs.buildPythonApplication rec {
description = "A CD ripper aiming for accuracy over speed";
maintainers = with maintainers; [ emily ];
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
index 5e00a01633..63ecd18e46 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8=";
};
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
postPatch = ''
substituteInPlace Misc/Config.cpp --replace /usr $out
diff --git a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix
index 802af13137..91cf74e65d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix
@@ -34,5 +34,6 @@ appimageTools.wrapType2 rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
maintainers = [ maintainers.aacebedo ];
+ mainProgram = "youtube-music";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix
index be2b85199b..534bee41a9 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix
@@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec {
license = licenses.cc0;
platforms = platforms.linux;
maintainers = [ maintainers.lgcl ];
+ mainProgram = "ytmdesktop";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix
index f55ba109ba..efe99f8455 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.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = pname;
rev = "v${version}";
- hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0=";
+ hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ=";
};
- cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU=";
+ cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg=";
nativeBuildInputs = [
cmake
diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix
index 77cf29eb4d..d801d81f86 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "unifi-protect-backup";
- version = "0.9.1";
+ version = "0.9.4";
format = "pyproject";
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "ep1cman";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-L7uM5v2CYGFHYxzBUKlMF+ChtjBM24GZ8NuyoQaOU6U=";
+ hash = "sha256-MFg518iodxdHbr7k5kpkTWI59Kk7pPwyIVswVcjasl8=";
};
pythonRelaxDeps = [
@@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec {
aiorun
aiosqlite
apprise
+ async-lru
click
expiring-dict
python-dateutil
diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
index 8c8d399d7d..7870b3c11e 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
@@ -4,6 +4,7 @@
, wrapQtAppsHook
, borgbackup
, qt5
+, stdenv
}:
python3Packages.buildPythonApplication rec {
@@ -19,6 +20,10 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ wrapQtAppsHook ];
+ buildInputs = lib.optionals stdenv.isLinux [
+ qt5.qtwayland
+ ];
+
propagatedBuildInputs = with python3Packages; [
peewee
pyqt5
@@ -29,8 +34,6 @@ python3Packages.buildPythonApplication rec {
appdirs
setuptools
platformdirs
- ] ++ lib.optionals stdenv.isLinux [
- qt5.qtwayland
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix
new file mode 100644
index 0000000000..e208666bfe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix
@@ -0,0 +1,27 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+ pname = "aperture";
+ version = "0.2-beta";
+
+ src = fetchFromGitHub {
+ owner = "lightninglabs";
+ repo = "aperture";
+ rev = "v${version}";
+ hash = "sha256-l1fpjCAg+1PGNotKrjFLoYOMEzRNXC1mfdjRPfE0DsY=";
+ };
+
+ vendorHash = "sha256-tWFFmRSDUZXijAUTgR8k4EERHwIEBOyZZZ9BGXso/tU=";
+
+ subPackages = [ "cmd/aperture" ];
+
+ meta = with lib; {
+ description = "L402 (Lightning HTTP 402) Reverse Proxy";
+ homepage = "https://github.com/lightninglabs/aperture";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sputn1ck ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
index c98e3e85ed..5a8ab4f0a4 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
- version = "1.10.3";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-a2+Rh+Pxy4pCU9eo4L3986+yVvjrNZY2bFQiUpVuYqM=";
+ sha256 = "sha256-fKw1RKylpbejzSTO3Ti2toJiSwqtmNC1e2XDAYa9L/0=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
index 58bf97870f..54ef0abbe5 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -8,9 +8,9 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.28"; sha256 = "1zwixvm22nh76ril7w2rkwdvikm76b822iscscpyp6nrfl8mzqi0"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
- (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.27"; sha256 = "14bgi3p31v8ypf1lqnc5xkpzfd2cj5a23v2wv1m38jl6ng2v6vqp"; })
+ (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix
index 2dd063e3ee..a68e230c24 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.48.0";
+ version = "2.48.1";
in
buildGoModule {
inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
- hash = "sha256-L2uQJdC0Z5biv//QzgjPpygsk8GlUoQsSNH4Cp5TvhU=";
+ hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg=";
fetchSubmodules = true;
};
- vendorHash = "sha256-wzA75+BL5Fm6X13dF/ou7qvMEdeaImmSs2lypH4hOTY=";
+ vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix
new file mode 100644
index 0000000000..2e1b6563af
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix
@@ -0,0 +1,73 @@
+{ fetchFromGitHub
+, stdenv
+, makeDesktopItem
+, lib
+, openssl
+, boost
+, curl
+, libevent
+, libzip
+, qrencode
+, qtbase
+, qttools
+, wrapQtAppsHook
+, autoreconfHook
+, pkg-config
+, libtool
+, miniupnpc
+, hexdump
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gridcoin-research";
+ version = "5.4.5.0";
+
+ src = fetchFromGitHub {
+ owner = "gridcoin-community";
+ repo = "Gridcoin-Research";
+ rev = "${version}";
+ sha256 = "1a174m7821c7d3yh9lyh0r3ds6qn06x16aa1qxcbrqyxxc127yky";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ wrapQtAppsHook
+ autoreconfHook
+ libtool
+ hexdump
+ ];
+
+ buildInputs = [
+ qttools
+ qtbase
+ qrencode
+ libevent
+ libzip
+ openssl
+ boost
+ miniupnpc
+ curl
+ ];
+
+ configureFlags = [
+ "--with-gui=qt5"
+ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+ "--with-qrencode"
+ "--with-boost-libdir=${boost.out}/lib"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "A POS-based cryptocurrency that rewards users for participating on the BOINC network";
+ longDescription = ''
+ A POS-based cryptocurrency that rewards users for participating on the BOINC network,
+ using peer-to-peer technology to operate with no central authority - managing transactions,
+ issuing money and contributing to scientific research are carried out collectively by the network
+ '';
+ homepage = "https://gridcoin.us/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gigglesquid ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix
index 4f53eaf580..2bc3a683ef 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, pkg-config
-, boost, miniupnpc, openssl, unbound
+, boost179, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
, easyloggingpp
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
- boost miniupnpc openssl unbound
+ boost179 miniupnpc openssl unbound
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
protobuf
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 858931058f..bf84ab1ba4 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.62.2";
+ version = "2.64.2";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
- hash = "sha256-Rb611v2QirGmJ01lZj6F3iHLTPI2eJp5acZDEQ4Ude0==";
+ hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
index a5abf52402..3930b50220 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
@@ -254,9 +254,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "array-bytes"
-version = "4.1.0"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
+checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd"
[[package]]
name = "arrayref"
@@ -523,7 +523,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"hash-db",
"log",
@@ -679,9 +679,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "bounded-collections"
-version = "0.1.5"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370"
+checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6"
dependencies = [
"log",
"parity-scale-codec",
@@ -932,13 +932,13 @@ dependencies = [
[[package]]
name = "cid"
-version = "0.8.6"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
+checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
dependencies = [
"core2",
"multibase",
- "multihash 0.16.2",
+ "multihash",
"serde",
"unsigned-varint",
]
@@ -1105,15 +1105,21 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "comfy-table"
-version = "6.0.0"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121d8a5b0346092c18a4b2fd6f620d7a06f0eb7ac0a45860939a0884bc579c56"
+checksum = "f9e1f7e5d046697d34b593bdba8ee31f4649366e452a2ccabb3baf3511e503d1"
dependencies = [
"strum",
"strum_macros",
"unicode-width",
]
+[[package]]
+name = "common-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
+
[[package]]
name = "concurrent-queue"
version = "1.2.2"
@@ -1457,9 +1463,9 @@ dependencies = [
[[package]]
name = "crypto-bigint"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
dependencies = [
"generic-array 0.14.6",
"rand_core 0.6.4",
@@ -1570,7 +1576,7 @@ dependencies = [
"cfg-if",
"fiat-crypto",
"packed_simd_2",
- "platforms 3.0.2",
+ "platforms",
"subtle",
"zeroize",
]
@@ -1702,9 +1708,9 @@ dependencies = [
[[package]]
name = "der"
-version = "0.7.1"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
dependencies = [
"const-oid",
"zeroize",
@@ -1841,6 +1847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
"block-buffer 0.10.3",
+ "const-oid",
"crypto-common",
"subtle",
]
@@ -1918,18 +1925,39 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+[[package]]
+name = "docify"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18b972b74c30cbe838fc6a07665132ff94f257350e26fd01d80bc59ee7fcf129"
+dependencies = [
+ "docify_macros",
+]
+
+[[package]]
+name = "docify_macros"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c93004d1011191c56df9e853dca42f2012e7488638bcd5078935f5ce43e06cf3"
+dependencies = [
+ "common-path",
+ "derive-syn-parse",
+ "lazy_static",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.16",
+ "termcolor",
+ "walkdir",
+]
+
[[package]]
name = "downcast"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
[[package]]
name = "dtoa"
version = "1.0.2"
@@ -1977,14 +2005,16 @@ dependencies = [
[[package]]
name = "ecdsa"
-version = "0.16.1"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
dependencies = [
- "der 0.7.1",
- "elliptic-curve 0.13.2",
+ "der 0.7.7",
+ "digest 0.10.6",
+ "elliptic-curve 0.13.5",
"rfc6979 0.4.0",
- "signature 2.0.0",
+ "signature 2.1.0",
+ "spki 0.7.2",
]
[[package]]
@@ -2054,17 +2084,17 @@ dependencies = [
[[package]]
name = "elliptic-curve"
-version = "0.13.2"
+version = "0.13.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
dependencies = [
"base16ct 0.2.0",
- "crypto-bigint 0.5.1",
+ "crypto-bigint 0.5.2",
"digest 0.10.6",
"ff 0.13.0",
"generic-array 0.14.6",
"group 0.13.0",
- "pkcs8 0.10.1",
+ "pkcs8 0.10.2",
"rand_core 0.6.4",
"sec1 0.7.1",
"subtle",
@@ -2172,7 +2202,7 @@ dependencies = [
[[package]]
name = "erasure_coding_fuzzer"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"honggfuzz",
"polkadot-erasure-coding",
@@ -2257,19 +2287,6 @@ dependencies = [
"quote",
]
-[[package]]
-name = "expander"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84"
-dependencies = [
- "blake2",
- "fs-err",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "expander"
version = "2.0.0"
@@ -2486,25 +2503,10 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
]
@@ -2527,7 +2529,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2552,7 +2554,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"Inflector",
"array-bytes",
@@ -2586,12 +2588,13 @@ dependencies = [
"sp-database",
"sp-externalities",
"sp-inherents",
+ "sp-io",
"sp-keystore",
"sp-runtime",
"sp-state-machine",
- "sp-std",
"sp-storage",
"sp-trie",
+ "sp-wasm-interface",
"thiserror",
"thousands",
]
@@ -2599,7 +2602,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2610,7 +2613,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2627,7 +2630,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -2643,9 +2646,9 @@ dependencies = [
[[package]]
name = "frame-metadata"
-version = "15.1.0"
+version = "16.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
+checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
dependencies = [
"cfg-if",
"parity-scale-codec",
@@ -2656,7 +2659,7 @@ dependencies = [
[[package]]
name = "frame-remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-recursion",
"futures",
@@ -2677,7 +2680,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"bitflags",
"environmental",
@@ -2686,7 +2689,7 @@ dependencies = [
"impl-trait-for-tuples",
"k256",
"log",
- "once_cell",
+ "macro_magic",
"parity-scale-codec",
"paste",
"scale-info",
@@ -2711,13 +2714,15 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"Inflector",
"cfg-expr",
"derive-syn-parse",
+ "expander 2.0.0",
"frame-support-procedural-tools",
"itertools",
+ "macro_magic",
"proc-macro-warning",
"proc-macro2",
"quote",
@@ -2727,7 +2732,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2739,7 +2744,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro2",
"quote",
@@ -2749,7 +2754,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-executive",
@@ -2769,24 +2774,26 @@ dependencies = [
"sp-state-machine",
"sp-std",
"sp-version",
+ "static_assertions",
"trybuild",
]
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
+ "serde",
]
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"cfg-if",
"frame-support",
@@ -2805,7 +2812,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2820,7 +2827,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2829,7 +2836,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2867,9 +2874,9 @@ dependencies = [
[[package]]
name = "fs_extra"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "funty"
@@ -3011,15 +3018,15 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"chrono",
"frame-election-provider-support",
"frame-support",
"frame-system",
- "git2",
"num-format",
"pallet-staking",
+ "sp-staking",
]
[[package]]
@@ -3105,19 +3112,6 @@ dependencies = [
"stable_deref_trait",
]
-[[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]]
name = "glob"
version = "0.3.0"
@@ -3443,21 +3437,23 @@ dependencies = [
"rustls 0.20.7",
"rustls-native-certs",
"tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.2",
"webpki-roots",
]
[[package]]
-name = "hyper-tls"
-version = "0.5.0"
+name = "hyper-rustls"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
dependencies = [
- "bytes",
+ "http",
"hyper",
- "native-tls",
+ "log",
+ "rustls 0.21.2",
+ "rustls-native-certs",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls 0.24.1",
]
[[package]]
@@ -3739,7 +3735,7 @@ dependencies = [
"soketto",
"thiserror",
"tokio",
- "tokio-rustls",
+ "tokio-rustls 0.23.2",
"tokio-util",
"tracing",
"webpki-roots",
@@ -3781,7 +3777,7 @@ checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad"
dependencies = [
"async-trait",
"hyper",
- "hyper-rustls",
+ "hyper-rustls 0.23.0",
"jsonrpsee-core",
"jsonrpsee-types",
"rustc-hash",
@@ -3855,13 +3851,13 @@ dependencies = [
[[package]]
name = "k256"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
dependencies = [
"cfg-if",
- "ecdsa 0.16.1",
- "elliptic-curve 0.13.2",
+ "ecdsa 0.16.7",
+ "elliptic-curve 0.13.5",
"once_cell",
"sha2 0.10.2",
]
@@ -3874,7 +3870,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "kusama-runtime"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -3927,6 +3923,7 @@ dependencies = [
"pallet-society",
"pallet-staking",
"pallet-staking-runtime-api",
+ "pallet-state-trie-migration",
"pallet-timestamp",
"pallet-tips",
"pallet-transaction-payment",
@@ -3980,7 +3977,7 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -4033,6 +4030,17 @@ dependencies = [
"kvdb",
]
+[[package]]
+name = "landlock"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068"
+dependencies = [
+ "enumflags2",
+ "libc",
+ "thiserror",
+]
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -4071,18 +4079,6 @@ dependencies = [
"rle-decode-fast",
]
-[[package]]
-name = "libgit2-sys"
-version = "0.14.2+1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
[[package]]
name = "libloading"
version = "0.7.2"
@@ -4099,12 +4095,6 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
[[package]]
name = "libp2p"
version = "0.51.3"
@@ -4177,7 +4167,7 @@ dependencies = [
"libp2p-identity",
"log",
"multiaddr",
- "multihash 0.17.0",
+ "multihash",
"multistream-select",
"once_cell",
"parking_lot 0.12.1",
@@ -4237,7 +4227,7 @@ dependencies = [
"ed25519-dalek",
"log",
"multiaddr",
- "multihash 0.17.0",
+ "multihash",
"quick-protobuf",
"rand 0.8.5",
"sha2 0.10.2",
@@ -4484,7 +4474,7 @@ dependencies = [
"libp2p-identity",
"libp2p-noise",
"log",
- "multihash 0.17.0",
+ "multihash",
"quick-protobuf",
"quick-protobuf-codec",
"rand 0.8.5",
@@ -4600,7 +4590,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
dependencies = [
"cc",
- "libc",
"pkg-config",
"vcpkg",
]
@@ -4668,24 +4657,14 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
dependencies = [
- "cfg-if",
"serde",
"value-bag",
]
-[[package]]
-name = "lru"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
-dependencies = [
- "hashbrown 0.12.3",
-]
-
[[package]]
name = "lru"
version = "0.9.0"
@@ -4742,6 +4721,53 @@ dependencies = [
"libc",
]
+[[package]]
+name = "macro_magic"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439"
+dependencies = [
+ "macro_magic_core",
+ "macro_magic_macros",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "macro_magic_core"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406"
+dependencies = [
+ "derive-syn-parse",
+ "macro_magic_core_macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "macro_magic_core_macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.16",
+]
+
+[[package]]
+name = "macro_magic_macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81"
+dependencies = [
+ "macro_magic_core",
+ "quote",
+ "syn 2.0.16",
+]
+
[[package]]
name = "maplit"
version = "1.0.2"
@@ -4856,12 +4882,6 @@ dependencies = [
"hash-db",
]
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
[[package]]
name = "merlin"
version = "2.0.1"
@@ -4931,7 +4951,7 @@ dependencies = [
[[package]]
name = "mmr-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"log",
@@ -4950,7 +4970,7 @@ dependencies = [
[[package]]
name = "mmr-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -5001,7 +5021,7 @@ dependencies = [
"data-encoding",
"log",
"multibase",
- "multihash 0.17.0",
+ "multihash",
"percent-encoding",
"serde",
"static_assertions",
@@ -5022,9 +5042,9 @@ dependencies = [
[[package]]
name = "multihash"
-version = "0.16.2"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
dependencies = [
"blake2b_simd",
"blake2s_simd",
@@ -5037,19 +5057,6 @@ dependencies = [
"unsigned-varint",
]
-[[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.2",
- "unsigned-varint",
-]
-
[[package]]
name = "multihash-derive"
version = "0.8.0"
@@ -5127,24 +5134,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
[[package]]
name = "netlink-packet-core"
version = "0.4.2"
@@ -5391,51 +5380,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-[[package]]
-name = "openssl"
-version = "0.10.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "openssl-probe"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
-[[package]]
-name = "openssl-sys"
-version = "0.9.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
[[package]]
name = "orchestra"
version = "0.0.5"
@@ -5527,13 +5477,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
dependencies = [
"cfg-if",
- "libm 0.1.4",
+ "libm",
]
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5548,7 +5498,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -5564,7 +5514,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -5578,7 +5528,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5602,7 +5552,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5622,7 +5572,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-election-provider-support",
"frame-remote-externalities",
@@ -5641,7 +5591,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5656,7 +5606,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -5675,7 +5625,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"binary-merkle-tree",
@@ -5699,7 +5649,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5717,7 +5667,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5736,7 +5686,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5753,7 +5703,7 @@ dependencies = [
[[package]]
name = "pallet-conviction-voting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5770,7 +5720,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5788,7 +5738,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5811,7 +5761,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5824,7 +5774,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5836,14 +5786,16 @@ dependencies = [
"sp-io",
"sp-npos-elections",
"sp-runtime",
+ "sp-staking",
"sp-std",
]
[[package]]
name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
+ "docify",
"frame-benchmarking",
"frame-election-provider-support",
"frame-support",
@@ -5860,7 +5812,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5883,7 +5835,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5899,7 +5851,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5919,7 +5871,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5936,7 +5888,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5953,7 +5905,7 @@ dependencies = [
[[package]]
name = "pallet-message-queue"
version = "7.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5972,7 +5924,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5989,7 +5941,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6005,7 +5957,7 @@ dependencies = [
[[package]]
name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6021,7 +5973,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -6038,7 +5990,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6058,7 +6010,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"pallet-nomination-pools",
"parity-scale-codec",
@@ -6069,7 +6021,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -6086,7 +6038,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6110,7 +6062,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6127,7 +6079,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6142,7 +6094,7 @@ dependencies = [
[[package]]
name = "pallet-ranked-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6160,7 +6112,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6175,7 +6127,7 @@ dependencies = [
[[package]]
name = "pallet-referenda"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -6194,7 +6146,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6211,7 +6163,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -6232,7 +6184,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6248,13 +6200,18 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
+ "frame-benchmarking",
"frame-support",
"frame-system",
+ "hex-literal 0.3.4",
+ "log",
"parity-scale-codec",
"rand_chacha 0.2.2",
"scale-info",
+ "sp-arithmetic",
+ "sp-io",
"sp-runtime",
"sp-std",
]
@@ -6262,7 +6219,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -6285,7 +6242,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6296,7 +6253,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"log",
"sp-arithmetic",
@@ -6305,7 +6262,7 @@ dependencies = [
[[package]]
name = "pallet-staking-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -6314,7 +6271,7 @@ dependencies = [
[[package]]
name = "pallet-state-trie-migration"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6331,7 +6288,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6346,7 +6303,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6364,7 +6321,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6383,7 +6340,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-support",
"frame-system",
@@ -6399,7 +6356,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6415,7 +6372,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.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6427,7 +6384,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6444,7 +6401,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6459,7 +6416,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6475,7 +6432,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6490,7 +6447,7 @@ dependencies = [
[[package]]
name = "pallet-whitelist"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6504,7 +6461,7 @@ dependencies = [
[[package]]
name = "pallet-xcm"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bounded-collections",
"frame-benchmarking",
@@ -6528,7 +6485,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6573,9 +6530,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967"
dependencies = [
"arrayvec 0.7.2",
"bitvec",
@@ -6588,9 +6545,9 @@ dependencies = [
[[package]]
name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -6827,12 +6784,12 @@ dependencies = [
[[package]]
name = "pkcs8"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
- "der 0.7.1",
- "spki 0.7.0",
+ "der 0.7.7",
+ "spki 0.7.2",
]
[[package]]
@@ -6841,12 +6798,6 @@ version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
-[[package]]
-name = "platforms"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
-
[[package]]
name = "platforms"
version = "3.0.2"
@@ -6855,14 +6806,15 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
[[package]]
name = "polkadot"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_cmd",
"color-eyre",
"nix 0.26.2",
"polkadot-cli",
"polkadot-core-primitives",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-overseer",
"substrate-rpc-client",
"tempfile",
@@ -6872,11 +6824,12 @@ dependencies = [
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
"futures",
+ "futures-timer",
"log",
"polkadot-node-jaeger",
"polkadot-node-metrics",
@@ -6898,12 +6851,13 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"bitvec",
"env_logger 0.9.0",
"futures",
+ "futures-timer",
"log",
"maplit",
"polkadot-node-network-protocol",
@@ -6923,7 +6877,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"derive_more",
@@ -6952,7 +6906,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
@@ -6981,14 +6935,14 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"clap 4.2.5",
"frame-benchmarking-cli",
"futures",
"log",
- "polkadot-client",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-metrics",
"polkadot-performance-test",
"polkadot-service",
@@ -7009,53 +6963,9 @@ dependencies = [
"try-runtime-cli",
]
-[[package]]
-name = "polkadot-client"
-version = "0.9.43"
-dependencies = [
- "async-trait",
- "frame-benchmarking",
- "frame-benchmarking-cli",
- "frame-system",
- "frame-system-rpc-runtime-api",
- "futures",
- "kusama-runtime",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "polkadot-core-primitives",
- "polkadot-node-core-parachains-inherent",
- "polkadot-primitives",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "rococo-runtime",
- "sc-client-api",
- "sc-consensus",
- "sc-executor",
- "sc-service",
- "sp-api",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-blockchain",
- "sp-consensus",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-consensus-grandpa",
- "sp-core",
- "sp-inherents",
- "sp-keyring",
- "sp-mmr-primitives",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-storage",
- "sp-timestamp",
- "sp-transaction-pool",
- "westend-runtime",
-]
-
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"always-assert",
"assert_matches",
@@ -7084,7 +6994,7 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -7095,7 +7005,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-channel",
@@ -7128,7 +7038,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"criterion",
"parity-scale-codec",
@@ -7142,7 +7052,7 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -7169,7 +7079,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"always-assert",
"assert_matches",
@@ -7198,7 +7108,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"futures",
"parity-scale-codec",
@@ -7217,7 +7127,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -7256,7 +7166,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"bitvec",
@@ -7269,6 +7179,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.12.1",
"polkadot-erasure-coding",
+ "polkadot-node-jaeger",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
@@ -7285,7 +7196,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"bitvec",
@@ -7311,7 +7222,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -7327,7 +7238,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -7351,7 +7262,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"futures",
"maplit",
@@ -7370,7 +7281,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"futures",
@@ -7391,7 +7302,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"fatality",
@@ -7419,7 +7330,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"async-trait",
"futures",
@@ -7435,7 +7346,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"fatality",
@@ -7456,7 +7367,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"always-assert",
"assert_matches",
@@ -7467,6 +7378,9 @@ dependencies = [
"parity-scale-codec",
"pin-project",
"polkadot-core-primitives",
+ "polkadot-node-core-pvf-common",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-metrics",
"polkadot-node-primitives",
"polkadot-parachain",
@@ -7479,13 +7393,15 @@ dependencies = [
"sp-wasm-interface",
"substrate-build-script-utils",
"tempfile",
+ "test-parachain-adder",
+ "test-parachain-halt",
"tokio",
"tracing-gum",
]
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"futures",
"futures-timer",
@@ -7507,30 +7423,66 @@ dependencies = [
]
[[package]]
-name = "polkadot-node-core-pvf-worker"
-version = "0.9.43"
+name = "polkadot-node-core-pvf-common"
+version = "1.0.0"
dependencies = [
"assert_matches",
"cpu-time",
"futures",
+ "landlock",
"libc",
"parity-scale-codec",
- "polkadot-node-core-pvf",
"polkadot-parachain",
"polkadot-primitives",
- "rayon",
"sc-executor",
"sc-executor-common",
"sc-executor-wasmtime",
"sp-core",
"sp-externalities",
"sp-io",
- "sp-maybe-compressed-blob",
"sp-tracing",
"substrate-build-script-utils",
"tempfile",
- "test-parachain-adder",
- "test-parachain-halt",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-execute-worker"
+version = "1.0.0"
+dependencies = [
+ "cpu-time",
+ "futures",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "rayon",
+ "sp-core",
+ "sp-maybe-compressed-blob",
+ "sp-tracing",
+ "tikv-jemalloc-ctl",
+ "tokio",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkadot-node-core-pvf-prepare-worker"
+version = "1.0.0"
+dependencies = [
+ "futures",
+ "libc",
+ "parity-scale-codec",
+ "polkadot-node-core-pvf-common",
+ "polkadot-parachain",
+ "polkadot-primitives",
+ "rayon",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
+ "sp-io",
+ "sp-maybe-compressed-blob",
+ "sp-tracing",
"tikv-jemalloc-ctl",
"tokio",
"tracing-gum",
@@ -7538,7 +7490,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"futures",
"lru 0.9.0",
@@ -7559,7 +7511,7 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"lazy_static",
"log",
@@ -7576,7 +7528,7 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_cmd",
"bs58",
@@ -7603,7 +7555,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"async-channel",
"async-trait",
@@ -7626,7 +7578,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bounded-vec",
"futures",
@@ -7648,7 +7600,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -7657,7 +7609,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"async-trait",
"futures",
@@ -7675,7 +7627,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"async-trait",
"derive_more",
@@ -7697,7 +7649,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -7738,7 +7690,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -7764,7 +7716,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bounded-collections",
"derive_more",
@@ -7780,13 +7732,13 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"env_logger 0.9.0",
"kusama-runtime",
"log",
"polkadot-erasure-coding",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-primitives",
"polkadot-primitives",
"quote",
@@ -7797,7 +7749,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"hex-literal 0.4.1",
@@ -7822,7 +7774,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives-test-helpers"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"polkadot-primitives",
"rand 0.8.5",
@@ -7834,7 +7786,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"jsonrpsee",
"mmr-rpc",
@@ -7865,7 +7817,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -7967,7 +7919,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -8018,7 +7970,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -8031,7 +7983,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bs58",
"frame-benchmarking",
@@ -8043,7 +7995,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"bitflags",
@@ -8097,13 +8049,15 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
"env_logger 0.9.0",
+ "frame-benchmarking",
"frame-benchmarking-cli",
"frame-support",
+ "frame-system",
"frame-system-rpc-runtime-api",
"futures",
"hex-literal 0.4.1",
@@ -8117,14 +8071,16 @@ dependencies = [
"pallet-babe",
"pallet-im-online",
"pallet-staking",
+ "pallet-transaction-payment",
"pallet-transaction-payment-rpc-runtime-api",
"parity-db",
+ "parity-scale-codec",
"polkadot-approval-distribution",
"polkadot-availability-bitfield-distribution",
"polkadot-availability-distribution",
"polkadot-availability-recovery",
- "polkadot-client",
"polkadot-collator-protocol",
+ "polkadot-core-primitives",
"polkadot-dispute-distribution",
"polkadot-gossip-support",
"polkadot-network-bridge",
@@ -8152,6 +8108,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-rpc",
"polkadot-runtime",
+ "polkadot-runtime-common",
"polkadot-runtime-constants",
"polkadot-runtime-parachains",
"polkadot-statement-distribution",
@@ -8193,6 +8150,7 @@ dependencies = [
"sp-core",
"sp-inherents",
"sp-io",
+ "sp-keyring",
"sp-keystore",
"sp-mmr-primitives",
"sp-offchain",
@@ -8203,6 +8161,8 @@ dependencies = [
"sp-timestamp",
"sp-transaction-pool",
"sp-trie",
+ "sp-version",
+ "sp-weights",
"substrate-prometheus-endpoint",
"tempfile",
"thiserror",
@@ -8213,7 +8173,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"arrayvec 0.5.2",
"assert_matches",
@@ -8244,7 +8204,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -8253,8 +8213,9 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
+ "frame-benchmarking",
"futures",
"parity-scale-codec",
"polkadot-node-subsystem",
@@ -8263,6 +8224,7 @@ dependencies = [
"polkadot-test-service",
"sc-block-builder",
"sc-consensus",
+ "sc-offchain",
"sc-service",
"sp-api",
"sp-blockchain",
@@ -8270,6 +8232,7 @@ dependencies = [
"sp-consensus-babe",
"sp-core",
"sp-inherents",
+ "sp-io",
"sp-keyring",
"sp-runtime",
"sp-state-machine",
@@ -8279,7 +8242,7 @@ dependencies = [
[[package]]
name = "polkadot-test-malus"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
@@ -8292,7 +8255,8 @@ dependencies = [
"polkadot-node-core-backing",
"polkadot-node-core-candidate-validation",
"polkadot-node-core-dispute-coordinator",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf-execute-worker",
+ "polkadot-node-core-pvf-prepare-worker",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-node-subsystem-test-helpers",
@@ -8307,7 +8271,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"frame-election-provider-support",
@@ -8372,9 +8336,8 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
- "frame-benchmarking",
"frame-system",
"futures",
"hex",
@@ -8399,7 +8362,6 @@ dependencies = [
"sc-consensus",
"sc-consensus-babe",
"sc-consensus-grandpa",
- "sc-executor",
"sc-network",
"sc-service",
"sc-tracing",
@@ -8426,7 +8388,7 @@ dependencies = [
[[package]]
name = "polkadot-voter-bags"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"clap 4.2.5",
"generate-bags",
@@ -8632,20 +8594,20 @@ dependencies = [
[[package]]
name = "proc-macro-warning"
-version = "0.3.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e25495609acefcaeb5052edad8ac91017c9bc98fc38ef321ed524e50b68bac"
+checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.16",
]
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
dependencies = [
"unicode-ident",
]
@@ -8878,9 +8840,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@@ -9119,7 +9081,7 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]]
name = "remote-ext-tests-bags-list"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"clap 4.2.5",
"frame-system",
@@ -9160,13 +9122,11 @@ dependencies = [
"http",
"http-body",
"hyper",
- "hyper-rustls",
- "hyper-tls",
+ "hyper-rustls 0.23.0",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite 0.2.9",
@@ -9176,8 +9136,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"tokio",
- "tokio-native-tls",
- "tokio-rustls",
+ "tokio-rustls 0.23.2",
"tower-service",
"url",
"wasm-bindgen",
@@ -9251,7 +9210,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"binary-merkle-tree",
"frame-benchmarking",
@@ -9345,7 +9304,7 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -9509,6 +9468,18 @@ dependencies = [
"webpki 0.22.0",
]
+[[package]]
+name = "rustls"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct 0.7.0",
+]
+
[[package]]
name = "rustls-native-certs"
version = "0.6.1"
@@ -9539,6 +9510,16 @@ dependencies = [
"base64 0.21.0",
]
+[[package]]
+name = "rustls-webpki"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
[[package]]
name = "rustversion"
version = "1.0.6"
@@ -9583,7 +9564,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"log",
"sp-core",
@@ -9594,7 +9575,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
@@ -9602,14 +9583,13 @@ dependencies = [
"ip_network",
"libp2p",
"log",
- "multihash 0.17.0",
+ "multihash",
"parity-scale-codec",
"prost 0.11.0",
"prost-build",
"rand 0.8.5",
"sc-client-api",
"sc-network",
- "sc-network-common",
"sp-api",
"sp-authority-discovery",
"sp-blockchain",
@@ -9623,7 +9603,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"futures-timer",
@@ -9646,7 +9626,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -9661,7 +9641,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -9680,7 +9660,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9691,7 +9671,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"chrono",
@@ -9709,7 +9689,6 @@ dependencies = [
"sc-client-db",
"sc-keystore",
"sc-network",
- "sc-network-common",
"sc-service",
"sc-telemetry",
"sc-tracing",
@@ -9731,7 +9710,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"fnv",
"futures",
@@ -9758,7 +9737,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"hash-db",
"kvdb",
@@ -9784,7 +9763,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
@@ -9809,7 +9788,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"fork-tree",
@@ -9824,7 +9803,6 @@ dependencies = [
"sc-consensus",
"sc-consensus-epochs",
"sc-consensus-slots",
- "sc-keystore",
"sc-telemetry",
"scale-info",
"sp-api",
@@ -9845,7 +9823,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"jsonrpsee",
@@ -9867,7 +9845,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"async-channel",
@@ -9879,9 +9857,7 @@ dependencies = [
"parking_lot 0.12.1",
"sc-client-api",
"sc-consensus",
- "sc-keystore",
"sc-network",
- "sc-network-common",
"sc-network-gossip",
"sc-network-sync",
"sc-utils",
@@ -9903,7 +9879,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"jsonrpsee",
@@ -9922,7 +9898,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -9935,7 +9911,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ahash 0.8.2",
"array-bytes",
@@ -9975,7 +9951,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"finality-grandpa",
"futures",
@@ -9995,7 +9971,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
@@ -10018,13 +9994,13 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "lru 0.8.1",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-executor-common",
"sc-executor-wasmtime",
+ "schnellru",
"sp-api",
"sp-core",
"sp-externalities",
@@ -10040,7 +10016,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
@@ -10052,13 +10028,12 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"anyhow",
"cfg-if",
"libc",
"log",
- "once_cell",
"rustix 0.36.7",
"sc-allocator",
"sc-executor-common",
@@ -10070,7 +10045,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ansi_term",
"futures",
@@ -10086,7 +10061,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"parking_lot 0.12.1",
@@ -10100,7 +10075,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"async-channel",
@@ -10115,37 +10090,33 @@ dependencies = [
"libp2p",
"linked_hash_set",
"log",
- "lru 0.8.1",
"mockall",
"parity-scale-codec",
"parking_lot 0.12.1",
+ "partial_sort",
"pin-project",
"rand 0.8.5",
- "sc-block-builder",
"sc-client-api",
- "sc-consensus",
"sc-network-common",
- "sc-peerset",
"sc-utils",
"serde",
"serde_json",
"smallvec",
- "snow",
"sp-arithmetic",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-runtime",
"substrate-prometheus-endpoint",
"thiserror",
"unsigned-varint",
+ "wasm-timer",
"zeroize",
]
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-channel",
"cid",
@@ -10156,7 +10127,6 @@ dependencies = [
"prost-build",
"sc-client-api",
"sc-network",
- "sc-network-common",
"sp-blockchain",
"sp-runtime",
"thiserror",
@@ -10166,45 +10136,33 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "array-bytes",
"async-trait",
"bitflags",
- "bytes",
"futures",
- "futures-timer",
"libp2p-identity",
"parity-scale-codec",
"prost-build",
"sc-consensus",
- "sc-peerset",
- "sc-utils",
- "serde",
- "smallvec",
- "sp-blockchain",
"sp-consensus",
"sp-consensus-grandpa",
"sp-runtime",
- "substrate-prometheus-endpoint",
- "thiserror",
- "zeroize",
]
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ahash 0.8.2",
"futures",
"futures-timer",
"libp2p",
"log",
- "lru 0.8.1",
"sc-network",
"sc-network-common",
- "sc-peerset",
+ "schnellru",
"sp-runtime",
"substrate-prometheus-endpoint",
"tracing",
@@ -10213,7 +10171,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"async-channel",
@@ -10225,8 +10183,6 @@ dependencies = [
"prost-build",
"sc-client-api",
"sc-network",
- "sc-network-common",
- "sc-peerset",
"sp-blockchain",
"sp-core",
"sp-runtime",
@@ -10236,7 +10192,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"async-channel",
@@ -10246,7 +10202,6 @@ dependencies = [
"futures-timer",
"libp2p",
"log",
- "lru 0.8.1",
"mockall",
"parity-scale-codec",
"prost 0.11.0",
@@ -10255,8 +10210,8 @@ dependencies = [
"sc-consensus",
"sc-network",
"sc-network-common",
- "sc-peerset",
"sc-utils",
+ "schnellru",
"smallvec",
"sp-arithmetic",
"sp-blockchain",
@@ -10271,17 +10226,15 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"futures",
"libp2p",
"log",
"parity-scale-codec",
- "pin-project",
"sc-network",
"sc-network-common",
- "sc-peerset",
"sc-utils",
"sp-consensus",
"sp-runtime",
@@ -10291,7 +10244,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"bytes",
@@ -10299,7 +10252,7 @@ dependencies = [
"futures",
"futures-timer",
"hyper",
- "hyper-rustls",
+ "hyper-rustls 0.24.0",
"libp2p",
"num_cpus",
"once_cell",
@@ -10308,8 +10261,6 @@ dependencies = [
"rand 0.8.5",
"sc-client-api",
"sc-network",
- "sc-network-common",
- "sc-peerset",
"sc-utils",
"sp-api",
"sp-core",
@@ -10319,26 +10270,10 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "sc-peerset"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
-dependencies = [
- "futures",
- "libp2p-identity",
- "log",
- "parking_lot 0.12.1",
- "partial_sort",
- "sc-utils",
- "serde_json",
- "sp-arithmetic",
- "wasm-timer",
-]
-
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -10347,7 +10282,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"jsonrpsee",
@@ -10378,7 +10313,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10397,7 +10332,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"http",
"jsonrpsee",
@@ -10412,7 +10347,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"futures",
@@ -10438,7 +10373,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"directories",
@@ -10469,7 +10404,6 @@ dependencies = [
"sc-rpc",
"sc-rpc-server",
"sc-rpc-spec-v2",
- "sc-storage-monitor",
"sc-sysinfo",
"sc-telemetry",
"sc-tracing",
@@ -10504,7 +10438,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"log",
"parity-scale-codec",
@@ -10515,14 +10449,12 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"clap 4.2.5",
"fs4",
- "futures",
"log",
"sc-client-db",
- "sc-utils",
"sp-core",
"thiserror",
"tokio",
@@ -10531,7 +10463,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -10550,7 +10482,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"libc",
@@ -10569,7 +10501,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"chrono",
"futures",
@@ -10588,7 +10520,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ansi_term",
"atty",
@@ -10596,12 +10528,10 @@ dependencies = [
"lazy_static",
"libc",
"log",
- "once_cell",
"parking_lot 0.12.1",
"regex",
"rustc-hash",
"sc-client-api",
- "sc-rpc-server",
"sc-tracing-proc-macro",
"serde",
"sp-api",
@@ -10619,7 +10549,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10630,14 +10560,13 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
"futures-timer",
"linked-hash-map",
"log",
- "num-traits",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-client-api",
@@ -10657,13 +10586,15 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
"log",
+ "parity-scale-codec",
"serde",
"sp-blockchain",
+ "sp-core",
"sp-runtime",
"thiserror",
]
@@ -10671,7 +10602,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-channel",
"futures",
@@ -10813,9 +10744,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct 0.2.0",
- "der 0.7.1",
+ "der 0.7.7",
"generic-array 0.14.6",
- "pkcs8 0.10.1",
+ "pkcs8 0.10.2",
"subtle",
"zeroize",
]
@@ -10902,18 +10833,18 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
[[package]]
name = "serde"
-version = "1.0.158"
+version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
+checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.158"
+version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
+checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2",
"quote",
@@ -11101,9 +11032,9 @@ dependencies = [
[[package]]
name = "signature"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
dependencies = [
"digest 0.10.6",
"rand_core 0.6.4",
@@ -11142,7 +11073,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -11219,7 +11150,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"hash-db",
"log",
@@ -11239,11 +11170,11 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"Inflector",
"blake2",
- "expander 1.0.0",
+ "expander 2.0.0",
"proc-macro-crate",
"proc-macro2",
"quote",
@@ -11252,8 +11183,8 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11265,8 +11196,8 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -11280,7 +11211,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11293,9 +11224,8 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "parity-scale-codec",
"sp-api",
"sp-inherents",
"sp-runtime",
@@ -11305,13 +11235,13 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"log",
- "lru 0.8.1",
"parity-scale-codec",
"parking_lot 0.12.1",
+ "schnellru",
"sp-api",
"sp-consensus",
"sp-database",
@@ -11323,7 +11253,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"futures",
@@ -11338,14 +11268,13 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"parity-scale-codec",
"scale-info",
"sp-api",
"sp-application-crypto",
- "sp-consensus",
"sp-consensus-slots",
"sp-inherents",
"sp-runtime",
@@ -11356,7 +11285,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -11364,11 +11293,9 @@ dependencies = [
"serde",
"sp-api",
"sp-application-crypto",
- "sp-consensus",
"sp-consensus-slots",
"sp-core",
"sp-inherents",
- "sp-keystore",
"sp-runtime",
"sp-std",
"sp-timestamp",
@@ -11377,7 +11304,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -11396,7 +11323,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"finality-grandpa",
"log",
@@ -11414,7 +11341,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11425,8 +11352,8 @@ dependencies = [
[[package]]
name = "sp-core"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "21.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"bitflags",
@@ -11469,24 +11396,22 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"blake2b_simd",
"byteorder",
"digest 0.10.6",
"sha2 0.10.2",
"sha3",
- "sp-std",
"twox-hash",
]
[[package]]
name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "proc-macro2",
"quote",
"sp-core-hashing",
"syn 2.0.16",
@@ -11495,7 +11420,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -11503,8 +11428,8 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro2",
"quote",
@@ -11513,8 +11438,8 @@ dependencies = [
[[package]]
name = "sp-externalities"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -11525,13 +11450,12 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
"parity-scale-codec",
"scale-info",
- "sp-core",
"sp-runtime",
"sp-std",
"thiserror",
@@ -11539,13 +11463,12 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"bytes",
"ed25519",
"ed25519-dalek",
- "futures",
"libsecp256k1",
"log",
"parity-scale-codec",
@@ -11565,8 +11488,8 @@ dependencies = [
[[package]]
name = "sp-keyring"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"lazy_static",
"sp-core",
@@ -11576,13 +11499,11 @@ dependencies = [
[[package]]
name = "sp-keystore"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "0.27.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "futures",
"parity-scale-codec",
"parking_lot 0.12.1",
- "serde",
"sp-core",
"sp-externalities",
"thiserror",
@@ -11591,7 +11512,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"thiserror",
"zstd 0.12.3+zstd.1.5.2",
@@ -11600,7 +11521,7 @@ dependencies = [
[[package]]
name = "sp-metadata-ir"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-metadata",
"parity-scale-codec",
@@ -11611,7 +11532,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -11629,7 +11550,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11643,7 +11564,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"sp-api",
"sp-core",
@@ -11652,8 +11573,8 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"backtrace",
"lazy_static",
@@ -11663,7 +11584,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"rustc-hash",
"serde",
@@ -11672,8 +11593,8 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"either",
"hash256-std-hasher",
@@ -11694,8 +11615,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -11712,8 +11633,8 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -11725,7 +11646,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11739,8 +11660,9 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
+ "impl-trait-for-tuples",
"parity-scale-codec",
"scale-info",
"serde",
@@ -11751,8 +11673,8 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "0.28.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"hash-db",
"log",
@@ -11767,14 +11689,14 @@ dependencies = [
"sp-trie",
"thiserror",
"tracing",
+ "trie-db",
]
[[package]]
name = "sp-statement-store"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
- "log",
"parity-scale-codec",
"scale-info",
"sp-api",
@@ -11789,13 +11711,13 @@ dependencies = [
[[package]]
name = "sp-std"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
[[package]]
name = "sp-storage"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11808,11 +11730,9 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
- "futures-timer",
- "log",
"parity-scale-codec",
"sp-inherents",
"sp-runtime",
@@ -11822,8 +11742,8 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -11835,7 +11755,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"sp-api",
"sp-runtime",
@@ -11844,10 +11764,9 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
- "log",
"parity-scale-codec",
"scale-info",
"sp-core",
@@ -11859,8 +11778,8 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ahash 0.8.2",
"hash-db",
@@ -11882,8 +11801,8 @@ dependencies = [
[[package]]
name = "sp-version"
-version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11899,8 +11818,8 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "8.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -11910,22 +11829,21 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
"sp-std",
- "wasmi",
"wasmtime",
]
[[package]]
name = "sp-weights"
-version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11966,12 +11884,12 @@ dependencies = [
[[package]]
name = "spki"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
dependencies = [
"base64ct",
- "der 0.7.1",
+ "der 0.7.7",
]
[[package]]
@@ -11997,7 +11915,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "staking-miner"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_cmd",
"clap 4.2.5",
@@ -12166,15 +12084,12 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
-dependencies = [
- "platforms 2.0.0",
-]
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -12193,7 +12108,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"hyper",
"log",
@@ -12205,7 +12120,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-client"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"jsonrpsee",
@@ -12218,14 +12133,12 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"jsonrpsee",
- "log",
"parity-scale-codec",
"sc-client-api",
"sc-rpc-api",
- "scale-info",
"serde",
"sp-core",
"sp-runtime",
@@ -12237,7 +12150,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"array-bytes",
"async-trait",
@@ -12263,7 +12176,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -12273,7 +12186,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -12284,12 +12197,13 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"ansi_term",
"build-helper",
"cargo_metadata",
"filetime",
+ "parity-wasm",
"sp-maybe-compressed-blob",
"strum",
"tempfile",
@@ -12315,11 +12229,70 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "sval"
-version = "1.0.0-alpha.5"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08"
+checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1"
+
+[[package]]
+name = "sval_buffer"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028"
+dependencies = [
+ "sval",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_dynamic"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_fmt"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_json"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_ref"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_serde"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046"
dependencies = [
"serde",
+ "sval",
+ "sval_buffer",
+ "sval_fmt",
]
[[package]]
@@ -12443,7 +12416,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
[[package]]
name = "test-parachain-adder"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"dlmalloc",
"parity-scale-codec",
@@ -12456,7 +12429,7 @@ dependencies = [
[[package]]
name = "test-parachain-adder-collator"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"clap 4.2.5",
"futures",
@@ -12464,7 +12437,7 @@ dependencies = [
"log",
"parity-scale-codec",
"polkadot-cli",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-parachain",
@@ -12482,7 +12455,7 @@ dependencies = [
[[package]]
name = "test-parachain-halt"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"rustversion",
"substrate-wasm-builder",
@@ -12490,7 +12463,7 @@ dependencies = [
[[package]]
name = "test-parachain-undying"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"dlmalloc",
"log",
@@ -12504,7 +12477,7 @@ dependencies = [
[[package]]
name = "test-parachain-undying-collator"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"clap 4.2.5",
"futures",
@@ -12512,7 +12485,7 @@ dependencies = [
"log",
"parity-scale-codec",
"polkadot-cli",
- "polkadot-node-core-pvf-worker",
+ "polkadot-node-core-pvf",
"polkadot-node-primitives",
"polkadot-node-subsystem",
"polkadot-parachain",
@@ -12530,7 +12503,7 @@ dependencies = [
[[package]]
name = "test-parachains"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"parity-scale-codec",
"sp-core",
@@ -12541,7 +12514,7 @@ dependencies = [
[[package]]
name = "test-runtime-constants"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -12768,16 +12741,6 @@ dependencies = [
"syn 2.0.16",
]
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
[[package]]
name = "tokio-retry"
version = "0.3.0"
@@ -12800,6 +12763,16 @@ dependencies = [
"webpki 0.22.0",
]
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.2",
+ "tokio",
+]
+
[[package]]
name = "tokio-stream"
version = "0.1.9"
@@ -12969,7 +12942,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -12979,7 +12952,7 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"expander 2.0.0",
@@ -13053,9 +13026,9 @@ dependencies = [
[[package]]
name = "trie-db"
-version = "0.27.0"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d75c77ea43f2ad8ea9d9c58de49dfc9c3995bdef32b503df7883ff054e7f1"
+checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
dependencies = [
"hash-db",
"hashbrown 0.13.2",
@@ -13128,7 +13101,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf"
dependencies = [
"async-trait",
"clap 4.2.5",
@@ -13139,7 +13112,6 @@ dependencies = [
"parity-scale-codec",
"sc-cli",
"sc-executor",
- "sc-service",
"serde",
"serde_json",
"sp-api",
@@ -13359,16 +13331,38 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
+checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
+dependencies = [
+ "value-bag-serde1",
+ "value-bag-sval2",
+]
+
+[[package]]
+name = "value-bag-serde1"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394"
dependencies = [
- "ctor",
"erased-serde",
"serde",
"serde_fmt",
+]
+
+[[package]]
+name = "value-bag-sval2"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d"
+dependencies = [
"sval",
- "version_check",
+ "sval_buffer",
+ "sval_dynamic",
+ "sval_fmt",
+ "sval_json",
+ "sval_ref",
+ "sval_serde",
]
[[package]]
@@ -13584,39 +13578,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "wasmi"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
-dependencies = [
- "parity-wasm",
- "wasmi-validation",
- "wasmi_core",
-]
-
-[[package]]
-name = "wasmi-validation"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
-dependencies = [
- "parity-wasm",
-]
-
-[[package]]
-name = "wasmi_core"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
-dependencies = [
- "downcast-rs",
- "libm 0.2.1",
- "memory_units",
- "num-rational",
- "num-traits",
-]
-
[[package]]
name = "wasmparser"
version = "0.102.0"
@@ -14084,7 +14045,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -14182,7 +14143,7 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -14581,7 +14542,7 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"bounded-collections",
"derivative",
@@ -14599,7 +14560,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"assert_matches",
"frame-support",
@@ -14626,7 +14587,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"environmental",
"frame-benchmarking",
@@ -14645,7 +14606,7 @@ dependencies = [
[[package]]
name = "xcm-executor-integration-tests"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -14665,7 +14626,7 @@ dependencies = [
[[package]]
name = "xcm-procedural"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"Inflector",
"proc-macro2",
@@ -14675,7 +14636,7 @@ dependencies = [
[[package]]
name = "xcm-simulator"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -14692,7 +14653,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-example"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"frame-support",
"frame-system",
@@ -14719,7 +14680,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-fuzzer"
-version = "0.9.43"
+version = "1.0.0"
dependencies = [
"arbitrary",
"frame-support",
@@ -14795,7 +14756,7 @@ dependencies = [
[[package]]
name = "zombienet-backchannel"
-version = "0.9.43"
+version = "1.0.0"
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 3c0644c10a..942d1755ac 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.43";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
- hash = "sha256-h+9b+KQgdYowHYGr0nPsqibcwOPmBVo9tKi/uEbLhqo=";
+ hash = "sha256-izm0rpLzwlhpp3dciQ1zj1boWxhgGnNMG5ceZoZQGEE=";
# 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,11 +34,24 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "binary-merkle-tree-4.0.0-dev" = "sha256-/8bGqnM/yqtCgVWkIaVEySZSV3XGYuiA3JuyHYTp2lw=";
+ "binary-merkle-tree-4.0.0-dev" = "sha256-J09SHQVOLGStMGONdreI5QZlk+uNNKzWRZpGiNJ+lrk=";
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
};
};
+ # NOTE: the build process currently tries to read some files to generate
+ # documentation from hardcoded paths that aren't compatible with the cargo
+ # vendoring strategy, so we need to manually put them in their expected place.
+ # this should be fixed with the next polkadot release that includes
+ # https://github.com/paritytech/substrate/pull/14570.
+ postPatch = ''
+ FAST_UNSTAKE_DIR=$PWD/../cargo-vendor-dir/pallet-fast-unstake-4.0.0-dev
+ FAST_UNSTAKE_DOCIFY_DIR=$FAST_UNSTAKE_DIR/frame/fast-unstake
+
+ mkdir -p $FAST_UNSTAKE_DOCIFY_DIR
+ cp -r $FAST_UNSTAKE_DIR/src $FAST_UNSTAKE_DOCIFY_DIR
+ '';
+
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix
index 897968e250..d91da1db8f 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix
@@ -42,8 +42,8 @@
let
pinData = lib.importJSON ./pin.json;
version = pinData.version;
- sha256 = pinData.sha256;
- cargoSha256 = pinData.cargoSha256;
+ hash = pinData.hash;
+ cargoHash = pinData.cargoHash;
in
rustPlatform.buildRustPackage rec {
pname = "solana-validator";
@@ -53,11 +53,11 @@ rustPlatform.buildRustPackage rec {
owner = "solana-labs";
repo = "solana";
rev = "v${version}";
- inherit sha256;
+ inherit hash;
};
# partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29
- inherit cargoSha256;
+ inherit cargoHash;
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json
index 175cd79ad1..4747c3e934 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json
@@ -1,5 +1,5 @@
{
"version": "1.10.35",
- "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
- "cargoSha256": "sha256-idlu9qkh2mrF6MxstRcvemKrtTGNY/InBnIDqRvDQPs"
+ "hash": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
+ "cargoHash": "sha256-idlu9qkh2mrF6MxstRcvemKrtTGNY/InBnIDqRvDQPs"
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh
old mode 100644
new mode 100755
index ffd8b0010c..cb8aa43ac6
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
+#! nix-shell -i oil -p jq moreutils nix-prefetch-github gnused
# 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
+# we need failures inside of command subs to get the correct cargoHash
shopt --unset inherit_errexit
const directory = $(dirname $0 | xargs realpath)
@@ -11,23 +11,23 @@ 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 latest_version = $(echo ${latest_rev#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')"
+ const tarball_hash = $(echo $tarball_meta | jq -r '.hash')
jq ".version = \"$latest_version\" | \
- .\"sha256\" = \"$tarball_hash\" | \
- .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
+ .\"hash\" = \"$tarball_hash\" | \
+ .\"cargoHash\" = \"\"" $directory/pin.json | sponge $directory/pin.json
- const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
+ const new_cargo_hash = $(nix-build -A solana-validator 2>&1 | \
tail -n 2 | \
head -n 1 | \
- sd '\s+got:\s+' '')
+ sed 's/\s*got:\s*//')
- jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
+ jq ".cargoHash = \"$new_cargo_hash\"" $directory/pin.json | sponge $directory/pin.json
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
index 72b1c691c5..1ef5d436ff 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "stellar-core";
- version = "19.11.0";
+ version = "19.12.0";
src = fetchFromGitHub {
owner = "stellar";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
+ sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix
index 0c3a3d2395..ce7bdbfe89 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, pkg-config
-, boost
+, boost179
, openssl
, libsodium
, libunwind
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- boost
+ boost179
openssl
libsodium
libunwind
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix
index 80cc3dbfeb..602025e60a 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "taproot-assets";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "taproot-assets";
rev = "v${version}";
- hash = "sha256-DOtCnPnS5Oq5B4xaYmNCXxMYJ9fhPZ11OfPKXH7eKUg=";
+ hash = "sha256-nTgIoYajpnlEvyXPcwXbm/jOfG+C83TTZiPmoB2kK24=";
};
vendorHash = "sha256-fc++0M7Mnn1nJOkV2gzAVRQCp3vOqsO2OQNlOKaMmB4=";
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix
index 744b43f6f8..3a4d385f4f 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "greetd";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = pname;
rev = version;
- sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ=";
+ sha256 = "sha256-w68iKabVVIHB+ujCd5q+L4T6+Tfqedou3wXOuMGi6aw=";
};
- cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g=";
+ cargoHash = "sha256-vn1ih4YXsltR1zdy7BzS3CSJO9Uewx/654lRTSkWV0k=";
nativeBuildInputs = [
scdoc
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix
index a520ad88d6..6cd336821c 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix
@@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
+ mainProgram = "regreet";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix
new file mode 100644
index 0000000000..9973099b1f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix
@@ -0,0 +1,33 @@
+{
+ fetchFromGitHub,
+ lib,
+ linux-pam,
+ rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "lemurs";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "coastalwhite";
+ repo = "lemurs";
+ rev = "v${version}";
+ hash = "sha256-6mNSLEWafw8yDGnemOhEiK8FTrBC+6+PuhlbOXTGmN0=";
+ };
+
+ cargoHash = "sha256-nfUBC1HSs7PcIbD7MViJFkfFAPda83XbAupNeShfwOs=";
+
+ # Fixes a lock issue
+ preConfigure = "cargo update --offline";
+
+ buildInputs = [
+ linux-pam
+ ];
+
+ meta = with lib; {
+ description = "A customizable TUI display/login manager written in Rust";
+ homepage = "https://github.com/coastalwhite/lemurs";
+ license = with licenses; [asl20 mit];
+ maintainers = with maintainers; [jeremiahs];
+ };
+}
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 4f907cf67c..e71677c130 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -10,14 +10,17 @@ let
inherit tiling_wm;
};
stableVersion = {
- version = "2022.2.1.20"; # "Android Studio Flamingo (2022.2.1) Patch 2"
- sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY=";
+ version = "2022.3.1.18"; # "Android Studio Giraffe (2022.3.1)"
+ sha256Hash = "sha256-JCFeEySmrJEYELLMGvstc1z3Rd+8BpGKQrjW+8a/dDM=";
};
betaVersion = {
- version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5"
- sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14=";
+ version = "2022.3.1.17"; # "Android Studio Giraffe (2022.3.1) RC 1"
+ sha256Hash = "sha256-Bpur9ytiwa0udiyYVxlfLT4M+ZcO5atQUQg/ForATP4=";
+ };
+ latestVersion = {
+ version = "2023.1.1.14"; # Android Studio Hedgehog (2023.1.1) Canary 14
+ sha256Hash = "sha256-MgZDUpRyM0XDfgqfYjtJJyG2CBaNB06PgtoJltDwNwk=";
};
- latestVersion = betaVersion;
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix
index 9a5c3c2901..ff068b2593 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix
@@ -5,11 +5,11 @@
let
pname = "codux";
- version = "15.4.4";
+ version = "15.6.1";
src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
- sha256 = "sha256-6XLKXw+e/310mCQxM/X/kzok562vGjEhmF1eLfakB4Q=";
+ sha256 = "sha256-a8zv5pVtS80J2PTrUiW8AA3rJ+rPAAzaaT5DVBLK5JE=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
index 7ef81a4ebc..6ea90b0b8a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix
@@ -1,40 +1,53 @@
-{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }:
+{ lib
+, stdenv
+, fetchgit
+, cwebbin
+, libX11
+, libXft
+, ncurses
+, pkg-config
+, unzip
+}:
stdenv.mkDerivation {
- pname = "edit-nightly";
- version = "20180228";
+ pname = "edit";
+ version = "unstable-2021-04-05";
src = fetchgit {
url = "git://c9x.me/ed.git";
- rev = "77d96145b163d79186c722a7ffccfff57601157c";
- sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
+ rev = "bc24e3d4f716b0afacef559f952c40f0be5a1c58";
+ hash = "sha256-DzQ+3B96+UzQqL3lhn0DfYmZy2LOANtibj1e1iVR+Jo=";
};
nativeBuildInputs = [
- unzip
- pkg-config
cwebbin
+ pkg-config
+ unzip
];
buildInputs = [
- ncurses
libX11
libXft
+ ncurses
];
preBuild = ''
- ctangle *.w
+ ctangle vicmd.w
'';
installPhase = ''
+ runHook preInstall
+
install -Dm755 obj/edit -t $out/bin
+
+ runHook postInstall
'';
- meta = with lib; {
+ meta = {
description = "A relaxing mix of Vi and ACME";
homepage = "https://c9x.me/edit";
- license = licenses.publicDomain;
- maintainers = [ maintainers.vrthra ];
- platforms = platforms.all;
+ license = lib.licenses.publicDomain;
+ maintainers = with lib.maintainers; [ AndersonTorres vrthra ];
+ platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix
index 9825ed0834..a81f582702 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix
@@ -28,7 +28,7 @@ let
pname = "tsc";
commit = version;
- sourceRoot = "source/core";
+ sourceRoot = "${src.name}/core";
recipe = writeText "recipe" ''
(tsc
@@ -44,7 +44,7 @@ let
pname = "tsc-dyn";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
- sourceRoot = "source/core";
+ sourceRoot = "${src.name}/core";
postInstall = ''
LIB=($out/lib/libtsc_dyn.*)
@@ -55,7 +55,7 @@ let
rm -r $out/lib
'';
- inherit (srcMeta) cargoSha256;
+ inherit (srcMeta) cargoHash;
};
in symlinkJoin {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json
index 6aa6fee183..b3ac6a0306 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json
@@ -3,8 +3,8 @@
"owner": "emacs-tree-sitter",
"repo": "elisp-tree-sitter",
"rev": "909717c685ff5a2327fa2ca8fb8a25216129361c",
- "sha256": "LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k="
+ "hash": "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k="
},
"version": "0.18.0",
- "cargoSha256": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8="
+ "cargoHash": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8="
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py
index 082602fcc4..77ef632ded 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py
@@ -51,12 +51,12 @@ def get_src(tag_name: str) -> Dict[str, str]:
)
src = json.loads(p.stdout)
- fields = ["owner", "repo", "rev", "sha256"]
+ fields = ["owner", "repo", "rev", "hash"]
return {f: src[f] for f in fields}
-def get_cargo_sha256(drv_path: str):
+def get_cargo_hash(drv_path: str):
# Note: No check=True since we expect this command to fail
p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE)
@@ -74,7 +74,7 @@ def get_cargo_sha256(drv_path: str):
if m:
return m.group(1)
- raise ValueError("Could not extract actual sha256 hash: ", stderr)
+ raise ValueError("Could not extract actual hash: ", stderr)
if __name__ == "__main__":
@@ -96,26 +96,26 @@ if __name__ == "__main__":
drv_path = eval_drv(
nixpkgs,
"""
- rustPlatform.buildRustPackage {
+ rustPlatform.buildRustPackage rec {
pname = "tsc-dyn";
version = "%s";
nativeBuildInputs = [ clang ];
src = fetchFromGitHub (lib.importJSON %s);
- sourceRoot = "source/core";
- cargoSha256 = lib.fakeSha256;
+ sourceRoot = "${src.name}/core";
+ cargoHash = lib.fakeHash;
}
"""
% (tag_name, f.name),
)
- cargo_sha256 = get_cargo_sha256(drv_path)
+ cargo_hash = get_cargo_hash(drv_path)
with open(join(cwd, "src.json"), mode="w") as f:
json.dump(
{
"src": src,
"version": tag_name,
- "cargoSha256": cargo_sha256,
+ "cargoHash": cargo_hash,
},
f,
indent=2,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix
index 9eaa4d119e..440184d959 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix
@@ -32,6 +32,7 @@ let
matthewbauer
];
platforms = lib.platforms.all;
+ mainProgram = "emacs";
};
in
{
@@ -50,12 +51,12 @@ in
emacs29 = import ./generic.nix {
pname = "emacs";
- version = "29.0.92";
+ version = "29.1-rc1";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
- rev = "29.0.92";
- hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A=";
+ rev = "29.1-rc1";
+ hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU=";
};
meta = mainlineMeta;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix
index 4f2b3f1eb3..4ecc511b65 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix
@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ frlan ];
platforms = platforms.all;
+ mainProgram = "geany";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix
index f85bb9e5fd..4352b74f96 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix
@@ -96,5 +96,6 @@ stdenv.mkDerivation rec {
maintainers = [ ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
+ mainProgram = "gedit";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch
new file mode 100644
index 0000000000..e525512fe4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch
@@ -0,0 +1,17 @@
+--- a/plugins/remote-dev-server/bin/launcher.sh
++++ b/plugins/remote-dev-server/bin/launcher.sh
+@@ -327,6 +327,8 @@
+ REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=1
+ fi
+
++REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=0
++
+ if [ $REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS -eq 1 ]; then
+ SELFCONTAINED_LIBS="$REMOTE_DEV_SERVER_DIR/selfcontained/lib"
+ if [ ! -d "$SELFCONTAINED_LIBS" ]; then
+@@ -568,3 +570,5 @@
+ "$LAUNCHER" "$STARTER_COMMAND" "$PROJECT_PATH" "$@"
+ ;;
+ esac
++
++unset REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
index b78da5da3f..71bf0eaeb5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
@@ -46,7 +46,7 @@ let
Enhancing productivity for every C and C++
developer on Linux, macOS and Windows.
'';
- maintainers = with maintainers; [ edwtjo mic92 ];
+ maintainers = with maintainers; [ edwtjo mic92 tymscar ];
};
}).overrideAttrs (attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [
@@ -97,20 +97,20 @@ let
};
});
- buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }:
- (mkJetBrainsProduct {
- inherit pname version src wmClass jdk buildNumber;
- product = "DataSpell";
- meta = with lib; {
- homepage = "https://www.jetbrains.com/dataspell/";
- inherit description license platforms;
- longDescription = ''
- DataSpell is a new IDE from JetBrains built for Data Scientists.
- Mainly it integrates Jupyter notebooks in the IntelliJ platform.
- '';
- maintainers = with maintainers; [ leona ];
- };
- });
+ buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }:
+ (mkJetBrainsProduct {
+ inherit pname version src wmClass jdk buildNumber;
+ product = "DataSpell";
+ meta = with lib; {
+ homepage = "https://www.jetbrains.com/dataspell/";
+ inherit description license platforms;
+ longDescription = ''
+ DataSpell is a new IDE from JetBrains built for Data Scientists.
+ Mainly it integrates Jupyter notebooks in the IntelliJ platform.
+ '';
+ maintainers = with maintainers; [ leona ];
+ };
+ });
buildGateway = { pname, version, src, license, description, wmClass, buildNumber, product, ... }:
(mkJetBrainsProduct {
@@ -132,6 +132,10 @@ let
(mkJetBrainsProduct {
inherit pname version src wmClass jdk buildNumber;
product = "Goland";
+ extraWrapperArgs = [
+ # fortify source breaks build since delve compiles with -O0
+ ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"''
+ ];
meta = with lib; {
homepage = "https://www.jetbrains.com/go/";
inherit description license platforms;
@@ -141,16 +145,13 @@ let
The new IDE extends the IntelliJ platform with the coding assistance
and tool integrations specific for the Go language
'';
- maintainers = [ ];
+ maintainers = with maintainers; [ tymscar ];
};
}).overrideAttrs (attrs: {
postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv
- # fortify source breaks build since delve compiles with -O0
- wrapProgram $out/bin/goland \
- --prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
'';
});
@@ -172,7 +173,7 @@ let
with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
as IntelliJ.
'';
- maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ];
+ maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov tymscar ];
platforms = ideaPlatforms;
};
});
@@ -207,7 +208,7 @@ let
with on-the-fly code analysis, error prevention and
automated refactorings for PHP and JavaScript code.
'';
- maintainers = with maintainers; [ dritter ];
+ maintainers = with maintainers; [ dritter tymscar ];
};
});
@@ -232,7 +233,7 @@ let
providing you almost everything you need for your comfortable
and productive development!
'';
- maintainers = with maintainers; [ genericnerdyusername ];
+ maintainers = with maintainers; [ genericnerdyusername tymscar ];
};
}).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup {
buildInputs = with python3.pkgs; [ python3 setuptools ];
@@ -286,7 +287,7 @@ let
homepage = "https://www.jetbrains.com/ruby/";
inherit description license platforms;
longDescription = description;
- maintainers = with maintainers; [ edwtjo ];
+ maintainers = with maintainers; [ edwtjo tymscar ];
};
});
@@ -302,7 +303,7 @@ let
and CSS with on-the-fly code analysis, error prevention and
automated refactorings for JavaScript code.
'';
- maintainers = with maintainers; [ abaldeau ];
+ maintainers = with maintainers; [ abaldeau tymscar ];
};
});
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix
index 1c00e408ae..efc939d032 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix
@@ -84,6 +84,10 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
patchelf --set-interpreter "$interpreter" bin/fsnotifier
munge_size_hack bin/fsnotifier $target_size
fi
+
+ if [ -d "plugins/remote-dev-server" ]; then
+ patch -p1 < ${./JetbrainsRemoteDev.patch}
+ fi
'';
installPhase = ''
@@ -99,7 +103,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
jdk=${jdk.home}
item=${desktopItem}
- makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \
+ wrapProgram "$out/$pname/bin/${loName}.sh" \
--prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6
@@ -114,11 +118,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
--set ${hiName}_JDK "$jdk" \
--set ${hiName}_VM_OPTIONS ${vmoptsFile}
+ ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname
+ echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
+ chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
+ ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
ln -s "$item/share/applications" $out/share
runHook postInstall
'';
-
} // lib.optionalAttrs (!(meta.license.free or true)) {
preferLocalBuild = true;
})
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix
index 4f519aa55a..bf160e2aa3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix
@@ -68,6 +68,8 @@ rec {
# Only use if you know what youre doing
raw = { inherit files byId byName; };
+ tests = callPackage ./tests.nix {};
+
addPlugins = ide: unprocessedPlugins:
let
@@ -98,14 +100,6 @@ rec {
let
pluginCmdsLines = map (plugin: "ln -s ${plugin} \"$out\"/${meta.mainProgram}/plugins/${baseNameOf plugin}") plugins;
pluginCmds = builtins.concatStringsSep "\n" pluginCmdsLines;
- extraBuildPhase = rec {
- clion = ''
- sed "s|${ide}|$out|" -i $out/bin/.clion-wrapped
- '';
- goland = ''
- sed "s|${ide}|$out|" -i $out/bin/.goland-wrapped
- '';
- };
in
''
cp -r ${ide} $out
@@ -115,8 +109,10 @@ rec {
do
ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/
done
- sed "s|${ide.outPath}|$out|" -i $out/bin/${meta.mainProgram}
+ sed "s|${ide.outPath}|$out|" \
+ -i $(realpath $out/bin/${meta.mainProgram}) \
+ -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server)
autoPatchelf $out/${meta.mainProgram}/bin
- '' + (extraBuildPhase."${ide.meta.mainProgram}" or "");
+ '';
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json
index a4504846d1..1b0f0472dd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,14 +17,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip"
},
"name": "ideavim"
},
@@ -33,7 +32,7 @@
"idea-ultimate"
],
"builds": {
- "231.9225.16": "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip"
+ "232.8660.185": "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip"
},
"name": "python"
},
@@ -43,7 +42,7 @@
"idea-ultimate"
],
"builds": {
- "231.9225.16": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip"
+ "232.8660.185": null
},
"name": "kotlin"
},
@@ -64,14 +63,13 @@
],
"builds": {
"223.8836.1185": null,
- "231.9011.35": null,
- "231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip"
},
"name": "ini"
},
@@ -81,8 +79,8 @@
"phpstorm"
],
"builds": {
- "231.9161.47": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip"
},
"name": "symfony-support"
},
@@ -92,8 +90,8 @@
"phpstorm"
],
"builds": {
- "231.9161.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
},
"name": "php-annotations"
},
@@ -105,9 +103,9 @@
"rider"
],
"builds": {
- "231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip"
+ "231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip"
},
"name": "python-community-edition"
},
@@ -128,14 +126,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip"
},
"name": "rust"
},
@@ -156,14 +153,13 @@
],
"builds": {
"223.8836.1185": null,
- "231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip"
},
"name": "rust-beta"
},
@@ -178,10 +174,10 @@
"webstorm"
],
"builds": {
- "231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
+ "232.8660.143": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip"
},
"name": "ide-features-trainer"
},
@@ -202,14 +198,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
+ "232.8660.111": null,
+ "232.8660.143": null,
+ "232.8660.185": null,
+ "232.8660.186": null,
+ "232.8660.197": null
},
"name": "nixidea"
},
@@ -218,7 +213,7 @@
"idea-ultimate"
],
"builds": {
- "231.9225.16": "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip"
+ "232.8660.185": "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip"
},
"name": "go"
},
@@ -239,17 +234,43 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip"
},
"name": "csv-editor"
},
+ "12062": {
+ "compatible": [
+ "clion",
+ "datagrip",
+ "goland",
+ "idea-community",
+ "idea-ultimate",
+ "mps",
+ "phpstorm",
+ "pycharm-community",
+ "pycharm-professional",
+ "rider",
+ "ruby-mine",
+ "webstorm"
+ ],
+ "builds": {
+ "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip",
+ "231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip"
+ },
+ "name": "vscode-keymap"
+ },
"12559": {
"compatible": [
"clion",
@@ -267,14 +288,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip"
},
"name": "eclipse-keymap"
},
@@ -295,14 +315,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip"
},
"name": "visual-studio-keymap"
},
@@ -323,14 +342,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9225.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9225.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+ "231.9225.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@@ -350,15 +368,14 @@
"webstorm"
],
"builds": {
- "223.8836.1185": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip"
+ "223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip"
},
"name": "github-copilot"
},
@@ -379,14 +396,13 @@
],
"builds": {
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9225.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9225.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+ "231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
}
@@ -394,28 +410,35 @@
"files": {
"https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=",
"https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=",
+ "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=",
+ "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=",
+ "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=",
+ "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
"https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=",
"https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=",
+ "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
"https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
"https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=",
+ "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
- "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=",
- "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip": "sha256-9KTWE7rudLZwxCEv5QNu/9rxA0o0GdQK4+oqkzeOtyA=",
+ "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=",
+ "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
- "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip": "sha256-vin0+O9f4rY3FYqztzdIlyal5bvrvrt8Q8neDrXRmsU=",
- "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=",
- "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
- "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip": "sha256-FHv/cELjKf3Jral2Cqc3QiE4bx1mm6jy42AsR27nt9g=",
+ "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=",
+ "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=",
+ "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=",
"https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=",
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
- "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
"https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=",
+ "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=",
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
- "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip": "sha256-OuOUVUYHfg5JFLX2xAQ/VHaS8gUI0H7SZEdau8fbAAY=",
- "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip": "sha256-kCS/fglqb4MD/sE+mGHchvQCUOdZiDrYtTAzn7XITkM=",
- "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=",
+ "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=",
+ "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=",
+ "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=",
+ "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=",
+ "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=",
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
- "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip": "sha256-VZoavuQyHP7rJ3p/R+maoHetEt8bYP/eSnlfEgfFrFc="
+ "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o="
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix
new file mode 100644
index 0000000000..6047d21f43
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix
@@ -0,0 +1,26 @@
+{ jetbrains, writeText }:
+
+{
+ # Check to see if the process for adding plugins is breaking anything, instead of the plugins themselves
+ default =
+ let
+ modify-ide = ide: jetbrains.plugins.addPlugins ide [ ];
+ ides = with jetbrains; map modify-ide [
+ clion
+ datagrip
+ dataspell
+ goland
+ idea-community
+ idea-ultimate
+ mps
+ phpstorm
+ pycharm-community
+ pycharm-professional
+ rider
+ ruby-mine
+ webstorm
+ ];
+ paths = builtins.concatStringsSep " " ides;
+ in
+ writeText "jb-ides" paths;
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
index 74a7147bb5..1024284a01 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
@@ -3,58 +3,58 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "03830bd8c32eca51d2cb54aafbb74ce46003eaab9601465876c84107c0a19a23",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.tar.gz",
- "build_number": "231.9161.40"
+ "version": "2023.2",
+ "sha256": "45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.2.tar.gz",
+ "build_number": "232.8660.186"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
- "version": "2023.1.2",
- "sha256": "57e8a79d69d9f34957fe7fa1307296396ab7c2b84bacffb6d86616cbcd596edd",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.tar.gz",
- "build_number": "231.9011.35"
+ "version": "2023.2",
+ "sha256": "f8344dad4f502a215440fb7ccbc4c69acdd0b18f33d855f0d0d0d2bbe44a5f26",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.tar.gz",
+ "build_number": "232.8660.111"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "07158e00ef81c58c9b295c1777635069777f5f3f16d593b14429673b9699cfff",
- "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.tar.gz",
- "build_number": "231.9225.14"
+ "version": "2023.2",
+ "sha256": "f8c486cb2e7cc2ce78fff173785f75c8c7461da622f81d3abe7017434e2bb4e4",
+ "url": "https://download.jetbrains.com/python/dataspell-2023.2.tar.gz",
+ "build_number": "232.8660.202"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
- "version": "2023.1.3",
- "sha256": "32d97c9935e4825d5f395e5039033121649838a3811e25301d70f32315a2e106",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.tar.gz",
- "build_number": "231.9161.32"
+ "version": "2023.2",
+ "sha256": "8b4064670f42d1812cf44068dd989d518b46fd04a8bd4b6b5e8f84e9a44f58b2",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.tar.gz",
+ "build_number": "232.8660.185"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "ac8bd42b6dee2aedcfd05656b7f74969e6775f41c9d6614d3cc4946fbc8c346f",
- "url": "https://download.jetbrains.com/go/goland-2023.1.4.tar.gz",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "17f1bbd9a46061fdd013d49a99859c1ca3ece1a3cc51cdcf2b46eae0432f2481",
+ "url": "https://download.jetbrains.com/go/goland-2023.2.tar.gz",
+ "build_number": "232.8660.185"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "9ea98c03b29903f7bde41f6a3c039621fff5d04015f37f9f21e04966d557ea90",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.tar.gz",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "b1a5c267ca86850764b0541bee0c27af7d2082e55516e95a0c8d30539571735c",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.tar.gz",
+ "build_number": "232.8660.185"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "b5b15e1bbc7d953715a2b3f5eb25b9bb26baa99bdbee2d11acc91339c725f73a",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.tar.gz",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "d398599557cc732fd1f58f38104d7cda35e326e4cd394245a8358e02fb8878b3",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.tar.gz",
+ "build_number": "232.8660.185"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -67,109 +67,109 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
- "version": "2023.1.3",
- "sha256": "c12c99b39615bd2d37eec93ed29faee2387294624eaed7fabd5c7cc8de9faf9f",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.tar.gz",
- "build_number": "231.9161.47",
+ "version": "2023.1.4",
+ "sha256": "7b44d704641c6015ce49e12e82c8866e9fdd8e8d421590235e536b3b1312b180",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.tar.gz",
+ "build_number": "231.9225.18",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "4def30bc442113605b907586ee087bc72e75fc63d826b9a9e16cd97dbb467309",
- "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.tar.gz",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "64472ee39d244fbc2cc8aeade204d02a767c7ce66b2edaa26a8499eeef44f3d7",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.tar.gz",
+ "build_number": "232.8660.197"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "0f9beda16f7e90631e75954bf780669ab05621b69e9f91a9e41ed1ecd1ac26cf",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.tar.gz",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "95f1666c471a9d752c53ec0b776840552e023f6405a3b000ce6f1014125bfc83",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.tar.gz",
+ "build_number": "232.8660.197"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
- "version": "2023.1.3",
- "sha256": "192be48828cb7515e8158cec8aa6ba4d320d3b65ebd09a921e85085143e9bd56",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.tar.gz",
- "build_number": "231.9161.46"
+ "version": "2023.1.4",
+ "sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz",
+ "build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
- "version": "2023.1.4",
- "sha256": "b9b5d2a3c0c0517e1ef1363b2abe5ca41441343bc1c8999d1b8e6dff248027fb",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.tar.gz",
- "build_number": "231.9225.12"
+ "version": "2023.2",
+ "sha256": "9da529bbc2c65503f1e01c85b745f676140c2263b9541fb1c5bae0d3b9329787",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.tar.gz",
+ "build_number": "232.8660.186"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
- "version": "2023.1.3",
- "sha256": "1cef18a6d80e063b520dd8e9a0cf5b27a9cb05bbfa5b680e97c54a7cb435c9c6",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.tar.gz",
- "build_number": "231.9161.29"
+ "version": "2023.2",
+ "sha256": "cc97c8ba44560dea41de1c03fd6023a287c3dca6476c297f02a473af124c073f",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.tar.gz",
+ "build_number": "232.8660.143"
}
},
"x86_64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "fdb801c7c42e87fa0db94b68192e09319583118461385e4133ce9cd01125cb41",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.dmg",
- "build_number": "231.9161.40"
+ "version": "2023.2",
+ "sha256": "2f97bc578e0eb21f4cde2291dc78f19dac5839d84319ba780cc8c98fd9694108",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.2.dmg",
+ "build_number": "232.8660.186"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
- "version": "2023.1.2",
- "sha256": "13302c2cda09fdf08025430cfb195d7cbf34ad0f66968091e5227a8ff71a7f79",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.dmg",
- "build_number": "231.9011.35"
+ "version": "2023.2",
+ "sha256": "0457a7503d4a1f0824777f5e27416831070b109be93c9c7bc465065c76631009",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.dmg",
+ "build_number": "232.8660.111"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "c0c79501d88fc003707707b3410ab4378aaef44a9cebb220f5b1eaeb3db640e9",
- "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.dmg",
- "build_number": "231.9225.14"
+ "version": "2023.2",
+ "sha256": "3f46033d82f23d558c9b1d0eb0d05a3bd1bcc6c320412e0dbadecdb326e9492a",
+ "url": "https://download.jetbrains.com/python/dataspell-2023.2.dmg",
+ "build_number": "232.8660.202"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
- "version": "2023.1.3",
- "sha256": "18d9bcce099d9f78ff4990f93c9ffc6819d7e789f4372659a3ea3bf0f1a2f85a",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.dmg",
- "build_number": "231.9161.32"
+ "version": "2023.2",
+ "sha256": "b5b3cbc4f339ff9ae255196fb32b1db86964ea8ce48dfe61c3d5976a5d831359",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.dmg",
+ "build_number": "232.8660.185"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "ec4d8724ef0b3c1d597801d23622ea5625b65c260d43d9e670c2fc63f448ea45",
- "url": "https://download.jetbrains.com/go/goland-2023.1.4.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "8dfde9eb0344c0c049c2c327ee5c92dff612bf2ac2574a04987b7f99ed91b47e",
+ "url": "https://download.jetbrains.com/go/goland-2023.2.dmg",
+ "build_number": "232.8660.185"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "07dcc09078efea0a6c7d009ec79878d69534f2ca973f546ed469abbc4fec5088",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "ad46a72491b50a5bf5f4a3066e7fb969576dd5b4f4dc322b31f14f638d564e2e",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.dmg",
+ "build_number": "232.8660.185"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "d039c8789724962fa264d55d47ac2e5efc2779fd082dcb6615ae15b2ca66ce91",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "5c60bbd9527b049777bf3ddd1de0f515688fff9e08d1eb09029082677f579151",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.dmg",
+ "build_number": "232.8660.185"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -182,109 +182,109 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
- "version": "2023.1.3",
- "sha256": "d181a8c9ff92f183f1ce68c1867de61b17e5a82f5b16ec472baa99f5a5f9ce83",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.dmg",
- "build_number": "231.9161.47",
+ "version": "2023.1.4",
+ "sha256": "4d3d9005772d2136e44f7774377fae053b690501800ea5e650d0f35882690fdd",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.dmg",
+ "build_number": "231.9225.18",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "8474b4efea07381d4847b183c26a1d7f4bb80807d34ad5cd058e643b7f930d28",
- "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.dmg",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "2de31d04ad6f199bac193975b6cba6904b8f074c9bc14ac7f14a0eaa6089324e",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.dmg",
+ "build_number": "232.8660.197"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "04945795cdee1fb36a5c19c2846203bcc4bccba8939f58dd1265651578f9c4c6",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.dmg",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "5db02ef2b9086e2bbbc5ba94b9729b8ae5e328364a7c000d1cf3f4e85b92f404",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.dmg",
+ "build_number": "232.8660.197"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
- "version": "2023.1.3",
- "sha256": "f7727c5f1b38352ca6ce7ad5ee410152b733bb72b98416d54b7b3e627fd6f2a9",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.dmg",
- "build_number": "231.9161.46"
+ "version": "2023.1.4",
+ "sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg",
+ "build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
- "version": "2023.1.4",
- "sha256": "4ade59a9d04cc4b5e0a4ed62c2c60e8ddba9717ae91a3e8cf53363d8f0a41e29",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.dmg",
- "build_number": "231.9225.12"
+ "version": "2023.2",
+ "sha256": "fc169ca55848e01ab6432babc358d93bf4e1dcc6f343e79fe27144912bed854c",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.dmg",
+ "build_number": "232.8660.186"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
- "version": "2023.1.3",
- "sha256": "ac8a4edbc2d846e2ac205ebf62ad0d883df5eac812b226b1b99c4f19764df005",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.dmg",
- "build_number": "231.9161.29"
+ "version": "2023.2",
+ "sha256": "daf4d9c0b27f305e063d128ed7a8a63cbfbe8ddfaadb4cb0b1484b9742235137",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.dmg",
+ "build_number": "232.8660.143"
}
},
"aarch64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "f3aa638dbf08df9763d557c02c5408be864442af25c7e4b0dce7889a800f3a49",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4-aarch64.dmg",
- "build_number": "231.9161.40"
+ "version": "2023.2",
+ "sha256": "c2b5ea78b6859f1ef56f32e040e0f9d3d9793198cfa2a8f73d21df2731ddedfd",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.2-aarch64.dmg",
+ "build_number": "232.8660.186"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
- "version": "2023.1.2",
- "sha256": "3af05578dd8c3b01a5b75e34b0944bccd307ce698e80fe238044762785920c90",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2-aarch64.dmg",
- "build_number": "231.9011.35"
+ "version": "2023.2",
+ "sha256": "51a9ba6f4448ffc10474522df6b5264972286599ee8165f9b961cd99c1c08bdd",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2-aarch64.dmg",
+ "build_number": "232.8660.111"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "bd0166ea6dcc4de0115102af44da7a587f4bb00a60f9ff09b3da35f2b38370c3",
- "url": "https://download.jetbrains.com/python/dataspell-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.14"
+ "version": "2023.2",
+ "sha256": "52e4e31b2dbc2ed29c547a01c025983b2c8af8b1d58ac8325694256e96fd2a21",
+ "url": "https://download.jetbrains.com/python/dataspell-2023.2-aarch64.dmg",
+ "build_number": "232.8660.202"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
- "version": "2023.1.3",
- "sha256": "3564f680ff11ac66722e970491d37d3f1faeb09354095f2086bf0bf4a0897e5b",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3-aarch64.dmg",
- "build_number": "231.9161.32"
+ "version": "2023.2",
+ "sha256": "09b7e8a217ac69accf286dbbc46397b3a18e51775d1682c2eb2db255ed69d2dc",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2-aarch64.dmg",
+ "build_number": "232.8660.185"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "5b60eac7a22f6e37345efe9dbbd65e9176a6f1ec899f92bcecbcabb8f96b2ae4",
- "url": "https://download.jetbrains.com/go/goland-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "0b48b7b62972ff6ff81c3e16adfe3824043c989d693bbd2a5b03145a80c4f72e",
+ "url": "https://download.jetbrains.com/go/goland-2023.2-aarch64.dmg",
+ "build_number": "232.8660.185"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "806d6edf7e4cf5636938522c4f64887ed9657b7628311573148d630bbd677228",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "e7c52c2cf202841e729868f3cb73bf40b92cb3c3860e60d614a7daa63dd5ee25",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.2-aarch64.dmg",
+ "build_number": "232.8660.185"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "a03b9357a0d54936df1631f75d11d2647bc89ca5c5baaa4af07a58ab729924cc",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.16"
+ "version": "2023.2",
+ "sha256": "f6255dc42b1631a19fc02ec8879f70963c38273d7998a709b745cffcaf9c12c8",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.2-aarch64.dmg",
+ "build_number": "232.8660.185"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -297,51 +297,51 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
- "version": "2023.1.3",
- "sha256": "49ca043ee6119ae31c5f3fd12aa085f22dc0117c95bf70fca8afe29960c1a546",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3-aarch64.dmg",
- "build_number": "231.9161.47",
+ "version": "2023.1.4",
+ "sha256": "3285135fc4c529640ecfc5b451fa9b51d9df2a323915509cc6cbb3f25717c9e2",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4-aarch64.dmg",
+ "build_number": "231.9225.18",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "34bd9ea7434e73d4552a90b2b15ae93b7f4ee8df23690d7b74862d50d85207bf",
- "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "6c841fbe53bd4cfd97867757e02db496ac5a3f749f9c18b5afa20577ab62bab0",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2023.2-aarch64.dmg",
+ "build_number": "232.8660.197"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "7c86ed350d71b2fef5f1992a377e7fe161c38a3de91bc1f3bad0d9aafbcde6a8",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.15"
+ "version": "2023.2",
+ "sha256": "8c022d282d409079abaf7b611a61041f6022140804587d10d49a150457e35e83",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2-aarch64.dmg",
+ "build_number": "232.8660.197"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
- "version": "2023.1.3",
- "sha256": "d8477d115836913063996abc43ecc531cf08b10f3fb8fc21f58d385743895337",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3-aarch64.dmg",
- "build_number": "231.9161.46"
+ "version": "2023.1.4",
+ "sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg",
+ "build_number": "231.9225.23"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
- "version": "2023.1.4",
- "sha256": "ddcb8bf654c24daa0365b9e734b9c6b6d0238303d0f8f540d6e1ce821539e59e",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4-aarch64.dmg",
- "build_number": "231.9225.12"
+ "version": "2023.2",
+ "sha256": "b91405e6c187baea2ac2f1ee81b7fdf6c4e60f52629bf3afe5bbb679baa76af7",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2-aarch64.dmg",
+ "build_number": "232.8660.186"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
- "version": "2023.1.3",
- "sha256": "c5cc29db9a12515892beed79e1970e628a816f78c629045795ea16c6e5629a2b",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3-aarch64.dmg",
- "build_number": "231.9161.29"
+ "version": "2023.2",
+ "sha256": "aa98f5c6ae61f3571cdc4abbd277c770d0b4a790e7fe4d60e1095b192a00b5b0",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2-aarch64.dmg",
+ "build_number": "232.8660.143"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn
index be5a54fb06..7162053d19 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn
+++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn
@@ -1 +1 @@
-{:deps {clojupyter/clojupyter {:mvn/version "0.3.3"}}}
+{:deps {clojupyter/clojupyter {:mvn/version "0.3.6"}}}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
index 2be3bf7a33..99299e2715 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
@@ -31,8 +31,8 @@
inherit repos;
artifactId = "data.json";
groupId = "org.clojure";
- sha512 = "b767973db8b5b36aeb5c55f082e020a5c3f657bee1eede018e68ccaa2c535005759bc8a162fce7bb63eee1c14c6f29ec1c6080978a08817189864cbd40f154fa";
- version = "2.3.1";
+ sha512 = "04b7c0c90cb26d643a0b3e7e1ffa2d2d423e977c1454ee5ea7c2e75547ecbc113838df17b797902a975f5ea2184a81a45b605a4d82970805e2bbb02feebc578d";
+ version = "2.4.0";
};
}
@@ -42,8 +42,8 @@
inherit repos;
artifactId = "clojure";
groupId = "org.clojure";
- sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b";
- version = "1.10.1";
+ sha512 = "1925300a0fe4cc9fc3985910bb04ae65a19ce274dacc5ec76e708cfa87a7952a0a77282b083d0aebb2206afff619af73a57f0d661a3423601586f0829cc7956b";
+ version = "1.11.1";
};
}
@@ -64,8 +64,8 @@
inherit repos;
artifactId = "clojupyter";
groupId = "clojupyter";
- sha512 = "d030ae69cdadecbcec9a052e4ad91ba4f47cdc4bb3fb780317f337af62d8c34d12ef05d132d6c9a4ce790008c979919c22162432c1b9bcf4e0a470020d585dbe";
- version = "0.3.3";
+ sha512 = "9a4f001cbde7a4de2d27859b25e508ba649225acf9dabad4c1c274e86674e0dcde250a49cacd0767bb99f5b15a61e2f1c829fb2fe7b7dfc4b87681b7ae0b04ae";
+ version = "0.3.6";
};
}
@@ -86,8 +86,8 @@
inherit repos;
artifactId = "tools.analyzer";
groupId = "org.clojure";
- sha512 = "e02d7baec926e0e0a7d9c71f09fee627fbde59ae7f3cbd4abcdf0533c8a87fba8c7cf4503df34bf33777063f4b6353a022552fd003fdbea9fad5752d53609bb8";
- version = "1.0.0";
+ sha512 = "c51752a714848247b05c6f98b54276b4fe8fd44b3d970070b0f30cd755ac6656030fd8943a1ffd08279af8eeff160365be47791e48f05ac9cc2488b6e2dfe504";
+ version = "1.1.0";
};
}
@@ -130,8 +130,8 @@
inherit repos;
artifactId = "core.specs.alpha";
groupId = "org.clojure";
- sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
- version = "0.2.44";
+ sha512 = "f521f95b362a47bb35f7c85528c34537f905fb3dd24f2284201e445635a0df701b35d8419d53c6507cc78d3717c1f83cda35ea4c82abd8943cd2ab3de3fcad70";
+ version = "0.2.62";
};
}
@@ -152,8 +152,8 @@
inherit repos;
artifactId = "jeromq";
groupId = "org.zeromq";
- sha512 = "0965b82a10136a656dfe48268008536a57b26be9190ff2f3d5dbf3fa298e21bc754e70b1e7fae1aca782d25c397c9ce8fa3832783665391142b31dc4a1bd0233";
- version = "0.5.1";
+ sha512 = "bd502d345926160b1a09e45f60eb81254dc67d6d9d7b79e025c08018dd16a18d32ff85b2440c352d530e61c96cd3b2d88fee2a8a912b436015ed31039e308ff4";
+ version = "0.5.2";
};
}
@@ -163,8 +163,8 @@
inherit repos;
artifactId = "spec.alpha";
groupId = "org.clojure";
- sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
- version = "0.2.176";
+ sha512 = "ddfe4fa84622abd8ac56e2aa565a56e6bdc0bf330f377ff3e269ddc241bb9dbcac332c13502dfd4c09c2c08fe24d8d2e8cf3d04a1bc819ca5657b4e41feaa7c2";
+ version = "0.3.218";
};
}
@@ -174,8 +174,8 @@
inherit repos;
artifactId = "pandect";
groupId = "pandect";
- sha512 = "8c265289f46a94cf2400f05223cdd3f9faee9a39e6ed5a55a3e89b09334a61e928c0f27e2db834edf3b544e2148a511bccf1ef73132bd9263659bed381abb59a";
- version = "0.6.1";
+ sha512 = "6179967af34e1abbe0dda2bd0961f101d016df6b1ce5bf4bb823794b07ee551d245d09e957a9c47bc3a15d306cca80ad1b9b11be99e1b3feb245c26e1b9154a3";
+ version = "1.0.2";
};
}
@@ -185,8 +185,8 @@
inherit repos;
artifactId = "tools.cli";
groupId = "org.clojure";
- sha512 = "9baf3fafe2e92b846404ef1bd897a4a335fe4bc1f78a2408ee93c09dc960a630f58a0e863b2d299624783f2851bb5d83f93fa627276d28d66c92764c46f27efe";
- version = "0.4.2";
+ sha512 = "1d88aa03eb6a664bf2c0ce22c45e7296d54d716e29b11904115be80ea1661623cf3e81fc222d164047058239010eb678af92ffedc7c3006475cceb59f3b21265";
+ version = "1.0.206";
};
}
@@ -196,8 +196,8 @@
inherit repos;
artifactId = "encore";
groupId = "com.taoensso";
- sha512 = "bb9510a88bca86f9cfc4a2e5c8a85782bc71d961a0a639735edafb61df130422488ee40d1db4cb6ad961e40acdb07259052937391c32f1e54c71f09dd63d33e5";
- version = "3.12.1";
+ sha512 = "43dbec081c4ad7b21526371bc78844877d50dd08580c4c039c4dac7e854247a6b145bda835460863fa91d270e81783ddcdad3aaa1a902575be5b21ac0a95c7d0";
+ version = "3.21.0";
};
}
@@ -218,8 +218,8 @@
inherit repos;
artifactId = "jcl-over-slf4j";
groupId = "org.slf4j";
- sha512 = "d9c08c3e4cb18b2d69ba8bcd4bbf3955dbc287e20141d244486f6237c36e8e2cf86ae48c295b5dd579219b5c7b1197658153f10fce73d155a4a1d4e6c7943952";
- version = "1.7.22";
+ sha512 = "17aca766b01f136d39bda982a6046d01d296ee076d9628e9776256bd931bbd88437377d5f1cc196d75bd7fa1672dd131311dbf567b4c3a618dd538a6905fbb64";
+ version = "2.0.3";
};
}
@@ -229,8 +229,8 @@
inherit repos;
artifactId = "tools.analyzer.jvm";
groupId = "org.clojure";
- sha512 = "ce9c7b51fa61c12c539f3c5c1c7fa1caf123497553d4e566c13895312faad2d2657fe6e54fe88110a6c87accb10c4c3b6ccfa87a035a7321da6c859da1d192d0";
- version = "1.1.0";
+ sha512 = "36ad50a7a79c47dea16032fc4b927bd7b56b8bedcbd20cc9c1b9c85edede3a455369b8806509b56a48457dcd32e1f708f74228bce2b4492bd6ff6fc4f1219d56";
+ version = "1.2.2";
};
}
@@ -251,19 +251,8 @@
inherit repos;
artifactId = "pedestal.log";
groupId = "io.pedestal";
- sha512 = "f6c4d8e1b202af9ef7950ec6d02b96f0e598e8d1f9ffffe8e5650e8ffdebd6c4919166aa83e34f47407870473024d28e7a49a2a0ad2b9af221514e42c518baae";
- version = "0.5.7";
- };
- }
-
- {
- name = "org.clojure/tools.macro";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "tools.macro";
- groupId = "org.clojure";
- sha512 = "18fb889ec7f0c8f23084f01587582be3c1baaa475249c40cfa8edc78c75079807ed49f2fb714a5c79b16bcf233142abcf571b12fff4e29cd78850c0016d6b4b9";
- version = "0.1.1";
+ sha512 = "229c6c73dc7ec39aee15f54ce81cf2b33301e444241f2dff2066b4c10ff47968f3caa95a8a918601e8f3e7563b34da6925e533615e7ce8b1f39bdb97ca082757";
+ version = "0.5.10";
};
}
@@ -273,19 +262,8 @@
inherit repos;
artifactId = "jackson-dataformat-cbor";
groupId = "com.fasterxml.jackson.dataformat";
- sha512 = "575a00fec1760571403aaadbe0aa6c74f8bb01f40feae00741df6604e7c2bf199ac739a789bbd5d83af75ec6d9fcc55f5a1515b05aef33e0d3cc3046acad9e89";
- version = "2.10.2";
- };
- }
-
- {
- name = "org.flatland/useful";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "useful";
- groupId = "org.flatland";
- sha512 = "b97c92692e36be3e4bdfe4a6b1f1ecb2729c960c25884d1cb12218d0b807789dc37120022b4dd0fd5daba1dd16f892ac134576f84ef301c23525ba55cb041e2d";
- version = "0.11.6";
+ sha512 = "b6e16c43fb3e71f82f8e7dc558f53cbcc8fea31efa59f40d22220f6e40167cf32c150efa18a81f839008d6a042e201bf17d8fd52a4fecbe8f356454f2d6a6170";
+ version = "2.13.3";
};
}
@@ -339,8 +317,8 @@
inherit repos;
artifactId = "pretty";
groupId = "io.aviso";
- sha512 = "512454e5296c54e2d2f3ddb3122e99edae3286b7e7f9a63dd453c96225b6aa5d0fb0972d58d7dac434b297f47a1f27d1b2021c126064af020f0c3040097226d6";
- version = "0.1.37";
+ sha512 = "416433ae5c5773a3a12e7cff3f75a43f1a2d3f4454aad04d065c1e4e13627130f289dbb41355a5665236082b6535939fc4c40a2fddcc22a40d0d4ba290544bfb";
+ version = "1.1.1";
};
}
@@ -350,8 +328,8 @@
inherit repos;
artifactId = "rewrite-clj";
groupId = "rewrite-clj";
- sha512 = "14018072e5c9466e8cafc08d68633f0d0a410ceb6631bd48cf7d67056e5bc972618f1b3f80ba00c4fdf88ad884fe58b636945ec6f053cbe14aee61ef173e12d3";
- version = "0.6.1";
+ sha512 = "04850f7b29be722be6c01760705be43e1b5b93315baa096925ceac94835b58702913c45c8166dadf193fb8f5150ff2c5539ae3ec85c37331727e5d0accfefcca";
+ version = "1.1.45";
};
}
@@ -394,8 +372,8 @@
inherit repos;
artifactId = "ordered";
groupId = "org.flatland";
- sha512 = "16ba9c232cefcf363c603af95343db3f86538e3829dce9fba9adce48c3bf2e80c24e4e30a4583750d124aeb9f1031cdbe93d08796366484495b1b22857de3045";
- version = "1.5.7";
+ sha512 = "849f115d8dc22122577bb6c2af383663488a84125303ba90559f4f5d8538693a5797d95aca608e6844413b925ea6e12112f0cf2d3dcacfcc603b50d749f7a25e";
+ version = "1.15.10";
};
}
@@ -427,8 +405,8 @@
inherit repos;
artifactId = "jackson-core";
groupId = "com.fasterxml.jackson.core";
- sha512 = "5055943790cea2c3abbacbe91e63634e6d2e977cd59b08ce102c0ee7d859995eb5d150d530da3848235b2b1b751a8df55cff2c33d43da695659248187ddf1bff";
- version = "2.10.2";
+ sha512 = "d5337db908b2c56dcb911e3d1a5f671456c13f254fe8d2a620823bc15b2db6aaa8325a86b436b5d181f2584b533158fd14d140b98305ac252f8dfd9a627da859";
+ version = "2.13.3";
};
}
@@ -438,8 +416,8 @@
inherit repos;
artifactId = "snakeyaml";
groupId = "org.yaml";
- sha512 = "b7ef491ded21c61260d6ad68b1541d0c753f01f3f065b66a31c8e4d8f5f6b5eff31e82a7cc68562567811cc0d540c980e8a42714574f50e7713b4799192f50f9";
- version = "1.19";
+ sha512 = "4322e41c6fc5114521da21787ab313fa74bf8449ab0c23ec830627b8121504f70d4522e880aec64df227164729d40b2fbd9670e3a046dd5a5aabc1f71e91c16c";
+ version = "1.25";
};
}
@@ -449,8 +427,8 @@
inherit repos;
artifactId = "asm";
groupId = "org.ow2.asm";
- sha512 = "40614e658138f2eb95bc26999545f996794c622c4d68efb9e10093743504c4b58bf22590767bc6bd93b77cdfb202c507144ba867bbc8b54d74fe7621cbc55e3a";
- version = "5.2";
+ sha512 = "876eac7406e60ab8b9bd6cd3c221960eaa53febea176a88ae02f4fa92dbcfe80a3c764ba390d96b909c87269a30a69b1ee037a4c642c2f535df4ea2e0dd499f2";
+ version = "9.2";
};
}
@@ -460,8 +438,8 @@
inherit repos;
artifactId = "jul-to-slf4j";
groupId = "org.slf4j";
- sha512 = "e76ee7ee3e1852be55c18ccb7a8f4a7005807da3cbd97f4b4895632fee92cc64785491d4f6384ae4ebd0f73a1ee4893dc1adf7119da056300f21eb2e7d3f233f";
- version = "1.7.14";
+ sha512 = "152f153c42e5f69c95e3caeed5ab519e975d7ad79ac0199f31699646299b7ddab58068d5964fbd2170eed29966c3d8d1b00b0a1a4a6f698f9a9eb9c9b9d30dcb";
+ version = "2.0.3";
};
}
@@ -482,8 +460,8 @@
inherit repos;
artifactId = "pedestal.interceptor";
groupId = "io.pedestal";
- sha512 = "9767bb8df4ec3d1ee1468c22afd64adc689bb0ae15e98dfc04ef98e65f237f67ded3ade9c1514d2e44e1dd56dbff6cafbc9795a5c57e166cb924f43175c3be83";
- version = "0.5.7";
+ sha512 = "b6d99300e2c656fc63841449067d74893c63f884d282ff1af40510e5e53baac0f17ac869212e0023dc01d3766248ce28e93e32a57239926254e3af0240c82178";
+ version = "0.5.10";
};
}
@@ -504,19 +482,8 @@
inherit repos;
artifactId = "omniconf";
groupId = "com.grammarly";
- sha512 = "f9b162b98676cb5073310309aac9678725cb4a7eec3fe00803b21ce4abcea3cc1c41df5e970105ed18352619dfab40c0736ae78e9206165f17b0094107b2594b";
- version = "0.3.2";
- };
- }
-
- {
- name = "clj-tuple/clj-tuple";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "clj-tuple";
- groupId = "clj-tuple";
- sha512 = "dd626944d0aba679a21b164ed0c77ea84449359361496cba810f83b9fdeab751e5889963888098ce4bf8afa112dbda0a46ed60348a9c01ad36a2e255deb7ab6d";
- version = "0.2.2";
+ sha512 = "2b13138090c9706af014b7d22b316af5300f41bfc70ee1f604ee6d817f70ca6227951f673231830c81888db2c50533f9c53de3e314d725a60b8eee99718655af";
+ version = "0.4.3";
};
}
@@ -537,8 +504,8 @@
inherit repos;
artifactId = "zprint";
groupId = "zprint";
- sha512 = "379b6f9228ec0b5ae1a24b0cce4c41e273534b456cf356ac67b7f72a7506345eddf7f7ac75c2c200864d5372c1fb0331d2b31bc22a21c496cafdfe839241e9f9";
- version = "0.4.15";
+ sha512 = "2f29288a1d9dd7e76689b32616049af8ebc0e98f0994f1eae1c8e6e725084df23de11a4d6231d2712167ef4adfdfffe494cea2c11b6e752f81acd641381516eb";
+ version = "1.2.4";
};
}
@@ -625,8 +592,8 @@
inherit repos;
artifactId = "slf4j-timbre";
groupId = "com.fzakaria";
- sha512 = "93ecc0e133a3f02f521cac125fd8842f94f2c284000b6b9f1cda7ef2841567bd674facea1f8c4e32da2321f414c1f2590ac58abf37f23347f6f551fcd9039339";
- version = "0.3.14";
+ sha512 = "9a25ed545a7dac8fb74096ed531fa4362989a1ed68350e63f403a871fdf19ab582c6f2c1c8e08978a431d8da31d8226bf34f1d0263ac5f6a14955ff56fdf9e17";
+ version = "0.3.21";
};
}
@@ -636,8 +603,8 @@
inherit repos;
artifactId = "clojure.java-time";
groupId = "clojure.java-time";
- sha512 = "a7111b5c78d7f920d74793d410f81c9ca3c9a8c4d652f132be55eb15f6d03a413cee1ae46bad6d3189c045d422a33c7320fbd02055c351779c379f75db48cbbd";
- version = "0.3.2";
+ sha512 = "cd27eddad69554fcc443603bb69ab7dbe5d4cc937080f4b4d1ef3590e855faef2366dda77724da6c9b8941c340f8b5c5cb1345855f946718bd3ceb9c124a226a";
+ version = "1.1.0";
};
}
@@ -663,14 +630,25 @@
};
}
+ {
+ name = "borkdude/edamame";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "edamame";
+ groupId = "borkdude";
+ sha512 = "5f5f36a85521464e97c0ada94581b37d7ffc7d1b9adaf7b3b509447bc0d6cedf339f12ae75d6bf679b69f9e1b582d0ee1a995bfd039657b17ec9a85516700fbe";
+ version = "0.0.19";
+ };
+ }
+
{
name = "com.taoensso/timbre";
path = pkgs.fetchMavenArtifact {
inherit repos;
artifactId = "timbre";
groupId = "com.taoensso";
- sha512 = "2570f1d59d98034d8425598ab676f4c1e17f9da9926def2e142296377ddccf0fe3a894ba023114d614ca728c77c11d50927a709bfa896e9c5cce0854be31e32d";
- version = "5.1.2";
+ sha512 = "8c88eea8f0a94a3fc14f450a03e76ce0573d31f6c301252d3f9afc177f87a03326966197e8508e766f3caab61ef356142c6dc002e07ed09771f341dd6b290edf";
+ version = "5.2.1";
};
}
@@ -680,8 +658,8 @@
inherit repos;
artifactId = "java.jdbc";
groupId = "org.clojure";
- sha512 = "50c263853f0b88d4b46746bf8f5efb8536f38dde2a08c26e5d26c2bd3bd851c0c0f0814d7899019c3879de2667b3b432a23de091bd8f8cea3e28bd00f0b715cb";
- version = "0.7.9";
+ sha512 = "19e37ee3a16ccfdeb299e72ee0ae64a557b20296dd9461bf2288d0507e1d915ad6fcc56e4aadd712340f5c21e2c764ed7d4ad074eb8e4c82dc6ba5fe96111930";
+ version = "0.7.12";
};
}
@@ -768,8 +746,8 @@
inherit repos;
artifactId = "cheshire";
groupId = "cheshire";
- sha512 = "5b2a339f8d90951a80105729a080b841e0de671f576bfa164a78bccc08691d548cff6a7124224444f7b3a267c9aca69c18e347657f1d66e407167c9b5b8b52cb";
- version = "5.10.0";
+ sha512 = "2262573047d194bba28b3d2ca4b00b12f8171d6f8f7f5449df35f10ab1ef5902a9ba2f9937399d6e4b54a78bda919fa205a22a44cde998019bc0cfc508e90f29";
+ version = "5.11.0";
};
}
@@ -801,8 +779,8 @@
inherit repos;
artifactId = "tools.reader";
groupId = "org.clojure";
- sha512 = "03677c7eb85d294f878f13066bbd841e788ec1267285690e65c2eb342b02aecd028679509b7f1d192cf5631b0839a92abfe36e93237bf5e2544c14e6cebe7452";
- version = "1.3.3";
+ sha512 = "3481259c7a1eac719db2921e60173686726a0c2b65879d51a64d516a37f6120db8ffbb74b8bd273404285d7b25143ab5c7ced37e7c0eaf4ab1e44586ccd3c651";
+ version = "1.3.6";
};
}
@@ -817,6 +795,17 @@
};
}
+ {
+ name = "org.babashka/sci";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "sci";
+ groupId = "org.babashka";
+ sha512 = "2897029dba4917facf93935229f1288d9e90973e8dbc8ff84448335452815274c23371ab643c35df0b1854ff6de1574c37880267fd0edd900039f5a1678d73c5";
+ version = "0.3.4";
+ };
+ }
+
{
name = "io.opentracing/opentracing-util";
path = pkgs.fetchMavenArtifact {
@@ -845,8 +834,8 @@
inherit repos;
artifactId = "nrepl";
groupId = "nrepl";
- sha512 = "663906ff1c8768c4a73fa9f32619da4c244cc86c93d86e8439eb8de81c79486be5a04140c1df6199ba475b3a3e7fd36304faef8b330672dd644945820cc6eb67";
- version = "0.8.3";
+ sha512 = "92534555cc5fa45e8990b8566996fe784df368849e0938fbc7a89909ccbb62dd7d4fca9b7aa3c615702ec30f9962a460c500f6b60abc72661c5f4c66414fc395";
+ version = "1.0.0";
};
}
@@ -867,8 +856,8 @@
inherit repos;
artifactId = "sqlite-jdbc";
groupId = "org.xerial";
- sha512 = "efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb";
- version = "3.25.2";
+ sha512 = "f4c27027fe3cb7914aaf155a1afaa0c8b455e5d142b4e5f31d87bfe619c9949e1981ba7eed1f7a8a3cd27edba1321cc4cd74cf4321ae800e8a911b4d94e03930";
+ version = "3.39.3.0";
};
}
@@ -889,8 +878,8 @@
inherit repos;
artifactId = "slf4j-api";
groupId = "org.slf4j";
- sha512 = "a944468440a883bb3bde1f78d39abe43a90b6091fd9f1a70430ac10ea91b308b2ef035e4836d68ba97afdba2b04f62edece204278aaa416276a5f8596f8688af";
- version = "1.7.26";
+ sha512 = "cf50d5cc86404fefa49730da36147db5f6d65c8b06163bbf62311e6874c20ca46db02ab6bda27c9c1485a5c57fe63b89fd3000b8d838c429240ee95734f5901e";
+ version = "2.0.3";
};
}
@@ -911,8 +900,8 @@
inherit repos;
artifactId = "test.check";
groupId = "org.clojure";
- sha512 = "ba7b5c915c1e7bd5e9e398f8cd9d74340ca3c4846483bae8f2191e40ea42bdd4d8019ec108c2bd64451f418abebed2258cf0ee5be597cc0bc8a02d772c6385ed";
- version = "0.10.0-RC1";
+ sha512 = "b8d7a330b0b5514cd6a00c4382052fab51c3c9d3bc53133f8506791fa670e7c5ecd65094977ea5ced91f59623b0abd1ab8feeec96d63c5c6e459b265a655c577";
+ version = "1.1.1";
};
}
@@ -944,8 +933,8 @@
inherit repos;
artifactId = "yaml";
groupId = "io.forward";
- sha512 = "561cfe0e92689b95008948a0a8aa839b9932ffd13791fdbd9ce55e0b0e3c895be6441ccd050b62ff671c747373fcba1199246c8bfb4206cb05584d06dea99b7c";
- version = "1.0.9";
+ sha512 = "e2d3b7aea260346a1db44bcc3c363877d0ff2b327c4fd287759782949b1a498bc8019f06ddabee84443b96b07ea4765443f8190e04f5f903de049e2cc0fd63e9";
+ version = "1.0.11";
};
}
@@ -966,19 +955,8 @@
inherit repos;
artifactId = "core.memoize";
groupId = "org.clojure";
- sha512 = "37308fcbbe64d0a2802917ef5a589075f81086d63e08c71a9a1b648b73dd362e5bdc8f756084fde1f4b1964ba82a6dc06b2119460281b7949a271d82e6a47a7e";
- version = "1.0.236";
- };
- }
-
- {
- name = "camel-snake-kebab/camel-snake-kebab";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "camel-snake-kebab";
- groupId = "camel-snake-kebab";
- sha512 = "3108a207378e8b6199ae6c71517fcc65dde97d2bab67d533a618c7ff50ea8b849ead3880857d00629d6c269499384b564ed43b631e6b06f283af94e8cae89144";
- version = "0.4.0";
+ sha512 = "67196537084b7cc34a01454d2a3b72de3fddce081b72d7a6dc1592d269a6c2728b79630bd2d52c1bf2d2f903c12add6f23df954c02ef8237f240d7394ccc3dde";
+ version = "1.0.253";
};
}
@@ -1010,8 +988,19 @@
inherit repos;
artifactId = "data.priority-map";
groupId = "org.clojure";
- sha512 = "fb2d703468fb6d5f28c38f25e8e7acdaf02d2fa1ac23c14a9ff065873e88c9b74e155e73e5069436d674d7ef8547f01bc9777b7ae3b9dcde67cbd327d4a20c06";
- version = "1.0.0";
+ sha512 = "bb8bc5dbfd3738c36b99a51880ac3f1381d6564e67601549ef5e7ae2b900e53cdcdfb8d0fa4bf32fb8ebc4de89d954bfa3ab7e8a1122bc34ee5073c7c707ac13";
+ version = "1.1.0";
+ };
+ }
+
+ {
+ name = "borkdude/sci.impl.reflector";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "sci.impl.reflector";
+ groupId = "borkdude";
+ sha512 = "c747fd347e6aba9578d105298b7c7402f53e8639d5c8e6dc83b127f3c413feeb1b9dead7405ac2c4345f02290902e8a2affbec749474481e9c9f19b3d049f18f";
+ version = "0.0.1";
};
}
@@ -1032,8 +1021,8 @@
inherit repos;
artifactId = "log4j-over-slf4j";
groupId = "org.slf4j";
- sha512 = "d0a13ae82823b921b308c897ec9a11ef86cb1b52dd81343f856224c65851f70eae0890a88550daa3a4ed57e7e2c150018a3cdc2345924a4e489a88827fc639b6";
- version = "1.7.14";
+ sha512 = "a1f90d8ea338660cc0e38073752cf32e46a042bc408477d841ba7ad69ad0d066bbbf9d4c399a34352d620ba9d2402c7a51574a88f314ddcc796c35adc99c37f4";
+ version = "2.0.3";
};
}
@@ -1043,19 +1032,8 @@
inherit repos;
artifactId = "core.cache";
groupId = "org.clojure";
- sha512 = "6e4e126f23b20120c50a4dbefbe1b3b9bd98f0a7b8fa83affa267ff7f0de09542d2727243859a1ea346bda5b782d4ae0110f6c2b169c298261707a1fdadaedb0";
- version = "1.0.207";
- };
- }
-
- {
- name = "rewrite-cljs/rewrite-cljs";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "rewrite-cljs";
- groupId = "rewrite-cljs";
- sha512 = "d87c07d510247e1b13dcb505436b3a43d8bb9a4bfebbd2ae0430249d2c8a859032affe2b2a4cda8f987e983f584fd999a3f9b87944d44b8837cdf4e2560c5ab9";
- version = "0.4.4";
+ sha512 = "0a07ceffc2fa3a536b23773eefc7ef5e1108913b93c3a5416116a6566de76dd5c218f3fb0cc19415cbaa8843838de310b76282f20bf1fc3467006c9ec373667e";
+ version = "1.0.225";
};
}
@@ -1065,8 +1043,8 @@
inherit repos;
artifactId = "core.async";
groupId = "org.clojure";
- sha512 = "7c8640769a68256f5cf131ed2436713c3c63bba2c4167f3593a1671ef65931d67b9b43eccfa6e5a20467ca7c6f5efd9cbf58d6c14e035757714f71220a754d0b";
- version = "1.3.618";
+ sha512 = "160a77da25382d7c257eee56cfe83538620576a331e025a2d672fc26d9f04e606666032395f3c2e26247c782544816a5862348f3a921b1ffffcd309c62ac64f5";
+ version = "1.5.648";
};
}
@@ -1076,8 +1054,8 @@
inherit repos;
artifactId = "jackson-dataformat-smile";
groupId = "com.fasterxml.jackson.dataformat";
- sha512 = "8998346f7039df868f3387d219efa0c04fc022a948d098296f3d7ac3f7a9a82bde6ec4a8f83b11994ad50318b5aca37781faacb1f20a65ba2ecc6d6d6eb9468e";
- version = "2.10.2";
+ sha512 = "4c1566aa4fac309de8fba08ea355165cf2a888b7bcec98e7035ac8acd7315e340415a10b8deec6497fc4eea5ba9319fc989676170d8c4c0d0bbc3d4f3cc4d681";
+ version = "2.13.3";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index cb814ddbc9..a9770a5c1b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -42,7 +42,7 @@ rec {
dontInstall = true;
buildPhase = ''
- convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out
+ convert ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out
'';
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
index c37a9e3bc7..7223d9e69a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# There appears to be a similar problem with metakernel's tests
doCheck = false;
- meta = with lib; {
+ meta = {
description = "A Jupyter kernel for Octave.";
homepage = "https://github.com/Calysto/octave_kernel";
- license = licenses.bsd3;
- maintainers = with maintainers; [ thomasjm ];
- platforms = platforms.all;
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ thomasjm ];
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix
index 081b038e23..d4dbb4d97c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix
@@ -41,5 +41,6 @@ buildGoModule rec {
description = "Modern and intuitive terminal-based text editor";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
+ mainProgram = "micro";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
index bd80496995..5b51f9563c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
@@ -75,5 +75,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ joachifm nequissimus ];
platforms = platforms.all;
+ mainProgram = "nano";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix
index 7dfbebb95d..15b9d0ba80 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix
@@ -4,6 +4,7 @@
, libvterm-neovim
, tree-sitter
, fetchurl
+, buildPackages
, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }
, CoreServices
, glibcLocales ? null, procps ? null
@@ -15,22 +16,32 @@
}:
let
- neovimLuaEnv = lua.withPackages(ps:
- (with ps; [ lpeg luabitop mpack ]
- ++ lib.optionals doCheck [
- nvim-client luv coxpcall busted luafilesystem penlight inspect
- ]
- ));
+ requiredLuaPkgs = ps: (with ps; [
+ lpeg
+ luabitop
+ mpack
+ ] ++ lib.optionals doCheck [
+ nvim-client
+ luv
+ coxpcall
+ busted
+ luafilesystem
+ penlight
+ inspect
+ ]
+ );
+ neovimLuaEnv = lua.withPackages requiredLuaPkgs;
+ neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs;
codegenLua =
- if lua.pkgs.isLuaJIT
+ if lua.luaOnBuild.pkgs.isLuaJIT
then
let deterministicLuajit =
- lua.override {
+ lua.luaOnBuild.override {
deterministicStringIds = true;
self = deterministicLuajit;
};
in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ])
- else lua;
+ else lua.luaOnBuild;
pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
in
@@ -99,6 +110,11 @@ in
# nvim --version output retains compilation flags and references to build tools
postPatch = ''
substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS "";
+ '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ sed -i runtime/CMakeLists.txt \
+ -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
+ sed -i src/nvim/po/CMakeLists.txt \
+ -e "s|\$' -i src/cpp/core/include/core/Thread.hpp
'';
hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));
diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
index 4ba505ff78..6a0156eedb 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
@@ -15,17 +15,18 @@
, poppler_gi
, webkitgtk_4_1
, librsvg
+, libportal
}:
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
- version = "55";
+ version = "56";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
- hash = "sha256-Mcl9kWeo4w/wW8crR58Yyqoh26w8/SmNrjmHps6DmRA=";
+ hash = "sha256-YCJu8EU+8RD09QNVT/RYF2ZJZ7cp+oawXThqTzg8ENQ=";
};
format = "other";
@@ -48,6 +49,7 @@ python3.pkgs.buildPythonApplication rec {
poppler_gi
webkitgtk_4_1
librsvg
+ libportal
];
propagatedBuildInputs = with python3.pkgs; [
@@ -56,6 +58,7 @@ python3.pkgs.buildPythonApplication rec {
pdfminer-six
pycairo
pexpect
+ bibtexparser
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
index afb5f1ebf1..ab59232d85 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.165.9",
+ "version": "3.167.2",
"deb": {
"x86_64-linux": {
- "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb",
- "hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA=="
+ "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb",
+ "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg=="
},
"aarch64-linux": {
- "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb",
- "hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg=="
+ "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb",
+ "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw=="
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix
index ff090dd325..8c74d8c5c8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix
@@ -47,10 +47,10 @@ stdenv.mkDerivation {
postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " +
"${ghostscript}/bin:" +
- (if aspell == null then "" else "${aspell}/bin:") +
- (if tex == null then "" else "${tex}/bin:") +
- (if netpbm == null then "" else "${lib.getBin netpbm}/bin:") +
- (if imagemagick == null then "" else "${imagemagick}/bin:");
+ (lib.optionalString (aspell != null) "${aspell}/bin:") +
+ (lib.optionalString (tex != null) "${tex}/bin:") +
+ (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") +
+ (lib.optionalString (imagemagick != null) "${imagemagick}/bin:");
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
index 35b06fde1f..97f51014d0 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix
@@ -1,19 +1,33 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg,
- wrapQtAppsHook, poppler, zlib, pkg-config }:
+{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip
+, hunspell
+, wrapQtAppsHook, poppler, zlib, pkg-config }:
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "texstudio";
- version = "4.5.2";
+ version = "4.6.2";
src = fetchFromGitHub {
- owner = "${pname}-org";
- repo = pname;
- rev = version;
- hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8=";
+ owner = "texstudio-org";
+ repo = "texstudio";
+ rev = finalAttrs.version;
+ hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho=";
};
- nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
- buildInputs = [ qtbase qtscript qtsvg poppler zlib ];
+ nativeBuildInputs = [
+ cmake
+ wrapQtAppsHook
+ pkg-config
+ ];
+ buildInputs = [
+ hunspell
+ poppler
+ qt5compat
+ qtbase
+ qtsvg
+ qttools
+ quazip
+ zlib
+ ];
meta = with lib; {
description = "TeX and LaTeX editor";
@@ -28,4 +42,4 @@ mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ ajs124 cfouche ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix
index a1ff1b8817..c2b82321d4 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix
@@ -1,53 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
-
+{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }:
stdenv.mkDerivation rec {
- version = "11.4";
+ version = "12.0";
pname = "textadept";
- nativeBuildInputs = [ pkg-config unzip zip ];
- buildInputs = [
- gtk2 ncurses glib
- ];
-
- enableParallelBuilding = true;
-
src = fetchFromGitHub {
name = "textadept11";
owner = "orbitalquark";
repo = "textadept";
rev = "textadept_${version}";
- sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0=";
+ sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c=";
};
- preConfigure =
- lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
- "ln -s ${fetchurl params} $PWD/src/${name}"
- ) (import ./deps.nix)) + ''
+ nativeBuildInputs = [ cmake wrapQtAppsHook ];
+ buildInputs = [ qtbase ];
- cd src
- make deps
- '';
-
- postBuild = ''
- make curses
- '';
-
- preInstall = ''
- mkdir -p $out/share/applications
- mkdir -p $out/share/pixmaps
- '';
-
- postInstall = ''
- make curses install PREFIX=$out MAKECMDGOALS=curses
- '';
-
- makeFlags = [
- "PREFIX=$(out)"
- "WGET=true"
- "PIXMAPS_DIR=$(out)/share/pixmaps"
- "GTK2=1"
+ cmakeFlags = [
+ "CMAKE_INSTALL_PREFIX=build/install"
];
+ preConfigure = ''
+ mkdir -p $PWD/build/_deps
+
+ '' +
+ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
+ "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
+ ) (import ./deps.nix));
+
meta = with lib; {
description = "An extensible text editor based on Scintilla with Lua scripting.";
homepage = "http://foicica.com/textadept";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix
index 1baac73df8..b0117f4022 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix
@@ -1,39 +1,32 @@
{
- "scintilla524.tgz" = {
- url = "https://www.scintilla.org/scintilla524.tgz";
- sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY=";
+ "scintilla536.tgz" = {
+ url = "https://www.scintilla.org/scintilla536.tgz";
+ sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ=";
};
"lexilla510.tgz" = {
url = "https://www.scintilla.org/lexilla510.tgz";
sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g=";
};
- "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = {
- url =
- "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip";
- sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo=";
+ "scinterm_5.0.zip" = {
+ url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip";
+ sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24=";
};
- "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = {
- url =
- "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip";
- sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE=";
+ "scintillua_6.2.zip" = {
+ url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip";
+ sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik=";
};
- "lua-5.4.4.tar.gz" = {
- url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz";
- sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E=";
+ "lua-5.4.6.tar.gz" = {
+ url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz";
+ sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
};
- "lpeg-1.0.2.tar.gz" = {
- url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
- sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
+ "lpeg-1.1.0.tar.gz" = {
+ url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz";
+ sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo=";
};
"v1_8_0.zip" = {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo=";
};
- "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = {
- url =
- "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip";
- sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg=";
- };
"cdk-5.0-20200923.tgz" = {
url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz";
sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0=";
@@ -42,4 +35,11 @@
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz";
sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";
};
+ # lua-std-regex
+ "1.0.zip" = {
+ url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip";
+ sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE=";
+ };
}
+
+
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix
new file mode 100644
index 0000000000..c3605691ad
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, crystal
+, vte
+, libgit2
+, editorconfig-core-c
+, gtksourceview4
+, wrapGAppsHook
+, desktopToDarwinBundle
+}:
+crystal.buildCrystalPackage rec {
+ pname = "tijolo";
+ version = "0.7.4";
+
+ src = fetchFromGitHub {
+ owner = "hugopl";
+ repo = "tijolo";
+ rev = "v${version}";
+ hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo=";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook ]
+ ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
+ buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ];
+
+ buildTargets = [ "all" ];
+ doCheck = false;
+
+ shardsFile = ./shards.nix;
+
+ installTargets = [ "install" "install-fonts"];
+ doInstallCheck = false;
+
+ meta = with lib; {
+ description = "Lightweight, keyboard-oriented IDE for the masses";
+ homepage = "https://github.com/hugopl/tijolo";
+ license = licenses.mit;
+ mainProgram = "tijolo";
+ maintainers = with maintainers; [ sund3RRR ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix
new file mode 100644
index 0000000000..480251e777
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix
@@ -0,0 +1,27 @@
+{
+ compiled_license = {
+ url = "https://github.com/elorest/compiled_license.git";
+ rev = "v1.2.2";
+ sha256 = "1f412r6m31cc093lcw31m2rp5s3y7vh6q3wc3xh9b8vccvmj21p7";
+ };
+ fzy = {
+ url = "https://github.com/hugopl/fzy.git";
+ rev = "v0.5.5";
+ sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv";
+ };
+ gobject = {
+ url = "https://github.com/jhass/crystal-gobject.git";
+ rev = "v0.10.0";
+ sha256 = "02cc3486ifbffdbvgl75ylwn47gpfb2j0srz92jx5yz1d596x746";
+ };
+ toml = {
+ url = "https://github.com/crystal-community/toml.cr.git";
+ rev = "v0.7.0";
+ sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z";
+ };
+ version_from_shard = {
+ url = "https://github.com/hugopl/version_from_shard.git";
+ rev = "v1.2.5";
+ sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
index 728ab5eb54..24e9ea914b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
@@ -27,5 +27,6 @@ rec {
license = licenses.vim;
maintainers = with maintainers; [ das_j equirosa ];
platforms = platforms.unix;
+ mainProgram = "vim";
};
}
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 39b653fbfa..0402a7dacd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
@@ -65,12 +65,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2023-05-20";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "ec80f3d48dcbf19209ef51d6020838cda5a1d46e";
- sha256 = "0ahhs6ffdffap566k6p0f1yncziacwnygq3ndaarngqz29w6wl62";
+ rev = "6134040ebedb7ab731e9b9d4b272c2ab55fb3af7";
+ sha256 = "1dppzp2v99p94qw23ad35w53lnfs8yk6cpp29ywq78rmgdkjv77c";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -125,12 +125,12 @@ final: prev:
Ionide-vim = buildVimPluginFrom2Nix {
pname = "Ionide-vim";
- version = "2023-07-04";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "ionide";
repo = "Ionide-vim";
- rev = "22a70da864c5c304c958561efb1ed5eb2ada780c";
- sha256 = "0ha8r4xkiiyisagmraqps2jv46bdjrm6hhcgr11cll3gk3rwh28f";
+ rev = "8435bae84b26b602dbb68399661b3989915cc4d3";
+ sha256 = "0bsy6mnnz24w35r6sn6gzjzbrkqm7v6wqpd8db7p7fika6l1kzm5";
};
meta.homepage = "https://github.com/ionide/Ionide-vim/";
};
@@ -173,24 +173,24 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
- version = "2023-07-10";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
- rev = "a38bf3001dc5576110cb0bbcacc262526ddf7bb9";
- sha256 = "1ng6dcnyccs43ikwp1pf6df520iaqa952lszadxm60mha4m2490r";
+ rev = "9264c54ae96d1d56f029ad9b561326c7b991c53b";
+ sha256 = "1lcq6gwh31w1fg2cw5bzihjalfvagr6gf86kprd83vpjzwvp3237";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2023-07-11";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "49af82180b22c3c2ff8d9d1e82a7ab1486cd052b";
- sha256 = "14lq3yjvxdmpsxp1n1qkcb2nvl23q0r157vizr5kkgy00v194ifd";
+ rev = "8d51a3512fa318393df2bc092e458fd7d6c8e75b";
+ sha256 = "0abffydl0h8nnxq5m0vicbi4cxcbfa34m13al7xx0plbk31q3iyd";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2023-07-10";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "bdba0106f6e33fffb8e2ffea0162ce5565b18840";
- sha256 = "0z02xxgnfxcpwc39fwqc47wdphgbxlcasksfj1p8lgrmw1q0p0kn";
+ rev = "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac";
+ sha256 = "138k6slpv8xxjl8sggqcgmly2byifwa9842y2w73hwc956fx9clr";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -377,12 +377,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
- version = "2023-07-10";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
- rev = "69cddda85747b77608a8f7a86111e812409475a8";
- sha256 = "135c0ilpq83cgcsc0gknyazzfv2pl0ll8crpa8gaxlb5g9vh8r70";
+ rev = "3e96e1325f15acdf7e9f13f360c434222bfe6090";
+ sha256 = "0qvjqmpfw6ljhsda2n5cb7vm3p3s38maiywy60s7nbnldl1l1d01";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@@ -449,12 +449,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2023-07-06";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "142a559acd70a4da190e36b1b05b9f1eec67acd0";
- sha256 = "1mvw668wq30zqlx1adyx9ikw86wkswaf0m22dczfh7i793457lnl";
+ rev = "f09c2f69f7fe4d6adf64396a5daa2736714f67a0";
+ sha256 = "0rvaxcrbfm846zzph76fmnzkqxkjh9gzbaslg6ffr3b25yfljx8q";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -502,8 +502,8 @@ final: prev:
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "e22facd3a696f4690f888e16ddaba585c8173e4e";
- sha256 = "08zpnsvj1qbiz7c3n23hhbb7n24yzmamfajka2kyffl5fprgph0i";
+ rev = "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2";
+ sha256 = "1429srq5gkw37b4hb05cxp0lxjqgfawak3b8vbdphg79zr9imwn8";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -559,12 +559,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2023-06-27";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "29e5ffe35a2fa1ca5ba19eebfe7cdd0191c16e39";
- sha256 = "109asfm9g7cbcbac55syf19vgn2ifwbxgyy69v51xwyyxlgq2czl";
+ rev = "b216892f0c1ce7bbe9efeeb6cf55b52a473f49c2";
+ sha256 = "0df56hrqyv1vq19alnpv981fmrb68gx3127izp7pi974r4if87pa";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -583,12 +583,12 @@ final: prev:
alpha-nvim = buildVimPluginFrom2Nix {
pname = "alpha-nvim";
- version = "2023-06-09";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "goolord";
repo = "alpha-nvim";
- rev = "9e33db324b8bb7a147bce9ea5496686ee859461d";
- sha256 = "0l5nwrdnb27a1sszivkzqf8q1isqkg07yh8p9f268m0433h8n0hf";
+ rev = "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65";
+ sha256 = "150hx42qpi25m6774f8y3di8lb7g3yca74q5l439v50prsxdh262";
};
meta.homepage = "https://github.com/goolord/alpha-nvim/";
};
@@ -967,12 +967,12 @@ final: prev:
base46 = buildVimPluginFrom2Nix {
pname = "base46";
- version = "2023-05-06";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "nvchad";
repo = "base46";
- rev = "bad87b034430b0241d03868c3802c2f1a4e0b4be";
- sha256 = "1nplnd4f5wzwkbbfw9nnpm3jdy0il4wbqh5gdnbh9xmldb3lf376";
+ rev = "a88ada931feecc22dfdcaae00ff98f412b863f9a";
+ sha256 = "1zqaqd2byzfqgy36jwjimcrvgs2wds9dx18kza41c3in9b9243rd";
};
meta.homepage = "https://github.com/nvchad/base46/";
};
@@ -1037,18 +1037,6 @@ final: prev:
meta.homepage = "https://github.com/LunarVim/bigfile.nvim/";
};
- bitbake-vim = buildVimPluginFrom2Nix {
- pname = "bitbake.vim";
- version = "2021-02-06";
- src = fetchFromGitHub {
- owner = "sblumentritt";
- repo = "bitbake.vim";
- rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
- sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
- };
- meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
- };
-
blamer-nvim = buildVimPluginFrom2Nix {
pname = "blamer.nvim";
version = "2021-11-17";
@@ -1159,12 +1147,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2023-07-10";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "cd27a52ecdfed7f14a41b61b7976f155e3d593c7";
- sha256 = "0fcabl395y2qhnnabhakdkhk9f18vh9wkx1pmsdvkizs0hnhxlx3";
+ rev = "99f0932365b34e22549ff58e1bea388465d15e99";
+ sha256 = "17cs0kbgavjsnwjp7n3xbznba0zfpz5g6wgxa6d30070w9hjq91j";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@@ -1243,12 +1231,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2023-07-09";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "99e0d388e0cfc265d98a1eb228e7e8708bef5219";
- sha256 = "1a2dahpqm9nvpk58a8jppnmhdj22yd03a1b9a17nks174cvbjdkv";
+ rev = "a12f2d375a06b0b10137462820efd5962425333e";
+ sha256 = "02p1wfkc6d5ysgv05ifazk3yswikan3j16fdcc07mfjp2y2cs5vk";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -1315,12 +1303,12 @@ final: prev:
clangd_extensions-nvim = buildVimPluginFrom2Nix {
pname = "clangd_extensions.nvim";
- version = "2023-05-23";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "p00f";
repo = "clangd_extensions.nvim";
- rev = "6d0bf36870d15c0c2284f4b6693a66552a6bf127";
- sha256 = "1rr3pyqg7hscs7chjy9mkb98g9vlc17zmfr6lx35vjbd3v7iblwv";
+ rev = "b3b0eb798ecbdd16832fd38d4b07ba31ab4fe831";
+ sha256 = "127sb5w8sv5ldx6vgzf7ynkw24wpvpdp7m192fh1qgymlnma8hsy";
};
meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
};
@@ -1999,12 +1987,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
- version = "2023-01-29";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043";
- sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy";
+ rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6";
+ sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -2023,12 +2011,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
- version = "2023-07-11";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
- rev = "3803ab16cd1e3160edae55fc5dd5e78b1d71e5d4";
- sha256 = "09haj4j1d8gry6537g7mzllac2drwnb5kib6np4ml9sylr6x72lp";
+ rev = "ddf848e8647e85774766ea8bdcd5a2258ea44006";
+ sha256 = "0l0bp9d4z0i8yfbnrpydvagzk3q0wc82r5wp3kbqk195qzykflx3";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@@ -2083,12 +2071,12 @@ final: prev:
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2022-12-16";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "23d2860931dcbcbdfb3543bed002e35d7b3b898b";
- sha256 = "0wqpyzggaxqplwi9w7ivndjkfisjv8f3lqw5dw7dps5zdk042svn";
+ rev = "9a1343c396178dc55ccc1166bf1eb434b5c18c43";
+ sha256 = "0qwkbf9yn7lwvihp3qdgd2kc85i6i3cca7spi2pcjsnf74bykqm8";
};
meta.homepage = "https://github.com/wincent/command-t/";
};
@@ -2251,12 +2239,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2023-06-11";
+ version = "2023-07-11";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "31a1626273e2bab479b6b8416a137f9edaba7daa";
- sha256 = "1dcwp8sziahrgks2fdczvvfvnb7v9md2izpjw8r9cwvlx030g5lr";
+ rev = "2482871cbe0d1b85d331465cf7f065d5d2a7e2ac";
+ sha256 = "1jmlpf0k9zf6djblpphxlwsg6l0nhfxni67z8gzmawxg8a300kgg";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -2275,12 +2263,12 @@ final: prev:
context_filetype-vim = buildVimPluginFrom2Nix {
pname = "context_filetype.vim";
- version = "2023-05-16";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "context_filetype.vim";
- rev = "512db78eb08f284a71bdd83b3ff27026334a3ab2";
- sha256 = "1ab12rir32yhl42ih2zfp7w8f3spi765622xj87aha4jxir20i2f";
+ rev = "7ff5b43fc8d5b274aa19ade5af11e9fa57577ed6";
+ sha256 = "01pa0aaxyfpq86ff2v38z4fh2ppbglp5h76r9js4vrby0b4yjhks";
};
meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
};
@@ -2323,24 +2311,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
- version = "2023-07-09";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
- rev = "e6a2ec767a98a21ebe9b247d80e462544e3f9397";
- sha256 = "1rg3w4v6q1kl14jkfiamwmmq4a6spz7s5piznhdsn1j21d0l3b1f";
+ rev = "2b27da78d6eb74fa9fd565e845e2381c51e59675";
+ sha256 = "0mawmz0i4nny1vdvahfb0b6hymil5vc4sa5yhj38yqcnwzbndzzv";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
- version = "2023-07-09";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
- rev = "ac313e324861e353bf6ddf5286160d10cb202da3";
- sha256 = "107jsagw15ab7whjxaygmd2aqd3a3jkm6d6vz513r5b7jrhclcbh";
+ rev = "dedb7387a50a797a7bd871d009cf711fbf00eb20";
+ sha256 = "1p2xyrfp9gdasrh0chr5mf8n7l0z2qhg908578pkl4bjn1sl1q46";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2359,12 +2347,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2023-07-09";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "02cf0fc1fb5af0805d87c7c4ecb396ffe92b8dc2";
- sha256 = "057ym4bhfich5hfbnsx7lb82d1rrsa3a3nzblfzhvaipb6sn05by";
+ rev = "8ad8815816657e6be07f6c47ae50f6e8a70e9a59";
+ sha256 = "1i1264czx49qs30i788nr8ryawrlk8gnvyw3p7psb58p6mc6gsih";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2479,24 +2467,24 @@ final: prev:
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp.vim";
- version = "2022-08-03";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
- rev = "8b4a9523632049b3b373de1233bef346073b8982";
- sha256 = "0g7mymqgncnmc326xysx9rlhja5601b18sn4hbpr7p49sqqspyv4";
+ rev = "7c972cb19c8544c681ca345c64ec39e04f4651cc";
+ sha256 = "15li2j26xxa90z6ci675whljym2sc6br6jxs2x4in5m1gv3qj36x";
};
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin";
- version = "2023-06-05";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "dart-lang";
repo = "dart-vim-plugin";
- rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f";
- sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4";
+ rev = "928302ec931caf0dcf21835cca284ccd2b192f7b";
+ sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548";
};
meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
};
@@ -2515,12 +2503,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2023-06-14";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "dashboard-nvim";
- rev = "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a";
- sha256 = "1bmi9hxchjs1s0d5gc02akyxzixq1f0k2hhr2jisj9xx8d0x8fjh";
+ rev = "c17d3210b3dec8798b4fc82a11c542989251f85d";
+ sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9";
};
meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
};
@@ -2611,24 +2599,24 @@ final: prev:
denops-vim = buildVimPluginFrom2Nix {
pname = "denops.vim";
- version = "2023-07-11";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "vim-denops";
repo = "denops.vim";
- rev = "fece0a2b24655e42a3fd10dbbf2962d39b381e90";
- sha256 = "12yj3wzz6qhf71zlmkxfxaqny4iyqp885iwhnr509cmcg0nynac8";
+ rev = "22e7ae3d712f190b3f46483e6b9dd50a99a9abbd";
+ sha256 = "15aqkxwaky7d0s0q9wqyaaxflin45ibsxci3qj830javih41hrqb";
};
meta.homepage = "https://github.com/vim-denops/denops.vim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol.nvim";
- version = "2023-07-04";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "6a471522fa69ec2cabc5fdbb55f5224fe10460a8";
- sha256 = "1sm81lgwks2yakd4f511zxdn2gx817xw0qrn6jxhrkwhjy3zhgmh";
+ rev = "dc0b9d36d841e66783e6e38c011db450ddbae0fb";
+ sha256 = "14dipd0bcgz501g43d1gmlmw29br4aa79zajfnm3hh83kw3mhlww";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -2841,12 +2829,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete.nvim";
- version = "2023-04-22";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "82db30626e411e99b0274b8d6c99bce561cb0394";
- sha256 = "0ras9hh57al5vap7ksp8rs3ih7fffswv8is39xfkks4jjwg4b1sf";
+ rev = "b3a03b25ecabcca444827b312e10439f8836289f";
+ sha256 = "0zbp5h0mf8v8hvxjr72p1nm91s20fn63ayx7h8zj2m55x8x7r8wg";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -2913,12 +2901,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2023-07-08";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c";
- sha256 = "0hzpcwv02yvqxzf2ldhdx6icsffi93r24rjzpipm0b1i6bspg2mw";
+ rev = "e91110d2a7f8e2f667666aba6ea089ff823f8748";
+ sha256 = "1d19870i3nzb4fbz3vm6m3gdz0grh383fwkkiw36yrpaiz021nyj";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2961,36 +2949,36 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
- version = "2023-07-10";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
- rev = "608ebc389514674213a74f1d173c00f85bebc008";
- sha256 = "0h43r4zlh14pwxzm8d76xm68vaxwdpn6z56ybzzmv7vcr9kpgm50";
+ rev = "948d237241b91389c8c2f109885b91cd2574b8bb";
+ sha256 = "09cgyskfmqnp0gl1qbwfij8a6r6c0frgbj39zjx15frbhraygpdb";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
- version = "2023-06-26";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
- rev = "e6eff7a5a950a853c3903d906dbcea03f778db5f";
- sha256 = "180whgmdfgsv5xbnrk4jndisafv4v59vi8001ikq4k08wm3ah634";
+ rev = "39611852fd7bbac117e939a26759bb37361f0c90";
+ sha256 = "19j6c9byrxjiv067lc7s6f34854nnxwcla8vil6g41f67m3810k7";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
dropbar-nvim = buildVimPluginFrom2Nix {
pname = "dropbar.nvim";
- version = "2023-07-10";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "Bekaboo";
repo = "dropbar.nvim";
- rev = "dd0a43d0bdd2918bef5ed7f42caacb1bbe5d7d92";
- sha256 = "0cwlwgi4s4iggss7d1jcn4jaw8idn60yrzpjxqm8h930aa6b2zks";
+ rev = "90fc6aa051d31f22b512f967cd1485dc0d1cf32a";
+ sha256 = "1dzkrf3qak2s5bagh6w5gvq9xqd11s0z3gaawjlqnq2dpfamccah";
};
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
};
@@ -3009,12 +2997,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2023-04-24";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "358cb6688ac577470a4eafcb53bdd63899dfc937";
- sha256 = "1jz3c5z4cdgi5a50c6wlhz23rapfqchm79n9f3mgc9ss1aisqv0y";
+ rev = "4fead634946186a21ca7f406b213896e596fbd93";
+ sha256 = "02xbjblsy384ld1002hc6mc9b9i9rxlsi692s8qp1sks0v0bjmag";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -3033,12 +3021,12 @@ final: prev:
edgy-nvim = buildVimPluginFrom2Nix {
pname = "edgy.nvim";
- version = "2023-07-01";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "folke";
repo = "edgy.nvim";
- rev = "0d3b64f9159442cf9edcad451a0dd9fb7e31bc41";
- sha256 = "1w43qilfhacnmqr76lp2fkbawbndas180f5ab7h133rwgr64lc7p";
+ rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4";
+ sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3";
};
meta.homepage = "https://github.com/folke/edgy.nvim/";
};
@@ -3070,12 +3058,12 @@ final: prev:
elixir-tools-nvim = buildVimPluginFrom2Nix {
pname = "elixir-tools.nvim";
- version = "2023-07-05";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "elixir-tools";
repo = "elixir-tools.nvim";
- rev = "e0c713f86333faf0484543b4c50d14ce8d1de1d2";
- sha256 = "1nxydkvdypbb4q29sfq6axw1vc4554n02bmsv59h0kxlsyaa7hl1";
+ rev = "0930654e8c83c6adbb479f75882ae5fd0caf9723";
+ sha256 = "1w0367p2hrhknka2kald0c35bzmvdn1h3b8gvqrl6k3mpr4v8qal";
};
meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
};
@@ -3143,36 +3131,36 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
- version = "2023-05-19";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
- rev = "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c";
- sha256 = "0jg53zzgv417v8c079cay11nwy8mi6v5svdslcl4iq84cr7l5qfq";
+ rev = "b8ef2d0bde98645250a8997393aefba38e8c6ff3";
+ sha256 = "0q8jji19abfqmbd30iha2h0bf15k12az6wh2b9nlcdhjzki81cdl";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
executor-nvim = buildVimPluginFrom2Nix {
pname = "executor.nvim";
- version = "2023-05-23";
+ version = "2023-07-12";
src = fetchFromGitHub {
owner = "google";
repo = "executor.nvim";
- rev = "c1c8d69dceefbfa299c43c8b69433e2adcb0ed02";
- sha256 = "0wld79mrjwr6v13an9v6lx57yfdpad13x06gqxzhr5by0z404bdn";
+ rev = "0fc98a2d05a0662af2d7c55899c79635bb05ac5a";
+ sha256 = "0mh13s9v7mkkq2zh4wmq273gv0nf7p6rn4hiwnk3zw053g9jpvzi";
};
meta.homepage = "https://github.com/google/executor.nvim/";
};
eyeliner-nvim = buildVimPluginFrom2Nix {
pname = "eyeliner.nvim";
- version = "2023-06-29";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "jinh0";
repo = "eyeliner.nvim";
- rev = "a6c05ed7f2a59640bd18ff0702694deda483a08e";
- sha256 = "1clla449ab1r71hwi9f96vf7l7ixqizvmh9vapcl7605p6iy6mny";
+ rev = "70e1fb4f68bfdad2b9e2b53fcaf367ac86fc693f";
+ sha256 = "071n0dk0cn4gw12xsg6klzflp1ihl9di60xs8kljh4zjdnc6b7l9";
};
meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
};
@@ -3279,8 +3267,8 @@ final: prev:
src = fetchFromGitHub {
owner = "j-hui";
repo = "fidget.nvim";
- rev = "f1c375ba68839eaa4a65efdf2aa078c0da0548fe";
- sha256 = "0bzlv846iz0dbvi166m5aj8ynxp86ba1ycwg0vjxawjcnkhvkdv4";
+ rev = "90c22e47be057562ee9566bad313ad42d622c1d3";
+ sha256 = "1ga6pxz89687km1mwisd4vfl1bpw6gg100v9xcfjks03zc1bywrp";
};
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
};
@@ -3324,36 +3312,36 @@ final: prev:
flash-nvim = buildVimPluginFrom2Nix {
pname = "flash.nvim";
- version = "2023-07-07";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "folke";
repo = "flash.nvim";
- rev = "a8da6ff212c1885ecde26af477207742959c67d7";
- sha256 = "1x7nrncpd9fj3mk74m1x0n1jzdyi6h5sw53mghd3ydyb4cqrg2pj";
+ rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27";
+ sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m";
};
meta.homepage = "https://github.com/folke/flash.nvim/";
};
flatten-nvim = buildVimPluginFrom2Nix {
pname = "flatten.nvim";
- version = "2023-04-23";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "willothy";
repo = "flatten.nvim";
- rev = "d92c93959e9ac52a00002d6fd64c2d2ca5dd7192";
- sha256 = "04p4cfvfb320bgsrhj9507z0s5hx1xi5fd0qs44qxws9aaqvx7c3";
+ rev = "97228f78dfee042c18ecce0d788c91f59e770f31";
+ sha256 = "0baab64zqj7z5rxb7cmy3k8xwbad1jmqzfljla2z9h3q83xff4a6";
};
meta.homepage = "https://github.com/willothy/flatten.nvim/";
};
flit-nvim = buildVimPluginFrom2Nix {
pname = "flit.nvim";
- version = "2023-06-23";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "ggandor";
repo = "flit.nvim";
- rev = "5c9a78b97f7f4301473ea5e37501b5b1d4da167b";
- sha256 = "1d8zjmynl3qjkv5r8rcf11185gwnrs72pl7xh0f0ckd08gl4ra0c";
+ rev = "498b3a4864e697f1ed1145e518c4c78c776c55d8";
+ sha256 = "0w56zv254hpw57zgwzaikj9ciyksvkbd0brynhgcaby8s6hhhgil";
};
meta.homepage = "https://github.com/ggandor/flit.nvim/";
};
@@ -3408,24 +3396,24 @@ final: prev:
flutter-tools-nvim = buildVimPluginFrom2Nix {
pname = "flutter-tools.nvim";
- version = "2023-07-06";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "akinsho";
repo = "flutter-tools.nvim";
- rev = "7850a771c4e773dc49d63081f508d004b416c13e";
- sha256 = "0vjnhsy0bm4xz9rpxda5n2yiy37yl8h90sh15lw04yc5rwcz88wi";
+ rev = "561d85b16d8ca2938820a9c26b2fe74096d89c81";
+ sha256 = "0n13m2vdqh75kr0rjlz5m29hcr9jyqxw78isn0gd7vclla1kkjw7";
};
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
- version = "2023-04-30";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
- rev = "fa4f2729cc2909db599169f22d8e55632d4c8d59";
- sha256 = "0hv79gdg7cgqr3a8vw1ysc48f6i3b8xabbglxspm5mbpf22c8xbk";
+ rev = "9bf2e7e294b00bac87c6123c889828ee08dc9b46";
+ sha256 = "0hmlh6qcra7sfq0i989cxs5jmgk6774bljzvq9m17ybwj3imb14f";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@@ -3444,12 +3432,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2023-07-09";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "6e0afe3be0ba43ef03d495a529de8fb22721c0d0";
- sha256 = "1rzipwl5slmv56fb84yy2isxfqydjydx2ns8sxydkhkk0pz25wrp";
+ rev = "bc38057e513458cb2486b6cd82d365fa294ee398";
+ sha256 = "1l2czwjsskcywjvayx1wcg5538fs2pfp88shx14c9s5q4h0v247m";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -3552,24 +3540,24 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
- version = "2023-07-10";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
- rev = "63bfdd54d1ba5af042a6be350aba4299b7a0f5a3";
- sha256 = "0l08xmgadwgjr37icv7cqxyfz8yb4fkb9hrv7760588yjkl6gdda";
+ rev = "1bba731df46feb1751dca1632268aae41ed5ac15";
+ sha256 = "08qv4zslrqrg67gbazk2sllcgx4hakl5fgrlcv7bd6r0djiv673y";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf.vim";
- version = "2023-06-09";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "1dcdb21db618055134cd611f4f5918f6d00a5df0";
- sha256 = "0655iypmf7nafrwhrj09v5cgwfsg8dnqgkrpxlb2z2b5wji79cx7";
+ rev = "e0d131d95364edf940a70127fcb5748b86e6955e";
+ sha256 = "04g1albh3f865vy7wp9zp4njpazf4haiynxpzy4j0x44wfnchl2j";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@@ -3720,12 +3708,12 @@ final: prev:
gitsigns-nvim = buildNeovimPlugin {
pname = "gitsigns.nvim";
- version = "2023-07-10";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220";
- sha256 = "0v0il2wwgca58gv4jl70gwimnh0qy8swmlxqaw0yl0yj68pgv6ba";
+ rev = "5d73da785a3c05fd63ac31769079db05169a6ec7";
+ sha256 = "16xdc4nf9i39bi9diin5v3782gnlp0ln95aphydv2s7rcg88mdlj";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -3744,12 +3732,12 @@ final: prev:
glance-nvim = buildVimPluginFrom2Nix {
pname = "glance.nvim";
- version = "2023-06-12";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "DNLHC";
repo = "glance.nvim";
- rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1";
- sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma";
+ rev = "3d67c10c422b2d2800761f4f484305540d54450b";
+ sha256 = "186zb2zh4njwy2rxfhmgq0bb3nyfiwf7d289k35qnzw0i7b21wkj";
};
meta.homepage = "https://github.com/DNLHC/glance.nvim/";
};
@@ -3768,24 +3756,24 @@ final: prev:
glow-nvim = buildVimPluginFrom2Nix {
pname = "glow.nvim";
- version = "2023-05-05";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "glow.nvim";
- rev = "bbd0473d72a45094495ee5600b5577823543eefe";
- sha256 = "13l7xd71nnvm643pc15zvi5yc2hig2x6s8dfv7bz9ygf3q7wyzy4";
+ rev = "0bd87753b052205d271a790b48a09882a9e79f35";
+ sha256 = "1sgarwqc8l8gygz90f408cljpcqrw1gsyzvfg6afih90214nfk95";
};
meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
};
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
- version = "2023-07-07";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
- rev = "6550ddf5ce491d17af009c397aceb25310566eaa";
- sha256 = "01im6m0h7pa04dzh0daxkll5y1i7zf5kxlj01cribghl04zlhdxc";
+ rev = "7e5602dd51a230581f43c42559d7acc2fbca23cf";
+ sha256 = "1090n4rdgjfgzfabdmmi0rxd4xk1h2y5jmhy9z7ncs0qpplhnbq2";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@@ -3828,12 +3816,12 @@ final: prev:
goto-preview = buildVimPluginFrom2Nix {
pname = "goto-preview";
- version = "2023-03-17";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "goto-preview";
- rev = "82ce83ae589be7a59e4ec5cfbbf82d9f5eb8bded";
- sha256 = "1hl8nlvp8rlycpkfwyl10lzd5ilxw33mfv1a39isrsa7l7ql75b9";
+ rev = "84532db88f8ee272bcd1c07cda55884e23fd9087";
+ sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl";
};
meta.homepage = "https://github.com/rmagatti/goto-preview/";
};
@@ -3900,12 +3888,12 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2023-04-24";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "3fff63b0d6a425ad1076a260cd4f6da61d1632b1";
- sha256 = "0207p4qg6s31957jbfb0k5yabgadzn6wf3z43m5skvp5w1al5a2b";
+ rev = "b17daceec6ed9a5fb46e0f293f2ac666c90e5459";
+ sha256 = "16kg8plbav8vd97a3kix5043f538kkqiv29kmwq6aa971vjxyp9g";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
@@ -3983,12 +3971,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
- version = "2023-07-09";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
- rev = "b2e3ecdc3d94bf489126c040be27a8af80733453";
- sha256 = "1yhnib92inqs3ww00bwimidpbzfi17xiv2ifjyprpfyx1kk76h33";
+ rev = "070f78dcf9fdb069ccb57e1b15bdfd7596a08bbd";
+ sha256 = "1j0dg6xsksndzfksszpwrs6a9ldkzfm2v1blk1r5yzj5lyr6q9j5";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@@ -4029,14 +4017,26 @@ final: prev:
meta.homepage = "https://github.com/travitch/hasksyn/";
};
+ headlines-nvim = buildVimPluginFrom2Nix {
+ pname = "headlines.nvim";
+ version = "2023-07-27";
+ src = fetchFromGitHub {
+ owner = "lukas-reineke";
+ repo = "headlines.nvim";
+ rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46";
+ sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz";
+ };
+ meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/";
+ };
+
heirline-nvim = buildVimPluginFrom2Nix {
pname = "heirline.nvim";
- version = "2023-07-05";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "rebelot";
repo = "heirline.nvim";
- rev = "76136ccd93ed608e8109762f032cf1118981ebbd";
- sha256 = "09mqjrbzhfbfs6n1hg4dv5kfr1xbwbq5qhd8b52550bs6a43r9bg";
+ rev = "1840fe27dbb38efa13c8af4614acafe6efa41988";
+ sha256 = "1h4h4hkz9vkdh2hza1qp0xmiv1rkxzzq7aa4zrp82460z1ic3z1h";
};
meta.homepage = "https://github.com/rebelot/heirline.nvim/";
};
@@ -4079,11 +4079,11 @@ final: prev:
himalaya-vim = buildVimPluginFrom2Nix {
pname = "himalaya-vim";
- version = "2023-02-15";
+ version = "2023-07-17";
src = fetchgit {
url = "https://git.sr.ht/~soywod/himalaya-vim";
- rev = "64fb17067cf5dbf5349726b9ed1b1b38065cdb82";
- sha256 = "13d5vs35bmzr4dj2anj2k7scmx647ddsyz941sjaajsyff37bvsv";
+ rev = "479c49fd46899144d24b78dbd81d64cc0c05ffc7";
+ sha256 = "0as0dxkf37pfqk878rq1d3dfdl2d724plabgs0cy3lkg20x389i4";
};
meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim";
};
@@ -4148,6 +4148,18 @@ final: prev:
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
+ hover-nvim = buildVimPluginFrom2Nix {
+ pname = "hover.nvim";
+ version = "2023-07-10";
+ src = fetchFromGitHub {
+ owner = "lewis6991";
+ repo = "hover.nvim";
+ rev = "c366d1b0f9d6612d25681d3fea0f9ea46fa54f4d";
+ sha256 = "0vhr5a9nsww4xhniv86j05isfv94fwa5sz2ikkn6fnl7d743m1xr";
+ };
+ meta.homepage = "https://github.com/lewis6991/hover.nvim/";
+ };
+
html5-vim = buildVimPluginFrom2Nix {
pname = "html5.vim";
version = "2020-08-22";
@@ -4306,12 +4318,12 @@ final: prev:
indentLine = buildVimPluginFrom2Nix {
pname = "indentLine";
- version = "2022-09-07";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "indentLine";
- rev = "d15d63bf9c4a74a02470d4bc8ecce53df13e3a75";
- sha256 = "079r951hg2z2cjlb4sh8iz4pvivlinbvidpgq66ddlv4v5q5yg34";
+ rev = "b96a75985736da969ac38b72a7716a8c57bdde98";
+ sha256 = "0g5rvgn6919wbg4xpiwzkq6c1nhsg2lmxmqg3fj75fk71glcggcp";
};
meta.homepage = "https://github.com/Yggdroot/indentLine/";
};
@@ -4402,12 +4414,12 @@ final: prev:
iron-nvim = buildVimPluginFrom2Nix {
pname = "iron.nvim";
- version = "2023-07-04";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "Vigemus";
repo = "iron.nvim";
- rev = "f603de5263be81782125a9c3010182f55b7d1dfc";
- sha256 = "04ss0jv0jliwab8mq7hdwz3m0y8scfp4y3irr3lhidfg9fcmwhs4";
+ rev = "7f876ee3e1f4ea1e5284b1b697cdad5b256e8046";
+ sha256 = "0yf7sykk6dvzmnzwphfmi3s3jmr9iab1aqszx6ir5915zy3wrwvl";
};
meta.homepage = "https://github.com/Vigemus/iron.nvim/";
};
@@ -4619,36 +4631,36 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
- version = "2023-07-09";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
- rev = "da8b00581a52f5f87ad2aba9f52171fda7491f18";
- sha256 = "1b2h6fzj54jwjqkqhd51lfw4mdqdiam9426zdxaic9nbjai7rjps";
+ rev = "3ad55ae678876516156cca2f361c51f7952a924b";
+ sha256 = "1yzdy9iqfx2aa7gd56lxqjmarpflnqqv0yyx9vcz5w9i7bg7dk1g";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit.nvim";
- version = "2023-06-03";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
- rev = "3466e48439601445e26c65635421625886f2d0c0";
- sha256 = "1w8qrgkvg7hivxlcr17l787gkyc0whi6iwgfl4chbcrll9ddj3r9";
+ rev = "1578fa3db0a707393d690a2357e7de6a47081ce0";
+ sha256 = "09kvwi51davqyvi0zhbkw5ri82z3g2ss4v66q6hs9n2ypm03hlvh";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
- version = "2023-07-10";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "891294bb7b5e4068a954b29f93556c1acb05393d";
- sha256 = "1hx6shg720939zqdqh2f7liz6ais5wsch94xn230gcviqr06mjg8";
+ rev = "b82d1e8d5f6f33bd89af95e795f6877a7a6cbf7c";
+ sha256 = "0npa97h0d31p0sagkssc2gag239gssawjd0n0q3mxbhfs6jyayck";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -4679,12 +4691,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
- version = "2023-07-04";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
- rev = "8facf2eb6a378fd7691dce8c8a7b2726823e2408";
- sha256 = "185zil8r41dz981qjmj241zri5iswfafqsx9racvsg87gcvysggn";
+ rev = "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c";
+ sha256 = "093fzf1bki2ll3lrqbnrw9w7i7aajbma4zq83c2nkxwi5gj5jqgl";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@@ -4871,12 +4883,12 @@ final: prev:
lir-nvim = buildVimPluginFrom2Nix {
pname = "lir.nvim";
- version = "2023-06-05";
+ version = "2023-07-12";
src = fetchFromGitHub {
owner = "tamago324";
repo = "lir.nvim";
- rev = "959ac31dae906fb71181c2e75ace62ffb1fff8c8";
- sha256 = "1r4m1nifavshj1g17sxcxfw449jamfc4ffdpil44g9wr7rjwv0hj";
+ rev = "969e95bd07ec315b5efc53af69c881278c2b74fa";
+ sha256 = "1rrmsib2frr4x00kl07v9acva8wa75fbpvpwq8yvdyjy1zgmir7q";
};
meta.homepage = "https://github.com/tamago324/lir.nvim/";
};
@@ -5027,12 +5039,12 @@ final: prev:
lsp-zero-nvim = buildVimPluginFrom2Nix {
pname = "lsp-zero.nvim";
- version = "2023-06-20";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "lsp-zero.nvim";
- rev = "de0e7d7c75cb032107d4a728aa0a63a61d8e5909";
- sha256 = "04x9hmshjfy11fsxjk51w0axafm05iiw3gja2jyj4mrh95lpzrwl";
+ rev = "7bcbd67298237d4c7a958715bc99f25f20702c6e";
+ sha256 = "0q61hfk3dsa6pgx25iqxz4r1r25mcizi0lbyvv88nn5fdvg8lv74";
};
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
};
@@ -5062,12 +5074,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2023-06-01";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "17ff7a405fea8376b015b8ea7910d2e59958bf68";
- sha256 = "1qgl3j9a0b3wf381q859xjw0pcfbfxxm0fsdhj7bgfdq11v2q60p";
+ rev = "58d4e810801da74c29313da86075d6aea537501f";
+ sha256 = "14v8mkv3q7l0pv63i3sgiv81bg5yfq927n94nrfz7nwfmg82rxxa";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -5146,12 +5158,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2023-07-10";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "45a4e899ca8f54936fe32ead6bba65f2a8d42e12";
- sha256 = "00d3bdpx26n61yy3rq7z44wlpryiqpccjnv6kjrp9gjsydh4a471";
+ rev = "e81cbe6004051c390721d8570a4a0541ceb0df10";
+ sha256 = "1smr62hm7id8j2j7cra8rcjn9xwdpayak9cfgyx4hs58w5g8hvbj";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -5243,36 +5255,36 @@ final: prev:
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
- version = "2023-07-10";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
- rev = "796008869e67ef27a5aa5ac44c08ce2a60b89f55";
- sha256 = "1l8nkjdl4k66yas0wrzddk83k7z73kcylqb0cv7h2v7f2d2y79ng";
+ rev = "e86a4c84ff35240639643ffed56ee1c4d55f538e";
+ sha256 = "00pv0yry8cj8w7y20r7ccla4482lh3dp9pd00k3lcycnbzj7k0s1";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
mason-tool-installer-nvim = buildVimPluginFrom2Nix {
pname = "mason-tool-installer.nvim";
- version = "2023-06-12";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "WhoIsSethDaniel";
repo = "mason-tool-installer.nvim";
- rev = "49e3efe743d846d80da5a4757d4f7e563a96cb84";
- sha256 = "1g5aha7jjw36wl2ji1i4gwa623x8v6agyxdqv68k7dsbid6kqj3r";
+ rev = "031903fefbf59371502092ef9e22cab9161d90ba";
+ sha256 = "1za6shsh5ykdv9ivf971b3ckfxk25p8lsd9qdgrmm5bag6vih8cl";
};
meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
};
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
- version = "2023-07-04";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
- rev = "5ad3e113b0c3fde3caba8630599373046f6197e8";
- sha256 = "1mqbby4arzr136szh371p2ynwvpaf6glkzyb7s5sr547v7qmb29c";
+ rev = "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f";
+ sha256 = "1yvf5hml1nhglmfaa0da5mjmgxaysc8x8k1rk820vpj5f1bhl70p";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@@ -5291,12 +5303,12 @@ final: prev:
material-nvim = buildVimPluginFrom2Nix {
pname = "material.nvim";
- version = "2023-07-06";
+ version = "2023-07-11";
src = fetchFromGitHub {
owner = "marko-cerovac";
repo = "material.nvim";
- rev = "c7631d373d3ae02ef502ec6b8620a8ff36ab922e";
- sha256 = "192xaw1k2sa5m92f046g6nbp4jw3yxb8xzzk33824h03adykblcl";
+ rev = "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536";
+ sha256 = "04fd3rm4lzf29vpma2ylh19qcsms81qs6nlzwji8la3d78zr09n3";
};
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
};
@@ -5351,24 +5363,24 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2023-07-11";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "4766f80acf4df22385adb36bf3a166752848f179";
- sha256 = "0n2zx64489qgmrr2w1j83rpi9j759p4w6xqnga23sxbsxgvvj60r";
+ rev = "aac602e097b99a06bc84e43356f080eb6256dd21";
+ sha256 = "0waznhg7qbs50wqkfs0pk5ar92drlf35fgg7lclcjdq09gji64v0";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap.vim";
- version = "2023-04-18";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "726746ed02eab2eef137a7ecceda7214fbeeec41";
- sha256 = "1p8bpa7g349zhx7z78gyxrhfrhibihd9v7p4224qzddk0pd4ibkz";
+ rev = "74573b63b9ef0583262b6bf6ef209eb7f3b06b94";
+ sha256 = "040z12dxagbfsbkdwpsz6dk2vpak3z737ra5ipb1ljqsswgrj5f9";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -5423,12 +5435,12 @@ final: prev:
monokai-pro-nvim = buildVimPluginFrom2Nix {
pname = "monokai-pro.nvim";
- version = "2023-06-25";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "loctvl842";
repo = "monokai-pro.nvim";
- rev = "cb351c21a46e12df53e0650a5a1ee1b9d27b9a98";
- sha256 = "0hknggiy49h1zfi0yvnxz9xv5r3jnriz5jrp8nyc1m3zwirmrir3";
+ rev = "cdad962b234580715bb3da4bf913c723280f9e5d";
+ sha256 = "1i05xil5nc3rr9x0vxr9pnqwbsbp01k9rl8rbhi6kv3cx8gs2q6y";
};
meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
};
@@ -5699,12 +5711,12 @@ final: prev:
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
- version = "2023-07-03";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
- rev = "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da";
- sha256 = "1hq3gxqv5jsih4cj78y8shn5ncna3hi8mwzgkl2qjhy490vc7kpa";
+ rev = "93fcf0a3056c60829c0a210fe35523cda7ef0369";
+ sha256 = "1gyb0y0dalam3s7gj8179kkgpjkn05wv15gkjhy0r16b7xyfk6vh";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@@ -5735,24 +5747,24 @@ final: prev:
neodark-vim = buildVimPluginFrom2Nix {
pname = "neodark.vim";
- version = "2022-11-13";
+ version = "2023-07-15";
src = fetchFromGitHub {
owner = "KeitaNakamura";
repo = "neodark.vim";
- rev = "d11dc6e8b32aeb64a3abc5f7d94d5569070bb4bc";
- sha256 = "0fxf8qcj6kh7j9mdnx2ncpnnxg37nbf6gs11d0nw27ihqc92xx1c";
+ rev = "2488bf42b197cb09f7807e35a58d3fe56ef1776b";
+ sha256 = "0ihkhhkgqvsm67kx41mr8zrir5wkk43pnq4kd8nbl467m1k88nxa";
};
meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/";
};
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
- version = "2023-07-11";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
- rev = "fed7f27480ac6bda777cb36f2d6737c8ccc580fe";
- sha256 = "19763byainb613r1xkk2grahbqxwvfiycg3ljz5cmmi9y82z7n2f";
+ rev = "f57e5210d450b47aa02ea6d9e50a37414f570b4c";
+ sha256 = "1mx41pwdrnxbzgwx478fcdp8v7qljh9z06jn5qs0706lsw05pkci";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@@ -5783,12 +5795,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2023-07-07";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
- rev = "1b6edb56e8c754494be1564912d33e50ddd8a023";
- sha256 = "0qm74hapfq4lghka7ipkppxlan1c37gjf89wqslclj7q40cplm32";
+ rev = "2118729749a5b500e6d52bfeac22559c5a0866cc";
+ sha256 = "1qfh68md3wv5bchpip450fnmgwzxlylgb8kf5p7i8gkkzz7qdg3q";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@@ -5843,12 +5855,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2023-07-09";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "c801ae5165423f4c70841e548208c74da86acf72";
- sha256 = "0gi9mmf24x8v97gg4f562pl9pn675lvwc2l1rdlrxk2w3ng28aad";
+ rev = "e76f0cb6b3ae5e990052343ebb73a5c8d8cac783";
+ sha256 = "194bawzni3psgzs2aljzdm7rgxv58psm30aakrnqy6rl11sackrc";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -5891,12 +5903,12 @@ final: prev:
neosnippet-vim = buildVimPluginFrom2Nix {
pname = "neosnippet.vim";
- version = "2022-11-01";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neosnippet.vim";
- rev = "b7c241fb5737c50bf09cf1e26298492c3fc0457a";
- sha256 = "11gbxkmbiiklqa8gzjm7dhg3xsv9k2wl131q6g18nwyrc5gaw8vb";
+ rev = "efb2a615df2e6df9364087686dacca223fcfa16a";
+ sha256 = "1yihgplpdgkn7dgsgwrw8q3pl0f7hj06wkpv5j5y834n5zrzm4n0";
};
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
};
@@ -5915,12 +5927,12 @@ final: prev:
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
- version = "2023-06-15";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
- rev = "e46eae5739c470aa011ee43108ea8a730736174e";
- sha256 = "0jwvasiv4y8dcg14h8b6n9fzma84bk0y3d8h5rydzg2351wk145m";
+ rev = "bec7be0f13ee19c85561943fc5f7b8daa4f4d465";
+ sha256 = "04w1ifxrxsyzyw0l4kv2sqnxjzv46j5v39l4d354042q5xcriw9c";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
@@ -5975,36 +5987,36 @@ final: prev:
neotest-go = buildVimPluginFrom2Nix {
pname = "neotest-go";
- version = "2023-07-01";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest-go";
- rev = "05535cb2cfe3ce5c960f65784896d40109572f89";
- sha256 = "0mg1cacs6hd2f0pgrggd94f88yaq99ic9xw3a3hiyywcx7apkz94";
+ rev = "f2580cad67ef0181403cf65858ab638ffd3ede9f";
+ sha256 = "0lvbqyqcz35964akcq5xmg69xw37jpf8202k27zy10f160swff8j";
};
meta.homepage = "https://github.com/nvim-neotest/neotest-go/";
};
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
- version = "2023-07-09";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
- rev = "f7d028916583af59e554bbc7b01255f53b931417";
- sha256 = "1wwxfwa9vqphr9qkpg2y195dqdk5qy3apivmja5abb98kvp761xx";
+ rev = "d936279cee9ba3547adc8aacb62accd900edc8d1";
+ sha256 = "1mqmdmk22k4m176bp7hlkx594fjhplrq3mqgbzim9kxnaqp4m5wx";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
neotest-jest = buildVimPluginFrom2Nix {
pname = "neotest-jest";
- version = "2023-04-16";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest-jest";
- rev = "22b1050dda3ebd401780ec4b8e193cf52523a4da";
- sha256 = "0vg433x68c9h0nzws6lwb4xcgqzm8ss5dkmi8df4fa55m2ll8iaw";
+ rev = "e60280f53ef9f84fd827aecae1e2f732ba4326b1";
+ sha256 = "1j4q8z3vpbcmgsmv2nvlr7dziqr4kl65prapqlr6zj0w30lr3gzn";
};
meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
};
@@ -6059,24 +6071,24 @@ final: prev:
neotest-rspec = buildVimPluginFrom2Nix {
pname = "neotest-rspec";
- version = "2023-06-30";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "olimorris";
repo = "neotest-rspec";
- rev = "f5569be7d462585576eb19282aab83887ba84a6c";
- sha256 = "174gj5kxvippr52qz4glij09dand627fy3q6l02fvfdir371q3sj";
+ rev = "754431f0ba41d058ba5d6c2d59908836e18ac355";
+ sha256 = "1jbd3i0zvjx7pknfg0xwk5g8742kpqbnk2z5vwnspwwf0y9ayk86";
};
meta.homepage = "https://github.com/olimorris/neotest-rspec/";
};
neotest-rust = buildVimPluginFrom2Nix {
pname = "neotest-rust";
- version = "2023-07-01";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "rouge8";
repo = "neotest-rust";
- rev = "6dce8963e5395adf079bf22e931dfce65d3fed25";
- sha256 = "0mg71ha951di5srw6g6whdpjjmbqrg47n2d5ana2q9svqmgrd0cc";
+ rev = "d1dfe0f51f3a1def715d1fdd6918341176592c23";
+ sha256 = "0iaxkp43q42zg08ggkp3n1p7y6dwfij3g9dm0d93wwgcg86ync53";
};
meta.homepage = "https://github.com/rouge8/neotest-rust/";
};
@@ -6275,12 +6287,12 @@ final: prev:
nix-develop-nvim = buildVimPluginFrom2Nix {
pname = "nix-develop.nvim";
- version = "2023-06-14";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "figsoda";
repo = "nix-develop.nvim";
- rev = "2453645ea621fd7265022628a44010fef9a64cea";
- sha256 = "1nxzxdahv1zr0kbnhf5sgw7657dha9m01xi2ij8fm8hp3ydvbypn";
+ rev = "afea026f5c478c000a8af8de87f7b711676387ab";
+ sha256 = "0nwjgr19pzdxd7yygz380b388qcfbzp9svs916kh0zayzi9yxc2k";
};
meta.homepage = "https://github.com/figsoda/nix-develop.nvim/";
};
@@ -6335,12 +6347,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
- version = "2023-07-01";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
- rev = "6c87c1d11c38180fb72bf8f45518a0a3e081afc1";
- sha256 = "0y0fwll3a421r0px9x2d8mq2nj00w6ahilwmrvmhvnazjgqd074j";
+ rev = "894db25ec726d32047799d4d0a982b701bec453b";
+ sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
@@ -6395,12 +6407,12 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
- version = "2023-06-18";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
- rev = "d146966a423e60699b084eeb28489fe3b6427599";
- sha256 = "0cg0771dai5gsch36qfandx3i48gq2zhifnmgwarl174af8f8mrq";
+ rev = "9e3916e784660f55f47daa6f26053ad044db5d6a";
+ sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
@@ -6431,12 +6443,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
- version = "2023-07-08";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
- rev = "720d71b546b8300bf3951c839f52db6cb83c3dc5";
- sha256 = "0byhs3711k9ji1vwvc2zgv75jvj7njfcmg47ipw28hl3nmhv3h67";
+ rev = "0e27cb4b44fbba69f8646d1f88555737d2b6aedf";
+ sha256 = "00a4wazmxmrnb2da0x4im4iwr0df0kh5jn73hclp517r73m3fi4w";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@@ -6479,24 +6491,24 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2023-06-18";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "e8f7dd7a72de3e7b6626c050a802000e69d53ff0";
- sha256 = "0lk78zvmf5cyyq4nmrzybi7dbpbwx499r0la4wza9h1gp4l7xvy7";
+ rev = "ae5b41ce880a6d850055e262d6dfebd362bb276e";
+ sha256 = "0bka3gy9all6axkdpbp0q5adspl6vrdws9my9gllszjndsjrdvvf";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
- version = "2023-05-13";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
- rev = "4f3aa29f49b38edb6db1c52cea57e64ce3de2373";
- sha256 = "0cl2f2xvl3sd0b0f6pmji9czcwyrgh0km9qji6pip6yhna4g7c0f";
+ rev = "6247ca9aa9f34644dfa290a6df3f6feefb73eb97";
+ sha256 = "0bfkhc046wwgrf02snvbx1p43xqhkhcr9b4r8w2nws4hlbzkdd4f";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
@@ -6515,12 +6527,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2023-06-24";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2";
- sha256 = "02z00d4ah393agcpp0ihzz19z2kgnqnz3l6vwrg9qgln5k21q5fq";
+ rev = "65397976cec59a1e9892b93e3ab1ea987064b0dc";
+ sha256 = "0yih7p37gm3ipx6vixb89iq7wwf85id8ff49hrs4v6y020s4sny5";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -6575,12 +6587,12 @@ final: prev:
nvim-cokeline = buildVimPluginFrom2Nix {
pname = "nvim-cokeline";
- version = "2023-07-06";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "willothy";
repo = "nvim-cokeline";
- rev = "904dc18d017cdf5c7c52a6455fd2a8d6f9a8bc3b";
- sha256 = "1wbfa9g22d2hshl2v0ksg5xmjhrdclqqq7zf33d9pxxr4bp62xyp";
+ rev = "c2842a51df781d357cd3408c411a7bec147b57ae";
+ sha256 = "14nv3rvcy7fznxqdk2xbxfsjp8dg9kzv27zakpq352l4w9i4qfv0";
};
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
};
@@ -6647,12 +6659,12 @@ final: prev:
nvim-coverage = buildVimPluginFrom2Nix {
pname = "nvim-coverage";
- version = "2023-05-26";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "andythigpen";
repo = "nvim-coverage";
- rev = "8fcc71e01e93f305e334b59f902e545a70d0050f";
- sha256 = "0d62vpbf03pbq4rs4yxywnn7j9wb90bahv1cx2wm5w4q6jgdgpk3";
+ rev = "4634dfb00961a86948518c7e6f85737c24364308";
+ sha256 = "0ry8b5945spz00scab6xxs8va56yg17q1dd6g90k3zm9gvdi0r79";
};
meta.homepage = "https://github.com/andythigpen/nvim-coverage/";
};
@@ -6671,24 +6683,24 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2023-07-09";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "3bde6f786057fa29d8356559b2ae3a52d9317fba";
- sha256 = "0mm3yhbidknz0rkbmsa32j4jnws9vfss8c6il833v0c4q7zm1jl5";
+ rev = "2f28ea843bcdb378b171a66ddcd568516e431d55";
+ sha256 = "12b72xhz3ha18xpcnc54s4ic19jg4i6v8dka8lxky6hymzw408ir";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-go = buildVimPluginFrom2Nix {
pname = "nvim-dap-go";
- version = "2023-05-23";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "leoluz";
repo = "nvim-dap-go";
- rev = "cdf604a5703838f65fdee7c198f6cb59b563ef6f";
- sha256 = "0iwwykp4ddw39blb8v3miw3l7xm0bsy6yzszb8pmli5cd6fgqf69";
+ rev = "eab43d63cef832801a701812913e4d1d726725e5";
+ sha256 = "1r3i3zx11apsihv66f10x363aigml4kfb178kdblxxffn014n728";
};
meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
};
@@ -6707,12 +6719,12 @@ final: prev:
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2023-05-29";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "c020f660b02772f9f3d11f599fefad3268628a9e";
- sha256 = "0w64jq8g57g6wacrz1yx9mfjmmd82qfcpia818lfa4594z1amfg3";
+ rev = "85b16ac2309d85c88577cd8ee1733ce52be8227e";
+ sha256 = "04ylr1jcj7bbcsrsx2z84savkf1yqaisymq7gsnhvzmbpxxwb96g";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@@ -6743,12 +6755,12 @@ final: prev:
nvim-fzf = buildVimPluginFrom2Nix {
pname = "nvim-fzf";
- version = "2022-07-12";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "vijaymarupudi";
repo = "nvim-fzf";
- rev = "a8dc4bae4c1e1552e0233df796e512ab9ca65e44";
- sha256 = "0cyq5rq029hnk9p3qw6gfhxvqiz5m788i4w6n4xxb6wif642bd4l";
+ rev = "45d14cd66c160b199b3c5cef0e7c81793dc2b1e0";
+ sha256 = "1qv7k1nvh61sd24k0c1iayhv3xw9vx14ciqgdmfggl8d4cfvlg21";
};
meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/";
};
@@ -6767,12 +6779,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2023-07-10";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "48e18669eb7bb7d6e7cb3d86de1082924f5fddd2";
- sha256 = "1jmx7sr5am4xz2id93c1g6a4pnd0ni361469i15qj4n757n90f8r";
+ rev = "571f25463a2a4c512b7c2617c976beb8190d2621";
+ sha256 = "1wxy0nwzg72i586a1zq8q17rbl116njbrwnbyd2xn1g21887myhm";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@@ -6791,24 +6803,24 @@ final: prev:
nvim-highlight-colors = buildVimPluginFrom2Nix {
pname = "nvim-highlight-colors";
- version = "2023-07-01";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "brenoprata10";
repo = "nvim-highlight-colors";
- rev = "60ee461c30953d2d1dc3895d01af995b24cc6788";
- sha256 = "09ikihpskymbawk5l4n4xc25dhmhywiwlsklimcwhj2bs4vngpa4";
+ rev = "231547093a788b925b8fc36351ad422701c3a8c8";
+ sha256 = "186bpqmb1w18zq5sgzy0xj1cs24sb5sqpm3rqsqyhjbybgcf56yn";
};
meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
};
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2023-07-07";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "67729d0c6218749937b9ec075650f336ad0a446b";
- sha256 = "0w286h8y3bzk19gc5rshccp005pg8vb7yv7c0s815c9dp7lbg1va";
+ rev = "7e67fa948e32ad54f790023ae7ab0bac1a1d10fa";
+ sha256 = "17r8adn2rw6b7914sk2i3407qj4ji8ph4b2dsjmfwrar6mixg411";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -6863,24 +6875,24 @@ final: prev:
nvim-lastplace = buildVimPluginFrom2Nix {
pname = "nvim-lastplace";
- version = "2023-06-05";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "ethanholz";
repo = "nvim-lastplace";
- rev = "aeb0e0bd399288092729da89a9e51dda4ccbc9ec";
- sha256 = "16b14l4k9lwlhbjzqqj0dn4726jdfwa5iz0sd2a1akvwq5r83rm5";
+ rev = "0bb6103c506315044872e0f84b1f736c4172bb20";
+ sha256 = "0a5bplxsds8y054jbgcwd0j0hzj0knazdmir54byd2bm57l78qcf";
};
meta.homepage = "https://github.com/ethanholz/nvim-lastplace/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
- version = "2023-07-10";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
- rev = "bb9ec720aa998252951627f811e8f39b76789e0a";
- sha256 = "03anzn14a8fc14wzv9m98f2flhn4lcn66g4c053r1bc9p54k21p0";
+ rev = "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9";
+ sha256 = "0i0lppncxz7nmd683sz79063nr9yds46lyhkkxjxj853mskjisii";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
@@ -6899,12 +6911,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
- version = "2023-06-22";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
- rev = "0b99416769e87231ce37aec64b4ed91feb43a98e";
- sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3";
+ rev = "3db039fb36bba925f096a659fc4d1b4a93f7fb70";
+ sha256 = "1kwy1rc2nd6krvy3n4dkyxl0a2dzfl3viyrfrbzypv321p60jyyf";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@@ -6935,12 +6947,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2023-07-08";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "deade69789089c3da15237697156334fb3e943f0";
- sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6";
+ rev = "b6091272422bb0fbd729f7f5d17a56d37499c54f";
+ sha256 = "1miar4bdf60s4gp55rc9918v0k33w2mnqym9b44mqkxzn2fbsrh2";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -6995,12 +7007,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
- version = "2023-07-04";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
- rev = "cd50bfeae9915b827289141ee9914b79fc8887aa";
- sha256 = "0rwzcq4lhq3qibn5p290yp3ly55cg0l64csw9y8xnjr73jc9l164";
+ rev = "92e2085f08da4598c6ae0c19c332c5c04b33a2c5";
+ sha256 = "1rv6lqr8pfa53v94l25srjmgjglxpvzxl8kxan03xyiayh5k5nbn";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@@ -7031,12 +7043,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
- version = "2023-07-08";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
- rev = "6e8850a524307814decc1b195a2c8a51482a9886";
- sha256 = "1js5vdjc9rs2gi0g7b2lkwxs9assnykbc9i2f144b3ky7yhiisbw";
+ rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0";
+ sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@@ -7115,12 +7127,12 @@ final: prev:
nvim-pqf = buildVimPluginFrom2Nix {
pname = "nvim-pqf";
- version = "2023-06-20";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "yorickpeterse";
repo = "nvim-pqf";
- rev = "90c7e33245e807eea85fadc6360a1d053406bc2c";
- sha256 = "1rcvp90ipsgv33if63a0fivfp5gi5qrgk6z8s7kycwdqkcf2fzrq";
+ rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d";
+ sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g";
};
meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
};
@@ -7151,12 +7163,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2023-07-11";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "1c559f44cbde8a3637a48b6b5f44e201aff4e1cf";
- sha256 = "1nybh0n5g2sz0n4j974i173zv5byqly5k26km88kygxa3dzlmqx8";
+ rev = "d83bf0bf21349d396f365f86a8126747cb72d89c";
+ sha256 = "0miw0mw3s73iv7inwhqcndcw4v759d5kvl74yd49n6qn28y0cj86";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -7187,24 +7199,24 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
- version = "2023-07-09";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "6edac44e10b94b88bf3067fae937915172a3f825";
- sha256 = "1l954rr5ckf6dr3qcpiambd8ikhrs80i75x9sdvsw99ccrjdfgph";
+ rev = "3ba6edeea1390457caaf73e96ab9c086ff6f90e9";
+ sha256 = "1c949pvry9qzwrd5736llnqgp4111jrj2gvrkbg8chwm9jyh75a4";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
nvim-spider = buildVimPluginFrom2Nix {
pname = "nvim-spider";
- version = "2023-06-11";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-spider";
- rev = "04c6fc14d09823002dae486100745011fc3201ca";
- sha256 = "14310nzyjw7z83m7lqgbw2g0924ikwqi4h6cg9xcmh9ydflvn4dd";
+ rev = "b268dfcdd00e75d8c3f3576da7f89dfe14cadeec";
+ sha256 = "18ik049anbdcadj3myn5y78qz62x8amrdibr2avkrb0ay9bfvjaj";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
};
@@ -7259,36 +7271,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2023-07-09";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
- rev = "a708bd2413d467929b5019ec1bce7b1f428438bc";
- sha256 = "1ss2dy68144jsf5ynfmv2nik2yklb3qxb547qq9nd04l3wj8f5n9";
+ rev = "273c1700eb68c27dce4e518efafc8144fd7ce4ab";
+ sha256 = "1cs0nkjmmd8gqlwk68zqy9hr2s86hybacmqxvf7n69f8q3539g38";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2023-07-11";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36";
- sha256 = "0qbgh8hvnjb0dg8fqv9w5025sv2z8b9lwcgqpbdcsgqih2g6k84r";
+ rev = "f09bcffe0c29a464db24ad8124dd1f0be3fe9ce5";
+ sha256 = "07lkgkwnzibsx0syd1js4j5rgpxqb2vpkn0x37zb8x2dxzdfv0i8";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2023-06-29";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
- rev = "63f3ffc50b0afc59be1015153d00922498085be8";
- sha256 = "1jvsf80q8dxhdxbphrms755aj4ak58xacpzgs91v5jb5zjcvmsx9";
+ rev = "6f8f788738b968f24a108ee599c5be0031f94f06";
+ sha256 = "1a7gqxl2l5lhx282jd0hx0mc377scr8zv6xss7jsw55k6y4ad5h0";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@@ -7331,12 +7343,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2023-06-26";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "52f1f3280d9092bfaee5c45be5962fabee3d9654";
- sha256 = "1k0065mn4hb3ama3qxrln24rf7cqziysddvw4anxws85dan5x9sj";
+ rev = "9e519b6146512c8e2e702faf8ac48420f4f5deec";
+ sha256 = "1asdjyk9kp4aip9qc2q6ic2jkc8g3ilzjqvxqskjc2jq21fyscp9";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -7355,12 +7367,12 @@ final: prev:
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
pname = "nvim-ts-context-commentstring";
- version = "2023-06-22";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "joosepalviste";
repo = "nvim-ts-context-commentstring";
- rev = "7f625207f225eea97ef7a6abe7611e556c396d2f";
- sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65";
+ rev = "e9062e2dfb9854e6a927370f2d720de354c88524";
+ sha256 = "198mh7n08824mxnqhxa74fvv0nlsy179qigjzla4fny5y3yxrjq0";
};
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
};
@@ -7379,11 +7391,11 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
- version = "2023-07-09";
+ version = "2023-07-12";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
- rev = "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df";
- sha256 = "1xa6khjjq6l9269dnhsgkiq18hjf52f4dp0n622x8bmmxifql9ja";
+ rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f";
+ sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
@@ -7402,12 +7414,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2023-06-25";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
- rev = "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9";
- sha256 = "1i40jzpx710amxm7hgy0ac8pda6bsmkm4r110z691c1l0i90ppwl";
+ rev = "efbfed0567ef4bfac3ce630524a0f6c8451c5534";
+ sha256 = "12hi19zdwflqqg81n35b696hqalbyxvskf7w8qzygcxg3830kl8n";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@@ -7450,12 +7462,12 @@ final: prev:
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev.nvim";
- version = "2023-07-07";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
- rev = "e31cbf722290b640cbf80634792fcaa27dc7b699";
- sha256 = "02krpnqg1k0hnvrhrvk2z7lb1lg38w355xs63p4i34nrmnc5fygp";
+ rev = "07f161a0252f7ad1cf22a1ba4a567b41d9aece97";
+ sha256 = "086qy6zqjjnjml8msxi34zx79cvqfmnv4lgg8gz32m3gpllazvkp";
};
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
@@ -7510,12 +7522,12 @@ final: prev:
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
- version = "2023-06-30";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
- rev = "a5ff72a8da0df1042ee4c7705c301901062fa6d5";
- sha256 = "105ldc37iywalh82snfr3rk750hz7vszi01ipzbfzd8hqvwr930g";
+ rev = "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a";
+ sha256 = "0zyp32nb0xa882i6rjwgs94icpmwpww22g7v1laz0ldm4vkn0qlj";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -7547,36 +7559,36 @@ final: prev:
onedark-nvim = buildVimPluginFrom2Nix {
pname = "onedark.nvim";
- version = "2023-06-12";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "navarasu";
repo = "onedark.nvim";
- rev = "462b45758ea94ff30ad48979268094590a6b7b7e";
- sha256 = "0m7alckgwnqzv9zycrvpisnx8bg2n8057j8lvqjmx4fagfnr8nmh";
+ rev = "cae5fdf035ee92c407a29ee2ccfcff503d2be7f1";
+ sha256 = "0vnsihlwq930hm8f8j6h4ixbk4rrrmqjlkw9q5nd3x38k899iz0x";
};
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
};
onedark-vim = buildVimPluginFrom2Nix {
pname = "onedark.vim";
- version = "2023-05-02";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "joshdick";
repo = "onedark.vim";
- rev = "4e983447f0442dba1629cdaeddfd137793d71d28";
- sha256 = "1vg5zfzyl9c93w9i3d4i22px558warma9gnpafgklrxkwq1hxq0h";
+ rev = "57b77747694ea5676c3ca0eeaf9567dc499730c0";
+ sha256 = "1yr3yywisqwdd3b7xbmcpc3dlq61mjcaspm30j2iqzs000ldbpxf";
};
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2023-07-05";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "9454a13714cf771f6c61c2abb3094c0737d9d176";
- sha256 = "12nbm4p421jcj17az0vmk4cj44ixm0v2i2i6p74llpwn7bzdza3f";
+ rev = "5b447b2d5937a66033084b05ced0f79bcf6e6f64";
+ sha256 = "1czja1d558f303s9dbsr724a3vxgw0lhglzq4n614ljzwy2bwqx5";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -7655,12 +7667,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2023-07-04";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "6f73b461b9f887968d0f69ab3aee6b4ceebe3445";
- sha256 = "0j3sms9f50nrp4g3brvrnzfa2nnyw03ghc5vrhn5qp213b66bgl2";
+ rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b";
+ sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -7847,24 +7859,24 @@ final: prev:
plenary-nvim = buildNeovimPlugin {
pname = "plenary.nvim";
- version = "2023-07-06";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "bda256fab0eb66a15e8190937e417e6a14ee5d72";
- sha256 = "1rsybpshyvzrfzn4dnbhqawn7inrmsfb84rmsklf781chzfjp49l";
+ rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb";
+ sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
poimandres-nvim = buildVimPluginFrom2Nix {
pname = "poimandres.nvim";
- version = "2023-02-17";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "olivercederborg";
repo = "poimandres.nvim";
- rev = "43ea31d1e19f7603697bb3272b233930d0292383";
- sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21";
+ rev = "6f281c8765fef5aa4d004532861b726b1f73721d";
+ sha256 = "0qpv3mkchvyyixnwi771n8n2xw81sxpw4daycwbm3wfj9r7739cr";
};
meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
};
@@ -7930,6 +7942,18 @@ final: prev:
meta.homepage = "https://github.com/sotte/presenting.vim/";
};
+ preto = buildVimPluginFrom2Nix {
+ pname = "preto";
+ version = "2023-02-10";
+ src = fetchFromGitHub {
+ owner = "ewilazarus";
+ repo = "preto";
+ rev = "d7f5205ab63dcbfa80abbc18badd51aa0d9965b1";
+ sha256 = "1l9s6linmjy7wlxsp4gipffnxakwvi1037phcnsr294c920d4dz5";
+ };
+ meta.homepage = "https://github.com/ewilazarus/preto/";
+ };
+
prev_indent = buildVimPluginFrom2Nix {
pname = "prev_indent";
version = "2014-03-08";
@@ -8161,12 +8185,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2023-06-28";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "859289acc0fda13bf42834dbeef10b8c1148d444";
- sha256 = "0nipkn9yfgy3606kkaiyq6rvmasq4jmivdnhr102bl86xsccm4yw";
+ rev = "5359e74291164fcaeaaecdea9ba753ad54eb53d0";
+ sha256 = "1jskfd63n3r1slwhbv1qv239nd0mp3q7h4r9fardkc4xf7nsy1jb";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -8209,12 +8233,12 @@ final: prev:
rest-nvim = buildNeovimPlugin {
pname = "rest.nvim";
- version = "2023-07-11";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
- rev = "80283b7e384a533ff8296a97362f7b1a1c1af83f";
- sha256 = "0a6vjc2dsj724nxi8szhhqx178ghif08qgib4g8lrvlix1lw56a8";
+ rev = "22673c848768ff25517154a5aebfebc0c77d0b4f";
+ sha256 = "1arfcrq4vh3hp4g8s6qib25cykn7v9ywfb8nv9mh8nivqryvmwvq";
};
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
};
@@ -8341,12 +8365,12 @@ final: prev:
satellite-nvim = buildVimPluginFrom2Nix {
pname = "satellite.nvim";
- version = "2023-07-11";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "satellite.nvim";
- rev = "eda3a7014a948e36c330934c7d49c7d86b2fb71d";
- sha256 = "0rfasa1rzyrjid8nl0dzd7prj5ys0mg768znlsdhmn9wnh2lmnll";
+ rev = "8a84a2ab739d0cb5eff461f2635a32bf9a0c508d";
+ sha256 = "0x5kc8r6z8m7arhxv2nq723fzdn7c5xvmsxpp5jndvbk6nmh6n78";
};
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
};
@@ -8473,12 +8497,12 @@ final: prev:
sg-nvim = buildVimPluginFrom2Nix {
pname = "sg.nvim";
- version = "2023-06-28";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "sg.nvim";
- rev = "3574508d9a48caeb8813bd58080024b8363589ce";
- sha256 = "0s53nxvcyjp90frcvlpfpl5sn9x28kqfiw80bj2j8dbhkmz395k7";
+ rev = "7de5e1577800560b2a94c0618fdccc67b74fa620";
+ sha256 = "1prq9q4mcy9035n8vganwgcmdxr7xpg8dscrracd4mrny5bhx20j";
};
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
};
@@ -8618,12 +8642,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2023-04-24";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf";
- sha256 = "0zfgi04c42n1bf5l9zj4g5k60fnsp2njf12vkpfnq2vqdcj1563i";
+ rev = "adb066ac5250556ccfca22f901c9710a735f23c2";
+ sha256 = "081ccy3s94js343ywr24jwky3qrmk508vddm5vrhpdgrpni2z2zm";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -8750,12 +8774,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin.vim";
- version = "2023-06-25";
+ version = "2023-07-12";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "95a700875530a1ad87232e472fab307ee2a553ba";
- sha256 = "0gpj66dwx7qf7gk6qp7sxabfykfq5b8qgzcwm097mv1kzxyp9fxl";
+ rev = "4073ac528b5e552a6b4347cacca9899f74b98843";
+ sha256 = "1sa4dmckx44l6dhmxwgs9nslwz752fhslr2y84zb7gdjqd9w3wmm";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -8775,12 +8799,12 @@ final: prev:
srcery-vim = buildVimPluginFrom2Nix {
pname = "srcery-vim";
- version = "2023-04-25";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
- rev = "6545397ee8119c43f5717600a42ad4b44be0f572";
- sha256 = "1i71l565kmfqrl691ccs1p12v3rig00j4bvl9qg9fhwwxk61bcpx";
+ rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9";
+ sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@@ -8833,6 +8857,18 @@ final: prev:
meta.homepage = "https://github.com/eigenfoo/stan-vim/";
};
+ starrynight = buildVimPluginFrom2Nix {
+ pname = "starrynight";
+ version = "2021-09-09";
+ src = fetchFromGitHub {
+ owner = "josegamez82";
+ repo = "starrynight";
+ rev = "241a94cb0a206efc6fc5f403834c39baf7ad1176";
+ sha256 = "1g2vvvvw1qg9ipfkpvijmkswa6rhh3rnizjmx1h5ghkvgxsr1ryl";
+ };
+ meta.homepage = "https://github.com/josegamez82/starrynight/";
+ };
+
starsearch-vim = buildVimPluginFrom2Nix {
pname = "starsearch.vim";
version = "2014-09-21";
@@ -8871,12 +8907,12 @@ final: prev:
substitute-nvim = buildVimPluginFrom2Nix {
pname = "substitute.nvim";
- version = "2023-07-03";
+ version = "2023-07-20";
src = fetchFromGitHub {
owner = "gbprod";
repo = "substitute.nvim";
- rev = "7412aa56dedc3f507cddb02167a939e55b39a2cd";
- sha256 = "17pjl4sl62myfar9xv2axghyj0dfllzr611qzh14a2kgf1x326n6";
+ rev = "89dbe55cccee36bcb5e2be8c2d92ff8716601734";
+ sha256 = "01cwgkgf8kgi4x4flwwfaj4qgafvnzaiixn68im4279rm6m1ic6y";
};
meta.homepage = "https://github.com/gbprod/substitute.nvim/";
};
@@ -9016,12 +9052,12 @@ final: prev:
tabline-nvim = buildVimPluginFrom2Nix {
pname = "tabline.nvim";
- version = "2023-06-03";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "tabline.nvim";
- rev = "1f77f520249d508eebff462e103ed699ecf5dc5f";
- sha256 = "1c5hpjv7w6r65kadrxywqbp21k527pzrpmqchyxcjjplc1gzq9p4";
+ rev = "ff33d12a20d52daafa5393162cae4108faf8128b";
+ sha256 = "0kcirs2b1398vwgdn045rfbpx6qrai7nxwsbwsvykwk7glmaa8vh";
};
meta.homepage = "https://github.com/kdheepak/tabline.nvim/";
};
@@ -9209,12 +9245,12 @@ final: prev:
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
pname = "telescope-file-browser.nvim";
- version = "2023-07-01";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-file-browser.nvim";
- rev = "e03ff55962417b69c85ef41424079bb0580546ba";
- sha256 = "1agwrhwb6w0qpcgcmffibnip61g6dqjzmchngb1a9fwxqvzrgfll";
+ rev = "6c234e863444c246611ad7458185c771ad8cd6e6";
+ sha256 = "05bd8yw22hp6lj732dhffq8wpy13qslwv2wf8rlmza2m7am4jfiy";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
};
@@ -9340,6 +9376,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
};
+ telescope-sg = buildVimPluginFrom2Nix {
+ pname = "telescope-sg";
+ version = "2023-08-02";
+ src = fetchFromGitHub {
+ owner = "Marskey";
+ repo = "telescope-sg";
+ rev = "df40e78ed1c1ba3cb3591a799c8e4292c88e1ff0";
+ sha256 = "0mqqh15jl7y4i1ycb5lpw9fvad4qm03vw5x7paxw8h2yzi39qp0p";
+ };
+ meta.homepage = "https://github.com/Marskey/telescope-sg/";
+ };
+
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols.nvim";
version = "2023-02-19";
@@ -9439,12 +9487,12 @@ final: prev:
telescope-nvim = buildNeovimPlugin {
pname = "telescope.nvim";
- version = "2023-07-06";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "276362a8020c6e94c7a76d49aa00d4923b0c02f3";
- sha256 = "043rrifqhg5bsksqhfdc20f96i2s2xyd6qyga4918fr75sf8hmib";
+ rev = "22735947d84d78f29436c203f0a4b8dc15dda204";
+ sha256 = "09vy6kmqrnk503vxa7v9z526lv7p3h76fcpcacq1n2196hrjdrxx";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -9487,12 +9535,12 @@ final: prev:
term-edit-nvim = buildVimPluginFrom2Nix {
pname = "term-edit.nvim";
- version = "2023-05-28";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "chomosuke";
repo = "term-edit.nvim";
- rev = "3c2385d5d058720928a96e77c405466478fb711a";
- sha256 = "06qkld6i542p0hh2jxk80n5xfrf0jklg4b7vmkm6imvkcj705hdc";
+ rev = "07bfebde433d3de5d3f53494417413d5a3f7292b";
+ sha256 = "15mm09wqn83pnqp0k6js0j8g0v71bmf7wda64vbyicxc9xsrxn7q";
};
meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
};
@@ -9692,24 +9740,24 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
- version = "2023-07-10";
+ version = "2023-07-17";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
- rev = "83aa231fa414a5dcb72aed97437446a6ca5a81f2";
- sha256 = "0dhbc9s9irzamlv7b8qdamixvh4nf1p7icszdbd8jwks9dfhm9mk";
+ rev = "00c13dccc78c09fa5da4c5edda990a363e75035e";
+ sha256 = "0fvz9rp8rr63pimhpzyx5a05qbgyzixbbglpvkd137bpvya2xigy";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
- version = "2023-07-05";
+ version = "2023-07-13";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "284667adfff02b9a0adc65968c553c6096b543b6";
- sha256 = "0r9scw1r8vd761pqf9zl2aly70xc04h8fqy17ra49p879sx254wd";
+ rev = "1ee11019f8a81dac989ae1db1a013e3d582e2033";
+ sha256 = "0ygrwps4riq37wxwzplw2jyxi7qc7yagypfd444vp0vklqnslvn7";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -9776,12 +9824,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
- version = "2023-06-24";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "d99e2abd10808ef91738ce98a5c767e6a51df449";
- sha256 = "0j5ypv22qahic4lch0k3vssxwnbdngyx2b5h532yn4jkjlph5y0y";
+ rev = "fc4bb22b1d2cd5eb46fe61a9f6d6416d742beb5c";
+ sha256 = "0mhhjl4q45bn0i22jqri6v3rp24d7l3k2q72ggx5i1xinxls3ap5";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -9860,12 +9908,12 @@ final: prev:
typst-vim = buildVimPluginFrom2Nix {
pname = "typst.vim";
- version = "2023-07-02";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "kaarmu";
repo = "typst.vim";
- rev = "5c1a933d6e8178d8d2596165b1709a7605b26d11";
- sha256 = "0pm56qlrj27y8krcjyiw17mpfb3ggl1898zj41fdb8zbhj36mj18";
+ rev = "6a99324a138c2da69589a8ab2e49375774e43d77";
+ sha256 = "085ksm9mp2w93vm22yabg1xgnjv4wd6yg3ivakqhghyk5x2qk9xy";
};
meta.homepage = "https://github.com/kaarmu/typst.vim/";
};
@@ -9908,12 +9956,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
- version = "2023-07-10";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
- rev = "2db2ff26f1537d75e9c20e594344c4ea8459d344";
- sha256 = "13xl7winslmalasc01x69zdnhr1q6amzg7808hmc97vj770y85rm";
+ rev = "3a2d7d78b310f6ddde939042fa04b553012d2c7b";
+ sha256 = "10741mmqls1ys0cd7kab1cn7sjby8f9fhap57jh01nhjkkqbfz86";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@@ -10004,12 +10052,12 @@ final: prev:
vifm-vim = buildVimPluginFrom2Nix {
pname = "vifm.vim";
- version = "2023-07-05";
+ version = "2023-07-23";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
- rev = "2d8b2d2003c01e1fada6ec23938f6f983540a2a5";
- sha256 = "1hrg0172p85q227x8w070jx5qglnl4wqm9n48hcg10wn9sncm6xw";
+ rev = "830e7187949fb6b12cfa5c45acb98d3ffc320d5b";
+ sha256 = "1q5039fcm1skpxxp01lqvcx0hh5hq331zxwcslva8v38wy195pqw";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@@ -10352,12 +10400,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2023-05-25";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "423fe9e2acbe64bd8637d0bedff132972d7603de";
- sha256 = "0cy78kd37q9nzk9f9f3k2aip1bvrcqra4ka02v2pnyr4a00iripj";
+ rev = "e6bb8427dc2d2dc3583ed1bf5ff6a9682c854d32";
+ sha256 = "0sbhpp8w1rdrh386j3q4n2zrwq1ipxb9107ddwlgs89nh5wbf4qv";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -10470,6 +10518,18 @@ final: prev:
meta.homepage = "https://github.com/haya14busa/vim-asterisk/";
};
+ vim-astro = buildVimPluginFrom2Nix {
+ pname = "vim-astro";
+ version = "2022-08-25";
+ src = fetchFromGitHub {
+ owner = "wuelnerdotexe";
+ repo = "vim-astro";
+ rev = "34732be5e9a5c28c2409f4490edf92d46d8b55a9";
+ sha256 = "1ild33hxiphj0z8b4kpcad4rai7q7jd0lsmhpa30kfgmyj5kh90z";
+ };
+ meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/";
+ };
+
vim-asymptote = buildVimPluginFrom2Nix {
pname = "vim-asymptote";
version = "2014-06-26";
@@ -10832,12 +10892,12 @@ final: prev:
vim-code-dark = buildVimPluginFrom2Nix {
pname = "vim-code-dark";
- version = "2023-06-05";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "tomasiser";
repo = "vim-code-dark";
- rev = "978be3a98e49e166b572c9618206061ed74603e4";
- sha256 = "0q7baxh2ckq0b0ycyyg7p0jq7b3wvlfgq8c69bd2dm5gdbijpq08";
+ rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904";
+ sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0";
};
meta.homepage = "https://github.com/tomasiser/vim-code-dark/";
};
@@ -11000,12 +11060,12 @@ final: prev:
vim-css-color = buildVimPluginFrom2Nix {
pname = "vim-css-color";
- version = "2023-03-08";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "ap";
repo = "vim-css-color";
- rev = "5687a7978bc80263cd03d0a667c2f56890cfb940";
- sha256 = "1bm5ay1c9jw34ax9bxivq9b3crfgizphfq40rd406jdyg72ahgbk";
+ rev = "6cc65734bc7105d9677ca54e2255fcbc953ba6bf";
+ sha256 = "1mjry4xiaxhjgzajsbmh4iph9hhxbwgdj3raaxlqzmmnyjsz03iy";
};
meta.homepage = "https://github.com/ap/vim-css-color/";
};
@@ -11588,12 +11648,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2023-06-12";
+ version = "2023-07-04";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "43f18ab9155c853a84ded560c6104e6300ad41da";
- sha256 = "0s9kyid27bvpqb44hirqvjp33lf7hihw7yj0s2kwv9aif0k6mbw0";
+ rev = "b3b838d690f315a503ec4af8c634bdff3b200aaf";
+ sha256 = "1y4jvrja0d77hsr24mb9bfgls5vy12r8g2bmsbsx40zvmwnlh294";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -11696,12 +11756,12 @@ final: prev:
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2023-06-16";
+ version = "2023-07-14";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "4a7ca061af2b199a9b97041270611439e8fa2b02";
- sha256 = "1pqn6g925i4a88d4n9hxjb9fwr7ib7mwslxhl3cphzk0986ncdjf";
+ rev = "8a2f8199b689b93fe4391a8ba1d97dd84b86ebd6";
+ sha256 = "1jxp27mmp84gkjll0h96q9zbh8gs1dsb46cvqnbqvag1p3laxxlq";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -12129,12 +12189,12 @@ final: prev:
vim-isort = buildVimPluginFrom2Nix {
pname = "vim-isort";
- version = "2020-08-14";
+ version = "2023-07-12";
src = fetchFromGitHub {
owner = "fisadev";
repo = "vim-isort";
- rev = "94b1f1202899aa0b6e2cc20e6d1f133eafe24331";
- sha256 = "16r2nsdapf3r0zjqwwbl0k8g2p81h9zs14b91dhskyvs0hvf7cfy";
+ rev = "757c2c830ba0365167460c26f304f3472dfa2ce2";
+ sha256 = "01la7hmf9z9iqv1n4lmsihsny6wsjzqa5c7prws88jkmryrvjxdb";
};
meta.homepage = "https://github.com/fisadev/vim-isort/";
};
@@ -12322,12 +12382,12 @@ final: prev:
vim-just = buildVimPluginFrom2Nix {
pname = "vim-just";
- version = "2023-07-09";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
- rev = "ceabb579cf085cee5ebd361625c237cb565f5af3";
- sha256 = "04vs5zl8l5pvddk267jfkzlkghiddn5pqgjf2aw86yfaaxg6i8r4";
+ rev = "2a94aecd8eb53e1147392da33df8ee4ea6e482d6";
+ sha256 = "0n8vq3a4z9yl3xidg2gbclwwwjdd82kixqjjdm8z03d8vy59qg9r";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
};
@@ -12646,12 +12706,12 @@ final: prev:
vim-markbar = buildVimPluginFrom2Nix {
pname = "vim-markbar";
- version = "2023-07-04";
+ version = "2023-07-18";
src = fetchFromGitHub {
owner = "Yilin-Yang";
repo = "vim-markbar";
- rev = "8c5a4d28a4d315db3d64cc2cd3859dbad675fb66";
- sha256 = "1xg0vsijcmp4sjsk2cz3379zyhrqs7fin15gsknzgpxwnmpjfg0v";
+ rev = "00f8620cd53f569dca26594e9c94534f03fe16d6";
+ sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z";
};
meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
};
@@ -12695,12 +12755,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2023-07-11";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "3c4ccc489002fe72b5d2e2ffc4b3b5a7d3ab65d8";
- sha256 = "0mpvqlk8a7vms2j29mpfpkqa1pxsncqr7flsg6q6z3cdqcrgh1j2";
+ rev = "0646093e07b1f89b16536cfb3dc4993e3f0ac653";
+ sha256 = "117zdg6ibnnnpl03r6dhb71hm3dw6h0y2lxbkj8kl5b0gk8lapph";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -12947,12 +13007,12 @@ final: prev:
vim-nix = buildVimPluginFrom2Nix {
pname = "vim-nix";
- version = "2022-04-25";
+ version = "2023-07-21";
src = fetchFromGitHub {
owner = "LnL7";
repo = "vim-nix";
- rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee";
- sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av";
+ rev = "b5da592a45418d02b116ebf686ee3786b419d80a";
+ sha256 = "1lb6zxz577zmyjsrk47apvyik7hl3xbrls20fxx10qp4ksnjms0q";
};
meta.homepage = "https://github.com/LnL7/vim-nix/";
};
@@ -13221,6 +13281,18 @@ final: prev:
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
+ vim-paper = buildVimPluginFrom2Nix {
+ pname = "vim-paper";
+ version = "2023-03-16";
+ src = fetchFromGitHub {
+ owner = "yorickpeterse";
+ repo = "vim-paper";
+ rev = "47f6ca5452a718c2e3b95a9c75932d34b2a8f5ae";
+ sha256 = "04wj853rlxm8bzzcasc1ib4npf8m81nwrqapxpmh7pv3hcg56k69";
+ };
+ meta.homepage = "https://github.com/yorickpeterse/vim-paper/";
+ };
+
vim-parinfer = buildVimPluginFrom2Nix {
pname = "vim-parinfer";
version = "2022-11-29";
@@ -13871,12 +13943,12 @@ final: prev:
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2023-06-23";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38";
- sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3";
+ rev = "99cc4af89014971ca65748b32128d15b008c979c";
+ sha256 = "1sh5k3w3d81gnyvsfy70vygvvi3rsk8wbyh1n30k0fl6b30j4pb6";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -13955,12 +14027,12 @@ final: prev:
vim-sneak = buildVimPluginFrom2Nix {
pname = "vim-sneak";
- version = "2022-10-27";
+ version = "2023-07-12";
src = fetchFromGitHub {
owner = "justinmk";
repo = "vim-sneak";
- rev = "93395f5b56eb203e4c8346766f258ac94ea81702";
- sha256 = "0aylgy7k8k6f058z3zmz9vsmigff5f6lfjzciqyccksjaji9c0kr";
+ rev = "29ec9167d4a609f74c130b46265aa17eb2736e6a";
+ sha256 = "1n7y5i8zbr04n48n0l4k1xp76pgrbd2lx0pnj4278ply88hgfg9f";
};
meta.homepage = "https://github.com/justinmk/vim-sneak/";
};
@@ -14256,12 +14328,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2023-07-10";
+ version = "2023-07-24";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "155342d6c8137a8a5dfbdbfca2de831643b2e006";
- sha256 = "147vrnwal7l306l1r9cyd2hrdams0ghzb1fyf9c7yfihak2ag2jg";
+ rev = "63d317c2f6c34e561987d4ab0aa003d8391c4033";
+ sha256 = "0blxanzxlszxl5yyn21wix99slgbnsdib5bc88rngsvwvr4j265k";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -14988,12 +15060,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2023-06-27";
+ version = "2023-07-19";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "02c8da857bbb1b5fc2cf7dfbdda85ba1201a8d8c";
- sha256 = "1r4j4hilfrccrfpq08i24qdc7560lra3zvwd15y9371nkgbvrjqg";
+ rev = "95791ba3eb2e7d60de7faa4d5c13280ade356a0b";
+ sha256 = "1ss0aa2m7163yavqzxrjjr90fxbkik8mhilkwz1vjhb434wa8rnh";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -15001,12 +15073,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2023-07-05";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "bab96ed04dd951b22663b08c670ff33960fc6419";
- sha256 = "1mpy9wqdy3bpgsd1727pn2nxpjhhxlazfhcykccqcjnx2m1k00wa";
+ rev = "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868";
+ sha256 = "1yyz90a84n6npa35ngb9hb8fv7ir89f1nv89c5ps59fxmdivh9sq";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -15121,12 +15193,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
- version = "2023-06-19";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
- rev = "d871f2b664afd5aed3dc1d1573bef2fb24ce0484";
- sha256 = "00078wm0j2d2yzfqr1lvc7iawkzznbfzf7gq3c0g497pzhvhgl2q";
+ rev = "38b990f6eabf62014018b4aae70a97d7a6c2eb88";
+ sha256 = "08j58jc3ja1hbg15raj2xg3ff3wyjf09i42qda84b1iq0klrlxnp";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@@ -15157,12 +15229,12 @@ final: prev:
wiki-vim = buildVimPluginFrom2Nix {
pname = "wiki.vim";
- version = "2023-07-06";
+ version = "2023-07-25";
src = fetchFromGitHub {
owner = "lervag";
repo = "wiki.vim";
- rev = "ba0dfb47cdd3018df2cc46ce045e93b5fbb394ca";
- sha256 = "0gchas7sfb602cmwwqfbzd7g65ph1vvj1rc2rq5b828ncqin7ww5";
+ rev = "4bd7d1b21a0197f11b336cefb434132b5e595dcf";
+ sha256 = "176v8idcjv32q4kywdrr5xqpj849ckcdlvqybv04mhd6wcnq3xzr";
};
meta.homepage = "https://github.com/lervag/wiki.vim/";
};
@@ -15181,12 +15253,12 @@ final: prev:
wildfire-vim = buildVimPluginFrom2Nix {
pname = "wildfire.vim";
- version = "2022-05-05";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "gcmt";
repo = "wildfire.vim";
- rev = "b371e2b1d938ae0e164146136051de164ecb9aa5";
- sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p";
+ rev = "dfcf48aad2e80c63272df67a1b81e37cbc443412";
+ sha256 = "1m8i737dayw1fs67k1lszgs5zgfqm8krr4scp287cackgvg1kznd";
};
meta.homepage = "https://github.com/gcmt/wildfire.vim/";
};
@@ -15324,6 +15396,18 @@ final: prev:
meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
};
+ yescapsquit-vim = buildVimPluginFrom2Nix {
+ pname = "yescapsquit.vim";
+ version = "2022-08-31";
+ src = fetchFromGitHub {
+ owner = "lucasew";
+ repo = "yescapsquit.vim";
+ rev = "68290b5869bebe093ccc87ee80d15688ac2b104d";
+ sha256 = "1wqxmrzg111ri9wiri73kyyms0bg7jnny3d86bvlr8c0wrd5c2vb";
+ };
+ meta.homepage = "https://github.com/lucasew/yescapsquit.vim/";
+ };
+
yuck-vim = buildVimPluginFrom2Nix {
pname = "yuck.vim";
version = "2022-10-29";
@@ -15398,12 +15482,12 @@ final: prev:
zig-vim = buildVimPluginFrom2Nix {
pname = "zig.vim";
- version = "2023-06-23";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "0c4f965468259ab6e47fd7c6b2127583a8860eb1";
- sha256 = "052jmw1pzqydg4icsq2s7vn66wyn2ki4lzpln2fzxx9r9hbwfi8m";
+ rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e";
+ sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
@@ -15446,12 +15530,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2023-07-11";
+ version = "2023-07-26";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "3ffd2f511f3dc6c01258923d7170ccaf1445634b";
- sha256 = "0ry208p1lib2rnmfcph1k29lvm6cccnjvbbzmwrhjkp97m54ricl";
+ rev = "737f60a3a25c79d9bb9574092f6c6c958a3d747a";
+ sha256 = "0n2jwxzprgn4lryaivrfds78dri9h24q7ablf5lyfj6wcrmcqgk7";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -15506,12 +15590,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
- version = "2023-07-11";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
- rev = "bed04d06547910b288f25c153b9bb181fecf52fa";
- sha256 = "1l8x8gp40kpz35rizr0lx003pdv7rv32gr5imvyhlcdvg88g72ls";
+ rev = "557e6fd7fbca325a4bea582576fe36bec903367c";
+ sha256 = "0cxg1ahl9la3m8cd3sb7s456kmvrxjjsf411imyfgl0rp7632bf5";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};
@@ -15528,6 +15612,18 @@ final: prev:
meta.homepage = "https://github.com/mattn/calendar-vim/";
};
+ nightfly = buildVimPluginFrom2Nix {
+ pname = "nightfly";
+ version = "2023-07-19";
+ src = fetchFromGitHub {
+ owner = "bluz71";
+ repo = "vim-nightfly-colors";
+ rev = "cd68ec3c0a3ca2bf15072dd2040401ea4b89e79f";
+ sha256 = "00nfpkpv0li3wgh926azp8xf1zvdh3zc6fx5aznplhs9j6xbdx21";
+ };
+ meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
+ };
+
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
version = "2023-05-03";
@@ -15542,24 +15638,24 @@ final: prev:
nvchad-extensions = buildVimPluginFrom2Nix {
pname = "nvchad-extensions";
- version = "2023-07-11";
+ version = "2023-07-27";
src = fetchFromGitHub {
owner = "nvchad";
repo = "extensions";
- rev = "0b8d75a10032d7f0cd0c6758e5f28195a0d62637";
- sha256 = "0b6jacncd3p5znxmwbivc05wbr8xc5pi9n69dvdzbsd9frickwp3";
+ rev = "0bfeb74229ad973ce600088997ac8421980f79bb";
+ sha256 = "1jh5728mwfpg9pzgd9pvb177ssdzfvs8bsms1mrjcjx7xj2iv33m";
};
meta.homepage = "https://github.com/nvchad/extensions/";
};
nvchad-ui = buildVimPluginFrom2Nix {
pname = "nvchad-ui";
- version = "2023-06-18";
+ version = "2023-07-28";
src = fetchFromGitHub {
owner = "nvchad";
repo = "ui";
- rev = "53b0d0b0e2a30e730865110eb2128dcfee7b87f6";
- sha256 = "04vvklyiy9crg89flfmhkrf907d66j1pf050vzxbw2kida888lc5";
+ rev = "47ef4046504e5562a3daf30db50b7d4a1552fcb5";
+ sha256 = "1hx7i8z31avpfngqi21izl740p0ryhkf3ys1g76drnzqi6gan8d7";
};
meta.homepage = "https://github.com/nvchad/ui/";
};
@@ -15590,12 +15686,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
- version = "2023-06-21";
+ version = "2023-07-22";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
- rev = "932adb0d9351186db047302de021bb2976756a07";
- sha256 = "1kfq83vr483cizx14gghvckwnh44x20jbvqjac1y60fmk8b18plb";
+ rev = "e10340767534b4988992de838d6c811db63b74db";
+ sha256 = "1a58a3xdl3wvs54sbmyyjs6mps8icp7r0g287i3h5jam10vabw3n";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};
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 363193ff13..8c5562b8ba 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -27,12 +27,12 @@
};
arduino = buildGrammar {
language = "arduino";
- version = "0.0.0+rev=787bc6e";
+ version = "0.0.0+rev=3446bac";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
- rev = "787bc6e1ca23092821231f6096438343f728ee6f";
- hash = "sha256-PKjSNEy27Snu9B2eBZcOQYNXI/cnKhFdrBrePqcp7Rk=";
+ rev = "3446bac828d5db2a6cf60ab31813c02ab53547a7";
+ hash = "sha256-E4mRE+CtuI/s3LlVcT/VFhFdFakRXvSr7/v4gaB4H+U=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@@ -126,12 +126,12 @@
};
c = buildGrammar {
language = "c";
- version = "0.0.0+rev=a60f1dd";
+ version = "0.0.0+rev=ad09589";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
- rev = "a60f1ddef4702fc8a82a9bfc207d0cf453d748bb";
- hash = "sha256-7MNTbIQT+7ksV2vmrIZzBZM1BlCdGI7P0DYw0sP6hvU=";
+ rev = "ad095896dd223f1c22b85ac5ec84ab11fb732b07";
+ hash = "sha256-0SqgOjsSFQkDeJMmF9mAgvbgnm9CCuFTYCUJo4zjCEU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
@@ -159,12 +159,12 @@
};
capnp = buildGrammar {
language = "capnp";
- version = "0.0.0+rev=7d5fa4e";
+ version = "0.0.0+rev=dc28c9f";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-capnp";
- rev = "7d5fa4e94d3643ec15750106113be0d40f9fc1bb";
- hash = "sha256-K83xouIGsv9EDLp4MSH9i6JE/GlAT72i3eJa58vR2gs=";
+ rev = "dc28c9f4212809eab74d10996086297853eb34e5";
+ hash = "sha256-4GcOBC5JJsfbdsIrQd33tSW2sz6ytjYGqWgFVFLH6sc=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
};
@@ -258,12 +258,12 @@
};
cpp = buildGrammar {
language = "cpp";
- version = "0.0.0+rev=0e7b7a0";
+ version = "0.0.0+rev=f88bf81";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
- rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d";
- hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4=";
+ rev = "f88bf81238ec2842682e4d1dac0acf3b43b686e9";
+ hash = "sha256-9GOzjjIA/RXNLGlFSyvir4cHAl075TSW10AsOlJec0k=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@@ -280,12 +280,12 @@
};
cuda = buildGrammar {
language = "cuda";
- version = "0.0.0+rev=c9ba632";
+ version = "0.0.0+rev=2af3d43";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
- rev = "c9ba632aa68d24f32d2f97e356795f45f85e6c55";
- hash = "sha256-2Wtkmlzhq+ShqFUnlofeFEN24toLaLD/O0/zSzbEZEE=";
+ rev = "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab";
+ hash = "sha256-ZwinNfhFM1u4qplHOFR8xKphtSjENS+o4u9RUgEnOHg=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@@ -403,12 +403,12 @@
};
elixir = buildGrammar {
language = "elixir";
- version = "0.0.0+rev=7be3905";
+ version = "0.0.0+rev=2616034";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
- rev = "7be390548a870ca9cb1bd7f59ac92457bbec7bf5";
- hash = "sha256-Id+c414ugW3PXOWx75ZMoN13qQdiyWs0cab9mNdT8/A=";
+ rev = "2616034f78ffa83ca6a521ebd7eee1868cb5c14c";
+ hash = "sha256-KY/qeIKWaXUCpA7hbK3ptfCg/cXoISa6mNYB7a0XY18=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -436,14 +436,14 @@
};
elvish = buildGrammar {
language = "elvish";
- version = "0.0.0+rev=f32711e";
+ version = "0.0.0+rev=5e7210d";
src = fetchFromGitHub {
- owner = "ckafi";
+ owner = "elves";
repo = "tree-sitter-elvish";
- rev = "f32711e31e987fd5c2c002f3daba02f25c68672f";
- hash = "sha256-/3npcIfTH8w5ekLTb//ZCTxuSGhOXkUBaCq3WWcK2J4=";
+ rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5";
+ hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg=";
};
- meta.homepage = "https://github.com/ckafi/tree-sitter-elvish";
+ meta.homepage = "https://github.com/elves/tree-sitter-elvish";
};
embedded_template = buildGrammar {
language = "embedded_template";
@@ -458,12 +458,12 @@
};
erlang = buildGrammar {
language = "erlang";
- version = "0.0.0+rev=5dba13d";
+ version = "0.0.0+rev=7aa24fe";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
- rev = "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe";
- hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog=";
+ rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc";
+ hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8=";
};
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
};
@@ -513,12 +513,12 @@
};
fortran = buildGrammar {
language = "fortran";
- version = "0.0.0+rev=31552ac";
+ version = "0.0.0+rev=482bdb8";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
- rev = "31552ac43ecaffa443a12ebea68cc526d334892f";
- hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM=";
+ rev = "482bdb8b8fb7305b928937379820aa6449e359a7";
+ hash = "sha256-x2Cm1yUfhlkl8zgbQFPe/IxVNGpX050J3wjsqe7uOW8=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -590,12 +590,12 @@
};
gitattributes = buildGrammar {
language = "gitattributes";
- version = "0.0.0+rev=577a075";
+ version = "0.0.0+rev=19c716d";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
- rev = "577a075d46ea109905c5cb6179809df88da61ce9";
- hash = "sha256-gBfLmNf7aaqMY3yMF7svFuqif43BAmmY1yYkvVcNUhI=";
+ rev = "19c716d2f45eac9529703413dc12aa8c76d13adc";
+ hash = "sha256-4fevdvH+Mi+MRURUcoDb9v511oaxBgP9U/OOODS/G+o=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes";
};
@@ -645,23 +645,23 @@
};
glsl = buildGrammar {
language = "glsl";
- version = "0.0.0+rev=53ca269";
+ version = "0.0.0+rev=34e0657";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
- rev = "53ca269cae2a47b1b75791e2bfe843baeb02e903";
- hash = "sha256-qDysihoyGlzAFvhnu6qOjNTIRT9ii/A1B1wNiZNlJs8=";
+ rev = "34e0657e37323874c6b67c718a0f83410c4602cf";
+ hash = "sha256-tOIwOy0XmDpDPxLWXZQNqxgoycA03oaqbdp+PxJfn+0=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
go = buildGrammar {
language = "go";
- version = "0.0.0+rev=7a4edcb";
+ version = "0.0.0+rev=8c8007e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
- rev = "7a4edcbc376302efa8d6ba7e235070ab7ee3c4c8";
- hash = "sha256-VvMsFU/HSccB7JetiuNj3O+K/vm6bmDwGWhozyec4Vc=";
+ rev = "8c8007eaee47702bb0291a3c7aeb004909baab4d";
+ hash = "sha256-K8mvDoQXSXwyyYQuwEcV6RBTZFbn4OSi7R1nGoQkDQU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@@ -722,12 +722,12 @@
};
groovy = buildGrammar {
language = "groovy";
- version = "0.0.0+rev=54c7da8";
+ version = "0.0.0+rev=76e02db";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-groovy";
- rev = "54c7da8b167261e76c79513c0364a01836093526";
- hash = "sha256-83JIW+oOKbpqormWiNjU6uI2WAknVnUAXNFSAvdq83o=";
+ rev = "76e02db5866dd2b096512103ed4d8f630cc32980";
+ hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs=";
};
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy";
};
@@ -777,12 +777,12 @@
};
hcl = buildGrammar {
language = "hcl";
- version = "0.0.0+rev=becebeb";
+ version = "0.0.0+rev=b553906";
src = fetchFromGitHub {
owner = "MichaHoffmann";
repo = "tree-sitter-hcl";
- rev = "becebebd3509c02e871c99be55556269be1def1b";
- hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
+ rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
+ hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
};
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
};
@@ -810,12 +810,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
- version = "0.0.0+rev=ddb6082";
+ version = "0.0.0+rev=20c40a3";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
- rev = "ddb608219fa99d56ed98de2d60f396f575cc6590";
- hash = "sha256-UQTXdrHg4OfHnRgSAoo2gGZenE35NOypNeqUCsc4zdM=";
+ rev = "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd";
+ hash = "sha256-mLcl73XNDjkKUvFixPjW4EAO9y++gpitu7e+oym/Mpc=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@@ -832,12 +832,12 @@
};
hoon = buildGrammar {
language = "hoon";
- version = "0.0.0+rev=89271df";
+ version = "0.0.0+rev=dfa565f";
src = fetchFromGitHub {
owner = "urbit-pilled";
repo = "tree-sitter-hoon";
- rev = "89271dfe18f20aa71cbe5ef813252a8f98901240";
- hash = "sha256-UdYucPGeAFexjSxx1RHMWPPJ7KFQs41c+Vi8BSM+Yj0=";
+ rev = "dfa565f87c8997d43cec725d41f023cc3577ca46";
+ hash = "sha256-ogNgjvRRR0KevOlB1PH+cI+HHftq/JrS6pQuIwR5m2A=";
};
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
};
@@ -898,12 +898,12 @@
};
ispc = buildGrammar {
language = "ispc";
- version = "0.0.0+rev=848e588";
+ version = "0.0.0+rev=0bdbb03";
src = fetchFromGitHub {
owner = "fab4100";
repo = "tree-sitter-ispc";
- rev = "848e58874ffa2f7e540a6ec01ab9652b26995f37";
- hash = "sha256-xHX7N3pJbU8c4apoDXEm2VXOn9NH9atG8YfwSMyhHZ4=";
+ rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7";
+ hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY=";
};
meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";
};
@@ -920,23 +920,23 @@
};
java = buildGrammar {
language = "java";
- version = "0.0.0+rev=c194ee5";
+ version = "0.0.0+rev=6c8329e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
- rev = "c194ee5e6ede5f26cf4799feead4a8f165dcf14d";
- hash = "sha256-PNR1XajfELQuwYvCHm8778TzeUlxb9D+HrVF26lQk2E=";
+ rev = "6c8329e2da78fae78e87c3c6f5788a2b005a4afc";
+ hash = "sha256-pAo9hYhlLWjWB/n8nq/MzdMXbzOxcFzfrBCrj8xR/5g=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
};
javascript = buildGrammar {
language = "javascript";
- version = "0.0.0+rev=5720b24";
+ version = "0.0.0+rev=f772967";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
- rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7";
- hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U=";
+ rev = "f772967f7b7bc7c28f845be2420a38472b16a8ee";
+ hash = "sha256-rfOAn5S8E2RunlRyY1aTs7j0r6UGKH+732xdpk/5524=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@@ -1008,12 +1008,12 @@
};
julia = buildGrammar {
language = "julia";
- version = "0.0.0+rev=784364c";
+ version = "0.0.0+rev=d68ded9";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
- rev = "784364cb9185ef8dc245de4b0b51e3a22503419d";
- hash = "sha256-MPdDEVbIUsEQu84AB9k2Bhi3Oa47e9/tItGhKMfZLyU=";
+ rev = "d68ded9d5131878a2a06211ef0b47b72e70c6c08";
+ hash = "sha256-vPmZ9oA4t2LtQng88UNWkngwmpf2JLRlPOx/PM5mi80=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@@ -1151,47 +1151,47 @@
};
markdown = buildGrammar {
language = "markdown";
- version = "0.0.0+rev=936cc84";
+ version = "0.0.0+rev=aaf7679";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
- rev = "936cc84289f6de83c263ae8e659fb342867ceb16";
- hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM=";
+ rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee";
+ hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
- version = "0.0.0+rev=936cc84";
+ version = "0.0.0+rev=aaf7679";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
- rev = "936cc84289f6de83c263ae8e659fb342867ceb16";
- hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM=";
+ rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee";
+ hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
matlab = buildGrammar {
language = "matlab";
- version = "0.0.0+rev=676117e";
+ version = "0.0.0+rev=1558d8f";
src = fetchFromGitHub {
owner = "acristoffers";
repo = "tree-sitter-matlab";
- rev = "676117eafa64afedc8380a921a77cd9f2244bc6b";
- hash = "sha256-VB+SO89WAAPh1wj4E1nuHLzNNixBQrF3HcUeqrqV5dk=";
+ rev = "1558d8fc85f7810fa567292ad2a7e64913fa78a1";
+ hash = "sha256-3FKUGmMM3OeRXkS+izu5yrTgiewp5nHN2352t6sYurU=";
};
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
};
menhir = buildGrammar {
language = "menhir";
- version = "0.0.0+rev=db7953a";
+ version = "0.0.0+rev=be8866a";
src = fetchFromGitHub {
owner = "Kerl13";
repo = "tree-sitter-menhir";
- rev = "db7953acb0d5551f207373c81fa07a57d7b085cb";
- hash = "sha256-w/ibFZ4bMPPRTgTJFLQrAzMecykJFcrjJjekKMXwqSI=";
+ rev = "be8866a6bcc2b563ab0de895af69daeffa88fe70";
+ hash = "sha256-CQVEQurf8Ur5xnz+g7e1nck0a32o4oeMOT78thjx8MQ=";
};
meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir";
};
@@ -1253,12 +1253,12 @@
};
nix = buildGrammar {
language = "nix";
- version = "0.0.0+rev=14b5361";
+ version = "0.0.0+rev=66e3e9c";
src = fetchFromGitHub {
owner = "cstrahan";
repo = "tree-sitter-nix";
- rev = "14b53610c9038500066c509b2e67de04775b97fe";
- hash = "sha256-FNq/+Voqg534Nnm7rnv2daPwc9uFxNi1ce0m091jmRk=";
+ rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7";
+ hash = "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg=";
};
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
};
@@ -1275,47 +1275,47 @@
};
objc = buildGrammar {
language = "objc";
- version = "0.0.0+rev=6d876af";
+ version = "0.0.0+rev=77e28ae";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-objc";
- rev = "6d876afade2d5e70d394aaf994321c78297e3607";
- hash = "sha256-1LJ5pFslYqgPYoBptSw6SY7pt6syXJoxQUJ5KsybjSk=";
+ rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f";
+ hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
};
ocaml = buildGrammar {
language = "ocaml";
- version = "0.0.0+rev=3ad4d79";
+ version = "0.0.0+rev=694c577";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
- rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba";
- hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg=";
+ rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf";
+ hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8=";
};
location = "ocaml";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocaml_interface = buildGrammar {
language = "ocaml_interface";
- version = "0.0.0+rev=3ad4d79";
+ version = "0.0.0+rev=694c577";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
- rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba";
- hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg=";
+ rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf";
+ hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8=";
};
location = "interface";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
};
ocamllex = buildGrammar {
language = "ocamllex";
- version = "0.0.0+rev=fab854a";
+ version = "0.0.0+rev=c8f90e4";
src = fetchFromGitHub {
owner = "atom-ocaml";
repo = "tree-sitter-ocamllex";
- rev = "fab854a2de25b2284582bf7ed7f9970d19988c73";
- hash = "sha256-UmBTzWgjgp0EKAfZEY0uJhvYLHzeNtrMGEUPogx3Op8=";
+ rev = "c8f90e42e1b9cf9e30b1669c386b8d9de992d201";
+ hash = "sha256-cFzurSuO64PwOuJz1Fa0GTDZ2hnT0dHl4NwQhXWQWIw=";
};
generate = true;
meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@@ -1377,12 +1377,12 @@
};
perl = buildGrammar {
language = "perl";
- version = "0.0.0+rev=60aa138";
+ version = "0.0.0+rev=4a02376";
src = fetchFromGitHub {
owner = "ganezdragon";
repo = "tree-sitter-perl";
- rev = "60aa138f9e1db15becad53070f4d5898b0e8a98c";
- hash = "sha256-GpgUSm/kFFXgJOSBVBxPQiMfykZUgxLdmQfDfJE3Jq8=";
+ rev = "4a023763f54dec0a6f986f5bd238af788a3f0584";
+ hash = "sha256-8mLzXxkc8m69KOQtIT02MCKeTCuwERT3/Kegf48IEls=";
};
meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
};
@@ -1399,12 +1399,12 @@
};
phpdoc = buildGrammar {
language = "phpdoc";
- version = "0.0.0+rev=2d20f39";
+ version = "0.0.0+rev=915a527";
src = fetchFromGitHub {
owner = "claytonrcarter";
repo = "tree-sitter-phpdoc";
- rev = "2d20f39476348c2682761ce7251914031a7c013f";
- hash = "sha256-uJEUAMIJ/Bq0YhcQ78UxWcK4LM6qoum+Ett03qli+Os=";
+ rev = "915a527d5aafa81b31acf67fab31b0ac6b6319c0";
+ hash = "sha256-DYNJ/i+VBuTOxuphJn4nklTLfV7GuNP1RCCuf5qAYR4=";
};
meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc";
};
@@ -1463,6 +1463,17 @@
};
meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
};
+ promql = buildGrammar {
+ language = "promql";
+ version = "0.0.0+rev=4b6b9f3";
+ src = fetchFromGitHub {
+ owner = "MichaHoffmann";
+ repo = "tree-sitter-promql";
+ rev = "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3";
+ hash = "sha256-CaNCxgKL/N6TUcO838iR09tFTYS/kWJLf8whQF/3hAg=";
+ };
+ meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql";
+ };
proto = buildGrammar {
language = "proto";
version = "0.0.0+rev=42d82fa";
@@ -1487,34 +1498,34 @@
};
pug = buildGrammar {
language = "pug";
- version = "0.0.0+rev=884e225";
+ version = "0.0.0+rev=a7ff31a";
src = fetchFromGitHub {
owner = "zealot128";
repo = "tree-sitter-pug";
- rev = "884e225b5ecca5d885ae627275f16ef648acd42e";
- hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA=";
+ rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18";
+ hash = "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc=";
};
meta.homepage = "https://github.com/zealot128/tree-sitter-pug";
};
puppet = buildGrammar {
language = "puppet";
- version = "0.0.0+rev=843868b";
+ version = "0.0.0+rev=9ce9a5f";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-puppet";
- rev = "843868bfb909b734bfb63778a5685fae4bf2a33f";
- hash = "sha256-6fJNADrLVsIoho9G8qCsMKNDB5a32gUntug7Nh8pKEg=";
+ rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b";
+ hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-puppet";
};
python = buildGrammar {
language = "python";
- version = "0.0.0+rev=db1d218";
+ version = "0.0.0+rev=7c8930b";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
- rev = "db1d218a4f8fb87145aabeb22ca3c35925c411fc";
- hash = "sha256-v0pWQzO8M9w0ngTUO5eGoTTcBbVu7tRgA993zGfoNwI=";
+ rev = "7c8930b6388b5590ebef248853f144185a9eda1d";
+ hash = "sha256-6QXMocivEFGrmCFJdxz+z+FsAQ6MBd4kv7719gKO4Gg=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
};
@@ -1564,12 +1575,12 @@
};
r = buildGrammar {
language = "r";
- version = "0.0.0+rev=80efda5";
+ version = "0.0.0+rev=c55f8b4";
src = fetchFromGitHub {
owner = "r-lib";
repo = "tree-sitter-r";
- rev = "80efda55672d1293aa738f956c7ae384ecdc31b4";
- hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg=";
+ rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57";
+ hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=";
};
meta.homepage = "https://github.com/r-lib/tree-sitter-r";
};
@@ -1597,12 +1608,12 @@
};
regex = buildGrammar {
language = "regex";
- version = "0.0.0+rev=e1cfca3";
+ version = "0.0.0+rev=2354482";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-regex";
- rev = "e1cfca3c79896ff79842f057ea13e529b66af636";
- hash = "sha256-lDsr3sLrLf6wXu/juIA+bTtv1SBo+Jgwqw/6yBAE0kg=";
+ rev = "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96";
+ hash = "sha256-X4iQ60LgiVsF0rtinVysX16d6yFjaSmwwndP2L5cuqw=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
};
@@ -1628,6 +1639,17 @@
};
meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb";
};
+ robot = buildGrammar {
+ language = "robot";
+ version = "0.0.0+rev=51b82cf";
+ src = fetchFromGitHub {
+ owner = "Hubro";
+ repo = "tree-sitter-robot";
+ rev = "51b82cfd0c824681b6a282663820a5ce54243e55";
+ hash = "sha256-jRLP5LqA/Q3IosK0n5sLJ2SW/wXTo9ia1zpdnos/QN8=";
+ };
+ meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
+ };
ron = buildGrammar {
language = "ron";
version = "0.0.0+rev=ce6086b";
@@ -1683,6 +1705,18 @@
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
+ scfg = buildGrammar {
+ language = "scfg";
+ version = "0.0.0+rev=6deae0c";
+ src = fetchFromSourcehut {
+ owner = "~rockorager";
+ repo = "tree-sitter-scfg";
+ rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0";
+ hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk=";
+ };
+ generate = true;
+ meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg";
+ };
scheme = buildGrammar {
language = "scheme";
version = "0.0.0+rev=ca8af22";
@@ -1762,12 +1796,12 @@
};
sql = buildGrammar {
language = "sql";
- version = "0.0.0+rev=e08036e";
+ version = "0.0.0+rev=9fc30c9";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
- rev = "e08036ee4928b32fbebe55ac9336f81b7389e107";
- hash = "sha256-x3vngL+36kO60eEFN0jvTzh9sCvsYvrzrvfMg08JL4w=";
+ rev = "9fc30c949f29747d34c254677d039c9df3c521b4";
+ hash = "sha256-EyZSbcjbPuaQGpi33YK+hpsod73yifk2hL+MCjn8R9M=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -1828,12 +1862,12 @@
};
swift = buildGrammar {
language = "swift";
- version = "0.0.0+rev=56ecc99";
+ version = "0.0.0+rev=29541ac";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
- rev = "56ecc996e5765054fc25cdae5fbddfd75a64287b";
- hash = "sha256-GH0HpxAprOlOLv8zqsP1O0/RbIn93FfdgAHp56Pyw9g=";
+ rev = "29541ac9bbe2090de75d0b1e70360b85bbda1fef";
+ hash = "sha256-jT7SdhxX5AlZP33oH7NISV+HvJwQwsXMXDWzHorgnIc=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -1849,6 +1883,17 @@
};
meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc";
};
+ systemtap = buildGrammar {
+ language = "systemtap";
+ version = "0.0.0+rev=1af543a";
+ src = fetchFromGitHub {
+ owner = "ok-ryoko";
+ repo = "tree-sitter-systemtap";
+ rev = "1af543a96d060b1f808982037bfc54cc02218edd";
+ hash = "sha256-KCsISHv9yglW+63UY/9Dhb0yVz7Ha76EyHo65Si6SpY=";
+ };
+ meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap";
+ };
t32 = buildGrammar {
language = "t32";
version = "0.0.0+rev=4e581fc";
@@ -1863,12 +1908,12 @@
};
tablegen = buildGrammar {
language = "tablegen";
- version = "0.0.0+rev=e5e046e";
+ version = "0.0.0+rev=300f6a4";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-tablegen";
- rev = "e5e046e1b221e25111175469f02f3cf336010857";
- hash = "sha256-qh5AWLinsSwfbui7b3Vk7DRW3GaS4Avaa0iLeMmMFtM=";
+ rev = "300f6a490e71f895e644ed2deec6920860a2e107";
+ hash = "sha256-V4fEmiGPBAnZO+NAyA7FdlyjLSA0ByUfrCTbsdDOxc8=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen";
};
@@ -1886,12 +1931,12 @@
};
terraform = buildGrammar {
language = "terraform";
- version = "0.0.0+rev=becebeb";
+ version = "0.0.0+rev=b553906";
src = fetchFromGitHub {
owner = "MichaHoffmann";
repo = "tree-sitter-hcl";
- rev = "becebebd3509c02e871c99be55556269be1def1b";
- hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0=";
+ rev = "b5539065432c08e4118eb3ee7c94902fdda85708";
+ hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0=";
};
location = "dialects/terraform";
meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl";
@@ -1953,12 +1998,12 @@
};
tsx = buildGrammar {
language = "tsx";
- version = "0.0.0+rev=3429d8c";
+ version = "0.0.0+rev=b1bf482";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
- rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772";
- hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U=";
+ rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
+ hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
};
location = "tsx";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -1987,12 +2032,12 @@
};
typescript = buildGrammar {
language = "typescript";
- version = "0.0.0+rev=3429d8c";
+ version = "0.0.0+rev=b1bf482";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
- rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772";
- hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U=";
+ rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
+ hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
};
location = "typescript";
meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -2021,12 +2066,12 @@
};
uxntal = buildGrammar {
language = "uxntal";
- version = "0.0.0+rev=14e4760";
+ version = "0.0.0+rev=4c5ecd6";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-uxntal";
- rev = "14e47600afef0affffcbfbe1543381b1ac8fbc5c";
- hash = "sha256-SgBWJ8b/9kMkSDafx+6eSl+FS4Hkd1Ei2ALhTLL7yRk=";
+ rev = "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da";
+ hash = "sha256-vgeTsRJ3mlR02jXuucmXpszVOmusZwuV0xj/7sSs+WQ=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal";
};
@@ -2121,23 +2166,23 @@
};
wgsl_bevy = buildGrammar {
language = "wgsl_bevy";
- version = "0.0.0+rev=7cd38d6";
+ version = "0.0.0+rev=9e3273e";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-wgsl-bevy";
- rev = "7cd38d6895060b023353e04f7af099ec64add5d1";
- hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0=";
+ rev = "9e3273e64bdd3f74d1514674286838f9075ee9e4";
+ hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
};
wing = buildGrammar {
language = "wing";
- version = "0.0.0+rev=755aef4";
+ version = "0.0.0+rev=23712ef";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
- rev = "755aef4e57da4a00da47e85b6aff976b007d500c";
- hash = "sha256-EbTNiwZwzPWxf8VNUWX82x/Jz4RFCE1LDuzXwYiYQLs=";
+ rev = "23712eff9768576bdd852cb9b989a9cd44af014a";
+ hash = "sha256-IWqclJM3CKsgXIy3e6pUrd2iLfIu8QZT2k6eZXRpITA=";
};
location = "libs/tree-sitter-wing";
generate = true;
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 45373a8abd..3007625285 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -149,6 +149,19 @@ self: super: {
};
};
+ # The GitHub repository returns 404, which breaks the update script
+ bitbake-vim = buildVimPluginFrom2Nix {
+ pname = "bitbake.vim";
+ version = "2021-02-06";
+ src = fetchFromGitHub {
+ owner = "sblumentritt";
+ repo = "bitbake.vim";
+ rev = "faddca1e8768b10c80ee85221fb51a560df5ba45";
+ sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp";
+ };
+ meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
+ };
+
chadtree = super.chadtree.overrideAttrs {
passthru.python3Dependencies = ps: with ps; [
pynvim-pp
@@ -919,7 +932,7 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
- cargoHash = "sha256-IRp4avOvM2tz2oC1Cwr4W/d4i0pzawcZLP+c1+jnm+I=";
+ cargoHash = "sha256-bgroNNFRoKiySTC6Rldoy8Unepxd2OXwqcy3fA+CETs=";
nativeBuildInputs = [ pkg-config ];
@@ -953,18 +966,23 @@ self: super: {
sniprun =
let
- version = "1.3.4";
+ version = "1.3.6";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
- hash = "sha256-H1PmjiNyUp+fTDqnfppFii+aDh8gPD/ALHFNWVXch3w=";
+ hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
- cargoHash = "sha256-WXhH0zqGj/D83AoEfs0kPqW7UXIAkURTJ+/BKbuUvss=";
+ # Cargo.lock is outdated
+ preBuild = ''
+ cargo update --offline
+ '';
+
+ cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
index 6a696afb0d..614363cffb 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
@@ -26,6 +26,21 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "aho-corasick"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -37,49 +52,58 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.2.6"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
+ "anstyle-query",
"anstyle-wincon",
- "concolor-override",
- "concolor-query",
+ "colorchoice",
"is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "0.3.5"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
[[package]]
name = "anstyle-parse"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
dependencies = [
"utf8parse",
]
[[package]]
-name = "anstyle-wincon"
-version = "0.2.0"
+name = "anstyle-query"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "anyhow"
-version = "1.0.70"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "async-trait"
@@ -89,7 +113,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
@@ -121,9 +145,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bitflags"
@@ -133,9 +157,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bstr"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
+checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
dependencies = [
"memchr",
"once_cell",
@@ -155,9 +179,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytecount"
@@ -200,13 +224,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
+ "android-tzdata",
"iana-time-zone",
"js-sys",
- "num-integer",
"num-traits",
"serde",
"time 0.1.45",
@@ -216,9 +240,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.2.1"
+version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
dependencies = [
"clap_builder",
"clap_derive",
@@ -227,9 +251,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.2.1"
+version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
dependencies = [
"anstream",
"anstyle",
@@ -240,21 +264,21 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.2.0"
+version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "cli"
@@ -283,16 +307,6 @@ dependencies = [
"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 = "color-eyre"
version = "0.6.2"
@@ -321,30 +335,21 @@ dependencies = [
]
[[package]]
-name = "concolor-override"
+name = "colorchoice"
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",
-]
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "console"
-version = "0.15.5"
+version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -355,9 +360,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[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",
@@ -396,50 +401,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.13",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.13",
-]
-
[[package]]
name = "directories"
version = "4.0.1"
@@ -500,13 +461,13 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -623,7 +584,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
@@ -667,9 +628,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",
"libc",
@@ -701,7 +662,7 @@ version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
dependencies = [
- "aho-corasick",
+ "aho-corasick 0.7.20",
"bstr",
"fnv",
"log",
@@ -723,12 +684,12 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
dependencies = [
- "aho-corasick",
+ "aho-corasick 0.7.20",
"bstr",
"grep-matcher",
"log",
"regex",
- "regex-syntax",
+ "regex-syntax 0.6.29",
"thread_local",
]
@@ -749,9 +710,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.17"
+version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [
"bytes",
"fnv",
@@ -829,9 +790,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "hyper"
-version = "0.14.25"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes",
"futures-channel",
@@ -853,9 +814,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.23.2"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
dependencies = [
"http",
"hyper",
@@ -880,12 +841,11 @@ dependencies = [
[[package]]
name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
]
[[package]]
@@ -954,9 +914,9 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.1",
"libc",
@@ -971,14 +931,14 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "is-terminal"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1007,9 +967,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
dependencies = [
"wasm-bindgen",
]
@@ -1022,9 +982,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.141"
+version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "libgit2-sys"
@@ -1040,9 +1000,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.8"
+version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
dependencies = [
"cc",
"libc",
@@ -1050,20 +1010,11 @@ dependencies = [
"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 = "linux-raw-sys"
-version = "0.3.1"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "lock_api"
@@ -1077,16 +1028,13 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
[[package]]
name = "maple"
-version = "0.1.44"
+version = "0.1.45"
dependencies = [
"built",
"chrono",
@@ -1106,6 +1054,7 @@ dependencies = [
"base64 0.13.1",
"bytecount",
"chrono",
+ "clap",
"directories",
"dumb_analyzer",
"filter",
@@ -1188,14 +1137,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1208,16 +1156,6 @@ dependencies = [
"winapi",
]
-[[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-traits"
version = "0.2.15"
@@ -1254,9 +1192,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
[[package]]
name = "overload"
@@ -1321,9 +1259,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "printer"
@@ -1340,18 +1278,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@@ -1400,13 +1338,13 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.7.3"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
- "aho-corasick",
+ "aho-corasick 1.0.1",
"memchr",
- "regex-syntax",
+ "regex-syntax 0.7.2",
]
[[package]]
@@ -1422,12 +1360,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
-name = "reqwest"
-version = "0.11.16"
+name = "regex-syntax"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
"bytes",
"encoding_rs",
"futures-core",
@@ -1487,34 +1431,34 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.22"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustix"
-version = "0.37.7"
+version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "rustls"
-version = "0.20.8"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e"
dependencies = [
"log",
"ring",
+ "rustls-webpki",
"sct",
- "webpki",
]
[[package]]
@@ -1523,7 +1467,17 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+dependencies = [
+ "ring",
+ "untrusted",
]
[[package]]
@@ -1547,12 +1501,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
[[package]]
name = "sct"
version = "0.7.0"
@@ -1574,29 +1522,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.159"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.159"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
name = "serde_json"
-version = "1.0.95"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
@@ -1687,35 +1635,15 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.109"
+version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
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",
- "unicode-ident",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
[[package]]
name = "thiserror"
version = "1.0.40"
@@ -1733,7 +1661,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
@@ -1759,9 +1687,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.20"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
dependencies = [
"itoa",
"serde",
@@ -1771,15 +1699,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
dependencies = [
"time-core",
]
@@ -1801,9 +1729,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.27.0"
+version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
@@ -1814,36 +1742,35 @@ dependencies = [
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.13",
+ "syn",
]
[[package]]
name = "tokio-rustls"
-version = "0.23.4"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5"
dependencies = [
"rustls",
"tokio",
- "webpki",
]
[[package]]
name = "tokio-util"
-version = "0.7.7"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
@@ -1887,26 +1814,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [
"crossbeam-channel",
- "time 0.3.20",
+ "time 0.3.21",
"tracing-subscriber",
]
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",
@@ -1935,9 +1862,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
"nu-ansi-term",
"sharded-slab",
@@ -1969,9 +1896,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-normalization"
@@ -2078,9 +2005,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2088,24 +2015,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
dependencies = [
"cfg-if",
"js-sys",
@@ -2115,9 +2042,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2125,28 +2052,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2211,21 +2138,6 @@ 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 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"
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
index 81e277fb99..4236cf79e1 100644
--- 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
@@ -11,13 +11,13 @@
}:
let
- version = "0.44";
+ version = "0.45";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
- hash = "sha256-3kPRntl5tHsITrEJaRRcidowcyMpXDTVV5jFN/GV8Sk=";
+ hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos=";
};
meta = with lib; {
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 72f09aa5a7..c44c338e82 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
@@ -85,7 +85,6 @@ 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/HampusHauffman/block.nvim/,HEAD,
https://github.com/blueballs-theme/blueballs-neovim/,,
@@ -273,7 +272,7 @@ https://github.com/freddiehaddad/feline.nvim/,,
https://github.com/bakpakin/fennel.vim/,,
https://github.com/lambdalisue/fern.vim/,,
https://github.com/wincent/ferret/,,
-https://github.com/j-hui/fidget.nvim/,,
+https://github.com/j-hui/fidget.nvim/,legacy,
https://github.com/bogado/file-line/,,
https://github.com/glacambre/firenvim/,HEAD,
https://github.com/andviro/flake8-vim/,,
@@ -337,6 +336,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
https://github.com/neovimhaskell/haskell-vim/,,
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
https://github.com/travitch/hasksyn/,,
+https://github.com/lukas-reineke/headlines.nvim/,HEAD,
https://github.com/rebelot/heirline.nvim/,,
https://github.com/RaafatTurki/hex.nvim/,HEAD,
https://github.com/Yggdroot/hiPairs/,,
@@ -347,6 +347,7 @@ https://github.com/edluffy/hologram.nvim/,,
https://github.com/urbit/hoon.vim/,,
https://github.com/phaazon/hop.nvim/,,
https://github.com/rktjmp/hotpot.nvim/,,
+https://github.com/lewis6991/hover.nvim/,HEAD,
https://github.com/othree/html5.vim/,HEAD,
https://github.com/anuvyklack/hydra.nvim/,HEAD,
https://github.com/mboughaba/i3config.vim/,,
@@ -666,6 +667,7 @@ https://github.com/RishabhRD/popfix/,,
https://github.com/nvim-lua/popup.nvim/,,
https://github.com/andweeb/presence.nvim/,,
https://github.com/sotte/presenting.vim/,,
+https://github.com/ewilazarus/preto/,HEAD,
https://github.com/vim-scripts/prev_indent/,,
https://github.com/ahmedkhalf/project.nvim/,,
https://github.com/kevinhwang91/promise-async/,HEAD,
@@ -742,6 +744,7 @@ https://github.com/chr4/sslsecure.vim/,,
https://github.com/cshuaimin/ssr.nvim/,HEAD,
https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
+https://github.com/josegamez82/starrynight/,HEAD,
https://github.com/darfink/starsearch.vim/,,
https://github.com/luukvbaal/statuscol.nvim/,,
https://github.com/teto/stylish.nvim/,HEAD,
@@ -784,6 +787,7 @@ https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
https://github.com/MrcJkb/telescope-manix/,HEAD,
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
https://github.com/nvim-telescope/telescope-project.nvim/,,
+https://github.com/Marskey/telescope-sg/,HEAD,
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
https://github.com/fhill2/telescope-ultisnips.nvim/,,
@@ -885,6 +889,7 @@ https://github.com/ThePrimeagen/vim-apm/,,
https://github.com/PeterRincker/vim-argumentative/,,
https://github.com/FooSoft/vim-argwrap/,,
https://github.com/haya14busa/vim-asterisk/,,
+https://github.com/wuelnerdotexe/vim-astro/,HEAD,
https://github.com/hura/vim-asymptote/,,
https://github.com/907th/vim-auto-save/,,
https://github.com/vim-autoformat/vim-autoformat/,,
@@ -1090,6 +1095,7 @@ https://github.com/jistr/vim-nerdtree-tabs/,,
https://github.com/nfnty/vim-nftables/,,
https://github.com/kana/vim-niceblock/,,
https://github.com/nickel-lang/vim-nickel/,main,
+https://github.com/bluz71/vim-nightfly-colors/,,nightfly
https://github.com/tommcdo/vim-ninja-feet/,,
https://github.com/LnL7/vim-nix/,,
https://github.com/symphorien/vim-nixhash/,,
@@ -1114,6 +1120,7 @@ https://github.com/lambdalisue/vim-pager/,,
https://github.com/vim-pandoc/vim-pandoc/,,
https://github.com/vim-pandoc/vim-pandoc-after/,,
https://github.com/vim-pandoc/vim-pandoc-syntax/,,
+https://github.com/yorickpeterse/vim-paper/,HEAD,
https://github.com/bhurlow/vim-parinfer/,,
https://github.com/sickill/vim-pasta/,,
https://github.com/tpope/vim-pathogen/,,
@@ -1290,6 +1297,7 @@ https://github.com/tweekmonster/wstrip.vim/,,
https://github.com/drmingdrmer/xptemplate/,,
https://github.com/guns/xterm-color-table.vim/,,
https://github.com/HerringtonDarkholme/yats.vim/,,
+https://github.com/lucasew/yescapsquit.vim/,HEAD,
https://github.com/elkowar/yuck.vim/,HEAD,
https://github.com/KabbAmine/zeavim.vim/,,
https://github.com/folke/zen-mode.nvim/,,
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 804f3bb6e1..20e9dc56c4 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
@@ -326,8 +326,8 @@ let
mktplcRef = {
name = "astro-vscode";
publisher = "astro-build";
- version = "1.0.6";
- sha256 = "sha256-/gpZtOO8MA/MJ1o9eG4qmPqhWRZ5E+elA9Rr/kpOprI=";
+ version = "2.1.1";
+ sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";
@@ -449,6 +449,23 @@ let
};
};
+ batisteo.vscode-django = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ publisher = "batisteo";
+ name = "vscode-django";
+ version = "1.10.0";
+ sha256 = "sha256-vTaE3KhG5i2jGc5o33u76RUUFYaW4s4muHvph48HeQ4=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/batisteo.vscode-django/changelog";
+ description = "Django extension for Visual Studio Code";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=batisteo.vscode-django";
+ homepage = "https://github.com/vscode-django/vscode-django";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ azd325 ];
+ };
+ };
+
bbenoist.nix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Nix";
@@ -490,6 +507,22 @@ let
};
};
+ bierner.docs-view = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "docs-view";
+ publisher = "bierner";
+ version = "0.0.11";
+ sha256 = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/bierner.docs-view/changelog";
+ description = "A VSCode extension that displays documentation in the sidebar or panel";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.docs-view";
+ homepage = "https://github.com/mattbierner/vscode-docs-view#readme";
+ license = lib.licenses.mit;
+ };
+ };
+
bierner.emojisense = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "emojisense";
@@ -542,8 +575,8 @@ let
mktplcRef = {
name = "vscode-fish";
publisher = "bmalehorn";
- version = "1.0.33";
- sha256 = "sha256-ZQlG+HrjU4DFfpyiY8o0/ayDms6MGEObW8pV1Lmr5/Y=";
+ version = "1.0.35";
+ sha256 = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY=";
};
meta.license = lib.licenses.mit;
};
@@ -667,8 +700,8 @@ let
mktplcRef = {
name = "ruff";
publisher = "charliermarsh";
- version = "2023.30.0";
- sha256 = "sha256-E/zgKNxKH05qzLkoyq66qBDbkNJ7liBvU+ZSxw825c0=";
+ version = "2023.32.0";
+ sha256 = "sha256-phyPQqDgsYunF5FLqPevw8ZZG4Tw9qxjTOU4/kNGKU8=";
};
meta = {
license = lib.licenses.mit;
@@ -1074,6 +1107,22 @@ let
};
};
+ dotenv.dotenv-vscode = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "dotenv-vscode";
+ publisher = "dotenv";
+ version = "0.28.0";
+ sha256 = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/dotenv.dotenv-vscode/changelog";
+ description = "Official Dotenv extension for VSCode. Offers syntax highlighting, auto-cloaking, auto-completion, in-code secret peeking, and optionally dotenv-vault";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=dotenv.dotenv-vscode";
+ homepage = "https://github.com/dotenv-org/dotenv-vscode";
+ license = lib.licenses.mit;
+ };
+ };
+
dotjoshjohnson.xml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "xml";
@@ -1112,8 +1161,8 @@ let
# semver scheme, contrary to preview versions which are listed on
# the VSCode Marketplace and use a calver scheme. We should avoid
# using preview versions, because they expire after two weeks.
- version = "13.4.0";
- sha256 = "sha256-CYI62sWPlJNRP2KIkg4vQutIMC6gaCxtTVoOWZIS8Lw=";
+ version = "14.1.1";
+ sha256 = "sha256-eSN48IudpHYzT4u+S4b2I2pyEPyOwBCSL49awT/mzEE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -1217,6 +1266,38 @@ let
};
};
+ emroussel.atomize-atom-one-dark-theme = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "atomize-atom-one-dark-theme";
+ publisher = "emroussel";
+ version = "2.0.2";
+ sha256 = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/emroussel.atomize-atom-one-dark-theme/changelog";
+ description = "A detailed and accurate Atom One Dark theme for VSCode";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=emroussel.atomize-atom-one-dark-theme";
+ homepage = "https://github.com/emroussel/atomize/blob/main/README.md";
+ license = lib.licenses.mit;
+ };
+ };
+
+ enkia.tokyo-night = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "tokyo-night";
+ publisher = "enkia";
+ version = "1.0.0";
+ sha256 = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/enkia.tokyo-night/changelog";
+ description = "A clean Visual Studio Code theme that celebrates the lights of Downtown Tokyo at night";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night";
+ homepage = "https://github.com/enkia/tokyo-night-vscode-theme";
+ license = lib.licenses.mit;
+ };
+ };
+
equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vsc-material-theme";
@@ -1238,8 +1319,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
- version = "9.19.0";
- sha256 = "sha256-ymIlBzCcssj+J8hHOokVWUpxKTEkzkhNr80uCblhkFs=";
+ version = "10.1.0";
+ sha256 = "sha256-SQuf15Jq84MKBVqK6UviK04uo7gQw9yuw/WEBEXcQAc=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@@ -1559,8 +1640,8 @@ let
# the VSCode Marketplace and use a calver scheme. We should avoid
# using preview versions, because they can require insider versions
# of VS Code
- version = "0.66.0";
- sha256 = "sha256-rhAFNX+/BoKkQeFlVdoHzA8UmZeQofq7+UPooWleYVw=";
+ version = "0.68.1";
+ sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI=";
};
meta = { license = lib.licenses.mit; };
};
@@ -1661,8 +1742,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.224";
- sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs=";
+ version = "0.0.226";
+ sha256 = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
};
meta = {
license = lib.licenses.mit;
@@ -1886,8 +1967,8 @@ let
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
- version = "0.2.1";
- sha256 = "sha256-yC4ybThMFA2ncGhp8BYD7IrwYiDU3226hewsRvJYKy4=";
+ version = "0.2.2";
+ sha256 = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
@@ -1895,7 +1976,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide";
homepage = "https://github.com/jnoortheen/vscode-nix-ide";
license = lib.licenses.mit;
- maintainers = [ lib.maintainers.SuperSandro2000 ];
+ maintainers = [ ];
};
};
@@ -2275,8 +2356,8 @@ let
mktplcRef = {
name = "direnv";
publisher = "mkhl";
- version = "0.13.0";
- sha256 = "sha256-KdLJ7QTi9jz+JbbQuhXqyE3WV9oF+wyC/9ZJ/XTFOYc=";
+ version = "0.14.0";
+ sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs=";
};
meta = {
description = "direnv support for Visual Studio Code";
@@ -2513,6 +2594,22 @@ let
};
};
+ mskelton.npm-outdated = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "npm-outdated";
+ publisher = "mskelton";
+ version = "2.2.0";
+ sha256 = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/mskelton.npm-outdated/changelog";
+ description = "Shows which packages are outdated in an npm project";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=mskelton.npm-outdated";
+ homepage = "https://github.com/mskelton/vscode-npm-outdated";
+ license = lib.licenses.isc;
+ };
+ };
+
mvllow.rose-pine = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "mvllow";
@@ -2682,8 +2779,8 @@ let
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
- version = "4.25.0";
- sha256 = "sha256-/lD3i7ZdF/XOi7RduS3HIYHFXhkoW2+PJW249gQxcyk=";
+ version = "4.29.0";
+ sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM=";
};
meta = {
license = lib.licenses.mit;
@@ -2937,8 +3034,8 @@ let
mktplcRef = {
name = "crates";
publisher = "serayuzgur";
- version = "0.5.10";
- sha256 = "1dbhd6xbawbnf9p090lpmn8i5gg1f7y8xk2whc9zhg4432kdv3vd";
+ version = "0.6.0";
+ sha256 = "080zd103vjrz86vllr1ricq2vi3hawn4534n492m7xdcry9l9dpc";
};
meta = {
license = lib.licenses.mit;
@@ -3217,8 +3314,8 @@ let
mktplcRef = {
name = "even-better-toml";
publisher = "tamasfe";
- version = "0.19.0";
- sha256 = "sha256-MqSQarNThbEf1wHDTf1yA46JMhWJN46b08c7tV6+1nU=";
+ version = "0.19.2";
+ sha256 = "sha256-JKj6noi2dTe02PxX/kS117ZhW8u7Bhj4QowZQiJKP2E=";
};
meta = {
license = lib.licenses.mit;
@@ -3353,20 +3450,36 @@ let
mktplcRef = {
name = "sort-lines";
publisher = "Tyriar";
- version = "1.9.1";
- sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb";
+ version = "1.10.2";
+ sha256 = "sha256-AI16YBmmfZ3k7OyUrh4wujhu7ptqAwfI5jBbAc6MhDk=";
};
meta = {
license = lib.licenses.mit;
};
};
+ unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-mdx";
+ publisher = "unifiedjs";
+ version = "1.4.0";
+ sha256 = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg=";
+ };
+ meta = {
+ changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
+ description = "VSCode language support for MDX";
+ downloadPage = "https://github.com/mdx-js/mdx-analyzer";
+ homepage = "https://github.com/mdx-js/mdx-analyzer#readme";
+ license = lib.licenses.mit;
+ };
+ };
+
usernamehw.errorlens = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "errorlens";
publisher = "usernamehw";
- version = "3.8.0";
- sha256 = "sha256-T2YTEbeC22/B5BlBBrBATLv95HQC5xGab+KnCMzI1vc=";
+ version = "3.12.0";
+ sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
@@ -3616,6 +3729,21 @@ let
};
};
+ wmaurer.change-case = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "change-case";
+ publisher = "wmaurer";
+ version = "1.0.0";
+ sha256 = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc=";
+ };
+ meta = {
+ description = "A VSCode extension for quickly changing the case (camelCase, CONSTANT_CASE, snake_case, etc) of the current selection or current word";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=wmaurer.change-case";
+ homepage = "https://github.com/wmaurer/vscode-change-case";
+ license = lib.licenses.mit;
+ };
+ };
+
xadillax.viml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "viml";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
index d479e7d1fd..5bfe648d14 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
@@ -97,6 +97,6 @@ buildVscodeMarketplaceExtension {
meta = {
description = "Use any remote machine with a SSH server as your development environment.";
license = lib.licenses.unfree;
- maintainers = [ lib.maintainers.SuperSandro2000 lib.maintainers.tbenst ];
+ maintainers = [ lib.maintainers.tbenst ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json
index 167f92fbed..29f8c62b9a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json
@@ -1,6 +1,6 @@
{
"name": "rust-analyzer",
- "version": "0.3.1426",
+ "version": "0.3.1607",
"dependencies": {
"anser": "^2.1.1",
"d3": "^7.6.1",
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 dadb291aa5..77c589dbba 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
@@ -20,13 +20,13 @@ let
# Use the plugin version as in vscode marketplace, updated by update script.
inherit (vsix) version;
- releaseTag = "2023-03-06";
+ releaseTag = "2023-07-31";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = releaseTag;
- sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
+ sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4=";
};
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";
@@ -88,3 +88,4 @@ vscode-utils.buildVscodeExtension {
platforms = lib.platforms.all;
};
}
+
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh
index 03a71b557d..c6cce01e6d 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh
@@ -24,7 +24,7 @@ if [[ $# -ne 1 ]]; then
)
fi
old_version=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix)
-if grep -q 'cargoSha256 = ""' ./default.nix; then
+if grep -q 'cargoHash = ""' ./default.nix; then
old_version='broken'
fi
if [[ "$version" == "$old_version" ]]; then
@@ -34,10 +34,10 @@ echo "$old_version -> $version"
# update hashes
sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile"
-srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .sha256)
-sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile"
+srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .hash)
+sed -E 's#\bhash = ".*?"#hash = "'$srcHash'"#' --in-place "$nixFile"
cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
-sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"
+sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$nixFile"
pushd $TMPDIR
curl -LO https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
index 6d1c20c855..22a4025942 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
@@ -2,6 +2,7 @@
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland
+, libglvnd
# Populate passthru.tests
, tests
@@ -42,7 +43,7 @@ let
comment = "Code Editing. Redefined.";
genericName = "Text Editor";
exec = "${executableName} %F";
- icon = "code";
+ icon = "vs${executableName}";
startupNotify = true;
startupWMClass = shortName;
categories = [ "Utility" "TextEditor" "Development" "IDE" ];
@@ -51,7 +52,7 @@ let
actions.new-empty-window = {
name = "New Empty Window";
exec = "${executableName} --new-window %F";
- icon = "code";
+ icon = "vs${executableName}";
};
};
@@ -61,7 +62,7 @@ let
comment = "Code Editing. Redefined.";
genericName = "Text Editor";
exec = executableName + " --open-url %U";
- icon = "code";
+ icon = "vs${executableName}";
startupNotify = true;
categories = [ "Utility" "TextEditor" "Development" "IDE" ];
mimeTypes = [ "x-scheme-handler/vscode" ];
@@ -102,8 +103,9 @@ let
ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
+ # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages.
mkdir -p "$out/share/pixmaps"
- cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/code.png"
+ cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png"
# Override the previously determined VSCODE_PATH with the one we know to be correct
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}"
@@ -113,6 +115,9 @@ let
# The credentials should be stored in a secure keychain already, so the benefit of this is questionable
# in the first place.
rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt
+
+ # Unbundle libglvnd as VSCode doesn't include libGLESv2.so.2 which is necessary for GPU acceleration
+ rm -rf $out/lib/vscode/libGLESv2.so
'') + ''
runHook postInstall
'';
@@ -121,6 +126,7 @@ let
gappsWrapperArgs+=(
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
--prefix PATH : ${glib.bin}/bin
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
--add-flags ${lib.escapeShellArg commandLineArgs}
)
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 4fa4270d00..da75dff14d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -24,21 +24,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0xqcksnjdph81cc39qs1q0w6av2c3p3l64bws4iwndbxwvmrxqb0";
- x86_64-darwin = "1mh75kfrycm8rxs99z025sh9l9hry9rdp69njrb1p08dxrrslb45";
- aarch64-linux = "1755hiicbyq85bacn1cclnmg7k6xmgpgdiziar9rw14vp1kfid40";
- aarch64-darwin = "0498grcdlnm9kaxr61p3q46dp9q92i43wi6myfibky2nhqccad34";
- armv7l-linux = "04481jyvfdyq702x88raa5frspzya0158173blwcrmpgw8dda4fn";
+ x86_64-linux = "05yl6v11ndayz081m3j6dhclj0hshsf0ism7z31hmq6qvfl1sw0k";
+ x86_64-darwin = "16x1ppfi3n9gnxg2la2pzj67mlj507879hpqinhpz57dvys421h8";
+ aarch64-linux = "0m5k9rm14isj9x1j3nw3zvcxxz523396id7yhi8bpncr4ac8a087";
+ aarch64-darwin = "1kbhf3v71qhw4ql6pp8x5m68lgycjzxzm17c9ri0zn0b86ffp8d3";
+ armv7l-linux = "07lp0schicpnzs52gfbi9y8zfkwxhh92zv29afzy6vxdlqvmrf21";
}.${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.80.1";
+ version = "1.80.2";
pname = "vscode";
# This is used for VS Code - Remote SSH test
- rev = "74f6148eb9ea00507ec113ec51c489d6ffb4b771";
+ rev = "2ccd690cbff1569e4a83d7c43d45101f817401dc";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -62,7 +62,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
- sha256 = "1f5x53hsql8z54jv0wxgmx2j1fglvfs6ml7x6l5d58sh6wfkkpp1";
+ sha256 = "1425bngv0n2xpd7yp9xbmxv95adr9vv0vzy1wvqvgpd8p6h05r7n";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
index def268c8fa..45db0854ed 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,21 +15,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0y9gs7w330l8x21l2qr5ki46aqmz22v17kmaisj5z5lgyfqyyf97";
- x86_64-darwin = "1i1c0axlipp12b3y3sl6liq4cs7ybjflm8jnrwf9wrrvq7d911bn";
- aarch64-linux = "03894hcjsvskp3s1gl1cmnvy7s7x8iz4z6pz5wk7aayw0j03f3zh";
- aarch64-darwin = "0n59dpc18abq42y1sb5wdrbv9n8pwnyhlcsrjx41r9ykmfk8cvih";
- armv7l-linux = "0iiw5rdw2gsr5y45i00ri858ylm6q4jdk3vh7g0f0vv4csprx5c3";
+ x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy";
+ x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55";
+ aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d";
+ aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas";
+ armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk";
}.${system} or throwSystem;
- sourceRoot = if stdenv.isDarwin then "" else ".";
+ sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
in
callPackage ./generic.nix rec {
inherit sourceRoot commandLineArgs useVSCodeRipgrep;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.80.0.23188";
+ version = "1.80.2.23209";
pname = "vscodium";
executableName = "codium";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
index 7cd5b4e267..bbe5fec19d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
@@ -83,7 +83,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
mkdir -p "$out/share/applications"
mkdir -p "$out/share/pixmaps"
- ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
+ ln -sT "${vscode}/share/pixmaps/vs${executableName}.png" "$out/share/pixmaps/vs${executableName}.png"
ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix
index 8a58dd2455..8546b9c408 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "basiliskii";
version = "unstable-2022-09-30";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af";
sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM=";
};
- sourceRoot = "source/BasiliskII/src/Unix";
+ sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix";
patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ];
nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ SDL2 gtk2 mpfr ];
@@ -25,4 +25,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ quag ];
platforms = platforms.linux;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix
index 3cd8411f51..4f0e97d55f 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
- version = "132";
+ version = "133";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${finalAttrs.version}";
- hash = "sha256-0D7bOv934k1cuP6qNxo0uLp5tSEstI8wm0FEwu6TuUw=";
+ hash = "sha256-KCpHiIdid5h5CU2uyMOo+p5h50h3Ki5/4mUpdTAPKQA=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
index 493b1dcb1b..d38865adc2 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-39";
+ version = "2.0-45";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
- hash = "sha256-+2V78G4SDFb6ZQDDorvT13yqnZw2JAObF+WGYMMGYHE=";
+ hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko=";
};
patches = [
@@ -128,5 +128,6 @@ stdenv.mkDerivation rec {
license = licenses.mpl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zhaofengli baduhai ];
+ mainProgram = "cemu";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix
index 3acf4a0760..37d995334a 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix
@@ -1,23 +1,32 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, fetchFromGitHub
, SDL2
+, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "x16-emulator";
- version = "41";
+ version = "43";
src = fetchFromGitHub {
- owner = "commanderx16";
+ owner = "X16Community";
repo = "x16-emulator";
rev = "r${finalAttrs.version}";
- hash = "sha256-pnWqtSXQzUfQ8ADIXL9r2YjuBwHDQ2NAffAEFCN5Qzw=";
+ hash = "sha256-cZB7MRYlchD3zcBSWBIzyBiGHJobJvozkVT/7ftFkNg=";
};
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '/bin/echo' 'echo'
+ '';
+
dontConfigure = true;
- buildInputs = [ SDL2 ];
+ buildInputs = [
+ SDL2
+ zlib
+ ];
installPhase = ''
runHook preInstall
@@ -28,19 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
- meta = with lib; {
- homepage = "https://www.commanderx16.com/forum/index.php?/home/";
- description = "The official emulator of CommanderX16 8-bit computer";
- license = licenses.bsd2;
- maintainers = with maintainers; [ AndersonTorres ];
- mainProgram = "x16emu";
- inherit (SDL2.meta) platforms;
- broken = with stdenv; isDarwin && isAarch64;
- };
-
passthru = {
- # upstream project recommends emulator and rom to be synchronized;
- # passing through the version is useful to ensure this
+ # upstream project recommends emulator and rom to be synchronized; passing
+ # through the version is useful to ensure this
inherit (finalAttrs) version;
};
+
+ meta = {
+ homepage = "https://cx16forum.com/";
+ description = "The official emulator of CommanderX16 8-bit computer";
+ changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md";
+ license = lib.licenses.bsd2;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ mainProgram = "x16emu";
+ inherit (SDL2.meta) platforms;
+ broken = stdenv.isAarch64; # ofborg fails to compile it
+ };
})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix
index 202a212064..8c9c1d1b50 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, fetchFromGitHub
, cc65
, python3
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "x16-rom";
- version = "41";
+ version = "43";
src = fetchFromGitHub {
- owner = "commanderx16";
+ owner = "X16Community";
repo = "x16-rom";
rev = "r${finalAttrs.version}";
- hash = "sha256-kowdyUVi3hliqkL8VQo5dS3Dpxd4LQi5+5brkdnv0lE=";
+ hash = "sha256-LkGHfralxlishG1oyBojDnLMJ3c3KYp5YwJSZ2SIrbM=";
};
nativeBuildInputs = [
@@ -22,11 +22,15 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
- patchShebangs scripts/
+ patchShebangs findsymbols scripts/
+ substituteInPlace Makefile \
+ --replace '/bin/echo' 'echo'
'';
dontConfigure = true;
+ makeFlags = [ "PRERELEASE_VERSION=${finalAttrs.version}" ];
+
installPhase = ''
runHook preInstall
@@ -36,18 +40,18 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
- meta = with lib; {
- homepage = "https://www.commanderx16.com/forum/index.php?/home/";
- description = "ROM file for CommanderX16 8-bit computer";
- license = licenses.bsd2;
- maintainers = with maintainers; [ AndersonTorres ];
- inherit (cc65.meta) platforms;
- broken = with stdenv; isDarwin && isAarch64;
- };
-
passthru = {
- # upstream project recommends emulator and rom to be synchronized;
- # passing through the version is useful to ensure this
+ # upstream project recommends emulator and rom to be synchronized; passing
+ # through the version is useful to ensure this
inherit (finalAttrs) version;
};
+
+ meta = {
+ homepage = "https://github.com/X16Community/x16-rom";
+ description = "ROM file for CommanderX16 8-bit computer";
+ license = lib.licenses.bsd2;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ inherit (cc65.meta) platforms;
+ broken = stdenv.isDarwin && stdenv.isAarch64;
+ };
})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix
index 67950e0ed8..b147af8d02 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, callPackage
, patchelf
, unzip
@@ -15,18 +16,18 @@
}:
let
- version = "2.7.4";
+ version = "2.7.5";
craftos2-lua = fetchFromGitHub {
owner = "MCJack123";
repo = "craftos2-lua";
rev = "v${version}";
- sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY=";
+ hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY=";
};
craftos2-rom = fetchFromGitHub {
owner = "McJack123";
repo = "craftos2-rom";
- rev = "v${version}";
- sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0=";
+ rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update
+ hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k=";
};
in
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
owner = "MCJack123";
repo = "craftos2";
rev = "v${version}";
- sha256 = "sha256-9XMc7zmtPxlt3WgS93lUJNMFtUJ/llG9SFGtgdFqZEA=";
+ hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I=";
};
buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix
index b2d887428a..90b86a16fa 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix
@@ -1,12 +1,12 @@
{ stdenv
, craftos-pc
-, grep
+, gnugrep
}:
stdenv.mkDerivation {
name = "craftos-pc-test-eval-hello-world";
meta.timeout = 60;
- nativeBuildInputs = [ craftos-pc grep ];
+ nativeBuildInputs = [ craftos-pc gnugrep ];
buildCommand = ''
export HOME=$(pwd)
mkdir $HOME/.local $HOME/.config
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix
index ad5cf97401..af1cca9c27 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix
@@ -1,11 +1,11 @@
{ stdenv
, craftos-pc
-, grep
+, gnugrep
}:
stdenv.mkDerivation {
name = "craftos-pc-test-eval-periphemu";
meta.timeout = 60;
- nativeBuildInputs = [ craftos-pc grep ];
+ nativeBuildInputs = [ craftos-pc gnugrep ];
buildCommand = ''
export HOME=$(pwd)
mkdir $HOME/.local $HOME/.config
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
index 988ca79647..cc4d7265ce 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
@@ -227,5 +227,6 @@ in stdenv.mkDerivation {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ zhaofengli ];
platforms = [ "x86_64-linux" ];
+ mainProgram = "darling";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix
index 852586cc69..4a6d229762 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix
@@ -9,6 +9,7 @@
, graphicsmagick
, libGL
, libGLU
+, OpenGL
, libpng
, makeDesktopItem
}:
@@ -32,10 +33,13 @@ stdenv.mkDerivation rec {
SDL
SDL_net
SDL_sound
+ libpng
+ ] ++ (if stdenv.hostPlatform.isDarwin then [
+ OpenGL
+ ] else [
libGL
libGLU
- libpng
- ];
+ ]);
hardeningDisable = [ "format" ];
@@ -73,5 +77,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
+ mainProgram = "dosbox";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix
index aa8192d3ec..170a3c30e5 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation {
maintainers = [ lib.maintainers.edwtjo ];
license = lib.licenses.mit;
platforms = lib.platforms.linux;
+ mainProgram = "emulationstation";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix
index 656a1aed7e..6fe3e4455d 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix
@@ -38,14 +38,14 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
- version = "0.256";
+ version = "0.257";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
- hash = "sha256-rQ1GQks3Nni6ALxfiJzdkKUgbZrXaLu9vJtEDPjgP3Q=";
+ hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4=";
};
outputs = [ "out" "tools" ];
@@ -196,5 +196,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ thiagokokada ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
+ mainProgram = "mame";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix
index 06ef3d9908..50389db2b4 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ artemist benley shamilton xfix ];
platforms = platforms.linux;
+ mainProgram = "melonDS";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix
index 8537a05112..a52ee7ca30 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix
@@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.mpl20;
maintainers = with maintainers; [ MP2E AndersonTorres ];
platforms = platforms.linux;
+ mainProgram = "mgba";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix
index 82908a166d..ba8c69cfb3 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.mupen64plus.org/";
maintainers = [ maintainers.sander ];
platforms = [ "x86_64-linux" ];
+ mainProgram = "mupen64plus";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix
index fa55c2e963..b42a578639 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ MP2E ];
+ mainProgram = "nestopia";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix
index 101fb829c6..b80c32bd9e 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix
@@ -92,5 +92,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ rardiol ];
license = licenses.gpl2Plus;
platforms = platforms.all;
+ mainProgram = "pcsxr";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix
deleted file mode 100644
index 66ba3cdf4b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, fetchPypi, buildPythonApplication }:
-
-buildPythonApplication rec {
- pname = "py65";
- version = "1.1.0";
- format = "wheel";
-
- src = fetchPypi {
- inherit pname version format;
- sha256 = "Q7rjiHJ/Ew985vut/8fVAf/wWYW5aBPSvNPm8A6g1zg=";
- };
-
- meta = with lib; {
- homepage = "https://py65.readthedocs.io/";
- description = "Emulate 6502-based microcomputer systems in Python";
- longDescription = ''
- Py65 includes a program called Py65Mon that functions as a machine
- language monitor. This kind of program is sometimes also called a
- debugger. Py65Mon provides a command line with many convenient commands
- for interacting with the simulated 6502-based system.
- '';
- license = licenses.bsd3;
- maintainers = with maintainers; [ AndersonTorres ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix
index 63e03bc00a..a07d899ee7 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix
@@ -360,6 +360,17 @@ in
};
};
+ dosbox-pure = mkLibretroCore {
+ core = "dosbox-pure";
+ CXXFLAGS = "-std=gnu++11";
+ hardeningDisable = [ "format" ];
+ makefile = "Makefile";
+ meta = {
+ description = "Port of DOSBox to libretro aiming for simplicity and ease of use.";
+ license = lib.licenses.gpl2Only;
+ };
+ };
+
eightyone = mkLibretroCore {
core = "81";
src = getCoreSrc "eightyone";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix
index ba1bfe28b2..2abbdb1c46 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix
@@ -2,8 +2,6 @@
, stdenv
, nixosTests
, enableNvidiaCgToolkit ? false
-, withAssets ? false
-, withCoreInfo ? false
, withGamemode ? stdenv.isLinux
, withVulkan ? stdenv.isLinux
, withWayland ? stdenv.isLinux
@@ -61,10 +59,6 @@ stdenv.mkDerivation rec {
rev = "v${version}";
};
- patches = [
- ./use-default-values-for-libretro_info_path-assets_directory.patch
- ];
-
nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++
lib.optional withWayland wayland ++
lib.optional (runtimeLibs != [ ]) makeWrapper;
@@ -109,14 +103,8 @@ stdenv.mkDerivation rec {
"--enable-systemmbedtls"
"--disable-builtinzlib"
"--disable-builtinflac"
- ] ++
- lib.optionals withAssets [
"--disable-update_assets"
- "--with-assets_dir=${retroarch-assets}/share"
- ] ++
- lib.optionals withCoreInfo [
"--disable-update_core_info"
- "--with-core_info_dir=${libretro-core-info}/share"
] ++
lib.optionals stdenv.isLinux [
"--enable-dbus"
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json
index 903708aabd..410e782d0a 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json
@@ -1,518 +1,524 @@
{
"2048": {
- "owner": "libretro",
- "repo": "libretro-2048",
- "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2",
- "sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA="
+ "owner": "libretro",
+ "repo": "libretro-2048",
+ "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2",
+ "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA="
},
"atari800": {
"owner": "libretro",
"repo": "libretro-atari800",
"rev": "94033288b026fe699bc50703609807aa8075f4dd",
- "sha256": "fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI="
+ "hash": "sha256-fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI="
},
"beetle-gba": {
"owner": "libretro",
"repo": "beetle-gba-libretro",
"rev": "38182572571a48cb58057cde64b915237c4e2d58",
- "sha256": "4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo="
+ "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo="
},
"beetle-lynx": {
"owner": "libretro",
"repo": "beetle-lynx-libretro",
"rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae",
- "sha256": "f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA="
+ "hash": "sha256-f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA="
},
"beetle-ngp": {
"owner": "libretro",
"repo": "beetle-ngp-libretro",
"rev": "65460e3a9ad529f6901caf669abbda11f437ab55",
- "sha256": "+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w="
+ "hash": "sha256-+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w="
},
"beetle-pce-fast": {
"owner": "libretro",
"repo": "beetle-pce-fast-libretro",
"rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e",
- "sha256": "uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA="
+ "hash": "sha256-uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA="
},
"beetle-pcfx": {
"owner": "libretro",
"repo": "beetle-pcfx-libretro",
"rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758",
- "sha256": "xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY="
+ "hash": "sha256-xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY="
},
"beetle-psx": {
"owner": "libretro",
"repo": "beetle-psx-libretro",
"rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0",
- "sha256": "yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI="
+ "hash": "sha256-yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI="
},
"beetle-saturn": {
"owner": "libretro",
"repo": "beetle-saturn-libretro",
"rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414",
- "sha256": "RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM="
+ "hash": "sha256-RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM="
},
"beetle-snes": {
"owner": "libretro",
"repo": "beetle-bsnes-libretro",
"rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91",
- "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0="
+ "hash": "sha256-zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0="
},
"beetle-supafaust": {
"owner": "libretro",
"repo": "supafaust",
"rev": "75c658cce454e58ae04ea252f53a31c60d61548e",
- "sha256": "2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0="
+ "hash": "sha256-2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0="
},
"beetle-supergrafx": {
"owner": "libretro",
"repo": "beetle-supergrafx-libretro",
"rev": "1ff2daa9377114d5394142f75f1c388b706567ed",
- "sha256": "0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE="
+ "hash": "sha256-0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE="
},
"beetle-vb": {
"owner": "libretro",
"repo": "beetle-vb-libretro",
"rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313",
- "sha256": "C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674="
+ "hash": "sha256-C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674="
},
"beetle-wswan": {
"owner": "libretro",
"repo": "beetle-wswan-libretro",
"rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701",
- "sha256": "xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8="
+ "hash": "sha256-xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8="
},
"blastem": {
"owner": "libretro",
"repo": "blastem",
"rev": "277e4a62668597d4f59cadda1cbafb844f981d45",
- "sha256": "EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs="
+ "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs="
},
"bluemsx": {
"owner": "libretro",
"repo": "bluemsx-libretro",
"rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a",
- "sha256": "K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg="
+ "hash": "sha256-K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg="
},
"bsnes": {
"owner": "libretro",
"repo": "bsnes-libretro",
"rev": "4da970a334ba4644cef72e560985ea3f31fa40f7",
- "sha256": "Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI="
+ "hash": "sha256-Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI="
},
"bsnes-hd": {
"owner": "DerKoun",
"repo": "bsnes-hd",
"rev": "04821703aefdc909a4fd66d168433fcac06c2ba7",
- "sha256": "QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU="
+ "hash": "sha256-QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU="
},
"bsnes-mercury": {
"owner": "libretro",
"repo": "bsnes-mercury",
"rev": "fb9a41fe9bc230a07c4506cad3cbf21d3fa635b4",
- "sha256": "gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y="
+ "hash": "sha256-gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y="
},
"citra": {
"owner": "libretro",
"repo": "citra",
"rev": "d7e1612c17b1acb5d5eb68bb046820db49aeea5e",
- "sha256": "u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=",
+ "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=",
"fetchSubmodules": true
},
"desmume": {
"owner": "libretro",
"repo": "desmume",
"rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7",
- "sha256": "7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ="
+ "hash": "sha256-7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ="
},
"desmume2015": {
"owner": "libretro",
"repo": "desmume2015",
"rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893",
- "sha256": "kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="
+ "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="
},
"dolphin": {
"owner": "libretro",
"repo": "dolphin",
"rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04",
- "sha256": "9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg="
+ "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg="
},
"dosbox": {
"owner": "libretro",
"repo": "dosbox-libretro",
"rev": "b7b24262c282c0caef2368c87323ff8c381b3102",
- "sha256": "PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I="
+ "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I="
+ },
+ "dosbox-pure": {
+ "owner": "schellingb",
+ "repo": "dosbox-pure",
+ "rev": "035e01e43623f83a9e71f362364fd74091379455",
+ "hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A="
},
"eightyone": {
"owner": "libretro",
"repo": "81-libretro",
"rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0",
- "sha256": "Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA="
+ "hash": "sha256-Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA="
},
"fbalpha2012": {
"owner": "libretro",
"repo": "fbalpha2012",
"rev": "7f8860543a81ba79c0e1ce1aa219af44568c628a",
- "sha256": "r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc="
+ "hash": "sha256-r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc="
},
"fbneo": {
"owner": "libretro",
"repo": "fbneo",
"rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5",
- "sha256": "a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI="
+ "hash": "sha256-a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI="
},
"fceumm": {
"owner": "libretro",
"repo": "libretro-fceumm",
"rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2",
- "sha256": "B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE="
+ "hash": "sha256-B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE="
},
"flycast": {
"owner": "libretro",
"repo": "flycast",
"rev": "4c293f306bc16a265c2d768af5d0cea138426054",
- "sha256": "9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo="
+ "hash": "sha256-9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo="
},
"fmsx": {
"owner": "libretro",
"repo": "fmsx-libretro",
"rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3",
- "sha256": "LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg="
+ "hash": "sha256-LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg="
},
"freeintv": {
"owner": "libretro",
"repo": "freeintv",
"rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb",
- "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424="
+ "hash": "sha256-ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424="
},
"fuse": {
"owner": "libretro",
"repo": "fuse-libretro",
"rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e",
- "sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM="
+ "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM="
},
"gambatte": {
"owner": "libretro",
"repo": "gambatte-libretro",
"rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d",
- "sha256": "2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk="
+ "hash": "sha256-2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk="
},
"genesis-plus-gx": {
"owner": "libretro",
"repo": "Genesis-Plus-GX",
"rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027",
- "sha256": "4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI="
+ "hash": "sha256-4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI="
},
"gpsp": {
"owner": "libretro",
"repo": "gpsp",
"rev": "541adc9e1c6c9328c07058659594d6300ae0fa19",
- "sha256": "2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA="
+ "hash": "sha256-2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA="
},
"gw": {
"owner": "libretro",
"repo": "gw-libretro",
"rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d",
- "sha256": "luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0="
+ "hash": "sha256-luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0="
},
"handy": {
"owner": "libretro",
"repo": "libretro-handy",
"rev": "63db085af671bad2929078c55434623b7d4632a1",
- "sha256": "N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE="
+ "hash": "sha256-N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE="
},
"hatari": {
"owner": "libretro",
"repo": "hatari",
"rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5",
- "sha256": "i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao="
+ "hash": "sha256-i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao="
},
"mame": {
"owner": "libretro",
"repo": "mame",
"rev": "f7761a9902d59030882c58d4482446196e748c50",
- "sha256": "g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g="
+ "hash": "sha256-g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g="
},
"mame2000": {
"owner": "libretro",
"repo": "mame2000-libretro",
"rev": "0208517404e841fce0c094f1a2776a0e1c6c101d",
- "sha256": "WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ="
+ "hash": "sha256-WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ="
},
"mame2003": {
"owner": "libretro",
"repo": "mame2003-libretro",
"rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b",
- "sha256": "bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA="
+ "hash": "sha256-bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA="
},
"mame2003-plus": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "0b9309d9d86aea2457df74709e997bea37899475",
- "sha256": "US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0="
+ "hash": "sha256-US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0="
},
"mame2010": {
"owner": "libretro",
"repo": "mame2010-libretro",
"rev": "5f524dd5fca63ec1dcf5cca63885286109937587",
- "sha256": "OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M="
+ "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M="
},
"mame2015": {
"owner": "libretro",
"repo": "mame2015-libretro",
"rev": "2599c8aeaf84f62fe16ea00daa460a19298c121c",
- "sha256": "TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw="
+ "hash": "sha256-TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw="
},
"mame2016": {
"owner": "libretro",
"repo": "mame2016-libretro",
"rev": "01058613a0109424c4e7211e49ed83ac950d3993",
- "sha256": "IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="
+ "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="
},
"melonds": {
"owner": "libretro",
"repo": "melonds",
"rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649",
- "sha256": "ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM="
+ "hash": "sha256-ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM="
},
"mesen": {
"owner": "libretro",
"repo": "mesen",
"rev": "caa4e6f14373c40bd2805c600d1b476e7616444a",
- "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU="
+ "hash": "sha256-cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU="
},
"mesen-s": {
"owner": "libretro",
"repo": "mesen-s",
"rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8",
- "sha256": "/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo="
+ "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo="
},
"meteor": {
"owner": "libretro",
"repo": "meteor-libretro",
"rev": "e533d300d0561564451bde55a2b73119c768453c",
- "sha256": "zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ="
+ "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ="
},
"mgba": {
"owner": "libretro",
"repo": "mgba",
"rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad",
- "sha256": "rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg="
+ "hash": "sha256-rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg="
},
"mupen64plus": {
"owner": "libretro",
"repo": "mupen64plus-libretro-nx",
"rev": "5a63aadedc29655254d8fc7b4da3a325472e198b",
- "sha256": "QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE="
+ "hash": "sha256-QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE="
},
"neocd": {
"owner": "libretro",
"repo": "neocd_libretro",
"rev": "2070f5258c9d3feee15962f9db8c8ef20072ece8",
- "sha256": "X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg="
+ "hash": "sha256-X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg="
},
"nestopia": {
"owner": "libretro",
"repo": "nestopia",
"rev": "16b14865caf1effca030630e2fc73d2d4271fc53",
- "sha256": "dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM="
+ "hash": "sha256-dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM="
},
"np2kai": {
"owner": "AZO234",
"repo": "NP2kai",
"rev": "6089943a80a45b6c18d765765f7f31d7a5c0d9c6",
- "sha256": "tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=",
+ "hash": "sha256-tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=",
"fetchSubmodules": true
},
"nxengine": {
"owner": "libretro",
"repo": "nxengine-libretro",
"rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a",
- "sha256": "4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0="
+ "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0="
},
"o2em": {
"owner": "libretro",
"repo": "libretro-o2em",
"rev": "a2a12472fde910b6089ac3ca6de805bd58a9c999",
- "sha256": "0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg="
+ "hash": "sha256-0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg="
},
"opera": {
"owner": "libretro",
"repo": "opera-libretro",
"rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1",
- "sha256": "oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM="
+ "hash": "sha256-oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM="
},
"parallel-n64": {
"owner": "libretro",
"repo": "parallel-n64",
"rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c",
- "sha256": "aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA="
+ "hash": "sha256-aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA="
},
"pcsx2": {
"owner": "libretro",
"repo": "pcsx2",
"rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9",
- "sha256": "0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="
+ "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="
},
"pcsx_rearmed": {
"owner": "libretro",
"repo": "pcsx_rearmed",
"rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3",
- "sha256": "727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U="
+ "hash": "sha256-727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U="
},
"picodrive": {
"owner": "libretro",
"repo": "picodrive",
"rev": "7ab066aab84f15388a53433ea273420bcf917e00",
- "sha256": "NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=",
+ "hash": "sha256-NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=",
"fetchSubmodules": true
},
"play": {
"owner": "jpd002",
"repo": "Play-",
"rev": "b33834af08a4954f06be215eee80a72e7a378e91",
- "sha256": "IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=",
+ "hash": "sha256-IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=",
"fetchSubmodules": true
},
"ppsspp": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4",
- "sha256": "GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=",
+ "hash": "sha256-GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=",
"fetchSubmodules": true
},
"prboom": {
"owner": "libretro",
"repo": "libretro-prboom",
"rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582",
- "sha256": "klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA="
+ "hash": "sha256-klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA="
},
"prosystem": {
"owner": "libretro",
"repo": "prosystem-libretro",
"rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b",
- "sha256": "rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E="
+ "hash": "sha256-rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E="
},
"puae": {
"owner": "libretro",
"repo": "libretro-uae",
"rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76",
- "sha256": "6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU="
+ "hash": "sha256-6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU="
},
"quicknes": {
"owner": "libretro",
"repo": "QuickNES_Core",
"rev": "75d501a87ec2074e8d2f7256fb0359513c263c29",
- "sha256": "yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw="
+ "hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw="
},
"sameboy": {
"owner": "libretro",
"repo": "sameboy",
"rev": "09138330990da32362246c7034cf4de2ea0a2a2b",
- "sha256": "hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4="
+ "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4="
},
"scummvm": {
"owner": "libretro",
"repo": "scummvm",
"rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b",
- "sha256": "9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM="
+ "hash": "sha256-9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM="
},
"smsplus-gx": {
"owner": "libretro",
"repo": "smsplus-gx",
"rev": "60af17ddb2231ba98f4ed1203e2a2f58d08ea088",
- "sha256": "2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU="
+ "hash": "sha256-2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU="
},
"snes9x": {
"owner": "snes9xgit",
"repo": "snes9x",
"rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684",
- "sha256": "1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo="
+ "hash": "sha256-1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo="
},
"snes9x2002": {
"owner": "libretro",
"repo": "snes9x2002",
"rev": "540baad622d9833bba7e0696193cb06f5f02f564",
- "sha256": "WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs="
+ "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs="
},
"snes9x2005": {
"owner": "libretro",
"repo": "snes9x2005",
"rev": "fd45b0e055bce6cff3acde77414558784e93e7d0",
- "sha256": "zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI="
+ "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI="
},
"snes9x2010": {
"owner": "libretro",
"repo": "snes9x2010",
"rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf",
- "sha256": "7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU="
+ "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU="
},
"stella": {
"owner": "stella-emu",
"repo": "stella",
"rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15",
- "sha256": "9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4="
+ "hash": "sha256-9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4="
},
"stella2014": {
"owner": "libretro",
"repo": "stella2014-libretro",
"rev": "8ab051edd4816f33a5631d230d54059eeed52c5f",
- "sha256": "wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0="
+ "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0="
},
"swanstation": {
"owner": "libretro",
"repo": "swanstation",
"rev": "e24f21196cdcd50321475c4366b51af245a6bbe6",
- "sha256": "DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978="
+ "hash": "sha256-DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978="
},
"tgbdual": {
"owner": "libretro",
"repo": "tgbdual-libretro",
"rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3",
- "sha256": "MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs="
+ "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs="
},
"thepowdertoy": {
"owner": "libretro",
"repo": "ThePowderToy",
"rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243",
- "sha256": "aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo="
+ "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo="
},
"tic80": {
"owner": "libretro",
"repo": "tic-80",
"rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11",
- "sha256": "RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=",
+ "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=",
"fetchSubmodules": true
},
"vba-m": {
"owner": "libretro",
"repo": "vbam-libretro",
"rev": "640ce45325694d1dc574e90c95c55bc464368d7e",
- "sha256": "aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM="
+ "hash": "sha256-aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM="
},
"vba-next": {
"owner": "libretro",
"repo": "vba-next",
"rev": "0c310082a6345790124e9348861b300bcccbeced",
- "sha256": "RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78="
+ "hash": "sha256-RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78="
},
"vecx": {
"owner": "libretro",
"repo": "libretro-vecx",
"rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7",
- "sha256": "2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM="
+ "hash": "sha256-2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM="
},
"virtualjaguar": {
"owner": "libretro",
"repo": "virtualjaguar-libretro",
"rev": "2cc06899b839639397b8b30384a191424b6f529d",
- "sha256": "7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ="
+ "hash": "sha256-7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ="
},
"yabause": {
"owner": "libretro",
"repo": "yabause",
"rev": "4c96b96f7fbe07223627c469ff33376b2a634748",
- "sha256": "7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8="
+ "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8="
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
new file mode 100644
index 0000000000..92ba7f20c8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "retroarch-joypad-autoconfig";
+ version = "1.15.0";
+
+ src = fetchFromGitHub {
+ owner = "libretro";
+ repo = "retroarch-joypad-autoconfig";
+ rev = "v${version}";
+ hash = "sha256-/F2Y08uDA/pIIeLiLfOQfGVjX2pkuOqPourlx2RbZ28=";
+ };
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ meta = with lib; {
+ description = "Joypad autoconfig files";
+ homepage = "https://www.libretro.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; teams.libretro.members ++ [ ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py
index bd325e5739..a091958c38 100755
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py
@@ -36,6 +36,7 @@ CORES = {
"desmume2015": {"repo": "desmume2015"},
"dolphin": {"repo": "dolphin"},
"dosbox": {"repo": "dosbox-libretro"},
+ "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"},
"eightyone": {"repo": "81-libretro"},
"fbalpha2012": {"repo": "fbalpha2012"},
"fbneo": {"repo": "fbneo"},
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch
deleted file mode 100644
index 7ef7f439ec..0000000000
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6960855a0cdfd671d214030260b340a73878af52 Mon Sep 17 00:00:00 2001
-From: Thiago Kenji Okada
-Date: Fri, 23 Dec 2022 21:42:15 +0000
-Subject: [PATCH] Use default values for libretro_info_path/assets_directories
-
----
- configuration.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configuration.c b/configuration.c
-index d9ab8370c4..15b575d8a2 100644
---- a/configuration.c
-+++ b/configuration.c
-@@ -1483,7 +1483,7 @@ static struct config_path_setting *populate_settings_path(
- SETTING_PATH("core_options_path",
- settings->paths.path_core_options, false, NULL, true);
- SETTING_PATH("libretro_info_path",
-- settings->paths.path_libretro_info, false, NULL, true);
-+ settings->paths.path_libretro_info, false, NULL, false);
- SETTING_PATH("content_database_path",
- settings->paths.path_content_database, false, NULL, true);
- SETTING_PATH("cheat_database_path",
-@@ -1539,7 +1539,7 @@ static struct config_path_setting *populate_settings_path(
- SETTING_PATH("core_assets_directory",
- settings->paths.directory_core_assets, true, NULL, true);
- SETTING_PATH("assets_directory",
-- settings->paths.directory_assets, true, NULL, true);
-+ settings->paths.directory_assets, true, NULL, false);
- SETTING_PATH("dynamic_wallpapers_directory",
- settings->paths.directory_dynamic_wallpapers, true, NULL, true);
- SETTING_PATH("thumbnails_directory",
---
-2.38.1
-
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix
index afef0bef8a..4698bbe5bb 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix
@@ -3,16 +3,28 @@
, makeWrapper
, retroarch
, symlinkJoin
+, runCommand
, cores ? [ ]
+, settings ? { }
}:
let
+ settingsPath = runCommand "declarative-retroarch.cfg"
+ {
+ value = lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings);
+ passAsFile = [ "value" ];
+ }
+ ''
+ cp "$valuePath" "$out"
+ '';
+
# All cores should be located in the same path after symlinkJoin,
# but let's be safe here
coresPath = lib.lists.unique (map (c: c.libretroCore) cores);
- wrapperArgs = lib.strings.escapeShellArgs
- (lib.lists.flatten
- (map (p: [ "--add-flags" "-L ${placeholder "out" + p}" ]) coresPath));
+ wrapperArgs = lib.strings.escapeShellArgs (
+ (lib.lists.flatten (map (p: [ "--add-flags" "-L ${placeholder "out" + p}" ]) coresPath))
+ ++ [ "--add-flags" "--appendconfig=${settingsPath}" ]
+ );
in
symlinkJoin {
name = "retroarch-with-cores-${lib.getVersion retroarch}";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch
deleted file mode 100644
index dccf06fc07..0000000000
--- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9866ce8f538e1ab1f0902408b7575013b768f365 Mon Sep 17 00:00:00 2001
-From: Zane van Iperen
-Date: Wed, 2 Feb 2022 23:41:59 +1000
-Subject: [PATCH] llvm/ExecutionEngine/IntelJITEvents: only use
- ITTAPI_SOURCE_DIR
-
----
- .../IntelJITEvents/CMakeLists.txt | 32 ++-----------------
- 1 file changed, 2 insertions(+), 30 deletions(-)
-
-diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
-index 0c5017c3..d20c35f3 100644
---- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
-+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
-@@ -1,34 +1,6 @@
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
-
--if(NOT DEFINED ITTAPI_GIT_REPOSITORY)
-- set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git)
--endif()
--
--if(NOT DEFINED ITTAPI_GIT_TAG)
-- set(ITTAPI_GIT_TAG v3.18.12)
--endif()
--
--if(NOT DEFINED ITTAPI_SOURCE_DIR)
-- set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
--endif()
--
--if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
-- execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
-- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
-- RESULT_VARIABLE GIT_CLONE_RESULT)
-- if(NOT GIT_CLONE_RESULT EQUAL "0")
-- message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
-- endif()
--endif()
--
--execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
-- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
-- RESULT_VARIABLE GIT_CHECKOUT_RESULT)
--if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
-- message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
--endif()
--
--include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
-+include_directories( ${ITTAPI_SOURCE_DIR}/include/ )
-
- if( HAVE_LIBDL )
- set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
-@@ -40,7 +12,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
- add_llvm_component_library(LLVMIntelJITEvents
- IntelJITEventListener.cpp
- jitprofiling.c
-- ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
-+ ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c
-
- LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
-
---
-2.34.1
-
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix
index b035c7b0d1..88b3ddbb17 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix
@@ -1,24 +1,43 @@
-{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
-, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
-, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
-, sdl2Support ? true, SDL2
-, cubebSupport ? true, cubeb
-, waylandSupport ? true, wayland
+{ lib
+, stdenv
+, fetchFromGitHub
+, wrapQtAppsHook
+, cmake
+, pkg-config
+, git
+, qtbase
+, qtquickcontrols
+, qtmultimedia
+, openal
+, glew
+, vulkan-headers
+, vulkan-loader
+, libpng
+, libSM
+, ffmpeg
+, libevdev
+, libusb1
+, zlib
+, curl
+, wolfssl
+, python3
+, pugixml
+, flatbuffers
+, llvm_16
+, cubeb
+, faudioSupport ? true
+, faudio
+, SDL2
+, waylandSupport ? true
+, wayland
}:
let
# Keep these separate so the update script can regex them
- rpcs3GitVersion = "14840-842edbcbe";
- rpcs3Version = "0.0.27-14840-842edbcbe";
- rpcs3Revision = "842edbcbe795941981993c667c2d8a866126b5b0";
- rpcs3Sha256 = "1al4dx93f02k56k62dxjqqb46cwg0nkpjax1xnjc8v3bx4gsp6f6";
-
- ittapi = fetchFromGitHub {
- owner = "intel";
- repo = "ittapi";
- rev = "v3.18.12";
- sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
- };
+ rpcs3GitVersion = "15409-fd6829f75";
+ rpcs3Version = "0.0.28-15409-fd6829f75";
+ rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c";
+ rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk=";
in
stdenv.mkDerivation {
pname = "rpcs3";
@@ -29,11 +48,9 @@ stdenv.mkDerivation {
repo = "rpcs3";
rev = rpcs3Revision;
fetchSubmodules = true;
- sha256 = rpcs3Sha256;
+ hash = rpcs3Hash;
};
- patches = [ ./0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch ];
-
passthru.updateScript = ./update.sh;
preConfigure = ''
@@ -55,17 +72,20 @@ stdenv.mkDerivation {
"-DUSE_SYSTEM_FAUDIO=ON"
"-DUSE_SYSTEM_PUGIXML=ON"
"-DUSE_SYSTEM_FLATBUFFERS=ON"
+ "-DUSE_SYSTEM_SDL=ON"
+ "-DWITH_LLVM=ON"
+ "-DBUILD_LLVM=OFF"
"-DUSE_NATIVE_INSTRUCTIONS=OFF"
- "-DITTAPI_SOURCE_DIR=${ittapi}"
+ "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}"
];
nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];
buildInputs = [
qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
- libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
- ] ++ lib.optional sdl2Support SDL2
- ++ lib.optionals cubebSupport cubeb.passthru.backendLibs
+ libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM
+ ] ++ cubeb.passthru.backendLibs
+ ++ lib.optionals faudioSupport [ faudio SDL2 ]
++ lib.optional waylandSupport wayland;
postInstall = ''
@@ -81,5 +101,6 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ abbradar neonfuz ilian zane ];
license = licenses.gpl2Only;
platforms = [ "x86_64-linux" "aarch64-linux" ];
+ mainProgram = "rpcs3";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh
index 0c8477c528..1efecc7ec8 100755
--- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert
+#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix gnused jq nix-prefetch-git curl cacert
set -eou pipefail
@@ -48,12 +48,13 @@ final_ver="$major_ver-$git_ver"
echo "INFO: Latest commit is $commit_sha"
echo "INFO: Latest version is $final_ver"
-nix_sha256=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256)
-echo "INFO: SHA256 is $nix_sha256"
+nix_hash=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256)
+nix_hash=$(nix hash to-sri --type sha256 "$nix_hash")
+echo "INFO: Hash is $nix_hash"
sed -i -E \
-e "s/rpcs3GitVersion\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3GitVersion = \"${git_ver}\";/g" \
-e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \
-e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \
- -e "s/rpcs3Sha256\s*=\s*\"[a-z0-9]+\";$/rpcs3Sha256 = \"${nix_sha256}\";/g" \
+ -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \
"$ROOT/default.nix"
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
index 0042c8f872..199edc8e91 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
@@ -28,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
- version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+ version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
- rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c";
- sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5";
+ rev = "487261592eb9e9c31cacd08860f8894027bb1a07";
+ sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g";
};
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 6cc70c819a..3a509ea5fc 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix
@@ -133,7 +133,7 @@
(fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; })
(fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; })
(fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; })
- (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; })
+ (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; })
(fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
(fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
(fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; })
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix
index 82efe6b42a..34c2f72c7d 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix
@@ -123,5 +123,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ qknight xfix thiagokokada ];
platforms = platforms.unix;
broken = (withGtk && stdenv.isDarwin);
+ mainProgram = "snes9x";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix
new file mode 100644
index 0000000000..ce2518031b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix
@@ -0,0 +1,78 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, zip
+, copyDesktopItems
+, libpng
+, SDL2
+, SDL2_image
+, darwin
+
+# Optionally bundle a ROM file
+, rom ? null
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "tamatool";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "jcrona";
+ repo = "tamatool";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8=";
+ fetchSubmodules = true;
+ };
+
+ # * Point to the installed rom and res directory
+ # * Tell the user to use --rom instead of telling them to place the rom in the
+ # program directory (it's immutable!)
+ postPatch = ''
+ substituteInPlace src/tamatool.c \
+ --replace '#define RES_PATH' "#define RES_PATH \"$out/share/tamatool/res\" //" \
+ --replace '#define ROM_PATH' "#define ROM_PATH \"$out/share/tamatool/rom.bin\" //" \
+ --replace '#define ROM_NOT_FOUND_MSG' '#define ROM_NOT_FOUND_MSG "You need to use the --rom option!" //'
+ '';
+
+ nativeBuildInputs = [
+ zip
+ copyDesktopItems
+ ];
+
+ buildInputs = [
+ libpng
+ SDL2
+ SDL2_image
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.CoreFoundation
+ ];
+
+ makeFlags = [
+ "-Clinux"
+ "VERSION=${finalAttrs.version}"
+ "CFLAGS+=-I${SDL2.dev}/include/SDL2"
+ "CFLAGS+=-I${SDL2_image}/include/SDL2"
+ "DIST_PATH=$(out)"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ ];
+
+ desktopItems = [ "linux/tamatool.desktop" ];
+
+ installPhase = ''
+ runHook preInstall
+ install -Dm755 linux/tamatool $out/bin/tamatool
+ mkdir -p $out/share/tamatool
+ cp -r res $out/share/tamatool/res
+ install -Dm644 linux/tamatool.png $out/share/icons/hicolor/128x126/apps/tamatool.png
+ ${lib.optionalString (rom != null) "install -Dm677 ${rom} $out/share/tamatool/rom.bin"}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A cross-platform Tamagotchi P1 explorer";
+ homepage = "https://github.com/jcrona/tamatool";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix
index 935207321c..7151f5b0f9 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix
@@ -2,25 +2,24 @@
, stdenv
, fetchFromSourcehut
, SDL2
+, unstableGitUpdater
}:
stdenv.mkDerivation {
pname = "uxn";
- version = "unstable-2022-10-22";
+ version = "unstable-2023-07-30";
src = fetchFromSourcehut {
owner = "~rabbits";
repo = "uxn";
- rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d";
- hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ=";
+ rev = "9ca8e9623d0ab1c299f08d3dd9d54098557f5749";
+ hash = "sha256-K51YiLnBwFWgD3h3l2BhsvzhnHHolZPsjjUWJSe4sPQ=";
};
buildInputs = [
SDL2
];
- dontConfigure = true;
-
postPatch = ''
sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh
'';
@@ -44,11 +43,13 @@ stdenv.mkDerivation {
runHook postInstall
'';
- meta = with lib; {
+ passthru.updateScript = unstableGitUpdater { };
+
+ meta = {
homepage = "https://wiki.xxiivv.com/site/uxn.html";
description = "An assembler and emulator for the Uxn stack machine";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ AndersonTorres kototama ];
- platforms = with platforms; unix;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ AndersonTorres kototama ];
+ inherit (SDL2.meta) platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
index e35428a5a0..1bfb35e76d 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
@@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
in rec {
stable = fetchurl rec {
- version = "8.0.1";
+ version = "8.0.2";
url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz";
- hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30=";
+ hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc=";
## see http://wiki.winehq.org/Gecko
gecko32 = fetchurl rec {
@@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
- version = "8.10";
+ version = "8.13";
url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
- hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28=";
+ hash = "sha256-JuXTqD0lxUGMbA9USORD0gh2OiZDqrSw8a01KSKkwnU=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g=";
+ hash = "sha256-5upC+IWHBJE5DeFv96lD1hr4LYYaqAAzfxIroK9KlOY=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
index 28e7829a9c..311935b846 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
@@ -12,6 +12,7 @@
, libepoxy
, libpcap
, libsamplerate
+, libslirp
, makeDesktopItem
, mesa
, meson
@@ -27,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
- version = "0.7.97";
+ version = "0.7.110";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
rev = "v${finalAttrs.version}";
- hash = "sha256-Doyn+EHZ9nlYjufHnHARLXbyDjYIEGIHuLOXFHU5f3w=";
+ hash = "sha256-ztYjvQunjskPZUIntzX4GEh0nv0K6knVubYW+QlCCII=";
fetchSubmodules = true;
};
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
libepoxy
libpcap
libsamplerate
+ libslirp
mesa
openssl
vte
@@ -131,5 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ];
platforms = lib.platforms.linux;
+ mainProgram = "xemu";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix
index 3fdd6db846..71306bdc43 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix
@@ -110,7 +110,7 @@ in stdenv.mkDerivation {
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
# making the build fail, as that path does not exist
dontFixCmake = true;
-
+ patches = [./vulkan_version.patch];
cmakeFlags = [
# actually has a noticeable performance impact
"-DYUZU_ENABLE_LTO=ON"
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix
index 676b9db8f8..45043fb4b4 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix
@@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually!
-# Last updated: 2023-06-22
+# Last updated: 2023-08-02
{
compatList = {
- rev = "2288f79cad3be4c2c3148435372958aebea33156";
+ rev = "95617e06f8f19e3dcd76b694d6ba87408011cd4d";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
};
mainline = {
- version = "1475";
- hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm";
+ version = "1515";
+ hash = "sha256:0w9kg2rq43x9khws2yx6p7qad4xw6vkd04adiw021hjv1scajrlm";
};
ea = {
- version = "3702";
- distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j";
- fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8";
+ version = "3788";
+ distHash = "sha256:0w8jm51b2fwfbr5rmqdagjkay4kams2g12qqkqla6n696zn302jx";
+ fullHash = "sha256:1fdv7645ijnl58749f4qa5ni7bag4chmm1c8gvji5408grfp0ldq";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch
new file mode 100644
index 0000000000..7b77179e9f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch
@@ -0,0 +1,13 @@
+Yuzu requires a version of Vulkan that has not yet been released as a stable Vulkan SDK. In case this patch fails, check which version Yuzu is currently using and verify that it still works with the version shipped in Nixpkgs.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -314,7 +314,7 @@
+ find_package(zstd 1.5 REQUIRED)
+
+ if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
+- find_package(Vulkan 1.3.256 REQUIRED)
++ find_package(Vulkan 1.3.250 REQUIRED)
+ endif()
+
+ if (ENABLE_LIBUSB)
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
index e5ee64c28a..178b7c7b5a 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "browsr";
- version = "1.11.0";
+ version = "1.13.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "juftin";
repo = "browsr";
rev = "v${version}";
- hash = "sha256-LhrMQFkvdkYra/6jQtMAooGy76qLYldHoxEGMPhde7Q=";
+ hash = "sha256-vYb4XWBdQ4HJzICXNiBXit4aVgjYA9SCX15MppVtTS8=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix
index c4c2d9e652..f07309a8ad 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "clifm";
- version = "1.10";
+ version = "1.13";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4=";
+ sha256 = "sha256-Y9z3HT36Z1fwweOnniRgyNQX1cbrLSGGgB5UAxkq9mI=";
};
buildInputs = [ libcap acl file readline ];
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 5352311025..508aad3853 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
@@ -323,7 +323,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "felix"
-version = "2.5.0"
+version = "2.6.0"
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 2f1c250535..61d4ea25d9 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.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Zz2kTbY+5ZUxIZmwfg6Lpk1ulfuNSRWeaTZOh7fWAvg=";
+ sha256 = "sha256-e/NJmlXo6x/NUWU/JlVDItQK4c2XDC4unNNE+BUI5OE=";
};
cargoLock = {
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
index 9895cc108e..a8635a4163 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix
@@ -43,5 +43,6 @@ mkDerivation rec {
description = "Norton/Total Commander clone for KDE";
license = licenses.gpl2Only;
maintainers = with maintainers; [ sander turion ];
+ mainProgram = "krusader";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
index a61b0980d8..65211bb543 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix
@@ -93,5 +93,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander ];
platforms = with platforms; linux ++ darwin;
+ mainProgram = "mc";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix
index 8882bf42a5..cf3b1352f4 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix
@@ -10,13 +10,13 @@
}:
let
- version = "1.2.0-1";
+ version = "1.3.0-1";
src = fetchFromGitHub {
owner = "mucommander";
repo = "mucommander";
rev = version;
- sha256 = "sha256-OrtC7E/8n9uEo7zgFHYQqXV3qLpdKtxwbwZfxoOqTqA=";
+ sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw=";
};
postPatch = ''
@@ -49,7 +49,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "sha256-T4UhEzkaYh237+ZsoQTv1RgqcAKY4dPc/3x+dEie4A8=";
+ outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E=";
};
in
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch
new file mode 100644
index 0000000000..f1bf71e6b9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch
@@ -0,0 +1,15 @@
+diff --git a/src/nnn.c b/src/nnn.c
+index b3c0f986..c74e1ec9 100644
+--- a/src/nnn.c
++++ b/src/nnn.c
+@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX];
+ static runstate g_state;
+
+ /* Options to identify file MIME */
+-#if defined(__APPLE__)
+-#define FILE_MIME_OPTS "-bIL"
+-#elif !defined(__sun) /* no MIME option for 'file' */
++#if !defined(__sun) /* no MIME option for 'file' */
+ #define FILE_MIME_OPTS "-biL"
+ #endif
+
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 4c3fab6484..eb3e943676 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
@@ -34,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
+ # Nix-specific: ensure nnn passes correct arguments to the Nix file command on Darwin.
+ # By default, nnn expects the macOS default file command, not the one provided by Nix.
+ # However, both commands use different arguments to obtain the MIME type.
+ ./darwin-fix-file-mime-opts.patch
# FIXME: remove for next release
(fetchpatch {
url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch";
@@ -74,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];
+ mainProgram = "nnn";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix
index deb9a98a51..bfbe68d885 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
description = "File manager with GTK interface";
maintainers = [ maintainers.ttuegel ];
platforms = platforms.linux;
+ mainProgram = "pcmanfm";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
index e0b9954e1f..0fcfa61907 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix
@@ -67,9 +67,7 @@ python3.pkgs.buildPythonApplication rec {
'';
passthru = {
- updateScript = nix-update-script {
- attrPath = "portfolio-filemanager";
- };
+ updateScript = nix-update-script { };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix
index a192edb0b3..96d43dc8f2 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix
@@ -55,5 +55,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = with maintainers; [ toonn magnetophon ];
+ mainProgram = "ranger";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix
index 0e82fbfa65..b4681ab697 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix
@@ -51,7 +51,7 @@ in
rustPlatform.buildRustPackage {
inherit version src pname;
- sourceRoot = "source/src-tauri";
+ sourceRoot = "${src.name}/src-tauri";
cargoLock = {
lockFile = ./Cargo.lock;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
index 3f8bf84282..fa90b95bd7 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-12";
+ version = "7.1.1-15";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
- hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI=";
+ hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru.tests = {
- version = testers.testVersion { package = imagemagick; };
+ version = testers.testVersion { package = finalAttrs.finalPackage; };
inherit (python3.pkgs) img2pdf;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
index 1662f65a91..b98e7a4fb4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
@@ -2,28 +2,30 @@
, rustPlatform
, fetchFromGitHub
, installShellFiles
-, pkg-config
-, openssl
+, stdenv
+, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "artem";
- version = "1.2.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "finefindus";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-T652cdKVZqoZ+EwXmTSs9x+ftjvWOELjy37trCP7V+0=";
+ hash = "sha256-liYZloaXN9doNyPO76iCaiZO9ZkNGBm+BxxNX87ZqBM=";
};
- cargoSha256 = "sha256-2LXpvAbkpk2sJHZJvytwLYksZK4coVYyKvuNRiDK0Gg=";
+ cargoHash = "sha256-fTAuh4jbfNpFaEu1X0LwVA30ghQ6mh5/Afap7gUjzMc=";
- nativeBuildInputs = [ installShellFiles pkg-config ];
+ nativeBuildInputs = [
+ installShellFiles
+ ];
- buildInputs = [ openssl ];
-
- OPENSSL_NO_VENDOR = 1;
+ buildInputs = lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Security
+ ];
checkFlags = [
# require internet access
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
index ab75938760..2a7e0e9ac0 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
@@ -54,7 +54,7 @@
, breeze-icons
, oxygen
-, cudaSupport ? config.cudaSupport or false
+, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
}:
@@ -151,5 +151,6 @@ mkDerivation rec {
license = licenses.gpl2;
homepage = "https://www.digikam.org";
platforms = platforms.linux;
+ mainProgram = "digikam";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix
index 250ff2b32e..8e36e5b70d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix
@@ -56,7 +56,7 @@ let
src = djvSrc;
- sourceRoot = "source/etc/SuperBuild";
+ sourceRoot = "${src.name}/etc/SuperBuild";
nativeBuildInputs = [ cmake ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
index 5ca19d5b41..4859fee52f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
@@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix;
+ mainProgram = "feh";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
index c2eaac0f56..af16095a7d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
@@ -25,14 +25,14 @@
stdenv.mkDerivation rec {
pname = "foxotron";
- version = "2023-02-23";
+ version = "2023-07-16";
src = fetchFromGitHub {
owner = "Gargaj";
repo = "Foxotron";
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0=";
+ sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix
new file mode 100644
index 0000000000..5715241fb7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, fetchFromGitHub
+, cmake
+, mkDerivation
+, qttools
+}:
+
+mkDerivation {
+ pname = "glabels-qt";
+ version = "unstable-2021-02-06";
+
+ src = fetchFromGitHub {
+ owner = "jimevins";
+ repo = "glabels-qt";
+ rev = "glabels-3.99-master564";
+ hash = "sha256-SdNOkjspqf6NuuIBZDsJneY6PNrIiP4HU46wDpBLt9Y=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ qttools
+ ];
+
+ meta = with lib; {
+ description = "GLabels Label Designer (Qt/C++)";
+ homepage = "https://github.com/jimevins/glabels-qt";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.matthewcroughan ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
index a5d71d6b9e..9cc53a9c52 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
@@ -18,13 +18,13 @@
python3Packages.buildPythonApplication rec {
pname = "gscreenshot";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "${pname}";
rev = "v${version}";
- sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM=";
+ sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg=";
};
# needed for wrapGAppsHook to function
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 300e7f7bb5..b6c0472140 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
};
+ separateDebugInfo = true;
+
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ];
buildInputs = [ wayland wayland-protocols ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix
index e37539ceee..0fa08c31c0 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli
'';
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
meta = with lib; {
description = "Very customizable imageboard/booru downloader with powerful filenaming features";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix
index 6444537cac..3e1e482bb3 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix
@@ -4,6 +4,7 @@
, boost
, cairo
, cmake
+, desktopToDarwinBundle
, fetchurl
, gettext
, ghostscript
@@ -78,16 +79,15 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
+ (substituteAll {
+ # Fix path to ps2pdf binary
+ src = ./fix-ps2pdf-path.patch;
+ inherit ghostscript;
+ })
];
postPatch = ''
patchShebangs share/extensions
- substituteInPlace share/extensions/eps_input.inx \
- --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"
- substituteInPlace share/extensions/ps_input.inx \
- --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf"
- substituteInPlace share/extensions/ps_input.py \
- --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'"
patchShebangs share/templates
patchShebangs man/fix-roff-punct
@@ -107,7 +107,9 @@ stdenv.mkDerivation rec {
] ++ (with perlPackages; [
perl
XMLParser
- ]);
+ ]) ++ lib.optionals stdenv.isDarwin [
+ desktopToDarwinBundle
+ ];
buildInputs = [
boehmgc
@@ -157,6 +159,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.jtojnar ];
platforms = platforms.all;
+ mainProgram = "inkscape";
longDescription = ''
Inkscape is a feature-rich vector graphics editor that edits
files in the W3C SVG (Scalable Vector Graphics) file format.
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch
new file mode 100644
index 0000000000..9cd8e4b34c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch
@@ -0,0 +1,36 @@
+diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx
+--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx 2023-08-02 22:22:32.000000000 +0400
++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx 2023-08-02 22:23:34.000000000 +0400
+@@ -3,7 +3,7 @@
+ EPS Input
+ org.inkscape.input.eps
+ org.inkscape.input.pdf
+- ps2pdf
++ @ghostscript@/bin/ps2pdf
+ true
+
+diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx
+--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx 2023-08-02 22:22:33.000000000 +0400
++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx 2023-08-02 22:24:00.000000000 +0400
+@@ -3,7 +3,7 @@
+ PostScript Input
+ org.inkscape.input.postscript_input
+ org.inkscape.input.pdf
+- ps2pdf
++ @ghostscript@/bin/ps2pdf
+
+
+diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py
+--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py 2023-08-02 22:22:32.000000000 +0400
++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py 2023-08-02 22:23:48.000000000 +0400
+@@ -79,7 +79,7 @@
+ else:
+ try:
+ call(
+- "ps2pdf",
++ "@ghostscript@/bin/ps2pdf",
+ crop,
+ "-dAutoRotatePages=/" + self.options.autorotate,
+ input_file,
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
index 01f17bb41b..834ab6198a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
@@ -17,19 +17,17 @@
, wrapQtAppsHook
, zlib
, withTeXLive ? true
+, buildPackages
}:
stdenv.mkDerivation rec {
pname = "ipe";
- version = "7.2.26";
+ version = "7.2.27";
src = fetchurl {
url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
- sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU=";
+ sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
};
- patches = [
- ./headers-lookup.patch
- ];
nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
@@ -52,6 +50,7 @@ stdenv.mkDerivation rec {
"-C src"
"IPEPREFIX=${placeholder "out"}"
"LUA_PACKAGE=lua"
+ "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
"IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch b/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch
deleted file mode 100644
index a6adf1b164..0000000000
--- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 008cfc5d2b..b444841f8f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix
@@ -81,9 +81,7 @@ python3.pkgs.buildPythonApplication rec {
'';
passthru = {
- updateScript = nix-update-script {
- attrPath = "komikku";
- };
+ updateScript = nix-update-script { };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock
index 7336065200..065f9705cd 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock
@@ -393,7 +393,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -1009,9 +1009,9 @@ dependencies = [
[[package]]
name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
@@ -1077,9 +1077,9 @@ dependencies = [
[[package]]
name = "exr"
-version = "1.6.5"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7b44a196573e272e0cf0bcf130281c71e9a0c67062954b3323fd364bfdac9"
+checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
dependencies = [
"bit_field",
"flume",
@@ -1266,7 +1266,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -1396,7 +1396,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -2026,7 +2026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi 0.3.2",
- "rustix 0.38.3",
+ "rustix 0.38.4",
"windows-sys 0.48.0",
]
@@ -2577,9 +2577,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
[[package]]
name = "nalgebra"
-version = "0.32.2"
+version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
dependencies = [
"approx",
"matrixmultiply",
@@ -2593,9 +2593,9 @@ dependencies = [
[[package]]
name = "nalgebra-macros"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
dependencies = [
"proc-macro2",
"quote",
@@ -3024,7 +3024,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -3192,7 +3192,7 @@ dependencies = [
[[package]]
name = "oculante"
-version = "0.6.68"
+version = "0.6.69"
dependencies = [
"anyhow",
"arboard",
@@ -3230,7 +3230,7 @@ dependencies = [
"serde",
"serde_json",
"strum",
- "strum_macros 0.25.1",
+ "strum_macros",
"tiff 0.9.0",
"tiny-skia 0.9.1",
"turbojpeg",
@@ -3316,7 +3316,7 @@ checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -3437,7 +3437,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -3481,7 +3481,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -3597,9 +3597,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
dependencies = [
"unicode-ident",
]
@@ -3816,9 +3816,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick",
"memchr",
@@ -3828,9 +3828,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.0"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
+checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
dependencies = [
"aho-corasick",
"memchr",
@@ -3839,9 +3839,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reqwest"
@@ -4030,9 +4030,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.3"
+version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
dependencies = [
"bitflags 2.3.3",
"errno",
@@ -4043,9 +4043,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.21.3"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
dependencies = [
"log",
"ring",
@@ -4196,22 +4196,22 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.167"
+version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.167"
+version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -4436,24 +4436,11 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
- "strum_macros 0.24.3",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
+ "strum_macros",
]
[[package]]
@@ -4466,7 +4453,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -4502,9 +4489,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.23"
+version = "2.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
dependencies = [
"proc-macro2",
"quote",
@@ -4526,9 +4513,9 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.8"
+version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
+checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0"
[[package]]
name = "tempfile"
@@ -4576,7 +4563,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
]
[[package]]
@@ -5085,7 +5072,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
"wasm-bindgen-shared",
]
@@ -5119,7 +5106,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.25",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5546,9 +5533,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9482fe6ceabdf32f3966bfdd350ba69256a97c30253dc616fe0005af24f164e"
+checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"
dependencies = [
"memchr",
]
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix
index a58382b8de..5b758aaa1a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix
@@ -21,13 +21,13 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
- version = "0.6.68";
+ version = "0.6.69";
src = fetchFromGitHub {
owner = "woelper";
repo = pname;
rev = version;
- hash = "sha256-afkRId4PuRKnnloFLh2rD+npcCCUqDngKcnWbEf+6vk=";
+ hash = "sha256-xiZyI4TGXtpMoiX6KartjOO+BgbUht22Kg1FIp39m/o=";
};
cargoLock = {
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix
index 94c30fe0a3..37fcc0eb48 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix
@@ -109,5 +109,6 @@ mkDerivation rec {
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ bjornfor raskin gebner ];
+ mainProgram = "openscad";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix
index 61dca70c2a..131dd4457d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, qtsvg
+, qtwayland
, qttools
, exiv2
, wrapQtAppsHook
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtsvg
+ qtwayland
exiv2
];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
index 4cb2440cb8..0666501120 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "pixelnuke";
version = "unstable-2019-05-19";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40";
};
- sourceRoot = "source/pixelnuke";
+ sourceRoot = "${finalAttrs.src.name}/pixelnuke";
buildInputs = [ libevent glew glfw ];
@@ -26,4 +26,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
maintainers = with maintainers; [ mrVanDalo ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix
index 65c02102f0..b8d2adc909 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }:
let
- buildNumber = "1289";
+ buildNumber = "1292";
vaqua = fetchurl {
name = "VAqua9.jar";
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
@@ -37,29 +37,32 @@ let
sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
};
+ arch = {
+ x86_64 = "amd64";
+ }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
in
stdenv.mkDerivation rec {
pname = "processing";
- version = "4.1.1";
+ version = "4.2";
src = fetchFromGitHub {
owner = "processing";
repo = "processing4";
rev = "processing-${buildNumber}-${version}";
- sha256 = "sha256-OjTqANxzcW/RrAdqmVYAegrlLPu6w2pjzSyZyvUYIt4=";
+ sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU=";
};
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
- buildInputs = [ jdk javaPackages.jogl_2_3_2 ant rsync ffmpeg batik ];
+ buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ];
dontWrapGApps = true;
buildPhase = ''
echo "tarring jdk"
- tar --checkpoint=10000 -czf build/linux/jdk-17.0.5-amd64.tgz ${jdk}
+ tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk}
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
mkdir -p core/library
- ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/
+ ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/
ln -s ${vaqua} app/lib/VAqua9.jar
ln -s ${flatlaf} app/lib/flatlaf.jar
ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
index 11ddc7c7db..2dfc42c97a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "scantailor-advanced";
- version = "1.0.18";
+ version = "1.0.19";
src = fetchFromGitHub {
owner = "vigri";
repo = "scantailor-advanced";
rev = "v${version}";
- sha256 = "sha256-4/QSjgHvRgIduS/AXbT7osRTdOdgR7On3CbjRnGbwHU=";
+ sha256 = "sha256-mvoCoYdRTgXW5t8yd9Y9TOl7D3RDVwcjUv2YDUWrtRI=";
};
nativeBuildInputs = [ cmake qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
index 555770f7e1..f7ee044d42 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
@@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "shotwell";
- version = "0.32.1";
+ version = "0.32.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-SsRRdBatiqI7ROdcNL1uFrq3Nj+iCZG7CbrN+rP3Y84=";
+ sha256 = "sha256-pd5T6HMhbfj1mWyWgnvtlj1sY1TgReF5bf0ybGGIwmM=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
index 52c3fa3bae..61fcb3a24b 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix
@@ -39,7 +39,7 @@ let
pname = "ETL";
inherit version src;
- sourceRoot = "source/ETL";
+ sourceRoot = "${src.name}/ETL";
nativeBuildInputs = [
pkg-config
@@ -54,7 +54,7 @@ let
pname = "synfig";
inherit version src;
- sourceRoot = "source/synfig-core";
+ sourceRoot = "${src.name}/synfig-core";
configureFlags = [
"--with-boost=${boost.dev}"
@@ -89,7 +89,7 @@ stdenv.mkDerivation {
pname = "synfigstudio";
inherit version src;
- sourceRoot = "source/synfig-studio";
+ sourceRoot = "${src.name}/synfig-studio";
postPatch = ''
patchShebangs images/splash_screen_development.sh
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix
index 614a9e844c..aa7f17b20c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ anselmschueler ];
platforms = lib.platforms.unix;
+ mainProgram = "tesseract";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix
index 4b32cf8e8a..995f682d81 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "vengi-tools";
- version = "0.0.24";
+ version = "0.0.25";
src = fetchFromGitHub {
owner = "mgerhardy";
repo = "vengi";
rev = "v${version}";
- sha256 = "sha256-ZkO2CLSuuJcFJFBO4XS8Qec0CxxAJdzOGfFa2zy+4uI=";
+ hash = "sha256-ZY0HG1BpRQV7+RzdXUhKV6JRa/1RIYmCuhnYCZapG8w=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix
index 01601657c8..2752eaff87 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "vipsdisp";
- version = "2.4.1";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "jcupitt";
repo = "vipsdisp";
rev = "v${version}";
- sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8=";
+ hash = "sha256-hx7daXVarV4JdxZfwnTHsuxxijCRP17gkOjicI3EFlM=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix
index b02d35f93a..27957a5fa8 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoRoot = "src/fuzzy-finder";
cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src;
- sourceRoot = "source/src/fuzzy-finder";
+ sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder";
hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
index b36ac5968b..cd3b73b6b4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix
@@ -6,9 +6,11 @@
, wrapGAppsHook
, pkg-config
+, alsa-lib
, glib
, gsettings-desktop-schemas
, gtk3
+, gtksourceview4
, librsvg
, libsndfile
, libxml2
@@ -23,20 +25,23 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
- version = "1.1.3";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8=";
+ sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ=";
};
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
buildInputs =
- [ glib
+ [
+ alsa-lib
+ glib
gsettings-desktop-schemas
gtk3
+ gtksourceview4
librsvg
libsndfile
libxml2
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix
new file mode 100644
index 0000000000..a2ecaec7c3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, ninja
+, opencv
+, SDL2
+, gtk3
+, catch2_3
+, spdlog
+, exiv2
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xpano";
+ version = "0.16.1";
+
+ src = fetchFromGitHub {
+ owner = "krupkat";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj";
+ fetchSubmodules = true;
+ };
+
+ patches = [
+ # force install desktop + icon files
+ ./skip_prefix_check.patch
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ opencv
+ SDL2
+ gtk3
+ spdlog
+ # exiv2 # TODO: enable when 0.28.0 is available
+ ];
+
+ checkInputs = [
+ catch2_3
+ ];
+
+ doCheck = true;
+
+ cmakeFlags = [
+ "-DBUILD_TESTING=ON"
+ ];
+
+ meta = with lib; {
+ description = "A panorama stitching tool";
+ homepage = "https://krupkat.github.io/xpano/";
+ changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ krupkat ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch b/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch
new file mode 100644
index 0000000000..496cbc718b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,7 +167,6 @@ install(FILES
+ TYPE BIN
+ )
+
+-if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
+ install(FILES
+ "misc/build/linux/xpano.desktop"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications"
+@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
+ "misc/build/linux/cz.krupkat.Xpano.metainfo.xml"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo"
+ )
+-endif()
+
+ install(DIRECTORY
+ "${CMAKE_SOURCE_DIR}/misc/assets"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix
index 8b26c42b9c..b70c96ea8d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "xv";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "jasper-software";
repo = "xv";
rev = "v${version}";
- sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM=";
+ sha256 = "TXUcdrwtPNiS7z795RbzBXzNYRADeVtF5uz4aovLo/M=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
index 93e3f85639..7e9c80cd64 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
@@ -5,11 +5,21 @@
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
-, wrapGAppsHook
+, wrapGAppsHook, fetchpatch
}:
mkDerivation {
pname = "spectacle";
+
+ patches = [
+ # backport fix for region capture with multi-display high-dpi setups
+ # FIXME: remove in 23.08
+ (fetchpatch {
+ url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
+ hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
+ })
+ ];
+
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
diff --git a/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix b/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix
index 8f4d06939f..b04a9835a8 100644
--- a/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
description = "Unified tool for collecting system logs and other debug information";
homepage = "https://github.com/sosreport/sos";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ ];
};
}
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 cfcf1d7f89..7dbae3e43b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -61,6 +61,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
platforms = builtins.attrNames sources.${channel};
+ mainProgram = "1password";
};
in if stdenv.isDarwin
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
index e2c68adda5..4a05bc4e3a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
@@ -14,7 +14,7 @@ let
pname = "1password-cli";
version = "2.19.0";
sources = rec {
- aarch64-linux = fetch "linux_arm64" "sha256-z5+zCYYJxtzehBeilSWH/nPEOh8rXpwJDVL+SDansmY=" "zip";
+ aarch64-linux = fetch "linux_arm64" "sha256-/sP5Z52fWkRcv+Wj45HTV1Ckve+jA92m91kGGJwdC6s=" "zip";
i686-linux = fetch "linux_386" "sha256-UGPWk0I/nCaqWWz/rwG/TSDie0/tarKroGi+7Ge7kE4=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-rSZM0GuroSqVokhkjPtk3+2+C9w5/Tkh2cvB+kShyHY=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-3zVD8LUdxhzroLlnQCiCVELEQMPmCriRff85ZlfgSKI=" "pkg";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix
new file mode 100644
index 0000000000..6b37ef6b8e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, fetchPypi
+, python3Packages
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "acpic";
+ version = "1.0.0";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit version pname;
+ hash = "sha256-vQ9VxCNbOmqHIY3e1wq1wNJl5ywfU2tm62gDg3vKvcg=";
+ };
+
+ nativeBuildInputs = [
+ python3Packages.pbr
+ ];
+
+ # no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Daemon extending acpid event handling capabilities.";
+ homepage = "https://github.com/psliwka/acpic";
+ license = licenses.wtfpl;
+ maintainers = with maintainers; [ aacebedo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix
index af42c194e6..0496bd1c22 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix
@@ -2,13 +2,13 @@
let
pname = "anytype";
- version = "0.33.0";
+ version = "0.33.3";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
- sha256 = "sha256-lkocuPlUYGFWWEMaz7Q/SWMFIGa2w+jNQ0u5EzcSz7M=";
+ sha256 = "sha256-3qBd1WgHn/sfEyNRPTX5viMX3lVZPfsG6x7GfNwkL3E=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix
index 13d1554dcd..42f9feb421 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix
@@ -1,5 +1,6 @@
{ lib
, python3
+, fetchFromGitHub
, fetchPypi
}:
@@ -24,6 +25,16 @@ let
];
};
});
+ django-extensions = super.django-extensions.overridePythonAttrs (old: rec {
+ version = "3.1.5";
+ src = fetchFromGitHub {
+ inherit version;
+ owner = "django-extensions";
+ repo = "django-extensions";
+ rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5";
+ hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";
+ };
+ });
};
};
in
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix
index 525ab9788c..3ab0b19f63 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.26.4";
+ version = "1.26.7";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
- hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w=";
+ hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix
index dd5585c35b..199e89dc0b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix
@@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
maintainers = with maintainers; [ iammrinal0 ];
platforms = [ "x86_64-linux" ];
+ mainProgram = "authy";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix
index 0261f983ac..7e366d19d5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix
@@ -62,14 +62,14 @@ in
stdenv.mkDerivation rec {
pname = "azuredatastudio";
- version = "1.35.1";
+ version = "1.44.1";
desktopItems = [ desktopItem urlHandlerDesktopItem ];
src = fetchurl {
name = "${pname}-${version}.tar.gz";
url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable";
- sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ=";
+ sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg=";
};
nativeBuildInputs = [
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
];
# this will most likely need to be updated when azuredatastudio's version changes
- sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215";
+ sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6";
rpath = lib.concatStringsSep ":" [
atomEnv.libPath
diff --git a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix
index 66ad4046d1..f068667948 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix
@@ -49,5 +49,6 @@ mkDerivation rec {
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.phryneas ];
platforms = lib.platforms.linux;
+ mainProgram = "barrier";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
index 1618bf746c..abf3f53e32 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
license = licenses.isc;
maintainers = with maintainers; [ SlothOfAnarchy ];
platforms = platforms.linux;
+ mainProgram = "batsignal";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix
index 8ec1490bdc..84d43f5eb9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix
@@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec {
description = "Graphical tool to visualize binary data";
homepage = "https://github.com/sharkdp/binocle";
license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ figsoda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
index 7a667b1875..c6e4adf8a5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix
@@ -65,5 +65,6 @@ python3Packages.buildPythonApplication rec {
longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
license = licenses.gpl3;
maintainers = with maintainers; [ leonardoce mbprtpmnr ];
+ mainProgram = "bleachbit";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
index 81b7a54a75..448eb14771 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
@@ -5,7 +5,7 @@
, openvdb, libXxf86vm, tbb, alembic
, zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2
-, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}
+, cudaSupport ? config.cudaSupport, cudaPackages ? { }
, hipSupport ? false, hip # comes with a significantly larger closure size
, colladaSupport ? true, opencollada
, spaceNavSupport ? stdenv.isLinux, libspnav
@@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk=";
};
- patches = lib.optional stdenv.isDarwin ./darwin.patch;
+ patches = [
+ ./draco.patch
+ ] ++ lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs =
[ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev
@@ -165,6 +167,7 @@ stdenv.mkDerivation rec {
mkdir $out/Applications
mv $out/Blender.app $out/Applications
'' + ''
+ mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext}
buildPythonPath "$pythonPath"
wrapProgram $blenderExecutable \
--prefix PATH : $program_PATH \
@@ -193,5 +196,6 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
broken = stdenv.isDarwin;
maintainers = with maintainers; [ goibhniu veprbl ];
+ mainProgram = "blender";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch
new file mode 100644
index 0000000000..2a856a0638
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -898,11 +898,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
+ set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
+ set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF)
+
+-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
+- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
+- set(WITH_DRACO OFF)
+-endif()
+-
+ # enable boost for cycles, audaspace or i18n
+ # otherwise if the user disabled
+
+--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
++++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+@@ -17,7 +17,7 @@ def dll_path() -> Path:
+ """
+ lib_name = 'extern_draco'
+- blender_root = Path(bpy.app.binary_path).parent
++ blender_root = Path(bpy.app.binary_path).parent.parent
+- python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
++ python_lib = Path('share/blender/{v[0]}.{v[1]}/python-ext/lib'.format(v=bpy.app.version))
+ python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
+
+ path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix
new file mode 100644
index 0000000000..175b293c9d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix
@@ -0,0 +1,127 @@
+{ lib
+, stdenv
+, fetchzip
+, makeWrapper
+, alsa-lib
+, at-spi2-atk
+, at-spi2-core
+, atk
+, cairo
+, cups
+, dbus
+, expat
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, libGL
+, libappindicator-gtk3
+, libdrm
+, libnotify
+, libpulseaudio
+, libuuid
+, libxcb
+, libxkbcommon
+, libxshmfence
+, mesa
+, nspr
+, nss
+, pango
+, systemd
+, udev
+, unzip
+, xdg-utils
+, xorg
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "bloodhound";
+ version = "4.3.1";
+
+ src = fetchzip {
+ url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip";
+ hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw=";
+ };
+
+ rpath = lib.makeLibraryPath [
+ alsa-lib
+ at-spi2-atk
+ at-spi2-core
+ atk
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ gtk3
+ libGL
+ libappindicator-gtk3
+ libdrm
+ libnotify
+ libpulseaudio
+ libuuid
+ libxcb
+ libxkbcommon
+ mesa
+ nspr
+ nss
+ pango
+ systemd
+ stdenv.cc.cc.lib
+ udev
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libxkbfile
+ xorg.libxshmfence
+ ];
+
+ buildInputs = [
+ gtk3 # needed for GSETTINGS_SCHEMAS_PATH
+ ];
+
+ nativeBuildInputs = [ makeWrapper unzip ];
+
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/{bin,/lib/BloodHound}
+ mv * $out/lib/BloodHound
+ chmod +x $out/lib/BloodHound/BloodHound
+
+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+ $out/lib/BloodHound/BloodHound --set-rpath ${finalAttrs.rpath}:$out/lib/BloodHound \
+ --add-needed libudev.so # Needed to fix trace trap (core dump)
+
+ makeWrapper $out/lib/BloodHound/BloodHound $out/bin/BloodHound \
+ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+ --suffix PATH : ${lib.makeBinPath [xdg-utils]} \
+ --append-flags "--in-process-gpu" # fix for sandbox issues
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Active Directory reconnaissance and attack path management tool";
+ homepage = "https://github.com/BloodHoundAD/BloodHound";
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}";
+ downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ akechishiro ];
+ platforms = [ "x86_64-linux" ];
+ mainProgram = "BloodHound";
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
index 34f0f32361..64f0df2e4a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
@@ -109,5 +109,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ psydvl shamilton ];
platforms = platforms.linux;
+ mainProgram = "bottles";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix
index 8df75b0cbd..3f9f2ec678 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake ];
- sourceRoot = "source/src";
+ sourceRoot = "${src.name}/src";
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix
new file mode 100644
index 0000000000..ad95480c64
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix
@@ -0,0 +1,56 @@
+{ blueprint-compiler
+, desktop-file-utils
+, fetchFromGitHub
+, gobject-introspection
+, lib
+, libadwaita
+, meson
+, ninja
+, python3
+, stdenv
+, wrapGAppsHook4
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "cartridges";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = "kra-mo";
+ repo = "cartridges";
+ rev = "v${finalAttrs.version}";
+ sha256 = "sha256-jycTLKTHKhxd4t+3NB23Tf1oAvqiDHHsNmS6uLikgGA=";
+ };
+
+ buildInputs = [
+ libadwaita
+ (python3.withPackages (p: with p; [
+ pillow
+ pygobject3
+ pyyaml
+ requests
+ ]))
+ ];
+
+ nativeBuildInputs = [
+ blueprint-compiler
+ desktop-file-utils
+ gobject-introspection
+ meson
+ ninja
+ wrapGAppsHook4
+ ];
+
+ meta = with lib; {
+ description = "A GTK4 + Libadwaita game launcher";
+ longDescription = ''
+ A simple game launcher for all of your games.
+ It has support for importing games from Steam, Lutris, Heroic
+ and more with no login necessary.
+ You can sort and hide games or download cover art from SteamGridDB.
+ '';
+ homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.getchoo ];
+ platforms = platforms.linux;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix
new file mode 100644
index 0000000000..0c27255041
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix
@@ -0,0 +1,42 @@
+{
+ gettext = {
+ url = "https://github.com/geopjr/gettext.cr.git";
+ rev = "v1.0.0";
+ sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc";
+ };
+ non-blocking-spawn = {
+ url = "https://github.com/geopjr/non-blocking-spawn.git";
+ rev = "v1.0.5";
+ sha256 = "139gr87zlw0k9kf6pf9k2d88aa9x3kcnfg34qpbqrwsrck7708za";
+ };
+ version_from_shard = {
+ url = "https://github.com/hugopl/version_from_shard.git";
+ rev = "v1.2.5";
+ sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
+ };
+ gio = {
+ url = "https://github.com/hugopl/gio.cr.git";
+ rev = "v0.1.0";
+ sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8";
+ };
+ gtk4 = {
+ url = "https://github.com/hugopl/gtk4.cr.git";
+ rev = "v0.13.0";
+ sha256 = "0xsrcsh5qvwm9l7cywxpw49rfv94mkkqcliws4zkhxgr9isnirbm";
+ };
+ harfbuzz = {
+ url = "https://github.com/hugopl/harfbuzz.cr.git";
+ rev = "v0.1.0";
+ sha256 = "1lcb778b4k34sqxg979fpl425bbzf2gikjf2m5aj6x1fzxn46jg0";
+ };
+ pango = {
+ url = "https://github.com/hugopl/pango.cr.git";
+ rev = "v0.2.0";
+ sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf";
+ };
+ libadwaita = {
+ url = "https://github.com/geopjr/libadwaita.cr.git";
+ rev = "203737fc96bb48e1a710cb68e896d2c5b9c1a6e5";
+ sha256 = "11c2knxncjnwg4cgppfllxwgli1hf6sjyyx4ii8rgmnbird6xcmh";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix
new file mode 100644
index 0000000000..a77d0b34a7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, crystal
+, wrapGAppsHook4
+, desktopToDarwinBundle
+, gi-crystal
+, gobject-introspection
+, libadwaita
+, openssl
+, libxml2
+, pkg-config
+}:
+crystal.buildCrystalPackage rec {
+ pname = "Collision";
+ version = "3.5.0";
+
+ src = fetchFromGitHub {
+ owner = "GeopJr";
+ repo = "Collision";
+ rev = "v${version}";
+ hash = "sha256-YNMtiMSzDqBlJJTUntRtL6oXg+IuyAobQ4FYcwOdOas=";
+ };
+ patches = [ ./make.patch ];
+ shardsFile = ./collision-shards.nix;
+
+ # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to
+ # main_module:(.text+0x6f0): undefined reference to `SSL_library_init'
+ # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/
+ # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue.
+
+ nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection gi-crystal ]
+ ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
+ buildInputs = [ libadwaita openssl libxml2 ];
+
+ buildTargets = ["bindings" "build"];
+
+ doCheck = false;
+ doInstallCheck = false;
+
+ installTargets = ["desktop" "install"];
+
+ meta = with lib; {
+ description = "Check hashes for your files";
+ homepage = "https://github.com/GeopJr/Collision";
+ license = licenses.bsd2;
+ mainProgram = "collision";
+ maintainers = with maintainers; [ sund3RRR ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch b/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch
new file mode 100644
index 0000000000..73872a7892
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch
@@ -0,0 +1,20 @@
+--- a/Makefile 2023-07-09 10:49:31.064190374 +0300
++++ b/Makefile 2023-07-19 11:19:37.415480179 +0300
+@@ -6,7 +6,7 @@
+ all: desktop bindings build
+
+ bindings:
+- ./bin/gi-crystal || $(CRYSTAL_LOCATION)shards install && ./bin/gi-crystal
++ gi-crystal
+
+ build:
+ COLLISION_LOCALE_LOCATION="$(PREFIX)$(LOCALE_LOCATION)" $(CRYSTAL_LOCATION)shards build -Dpreview_mt --release --no-debug
+@@ -43,7 +43,7 @@
+ install -D -m 0644 data/dev.geopjr.Collision.desktop $(PREFIX)/share/applications/dev.geopjr.Collision.desktop
+ install -D -m 0644 data/icons/dev.geopjr.Collision.svg $(PREFIX)/share/icons/hicolor/scalable/apps/dev.geopjr.Collision.svg
+ install -D -m 0644 data/icons/dev.geopjr.Collision-symbolic.svg $(PREFIX)/share/icons/hicolor/symbolic/apps/dev.geopjr.Collision-symbolic.svg
+- gtk-update-icon-cache $(PREFIX)/share/icons/hicolor
++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor
+ glib-compile-schemas $(PREFIX)/share/glib-2.0/schemas/
+
+ uninstall:
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix
new file mode 100644
index 0000000000..77269ef853
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+ pname = "confetty";
+ version = "unstable-2022-11-05";
+
+ src = fetchFromGitHub {
+ owner = "maaslalani";
+ repo = "confetty";
+ rev = "6c6f1b5b605f78c3ed3bab2d2a1357c0dd794221";
+ hash = "sha256-1BAszv9I2JDflWyHuAlbJo7+oI7BI/TL10uFIYa8mLk=";
+ };
+
+ vendorHash = "sha256-RymdnueY674Zd231O8CIw/TEIDaWDzc+AaI6yk9hFgc=";
+
+ ldflags = [ "-s" "-w" ];
+
+ meta = with lib; {
+ description = "Confetti in your TTY";
+ homepage = "https://github.com/maaslalani/confetty";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix
index ec177c0aa7..82d7267b04 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix
@@ -1,11 +1,11 @@
-{ appstream-glib
+{ blueprint-compiler
, desktop-file-utils
-, fetchurl
+, fetchFromSourcehut
, gobject-introspection
-, gtk3
+, gtk4
, lib
+, libadwaita
, libnotify
-, libhandy
, meson
, ninja
, pkg-config
@@ -16,14 +16,17 @@
stdenv.mkDerivation rec {
pname = "confy";
- version = "0.6.5";
+ version = "0.7.0";
- src = fetchurl {
- url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
- sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k=";
+ src = fetchFromSourcehut {
+ owner = "~fabrixxm";
+ repo = "confy";
+ rev = version;
+ hash = "sha256-q8WASTNbiBuKb2tPQBmUL9ji60PRAPnYOTYxnUn0MAw=";
};
nativeBuildInputs = [
+ blueprint-compiler
desktop-file-utils
meson
ninja
@@ -33,8 +36,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gobject-introspection
- gtk3
- libhandy
+ gtk4
+ libadwaita
libnotify
(python3.withPackages (ps: with ps; [
icalendar
@@ -43,8 +46,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- # Remove executable bits so that meson runs the script with our Python interpreter
- chmod -x build-aux/meson/postinstall.py
+ patchShebangs build-aux/meson/postinstall.py
'';
meta = with lib; {
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 044ca97e34..a9c723d643 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.5";
+ version = "2.10.7";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
- hash = "sha256-sAjgG2f0rAWakPd2cZNGXkooIxQQM5OPHm11ahyY1WU=";
+ hash = "sha256-OVRl9yQKK3hJgRVV/W4Fl3LxdFpJs01Mo3pwxLg2RXg=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch
index 882e409026..65cfbdf1ac 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch
+++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch
@@ -1,11 +1,11 @@
diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp
-index a73371b..b9d66ca 100644
+index 32cabfb..aab92ea 100644
--- i/src/settings/appsettings.cpp
+++ w/src/settings/appsettings.cpp
-@@ -75,7 +75,7 @@ void AppSettings::applyLocale(const QLocale &locale)
+@@ -79,7 +79,7 @@ void AppSettings::applyLocale(const QLocale &locale)
const QLocale newLocale = locale == defaultLocale() ? QLocale::system() : locale;
QLocale::setDefault(newLocale);
- s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory));
+ s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, i18nDir, QStandardPaths::LocateDirectory));
- s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations"));
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
index 488b64185b..15dbb33118 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
@@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec {
nativeBuildInputs = [
copyDesktopItems
makeWrapper
- mavenJdk17
];
buildInputs = [
@@ -136,5 +135,6 @@ mavenJdk17.buildMavenPackage rec {
license = licenses.asl20;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
maintainers = with maintainers; [ jojosch mkg20001 ];
+ mainProgram = "dbeaver";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix
index 8c04161844..be2fcdbe4a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix
@@ -70,9 +70,7 @@ python3.pkgs.buildPythonApplication rec {
# handle setup hooks better
strictDeps = false;
- passthru.updateScript = nix-update-script {
- attrPath = pname;
- };
+ passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://github.com/dialect-app/dialect";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix
index 71fba4e515..b53fab409b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ pSub globin ];
platforms = platforms.all;
+ mainProgram = "dmenu";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
index ec3024d48d..47dbaa62c3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
@@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar ];
+ mainProgram = "dunst";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix
index c485375137..36fa71b1d9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix
@@ -63,5 +63,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = [ maintainers.novoxd ];
+ mainProgram = "dupeguru";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix
index 00e53d3a82..4faa7a7eac 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.24.1";
+ version = "1.24.2";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
- sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4=";
+ sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk=";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix
index 7fa2e4d891..0f02eeed17 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.erictapen ];
+ mainProgram = "fontpreview";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix
index 5ee5d162fa..2f8d26af43 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix
@@ -24,14 +24,14 @@ assert svgSupport -> enableCairo;
stdenv.mkDerivation rec {
pname = "fuzzel";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = pname;
rev = version;
- hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw=";
+ hash = "sha256-X1P/ghX97KCQcrNk44Cy2IAGuZ8DDwHBWzh1AHLDvd4=";
};
depsBuildBuild = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix
new file mode 100644
index 0000000000..983b61b931
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix
@@ -0,0 +1,83 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, cmake
+, libvorbis
+, ffmpeg
+, libeb
+, hunspell
+, opencc
+, xapian
+, libzim
+, lzo
+, xz
+, tomlplusplus
+, fmt
+, bzip2
+, libiconv
+, libXtst
+, qtbase
+, qtsvg
+, qtwebengine
+, qttools
+, qtwayland
+, qt5compat
+, qtmultimedia
+, qtspeech
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "goldendict-ng";
+ version = "23.07.23";
+
+ src = fetchFromGitHub {
+ owner = "xiaoyifang";
+ repo = "goldendict-ng";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8=";
+ };
+
+ nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+ buildInputs = [
+ qtbase
+ qtsvg
+ qttools
+ qtwebengine
+ qt5compat
+ qtmultimedia
+ qtspeech
+ libvorbis
+ tomlplusplus
+ fmt
+ hunspell
+ xz
+ lzo
+ libXtst
+ bzip2
+ libiconv
+ opencc
+ libeb
+ ffmpeg
+ xapian
+ libzim
+ ];
+
+ cmakeFlags = [
+ "-DWITH_XAPIAN=ON"
+ "-DWITH_ZIM=ON"
+ "-DWITH_FFMPEG_PLAYER=ON"
+ "-DWITH_EPWING_SUPPORT=ON"
+ "-DUSE_SYSTEM_FMT=ON"
+ "-DUSE_SYSTEM_TOML=ON"
+ ];
+
+ meta = with lib; {
+ homepage = "https://xiaoyifang.github.io/goldendict-ng/";
+ description = "Advanced multi-dictionary lookup program.";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ slbtty ];
+ license = licenses.gpl3Plus;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
index 1222fefab0..6cee8ce5ec 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
- rev = "v${version}";
+ rev = version;
hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix
index a8f5c91d1e..7c91181e06 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix
@@ -61,6 +61,81 @@ let
rev = 144;
sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4=";
};
+ darkPlacesPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/trunk";
+ rev = 57;
+ sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ };
+ doom3Pack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/trunk";
+ rev = 56;
+ sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ };
+ halfLifePack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/HalfLifePack/trunk";
+ rev = 1;
+ sha256 = "sha256-CrbN3iOG89j71y4ZJ4gNZEA5CYxphLLGbZwv6Tbjui0=";
+ };
+ her2Pack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/trunk";
+ rev = 55;
+ sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ };
+ jk2Pack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/JK2Pack/trunk";
+ rev = 77;
+ sha256 = "sha256-3g/p9OC0j2va9CXXtsQf0lP6VJ1WyI5k2W9xNRwYjS8=";
+ };
+ nexuizPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/NexuizPack/trunk";
+ rev = 49;
+ sha256 = "sha256-nAV7rZKDgAxlEmu2RfBFNsHv9Xgas1IlDgioligvY+c=";
+ };
+ preyPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk";
+ rev = 19;
+ sha256 = "sha256-wbKEnSaFO40HxhMsbYKy76MxXDvY9O1lTcr3M7fXxW0=";
+ };
+ q2wPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/trunk";
+ rev = 126;
+ sha256 = "sha256-Q6IyL2qUr+6ktP34oYkFqN5MeFxCXOkcjrPg5J95ftg=";
+ };
+ q4Pack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/trunk";
+ rev = 54;
+ sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+ };
+ ravenPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/RavenPack/trunk";
+ rev = 1;
+ sha256 = "sha256-bYRjCkdaznaO7+WDB6cgL3szTB+MXwt3IKH3L2rGjLs=";
+ };
+ reactionPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/ReactionPack/trunk";
+ rev = 69;
+ sha256 = "sha256-aXSM0ubyhgamLBzfNZ6RzRSdzKwfHWLt/6OS/i9mMVo=";
+ };
+ sof2Pack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/Sof2Pack/trunk";
+ rev = 1;
+ sha256 = "sha256-EnGhYghXe6hU5vvdF+Z9geTiHDukBEr1+CQgunxxGic=";
+ };
+ tremulousPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/trunk";
+ rev = 46;
+ sha256 = "sha256-NU+ynpqydFxdZSkh7Szm6DTqyMYVS+PU70Mp98ZjdOs=";
+ };
+ ufoaiPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/trunk";
+ rev = 69;
+ sha256 = "sha256-nAd7fFZJJ82rDPVlTiZkkTGXi5tw7BSKk+akFBXSWvY=";
+ };
+ warsowPack = fetchsvn {
+ url = "svn://svn.icculus.org/gtkradiant-gamepacks/WarsowPack/trunk";
+ rev = 53;
+ sha256 = "sha256-IQ12fEKnq0cJxef+ddvTXcwM8lQ8nlUoMJy81XJ7ANY=";
+ };
packs = runCommand "gtkradiant-packs" {} ''
mkdir -p $out
ln -s ${q3Pack} $out/Q3Pack
@@ -74,30 +149,36 @@ let
ln -s ${wolfPack} $out/WolfPack
ln -s ${unvanquishedPack} $out/UnvanquishedPack
ln -s ${q1Pack} $out/Q1Pack
+ ln -s ${darkPlacesPack} $out/DarkPlacesPack
+ ln -s ${doom3Pack} $out/Doom3Pack
+ ln -s ${halfLifePack} $out/HalfLifePack
+ ln -s ${her2Pack} $out/Her2Pack
+ ln -s ${jk2Pack} $out/JK2Pack
+ ln -s ${nexuizPack} $out/NexuizPack
+ ln -s ${preyPack} $out/PreyPack
+ ln -s ${q2wPack} $out/Q2WPack
+ ln -s ${q4Pack} $out/Q4Pack
+ ln -s ${ravenPack} $out/RavenPack
+ ln -s ${reactionPack} $out/ReactionPack
+ ln -s ${sof2Pack} $out/Sof2Pack
+ ln -s ${tremulousPack} $out/TermulousPack
+ ln -s ${ufoaiPack} $out/UFOAIPack
+ ln -s ${warsowPack} $out/WarsowPack
'';
in
stdenv.mkDerivation rec {
pname = "gtkradiant";
- version = "unstable-2022-07-31";
+ version = "unstable-2023-04-24";
src = fetchFromGitHub {
owner = "TTimo";
repo = "GtkRadiant";
- rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d";
- sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM=";
+ rev = "ddbaf03d723a633d53fa442c2f802f7ad164dd6c";
+ sha256 = "sha256-qI+KGx73AbM5PLFR2JDXKDbiqmU0gS/43rhjRKm/Gms=";
};
- # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store
- postPatch = ''
- substituteInPlace radiant/preferences.cpp \
- --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \
- --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \
- --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \
- --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";'
- '';
-
nativeBuildInputs =
let
python = python3.withPackages (ps: with ps; [
@@ -113,7 +194,7 @@ stdenv.mkDerivation rec {
test -e $(readlink $3)
elif [ "$1" = update ]; then
# verify existence
- test -e $(readlink $3)
+ test -e $(readlink $2)
else
echo "$@"
exit 1
@@ -145,8 +226,19 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/{bin,lib}
cp -ar install $out/lib/gtkradiant
+ for pack in ${packs}/* ; do
+ name=$(basename "$pack")
+ if ! [ -e $out/lib/gtkradiant/installs/$name ]; then
+ ln -s $pack $out/lib/gtkradiant/installs/$name
+ fi
+ done
- ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant
+ cat >$out/bin/gtkradiant < ./subprojects/nvtop.wrap
+ cp -r --no-preserve=mode,ownership "${nvtop}" ./subprojects/nvtop-src
+ cd ./subprojects/nvtop-src
+ mkdir -p include/libdrm
+ for patchfile in $(ls ../packagefiles/nvtop*.patch); do
+ patch -p1 < $patchfile
+ done
+ cd ../..
+ patchShebangs data/hwdb/generate_hwdb.py
+ sed -i 's|cmd.arg("dmidecode")|cmd.arg("${dmidecode}/bin/dmidecode")|g' src/sys_info_v2/mem_info.rs
+ '';
+
+ meta = with lib; {
+ description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
+ homepage = "https://gitlab.com/mission-center-devs/mission-center";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ GaetanLepage ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock
new file mode 100644
index 0000000000..7b99bafde5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock
@@ -0,0 +1,522 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "bitflags"
+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 = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "const-random"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
+dependencies = [
+ "const-random-macro",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "proc-macro-hack",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.146"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "num_cpus"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+dependencies = [
+ "dlv-list",
+ "hashbrown",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proxy"
+version = "0.2.5"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "libc",
+ "num_cpus",
+ "rust-ini",
+ "sha2",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
+[[package]]
+name = "rustix"
+version = "0.37.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
index 45fe2e1395..390bc01413 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
@@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
- version = "4909";
+ version = "4910";
src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
rev = version;
- sha256 = "sha256-B3G1xpDZtJqkjyufLwYnJQlXREvN6OrJEjHWWP05jDM=";
+ sha256 = "sha256-t4SyvDvwNdqKh95MRmHxlX6q84dN0y4ANPIXqS7ynBA=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix
index c9523581b0..d00b9103d8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix
@@ -152,5 +152,6 @@ stdenv.mkDerivation rec {
license = licenses.agpl3Plus;
maintainers = with maintainers; [ vrthra fpletz ];
platforms = platforms.unix;
+ mainProgram = "mupdf";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch b/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch
new file mode 100644
index 0000000000..352f8a077a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 273968c..236e5fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,10 +3,6 @@ project(mya)
+ set(CMAKE_C_STANDARD 11 )
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall")
+
+-if(UNIX)
+- set(LINUX TRUE)
+-endif()
+-
+ set(SRC_DIR src)
+ set(INC_DIR include)
+
+@@ -17,7 +13,8 @@ set_target_properties(mya PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DI
+ target_include_directories(mya PRIVATE ${INC_DIR})
+
+ set(LIBS curl json-c bsd)
+-if(LINUX)
+- list(APPEND LIBS)
++find_library(ARGP argp)
++if(ARGP)
++ list(APPEND LIBS argp)
+ endif()
+ target_link_libraries(mya ${LIBS})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix
new file mode 100644
index 0000000000..d33e6aecdf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+, curl
+, json_c
+, libbsd
+, argp-standalone
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "mya";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "jmakhack";
+ repo = "myanimelist-cli";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-EmdkPpYEUIk9hr6rbnixjvznKSEnTCSMZz/17BfHGCk=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ curl
+ json_c
+ libbsd
+ ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [
+ argp-standalone
+ ];
+
+ patches = [
+ ./argp.patch
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ # Based on the upstream PKGBUILD
+ mkdir -p $out/share/doc/${finalAttrs.pname}
+ cp -a bin $out
+ cp $cmakeDir/README.md $out/share/doc/${finalAttrs.pname}
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Minimalistic command line interface for fetching user anime data from MyAnimeList";
+ longDescription = ''
+ Minimalistic command line interface for fetching user anime data from MyAnimeList.
+
+ You have to run this with the MYANIMELIST_CLIENT_ID environ variable set.
+ Where to get one: .
+ Select the type `other`.
+ '';
+ homepage = "https://github.com/jmakhack/myanimelist-cli";
+ changelog = "https://github.com/jmakhack/myanimelist-cli/releases/tag/v${finalAttrs.version}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ pbsds ];
+ mainProgram = "mya";
+ platforms = platforms.all;
+ };
+})
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 468818e4f8..ff9fb7c6b2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
@@ -46,11 +46,11 @@ let
inherit (python3.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "8.0.33";
+ version = "8.0.34";
src = fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
- sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";
+ sha256 = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U=";
};
patches = [
@@ -196,5 +196,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ ];
platforms = platforms.linux;
+ mainProgram = "mysql-workbench";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix
new file mode 100644
index 0000000000..55bd926fb7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix
@@ -0,0 +1,76 @@
+{ lib, stdenv, appimageTools, fetchurl, undmg }:
+
+let
+ pname = "notesnook";
+ version = "2.5.7";
+
+ inherit (stdenv.hostPlatform) system;
+ throwSystem = throw "Unsupported system: ${system}";
+
+ suffix = {
+ x86_64-linux = "linux_x86_64.AppImage";
+ x86_64-darwin = "mac_x64.dmg";
+ aarch64-darwin = "mac_arm64.dmg";
+ }.${system} or throwSystem;
+
+ src = fetchurl {
+ url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
+ hash = {
+ x86_64-linux = "sha256-M/59pjhuKF/MOMpT9/qrlThHO0V8e49cfiaWMkEWHNg=";
+ x86_64-darwin = "sha256-cluIizmweIMU6RIFxoEQ3DYChRVEuVLxrPjwfFfeq1w=";
+ aarch64-darwin = "sha256-cbBnKrb8poyDL1D+32UrOl3RXt8Msncw440qra9+Gs0=";
+ }.${system} or throwSystem;
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit pname version src;
+ };
+
+ meta = with lib; {
+ description = "A fully open source & end-to-end encrypted note taking alternative to Evernote.";
+ longDescription = ''
+ Notesnook is a free (as in speech) & open source note taking app
+ focused on user privacy & ease of use. To ensure zero knowledge
+ principles, Notesnook encrypts everything on your device using
+ XChaCha20-Poly1305 & Argon2.
+ '';
+ homepage = "https://notesnook.com";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ j0lol ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ };
+
+ linux = appimageTools.wrapType2 rec {
+ inherit pname version src meta;
+
+ profile = ''
+ export LC_ALL=C.UTF-8
+ '';
+
+ multiPkgs = null; # no 32bit needed
+ extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
+ extraInstallCommands = ''
+ mv $out/bin/{${pname}-${version},${pname}}
+ install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
+ install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
+ substituteInPlace $out/share/applications/notesnook.desktop \
+ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
+ '';
+ };
+
+ darwin = stdenv.mkDerivation {
+ inherit pname version src meta;
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = "Notesnook.app";
+
+ installPhase = ''
+ mkdir -p $out/Applications/Notesnook.app
+ cp -R . $out/Applications/Notesnook.app
+ '';
+ };
+in
+if stdenv.isDarwin
+then darwin
+else linux
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
new file mode 100644
index 0000000000..44644ba217
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
@@ -0,0 +1,4 @@
+# Nintendo Switch HOS
+SUBSYSTEM=="usb", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="3000", MODE="0666"
+# Nintendo Switch RCM
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7321", MODE="0666"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix
new file mode 100644
index 0000000000..b86ae37363
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix
@@ -0,0 +1,88 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, maven
+, jre
+}:
+let
+ pkgDescription = "All-in-one tool for managing Nintendo Switch homebrew";
+
+ selectSystem = attrs:
+ attrs.${stdenv.hostPlatform.system}
+ or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+ jreWithJavaFX = jre.override { enableJavaFX = true; };
+in
+maven.buildMavenPackage rec {
+ pname = "ns-usbloader";
+ version = "7.0";
+
+ src = fetchFromGitHub {
+ owner = "developersu";
+ repo = "ns-usbloader";
+ rev = "v${version}";
+ sha256 = "sha256-x4zGwsDUVUHI4AUMPSqgnZVyZx+pWQA5xvtrFE8U3QU=";
+ };
+
+ patches = [ ./no-launch4j.patch ./make-deterministic.patch ];
+
+ # JavaFX pulls in architecture dependent jar dependencies. :(
+ # May be possible to unify these, but could lead to huge closure sizes.
+ mvnHash = selectSystem {
+ x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA=";
+ aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw=";
+ };
+ mvnParameters = "-DskipTests";
+
+ nativeBuildInputs = [
+ copyDesktopItems
+ makeWrapper
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/java
+ install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar
+
+ mkdir -p $out/bin
+ makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \
+ --append-flags "-jar $out/share/java/ns-usbloader.jar"
+
+ mkdir -p $out/lib/udev/rules.d
+ install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules
+
+ mkdir -p $out/share/icons/hicolor
+ install -Dm644 target/classes/res/app_icon32x32.png $out/share/icons/hicolor/32x32/apps/ns-usbloader.png
+ install -Dm644 target/classes/res/app_icon48x48.png $out/share/icons/hicolor/48x48/apps/ns-usbloader.png
+ install -Dm644 target/classes/res/app_icon64x64.png $out/share/icons/hicolor/64x64/apps/ns-usbloader.png
+ install -Dm644 target/classes/res/app_icon128x128.png $out/share/icons/hicolor/128x128/apps/ns-usbloader.png
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ type = "Application";
+ name = "ns-usbloader";
+ desktopName = "NS-USBLoader";
+ comment = pkgDescription;
+ exec = "ns-usbloader";
+ icon = "ns-usbloader";
+ categories = [ "Game" ];
+ terminal = false;
+ keywords = [ "nintendo" "switch" ];
+ })
+ ];
+
+ meta = with lib; {
+ description = pkgDescription;
+ homepage = "https://github.com/developersu/ns-usbloader";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ soupglasses ];
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch
new file mode 100644
index 0000000000..531f640b08
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch
@@ -0,0 +1,130 @@
+From 3f85e2754144bbf2805ba68d8c76b3dec3299f4d Mon Sep 17 00:00:00 2001
+From: Sofi
+Date: Sat, 29 Jul 2023 11:16:38 +0200
+Subject: [PATCH] make deterministic
+
+---
+ pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 57 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 320d4f3..5a594e6 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -51,6 +51,7 @@
+ yyyyMMdd.HHmmss
+ 19.0.2.1
+ 11
++ 2023-01-01T00:00:00Z
+
+
+
+@@ -166,7 +167,7 @@
+
+
+
+- ${project.artifactId}-${project.version}-${maven.build.timestamp}
++ ${project.artifactId}-${project.version}
+
+
+ src/main/resources
+@@ -193,26 +194,51 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+- 2.22.2
++ 3.1.2
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+- 2.22.2
++ 3.1.2
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+- 3.10.1
++ 3.11.0
+
+ 11
+
+
++
++ org.apache.maven.plugins
++ maven-enforcer-plugin
++ 3.3.0
++
++
++ enforce-versions
++ validate
++
++ enforce
++
++
++
++
++ [3.2.5,)
++
++
++ [1.8,)
++
++
++
++
++
++
++
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+- 3.1.2
++ 3.3.0
+
+- Launching error
+-
+-
+- %PWD%/jdk
+- 11.0.0
+-
+-
+- ${project.version}.0.0
+- ${project.version}
+- NS multi-tool
+- GNU General Public License v3, ${project.inceptionYear} ${project.organization.name}, Russia.
+- ${project.version}.0.0
+- ${project.version}
+- ${project.organization.name}
+- ${project.name}
+- ${project.name}
+- ${project.name}.exe
+-
+-
+- Startup error
+- JDK not found
+- JDK Version mismatch
+- Launcher Error
+-
+-
+-
+-
+-
+
+
+-
+\ No newline at end of file
++
+--
+2.41.0
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix
index 067af7a081..cceaec612d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix
@@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec {
description = "TOTP Authentication application for mobile";
homepage = "https://sr.ht/~martijnbraam/numberstation/";
license = licenses.gpl3Only;
- maintainers = with maintainers; [ dotlambda tomfitzhenry ];
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix
new file mode 100644
index 0000000000..943861a3d7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, fetchFromGitHub
+, atk
+, gdk-pixbuf
+, gobject-introspection
+, gtk-layer-shell
+, gtk3
+, pango
+, python310Packages
+, wrapGAppsHook
+}:
+
+python310Packages.buildPythonApplication rec {
+ pname = "nwg-displays";
+ version = "0.3.7";
+
+ src = fetchFromGitHub {
+ owner = "nwg-piotr";
+ repo = "nwg-displays";
+ rev = "v${version}";
+ hash = "sha256-Y405ZeOSpc1aPKEzFdvlgJgpGAi9HUR+Hvx63uYdp88=";
+ };
+
+ nativeBuildInputs = [
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
+
+ propagatedBuildInputs = [
+ atk
+ gdk-pixbuf
+ gtk-layer-shell
+ pango
+ python310Packages.gst-python
+ python310Packages.i3ipc
+ python310Packages.pygobject3
+ ];
+
+ dontWrapGApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}");
+ '';
+
+ # Upstream has no tests
+ doCheck = false;
+
+ meta = {
+ homepage = "https://github.com/nwg-piotr/nwg-displays";
+ description = "Output management utility for Sway and Hyprland";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ maintainers = [ ];
+ mainProgram = "nwg-displays";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
index e96255271d..1fdc5dd43d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
- version = "1.3.5";
+ version = "1.3.7";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
- sha256 = if stdenv.isDarwin then "sha256-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4=";
+ sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw=";
};
icon = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix
new file mode 100644
index 0000000000..642c765633
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, python3
+, fetchFromGitHub
+, copyDesktopItems
+, wrapQtAppsHook
+, makeDesktopItem
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "onthespot";
+ version = "0.5";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "casualsnek";
+ repo = "onthespot";
+ rev = "v${version}";
+ hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
+ };
+
+ nativeBuildInputs = with python3.pkgs; [
+ copyDesktopItems
+ pythonRelaxDepsHook
+ wrapQtAppsHook
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ charset-normalizer
+ defusedxml
+ librespot
+ music-tag
+ packaging
+ pillow
+ protobuf
+ pyogg
+ pyqt5
+ pyqt5_sip
+ pyxdg
+ requests
+ setuptools
+ show-in-file-manager
+ urllib3
+ zeroconf
+ ];
+
+ pythonRemoveDeps = [
+ "PyQt5-Qt5"
+ "PyQt5-stubs"
+ ];
+
+ pythonRelaxDeps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+ '';
+
+ meta = {
+ description = " QT based Spotify music downloader written in Python";
+ homepage = "https://github.com/casualsnek/onthespot";
+ license = lib.licenses.gpl2;
+ maintainers = with lib.maintainers; [ onny ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix
index 45e9c381c7..4ce864bfde 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
- sourceRoot = "source/${cargoRoot}";
+ sourceRoot = "${src.name}/${cargoRoot}";
sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix
index bd1664e85f..41d855cd33 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ jonringer ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
+ mainProgram = "openrgb";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix
index 331d0ccc5e..759a929e49 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "oranda";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "oranda";
rev = "v${version}";
- hash = "sha256-hxGRBMePUVod0Nwz2ozkZ6vmV7Ev+KeUFVKQDEViFJw=";
+ hash = "sha256-1pkAIz6Zh0ArIDmRSLHTnIgySWdxrDx0amTkdZhY6vY=";
};
- cargoHash = "sha256-Bn9dH+Iw825vuInip3KVx2zAPZixQ3vHkfoDFwPFzpk=";
+ cargoHash = "sha256-TKpPAzqwWBH2dlBNvU2kuqqOVu5WhSnSR3wW5FsW7yk=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix
index 4395cf7721..236a3190c8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix
@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "organicmaps";
- version = "2023.05.08-7";
+ version = "2023.06.04-13";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
- sha256 = "sha256-V7qTi5NiZf+1voZSHfuAyfMeTeiYfs/CoOQ2zweKmaU=";
+ hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc=";
fetchSubmodules = true;
};
@@ -37,6 +37,9 @@ mkDerivation rec {
# crude fix for https://github.com/organicmaps/organicmaps/issues/1862
echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh
+
+ # TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345
+ patchShebangs 3party/boost/tools/build/src/engine/build.sh
'';
nativeBuildInputs = [
@@ -67,7 +70,6 @@ mkDerivation rec {
passthru = {
updateScript = nix-update-script {
- attrPath = pname;
extraArgs = [ "-vr" "(.*)-android" ];
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock
new file mode 100644
index 0000000000..8c32ad4b65
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock
@@ -0,0 +1,4830 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "atk"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
+dependencies = [
+ "atk-sys",
+ "bitflags 1.3.2",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[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.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "brotli"
+version = "3.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bstr"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
+dependencies = [
+ "memchr",
+ "regex-automata 0.3.3",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "bytemuck"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cairo-rs"
+version = "0.15.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+ "thiserror",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "cargo_toml"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
+dependencies = [
+ "serde",
+ "toml 0.7.6",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfb"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
+dependencies = [
+ "byteorder",
+ "fnv",
+ "uuid",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "clap"
+version = "4.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_complete"
+version = "4.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "clap_mangen"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f"
+dependencies = [
+ "clap",
+ "roff",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "color_quant"
+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 = "colored"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+dependencies = [
+ "is-terminal",
+ "lazy_static",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "core-graphics"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+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 = "cssparser"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa 0.4.8",
+ "matches",
+ "phf 0.8.0",
+ "proc-macro2",
+ "quote",
+ "smallvec",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+dependencies = [
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
+[[package]]
+name = "dtoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+
+[[package]]
+name = "dtoa-short"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+dependencies = [
+ "dtoa",
+]
+
+[[package]]
+name = "dunce"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+
+[[package]]
+name = "embed-resource"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a"
+dependencies = [
+ "cc",
+ "rustc_version",
+ "toml 0.7.6",
+ "vswhom",
+ "winreg 0.11.0",
+]
+
+[[package]]
+name = "embed_plist"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
+[[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.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+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 = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "gdk"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+dependencies = [
+ "bitflags 1.3.2",
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "gdkwayland-sys"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+dependencies = [
+ "gdk-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "gdkx11-sys"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
+dependencies = [
+ "gdk-sys",
+ "glib-sys",
+ "libc",
+ "system-deps 6.1.1",
+ "x11",
+]
+
+[[package]]
+name = "generator"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.48.0",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "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.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
+[[package]]
+name = "gio"
+version = "0.15.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
+dependencies = [
+ "bitflags 1.3.2",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "gio-sys",
+ "glib",
+ "libc",
+ "once_cell",
+ "thiserror",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 6.1.1",
+ "winapi",
+]
+
+[[package]]
+name = "glib"
+version = "0.15.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
+dependencies = [
+ "bitflags 1.3.2",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "once_cell",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.15.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
+dependencies = [
+ "anyhow",
+ "heck 0.4.1",
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+dependencies = [
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "globset"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "gtk"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
+dependencies = [
+ "atk",
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk",
+ "gdk-pixbuf",
+ "gio",
+ "glib",
+ "gtk-sys",
+ "gtk3-macros",
+ "libc",
+ "once_cell",
+ "pango",
+ "pkg-config",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
+dependencies = [
+ "atk-sys",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "gtk3-macros"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"
+dependencies = [
+ "anyhow",
+ "proc-macro-crate",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "html5ever"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa 1.0.9",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-range"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
+
+[[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.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa 1.0.9",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows 0.48.0",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ico"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae"
+dependencies = [
+ "byteorder",
+ "png",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "ignore"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+dependencies = [
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
+
+[[package]]
+name = "image"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "infer"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
+dependencies = [
+ "cfb",
+]
+
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "interprocess"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "rustc_version",
+ "to_method",
+ "winapi",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "javascriptcore-rs"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
+dependencies = [
+ "bitflags 1.3.2",
+ "glib",
+ "javascriptcore-rs-sys",
+]
+
+[[package]]
+name = "javascriptcore-rs-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 5.0.0",
+]
+
+[[package]]
+name = "jni"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json-patch"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
+dependencies = [
+ "serde",
+ "serde_json",
+ "thiserror",
+ "treediff",
+]
+
+[[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 1.3.2",
+ "libc",
+]
+
+[[package]]
+name = "kuchiki"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
+dependencies = [
+ "cssparser",
+ "html5ever",
+ "matches",
+ "selectors",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+
+[[package]]
+name = "line-wrap"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
+dependencies = [
+ "safemem",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "markup5ever"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
+dependencies = [
+ "log",
+ "phf 0.8.0",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minisign-verify"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "ndk"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+dependencies = [
+ "bitflags 1.3.2",
+ "jni-sys",
+ "ndk-sys",
+ "num_enum",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
+[[package]]
+name = "normpath"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "notify"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
+dependencies = [
+ "bitflags 1.3.2",
+ "filetime",
+ "inotify",
+ "kqueue",
+ "libc",
+ "mio",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+ "objc_exception",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192"
+
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "open"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
+dependencies = [
+ "pathdiff",
+ "windows-sys 0.42.0",
+]
+
+[[package]]
+name = "opener"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788"
+dependencies = [
+ "bstr",
+ "normpath",
+ "winapi",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "os_info"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
+dependencies = [
+ "log",
+ "serde",
+ "winapi",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owmods_cli"
+version = "0.10.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "clap_complete",
+ "clap_mangen",
+ "colored",
+ "indicatif",
+ "log",
+ "owmods_core",
+ "tokio",
+]
+
+[[package]]
+name = "owmods_core"
+version = "0.10.0"
+dependencies = [
+ "anyhow",
+ "directories",
+ "futures",
+ "glob",
+ "lazy_static",
+ "log",
+ "opener",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tempfile",
+ "tokio",
+ "tokio-test",
+ "typeshare",
+ "uuid",
+ "version-compare 0.1.1",
+ "zip",
+]
+
+[[package]]
+name = "owmods_gui"
+version = "0.10.0"
+dependencies = [
+ "anyhow",
+ "log",
+ "notify",
+ "opener",
+ "owmods_core",
+ "regex",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-deep-link",
+ "tauri-plugin-window-state",
+ "time",
+ "tokio",
+ "typeshare",
+]
+
+[[package]]
+name = "pango"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
+dependencies = [
+ "bitflags 1.3.2",
+ "glib",
+ "libc",
+ "once_cell",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 6.1.1",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_macros 0.8.0",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_macros 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared 0.8.0",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared 0.10.0",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "plist"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
+dependencies = [
+ "base64 0.21.2",
+ "indexmap 1.9.3",
+ "line-wrap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "png"
+version = "0.17.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+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.10",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "raw-window-handle"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom 0.2.10",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.3",
+ "regex-syntax 0.7.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+dependencies = [
+ "base64 0.21.2",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tokio-util",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots",
+ "winreg 0.10.1",
+]
+
+[[package]]
+name = "rfd"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
+dependencies = [
+ "block",
+ "dispatch",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "js-sys",
+ "lazy_static",
+ "log",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows 0.37.0",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "roff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64 0.21.2",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
+[[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 = "schannel"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "selectors"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
+dependencies = [
+ "bitflags 1.3.2",
+ "cssparser",
+ "derive_more",
+ "fxhash",
+ "log",
+ "matches",
+ "phf 0.8.0",
+ "phf_codegen",
+ "precomputed-hash",
+ "servo_arc",
+ "smallvec",
+ "thin-slice",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+dependencies = [
+ "itoa 1.0.9",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa 1.0.9",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3"
+dependencies = [
+ "base64 0.21.2",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "serialize-to-javascript"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
+dependencies = [
+ "serde",
+ "serde_json",
+ "serialize-to-javascript-impl",
+]
+
+[[package]]
+name = "serialize-to-javascript-impl"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "servo_arc"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
+dependencies = [
+ "nodrop",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "soup2"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
+dependencies = [
+ "bitflags 1.3.2",
+ "gio",
+ "glib",
+ "libc",
+ "once_cell",
+ "soup2-sys",
+]
+
+[[package]]
+name = "soup2-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
+dependencies = [
+ "bitflags 1.3.2",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 5.0.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "state"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+dependencies = [
+ "loom",
+]
+
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sys-locale"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "system-deps"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
+dependencies = [
+ "cfg-expr 0.9.1",
+ "heck 0.3.3",
+ "pkg-config",
+ "toml 0.5.11",
+ "version-compare 0.0.11",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
+dependencies = [
+ "cfg-expr 0.15.3",
+ "heck 0.4.1",
+ "pkg-config",
+ "toml 0.7.6",
+ "version-compare 0.1.1",
+]
+
+[[package]]
+name = "tao"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "cc",
+ "cocoa",
+ "core-foundation",
+ "core-graphics",
+ "crossbeam-channel",
+ "dispatch",
+ "gdk",
+ "gdk-pixbuf",
+ "gdk-sys",
+ "gdkwayland-sys",
+ "gdkx11-sys",
+ "gio",
+ "glib",
+ "glib-sys",
+ "gtk",
+ "image",
+ "instant",
+ "jni",
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "objc",
+ "once_cell",
+ "parking_lot",
+ "png",
+ "raw-window-handle",
+ "scopeguard",
+ "serde",
+ "tao-macros",
+ "unicode-segmentation",
+ "uuid",
+ "windows 0.39.0",
+ "windows-implement",
+ "x11-dl",
+]
+
+[[package]]
+name = "tao-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
+
+[[package]]
+name = "tauri"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
+dependencies = [
+ "anyhow",
+ "base64 0.21.2",
+ "bytes",
+ "cocoa",
+ "dirs-next",
+ "embed_plist",
+ "encoding_rs",
+ "flate2",
+ "futures-util",
+ "glib",
+ "glob",
+ "gtk",
+ "heck 0.4.1",
+ "http",
+ "ignore",
+ "minisign-verify",
+ "objc",
+ "once_cell",
+ "open",
+ "os_info",
+ "percent-encoding",
+ "rand 0.8.5",
+ "raw-window-handle",
+ "regex",
+ "reqwest",
+ "rfd",
+ "semver",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "serialize-to-javascript",
+ "state",
+ "sys-locale",
+ "tar",
+ "tauri-macros",
+ "tauri-runtime",
+ "tauri-runtime-wry",
+ "tauri-utils",
+ "tempfile",
+ "thiserror",
+ "time",
+ "tokio",
+ "url",
+ "uuid",
+ "webkit2gtk",
+ "webview2-com",
+ "windows 0.39.0",
+ "zip",
+]
+
+[[package]]
+name = "tauri-build"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b"
+dependencies = [
+ "anyhow",
+ "cargo_toml",
+ "heck 0.4.1",
+ "json-patch",
+ "semver",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "tauri-winres",
+]
+
+[[package]]
+name = "tauri-codegen"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a"
+dependencies = [
+ "base64 0.21.2",
+ "brotli",
+ "ico",
+ "json-patch",
+ "plist",
+ "png",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tauri-utils",
+ "thiserror",
+ "time",
+ "uuid",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-macros"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "tauri-codegen",
+ "tauri-utils",
+]
+
+[[package]]
+name = "tauri-plugin-deep-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2"
+dependencies = [
+ "dirs",
+ "interprocess",
+ "log",
+ "objc2",
+ "once_cell",
+ "tauri-utils",
+ "windows-sys 0.48.0",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "tauri-plugin-window-state"
+version = "0.1.0"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50"
+dependencies = [
+ "bincode",
+ "bitflags 2.3.3",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-runtime"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769"
+dependencies = [
+ "gtk",
+ "http",
+ "http-range",
+ "rand 0.8.5",
+ "raw-window-handle",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "thiserror",
+ "url",
+ "uuid",
+ "webview2-com",
+ "windows 0.39.0",
+]
+
+[[package]]
+name = "tauri-runtime-wry"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b"
+dependencies = [
+ "cocoa",
+ "gtk",
+ "percent-encoding",
+ "rand 0.8.5",
+ "raw-window-handle",
+ "tauri-runtime",
+ "tauri-utils",
+ "uuid",
+ "webkit2gtk",
+ "webview2-com",
+ "windows 0.39.0",
+ "wry",
+]
+
+[[package]]
+name = "tauri-utils"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84"
+dependencies = [
+ "brotli",
+ "ctor",
+ "dunce",
+ "glob",
+ "heck 0.4.1",
+ "html5ever",
+ "infer",
+ "json-patch",
+ "kuchiki",
+ "memchr",
+ "phf 0.10.1",
+ "proc-macro2",
+ "quote",
+ "semver",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "thiserror",
+ "url",
+ "walkdir",
+ "windows 0.39.0",
+]
+
+[[package]]
+name = "tauri-winres"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
+dependencies = [
+ "embed-resource",
+ "toml 0.7.6",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tendril"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
+[[package]]
+name = "thin-slice"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
+
+[[package]]
+name = "thiserror"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
+dependencies = [
+ "itoa 1.0.9",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "to_method"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"
+
+[[package]]
+name = "tokio"
+version = "1.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+dependencies = [
+ "autocfg",
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-test"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
+dependencies = [
+ "async-stream",
+ "bytes",
+ "futures-core",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-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.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "treediff"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303"
+dependencies = [
+ "serde_json",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "typeshare"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f44d1a2f454cb35fbe05b218c410792697e76bd868f48d3a418f2cd1a7d527d6"
+dependencies = [
+ "chrono",
+ "serde",
+ "serde_json",
+ "typeshare-annotation",
+]
+
+[[package]]
+name = "typeshare-annotation"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc670d0e358428857cc3b4bf504c691e572fccaec9542ff09212d3f13d74b7a9"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf-8"
+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 = "uuid"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+dependencies = [
+ "getrandom 0.2.10",
+ "rand 0.8.5",
+]
+
+[[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-compare"
+version = "0.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
+
+[[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 = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "wasm-streams"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webkit2gtk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "gdk",
+ "gdk-sys",
+ "gio",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "gtk",
+ "gtk-sys",
+ "javascriptcore-rs",
+ "libc",
+ "once_cell",
+ "soup2",
+ "webkit2gtk-sys",
+]
+
+[[package]]
+name = "webkit2gtk-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
+dependencies = [
+ "atk-sys",
+ "bitflags 1.3.2",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "javascriptcore-rs-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "soup2-sys",
+ "system-deps 6.1.1",
+]
+
+[[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 = "webview2-com"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
+dependencies = [
+ "webview2-com-macros",
+ "webview2-com-sys",
+ "windows 0.39.0",
+ "windows-implement",
+]
+
+[[package]]
+name = "webview2-com-macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "webview2-com-sys"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
+dependencies = [
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "windows 0.39.0",
+ "windows-bindgen",
+ "windows-metadata",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
+dependencies = [
+ "windows_aarch64_msvc 0.37.0",
+ "windows_i686_gnu 0.37.0",
+ "windows_i686_msvc 0.37.0",
+ "windows_x86_64_gnu 0.37.0",
+ "windows_x86_64_msvc 0.37.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
+dependencies = [
+ "windows-implement",
+ "windows_aarch64_msvc 0.39.0",
+ "windows_i686_gnu 0.39.0",
+ "windows_i686_msvc 0.39.0",
+ "windows_x86_64_gnu 0.39.0",
+ "windows_x86_64_msvc 0.39.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-bindgen"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
+dependencies = [
+ "windows-metadata",
+ "windows-tokens",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
+dependencies = [
+ "syn 1.0.109",
+ "windows-tokens",
+]
+
+[[package]]
+name = "windows-metadata"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.1",
+]
+
+[[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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+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-tokens"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.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.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.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.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.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.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.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.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winreg"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wry"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea"
+dependencies = [
+ "base64 0.13.1",
+ "block",
+ "cocoa",
+ "core-graphics",
+ "crossbeam-channel",
+ "dunce",
+ "gdk",
+ "gio",
+ "glib",
+ "gtk",
+ "html5ever",
+ "http",
+ "kuchiki",
+ "libc",
+ "log",
+ "objc",
+ "objc_id",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "sha2",
+ "soup2",
+ "tao",
+ "thiserror",
+ "url",
+ "webkit2gtk",
+ "webkit2gtk-sys",
+ "webview2-com",
+ "windows 0.39.0",
+ "windows-implement",
+]
+
+[[package]]
+name = "x11"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "xattr"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "xtask"
+version = "0.10.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "clap_complete",
+ "clap_mangen",
+ "regex",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "byteorder",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "zstd",
+]
+
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "5.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.8+zstd.1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix
new file mode 100644
index 0000000000..3a1c224c2c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, installShellFiles
+, zstd
+, openssl
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "owmods-cli";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "ow-mods";
+ repo = "ow-mod-man";
+ rev = "cli_v${version}";
+ hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "tauri-plugin-window-state-0.1.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
+ };
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ installShellFiles
+ ];
+
+ buildInputs = [
+ zstd
+ ] ++ lib.optionals stdenv.isLinux [
+ openssl
+ ] ++ lib.optionals stdenv.isDarwin [
+ Security
+ ];
+
+ env = {
+ ZSTD_SYS_USE_PKG_CONFIG = true;
+ };
+
+ buildAndTestSubdir = "owmods_cli";
+
+ postInstall = ''
+ cargo xtask dist_cli
+ installManPage man/man*/*
+ installShellCompletion --cmd owmods \
+ dist/cli/completions/owmods.{bash,fish,zsh}
+ '';
+
+ meta = with lib; {
+ description = "CLI version of the mod manager for Outer Wilds Mod Loader";
+ homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli";
+ downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
+ changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
+ mainProgram = "owmods";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ locochoco ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
index fa6b1f86e0..87847e32f6 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.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
- sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s=";
+ sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE=";
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix
new file mode 100644
index 0000000000..01a60baa2a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix
@@ -0,0 +1,77 @@
+{ fetchFromGitHub
+, gobject-introspection
+, lib
+, libadwaita
+, python3
+, wrapGAppsHook
+, lmmath
+}:
+python3.pkgs.buildPythonApplication rec {
+ pname = "plots";
+ version = "0.8.5";
+
+ src = fetchFromGitHub {
+ owner = "alexhuntley";
+ repo = "Plots";
+ rev = "v${version}";
+ hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw=";
+ };
+
+ nativeBuildInputs = [
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ propagatedBuildInputs = [
+ libadwaita
+ (python3.withPackages (p: with p; [
+ numpy
+ pygobject3
+ lark
+ jinja2
+ freetype-py
+ pyopengl
+ pycairo
+ pyglm
+ ]))
+ ];
+
+ nativeCheckInputs = [
+ (python3.withPackages (p: with p; [
+ pytest
+ ]))
+ ];
+
+ dontWrapGApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ postInstall = ''
+ install -D ${lmmath}/share/fonts/opentype/latinmodern-math.otf -t $out/share/fonts/
+
+ install -D res/com.github.alexhuntley.Plots.metainfo.xml -t $out/share/metainfo/
+ install -D res/com.github.alexhuntley.Plots.desktop -t $out/share/applications/
+ install -D res/com.github.alexhuntley.Plots.svg -t $out/share/icons/hicolor/scalable/apps/
+ install -D res/com.github.alexhuntley.Plots-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
+
+ for lang_dir in help/*; do
+ lang=$(basename "$lang_dir")
+ install -D -t $out/share/help/$lang/plots/ $lang_dir/*
+ done
+ '';
+
+ meta = with lib; {
+ description = "Graph plotting app for GNOME";
+ longDescription = ''
+ Plots is a graph plotting app for GNOME.
+ Plots makes it easy to visualise mathematical formulae.
+ In addition to basic arithmetic operations, it supports trigonometric, hyperbolic, exponential and logarithmic functions, as well as arbitrary sums and products.
+ It can display polar equations, and both implicit and explicit Cartesian equations.
+ '';
+ homepage = "https://github.com/alexhuntley/Plots";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ sund3RRR ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix
new file mode 100644
index 0000000000..02ebcaa2fb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildGoModule, installShellFiles, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "pop";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "charmbracelet";
+ repo = "pop";
+ rev = "v${version}";
+ hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k=";
+ };
+
+ vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8=";
+
+ GOWORK = "off";
+
+ nativeBuildInputs = [
+ installShellFiles
+ ];
+
+ ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
+
+ postInstall = ''
+ $out/bin/pop man > pop.1
+ installManPage pop.1
+ installShellCompletion --cmd pop \
+ --bash <($out/bin/pop completion bash) \
+ --fish <($out/bin/pop completion fish) \
+ --zsh <($out/bin/pop completion zsh)
+ '';
+
+ meta = with lib; {
+ description = "Send emails from your terminal";
+ homepage = "https://github.com/charmbracelet/pop";
+ changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ caarlos0 maaslalani ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock
index 7772f9927e..09971788db 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock
@@ -2,21 +2,21 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "aho-corasick"
version = "1.0.2"
@@ -58,9 +58,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "arboard"
@@ -100,9 +100,9 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -164,6 +164,24 @@ dependencies = [
"event-listener",
]
+[[package]]
+name = "async-process"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "autocfg",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "signal-hook",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "async-recursion"
version = "1.0.4"
@@ -172,7 +190,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -183,13 +201,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
[[package]]
name = "async-trait"
-version = "0.1.68"
+version = "0.1.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -213,7 +231,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -239,6 +257,21 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
[[package]]
name = "base64"
version = "0.13.1"
@@ -316,9 +349,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
dependencies = [
"memchr",
"serde",
@@ -378,7 +411,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -388,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
dependencies = [
"serde",
- "toml 0.7.4",
+ "toml 0.7.6",
]
[[package]]
@@ -425,9 +458,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a"
+checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
dependencies = [
"smallvec",
"target-lexicon",
@@ -562,21 +595,20 @@ dependencies = [
[[package]]
name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
dependencies = [
"bitflags",
"core-foundation",
- "foreign-types",
"libc",
]
[[package]]
name = "cpufeatures"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
dependencies = [
"libc",
]
@@ -673,7 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -688,9 +720,9 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.20.1"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
dependencies = [
"darling_core",
"darling_macro",
@@ -698,27 +730,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.1"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
name = "darling_macro"
-version = "0.20.1"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -867,9 +899,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "dtoa"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dtoa-short"
@@ -894,13 +926,13 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "embed-resource"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a"
+checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a"
dependencies = [
"cc",
"rustc_version",
- "toml 0.7.4",
+ "toml 0.7.6",
"vswhom",
"winreg 0.11.0",
]
@@ -950,9 +982,15 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
[[package]]
name = "errno"
version = "0.3.1"
@@ -992,9 +1030,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "exr"
-version = "1.6.4"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56"
+checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
dependencies = [
"bit_field",
"flume",
@@ -1170,7 +1208,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -1250,7 +1288,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1267,7 +1305,7 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1281,7 +1319,7 @@ dependencies = [
"gobject-sys",
"libc",
"pkg-config",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1293,15 +1331,15 @@ dependencies = [
"gdk-sys",
"glib-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
"x11",
]
[[package]]
name = "generator"
-version = "0.7.4"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
dependencies = [
"cc",
"libc",
@@ -1364,6 +1402,12 @@ dependencies = [
"weezl",
]
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
[[package]]
name = "gio"
version = "0.15.12"
@@ -1390,7 +1434,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
"winapi",
]
@@ -1436,7 +1480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
dependencies = [
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1447,11 +1491,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
"bstr",
"fnv",
"log",
@@ -1466,7 +1510,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1507,7 +1551,7 @@ dependencies = [
"gobject-sys",
"libc",
"pango-sys",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -1526,9 +1570,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.19"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
dependencies = [
"bytes",
"fnv",
@@ -1536,7 +1580,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
- "indexmap",
+ "indexmap 1.9.3",
"slab",
"tokio",
"tokio-util",
@@ -1558,6 +1602,12 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
[[package]]
name = "heck"
version = "0.3.3"
@@ -1575,18 +1625,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@@ -1616,7 +1657,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.6",
+ "itoa 1.0.9",
]
[[package]]
@@ -1650,9 +1691,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "hyper"
-version = "0.14.26"
+version = "0.14.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
"bytes",
"futures-channel",
@@ -1663,7 +1704,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.6",
+ "itoa 1.0.9",
"pin-project-lite",
"socket2",
"tokio",
@@ -1777,10 +1818,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
"serde",
]
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
[[package]]
name = "infer"
version = "0.12.0"
@@ -1805,16 +1856,16 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "ipnet"
-version = "2.7.2"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
name = "itoa"
@@ -1824,9 +1875,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "javascriptcore-rs"
@@ -1951,9 +2002,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.146"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libdbus-sys"
@@ -2079,7 +2130,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
[[package]]
@@ -2338,11 +2389,11 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
"libc",
]
@@ -2406,6 +2457,15 @@ dependencies = [
"objc",
]
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "once_cell"
version = "1.18.0"
@@ -2424,9 +2484,9 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.54"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
"bitflags",
"cfg-if",
@@ -2445,7 +2505,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -2456,9 +2516,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.88"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
"cc",
"libc",
@@ -2520,7 +2580,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -2549,7 +2609,7 @@ dependencies = [
"libc",
"redox_syscall 0.3.5",
"smallvec",
- "windows-targets 0.48.0",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -2571,7 +2631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
]
[[package]]
@@ -2674,29 +2734,29 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -2712,14 +2772,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "plist"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"
+checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
dependencies = [
"base64 0.21.2",
- "indexmap",
+ "indexmap 1.9.3",
"line-wrap",
- "quick-xml 0.28.2",
+ "quick-xml 0.29.0",
"serde",
"time",
]
@@ -2774,7 +2834,7 @@ dependencies = [
"tauri-plugin-autostart",
"tauri-plugin-single-instance",
"tiny_http",
- "toml 0.7.4",
+ "toml 0.7.6",
"window-shadows",
"windows 0.44.0",
]
@@ -2833,9 +2893,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
@@ -2868,10 +2928,19 @@ dependencies = [
]
[[package]]
-name = "quote"
-version = "1.0.28"
+name = "quick-xml"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
dependencies = [
"proc-macro2",
]
@@ -3016,13 +3085,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.8.4"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
"memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.3.3",
+ "regex-syntax 0.7.4",
]
[[package]]
@@ -3034,6 +3104,17 @@ dependencies = [
"regex-syntax 0.6.29",
]
+[[package]]
+name = "regex-automata"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.4",
+]
+
[[package]]
name = "regex-syntax"
version = "0.6.29"
@@ -3042,9 +3123,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reqwest"
@@ -3110,6 +3191,12 @@ dependencies = [
"windows 0.37.0",
]
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
[[package]]
name = "rustc_version"
version = "0.4.0"
@@ -3121,9 +3208,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.20"
+version = "0.37.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
dependencies = [
"bitflags",
"errno",
@@ -3135,15 +3222,15 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "safemem"
@@ -3162,11 +3249,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3177,21 +3264,21 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "screenshots"
version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9ad94ff24ed04a594f77ab87feb2aa12e9db3eed47321f71e01e75882c5b45"
+source = "git+https://github.com/pot-app/screenshots-rs#f19fde2ced8306f2bb5113c11002f24d710c6914"
dependencies = [
"anyhow",
"core-graphics",
"dbus",
"display-info",
"fxhash",
+ "percent-encoding",
"png",
"widestring",
"windows 0.48.0",
@@ -3224,7 +3311,7 @@ dependencies = [
[[package]]
name = "selection"
version = "0.1.0"
-source = "git+https://github.com/pot-app/Selection#43845dc902d2e507f09914ded1481850f26b7332"
+source = "git+https://github.com/pot-app/Selection#8b44b68fbfe614aff190610ec03d52b6f3b57f19"
dependencies = [
"arboard",
"enigo",
@@ -3255,60 +3342,60 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
dependencies = [
"serde",
]
[[package]]
name = "serde"
-version = "1.0.164"
+version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.164"
+version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
name = "serde_json"
-version = "1.0.97"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.9",
"ryu",
"serde",
]
[[package]]
name = "serde_repr"
-version = "0.1.12"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
name = "serde_spanned"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
dependencies = [
"serde",
]
@@ -3320,21 +3407,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.6",
+ "itoa 1.0.9",
"ryu",
"serde",
]
[[package]]
name = "serde_with"
-version = "3.0.0"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513"
+checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3"
dependencies = [
"base64 0.21.2",
"chrono",
"hex",
- "indexmap",
+ "indexmap 1.9.3",
"serde",
"serde_json",
"serde_with_macros",
@@ -3343,14 +3430,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.0.0"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070"
+checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -3416,6 +3503,25 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "signal-hook"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "simd-adler32"
version = "0.3.5"
@@ -3439,9 +3545,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "socket2"
@@ -3562,9 +3668,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.18"
+version = "2.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
dependencies = [
"proc-macro2",
"quote",
@@ -3586,14 +3692,14 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.1.0"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
- "cfg-expr 0.15.2",
+ "cfg-expr 0.15.3",
"heck 0.4.1",
"pkg-config",
- "toml 0.7.4",
+ "toml 0.7.6",
"version-compare 0.1.1",
]
@@ -3659,9 +3765,9 @@ dependencies = [
[[package]]
name = "tar"
-version = "0.4.38"
+version = "0.4.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"
dependencies = [
"filetime",
"libc",
@@ -3670,15 +3776,15 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.7"
+version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
+checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0"
[[package]]
name = "tauri"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc35893c7e08d9564a9206bd52182dce031b0d5132dc946b3e166e00d03f8cfe"
+checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
dependencies = [
"anyhow",
"base64 0.21.2",
@@ -3789,7 +3895,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-autostart"
version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#c4d2c8c693a8e0da627f4c845486dbe1b1e32c64"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1"
dependencies = [
"auto-launch",
"log",
@@ -3802,7 +3908,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-single-instance"
version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1"
dependencies = [
"log",
"serde",
@@ -3890,14 +3996,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
dependencies = [
"embed-resource",
- "toml 0.7.4",
+ "toml 0.7.6",
]
[[package]]
name = "tauri-winrt-notification"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d70573554e7630c2ca3677ea78d5ae6b030aedee5f9bf33c15d644904fa698"
+checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f"
dependencies = [
"quick-xml 0.23.1",
"windows 0.39.0",
@@ -3936,22 +4042,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -3977,11 +4083,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.22"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.9",
"serde",
"time-core",
"time-macros",
@@ -3995,9 +4101,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
dependencies = [
"time-core",
]
@@ -4031,11 +4137,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.28.2"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
"autocfg",
+ "backtrace",
"bytes",
"libc",
"mio",
@@ -4080,9 +4187,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
@@ -4092,20 +4199,20 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.10"
+version = "0.19.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
@@ -4132,13 +4239,13 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
]
[[package]]
@@ -4242,9 +4349,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
@@ -4281,9 +4388,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "uuid"
-version = "1.3.4"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"getrandom 0.2.10",
]
@@ -4396,7 +4503,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
"wasm-bindgen-shared",
]
@@ -4430,7 +4537,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.18",
+ "syn 2.0.26",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4567,7 +4674,7 @@ dependencies = [
"pango-sys",
"pkg-config",
"soup2-sys",
- "system-deps 6.1.0",
+ "system-deps 6.1.1",
]
[[package]]
@@ -4714,7 +4821,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -4764,7 +4871,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.1",
]
[[package]]
@@ -4784,9 +4891,9 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
@@ -4949,9 +5056,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
-version = "0.4.7"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
dependencies = [
"memchr",
]
@@ -5115,24 +5222,26 @@ dependencies = [
[[package]]
name = "xml-rs"
-version = "0.8.14"
+version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
+checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336"
[[package]]
name = "zbus"
-version = "3.12.0"
+version = "3.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3"
+checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs",
"async-io",
"async-lock",
+ "async-process",
"async-recursion",
"async-task",
"async-trait",
+ "blocking",
"byteorder",
"derivative",
"enumflags2",
@@ -5160,9 +5269,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "3.12.0"
+version = "3.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a"
+checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5174,9 +5283,9 @@ dependencies = [
[[package]]
name = "zbus_names"
-version = "2.5.1"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a"
+checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
dependencies = [
"serde",
"static_assertions",
@@ -5205,9 +5314,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "3.13.0"
+version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cb36cd95352132911c9c99fdcc1635de5c2c139bd34cbcf6dfb8350ee8ff6a7"
+checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
dependencies = [
"byteorder",
"enumflags2",
@@ -5219,9 +5328,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "3.13.0"
+version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34951e1ac64f3a1443fe7181256b9ed6a811a1631917566c3d5ca718d8cf33"
+checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5232,9 +5341,9 @@ dependencies = [
[[package]]
name = "zvariant_utils"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b"
+checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
dependencies = [
"proc-macro2",
"quote",
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix
index cad203519f..941796315c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix
@@ -23,16 +23,16 @@
stdenv.mkDerivation rec {
pname = "pot";
- version = "1.6.1";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "pot-app";
repo = "pot-desktop";
rev = version;
- hash = "sha256-AiDQleRMuLExaVuiLvubebobDaK2YJTWjZ00F5UptuQ=";
+ hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg=";
};
- sourceRoot = "source/src-tauri";
+ sourceRoot = "${src.name}/src-tauri";
postPatch = ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
@@ -76,10 +76,11 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U=";
- "tauri-plugin-autostart-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ=";
+ "tauri-plugin-single-instance-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE=";
+ "tauri-plugin-autostart-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE=";
"enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
- "selection-0.1.0" = "sha256-85NUACRi7TjyMNKVz93G+W1EXKIVZZge/h/HtDwiW/Q=";
+ "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8=";
+ "screenshots-0.6.0" = "sha256-NHs7gqplg/eSUWYojayxeJtX7T4f8mt+akahi9LeukU=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix
index a9f23d238c..0e90ad933d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix
@@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
- version = "0.51.4";
+ version = "0.60.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
- hash = "sha256-eR8uYeScV6bxntc2bEwJC/VSH1bXendJ1FNJB0bC2i0=";
+ hash = "sha256-BsDel6F09HP5Oz2p0DDXKuS7Id5XPhZZxEzwu76vVwk=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -43,7 +43,7 @@ buildGoModule rec {
installShellFiles
];
- vendorHash = "sha256-dlTqBKyI2t3twxQ+mnn+LTWzM2+CnEa4X0K2yDAZsQA=";
+ vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
index e283f0d466..28969a777e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix
@@ -30,6 +30,10 @@ let
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
+ disabledTestPaths = [
+ "test/aaa_profiling"
+ "test/ext/mypy"
+ ];
});
});
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
index 3b1bdca195..92949ad4a8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
@@ -53,5 +53,6 @@ mkDerivation {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
+ mainProgram = "qdirstat";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix
index 5f9958f2d5..d73c379387 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl";
};
- sourceRoot = "source/src-qt5";
+ sourceRoot = "${src.name}/src-qt5";
nativeBuildInputs = [
qmake
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 02bae93229..0aac804502 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
@@ -31,5 +31,6 @@ buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ equirosa dit7ya ];
platforms = platforms.linux;
+ mainProgram = "rofi-rbw";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix
new file mode 100644
index 0000000000..fedb03fa61
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, libnotify
+, slop
+, ffcast
+, ffmpeg
+, xclip
+, rofi
+, coreutils
+, gnused
+, procps
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rofi-screenshot";
+ version = "2023-07-02";
+
+ src = fetchFromGitHub {
+ owner = "ceuk";
+ repo = pname;
+ rev = "365cfa51c6c7deb072d98d7bfd68cf4038bf2737";
+ hash = "sha256-M1cab+2pOjZ2dElMg0Y0ZrIxRE0VwymVwcElgzFrmVs=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postFixup = ''
+ wrapProgram $out/bin/${pname} \
+ --set PATH ${
+ lib.makeBinPath [
+ libnotify
+ slop
+ ffcast
+ ffmpeg
+ xclip
+ rofi
+ coreutils
+ gnused
+ procps
+ ]
+ }
+ '';
+
+ installPhase = ''
+ install -Dm755 ${pname} $out/bin/${pname}
+ '';
+
+ meta = {
+ description =
+ "Use rofi to perform various types of screenshots and screen captures";
+ homepage = "https://github.com/ceuk/rofi-screenshot";
+ maintainers = with lib.maintainers; [ zopieux ];
+ platforms = lib.platforms.all;
+ license = lib.licenses.wtfpl;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix
index a505ad13a1..edd0120341 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ bew ];
platforms = with platforms; linux;
+ mainProgram = "rofi";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
index dfb096d654..1d7ef32cd3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
@@ -9,14 +9,14 @@
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "rofi-wayland-unwrapped";
- version = "1.7.5+wayland1";
+ version = "1.7.5+wayland2";
src = fetchFromGitHub {
owner = "lbonn";
repo = "rofi";
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
+ sha256 = "sha256-5pxDA/71PV4B5T3fzLKVC4U8Gt13vwy3xSDPDsSDAKU=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix
new file mode 100644
index 0000000000..99f9a465e1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix
@@ -0,0 +1,91 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, crystal
+, wrapGAppsHook4
+, gobject-introspection
+, desktopToDarwinBundle
+, webkitgtk_6_0
+, sqlite
+, gi-crystal
+, libadwaita
+, gtk4
+, pango
+}:
+let
+ gtk4' = gtk4.override { x11Support = true; };
+ pango' = pango.override { withIntrospection = true; };
+in
+crystal.buildCrystalPackage rec {
+ pname = "rtfm";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "hugopl";
+ repo = "rtfm";
+ rev = "v${version}";
+ name = "rtfm";
+ hash = "sha256-SmQq3hG94oV346dHtqTHC0xE4cWB3rspD3XXu+mSI8Q=";
+ };
+
+ patches = [
+ # 1) fixed gi-crystal binding generator command
+ # 2) removed `-v` arg to `cp` command to prevent build failure due to stdout buffer overflow
+ # 3) added commands to build gschemas and update icon-cache
+ ./patches/make.patch
+
+ # fixed docset path and gi libs directory names
+ ./patches/friendly-docs-path.patch
+
+ # added chmod +w for copied docs to prevent error:
+ # `Error opening file with mode 'wb': '.../style.css': Permission denied`
+ ./patches/enable-write-permissions.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace "crystal run src/create_crystal_docset.cr" "crystal src/create_crystal_docset.cr ${crystal}/share/doc/crystal/api/" \
+ --replace "crystal run src/create_gtk_docset.cr" "crystal src/create_gtk_docset.cr gtk-doc/"
+ '';
+
+ shardsFile = ./shards.nix;
+
+ nativeBuildInputs = [
+ wrapGAppsHook4
+ gobject-introspection
+ gi-crystal
+ ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
+
+ buildInputs = [
+ webkitgtk_6_0
+ sqlite
+ libadwaita
+ gtk4'
+ pango'
+ ];
+
+ buildTargets = [ "configure" "rtfm" "docsets" ];
+
+ preBuild = ''
+ mkdir gtk-doc/
+
+ for file in "${gtk4'.devdoc}"/share/doc/*; do
+ ln -s "$file" "gtk-doc/$(basename "$file")"
+ done
+
+ for file in "${pango'.devdoc}"/share/doc/*; do
+ ln -s "$file" "gtk-doc/$(basename "$file")"
+ done
+
+ for file in "${libadwaita.devdoc}"/share/doc/*; do
+ ln -s "$file" "gtk-doc/$(basename "$file")"
+ done
+ '';
+
+ meta = with lib; {
+ description = "Dash/docset reader with built in documentation for Crystal and GTK APIs";
+ homepage = "https://github.com/hugopl/rtfm/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sund3RRR ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch
new file mode 100644
index 0000000000..efdabce083
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch
@@ -0,0 +1,10 @@
+--- a/src/doc2dash/doc_set_builder.cr 2023-07-19 14:00:06.864770147 +0300
++++ b/src/doc2dash/doc_set_builder.cr 2023-07-19 13:59:35.440707740 +0300
+@@ -44,6 +44,7 @@
+ real_dest = @html_dest.join(dest || source)
+ Dir.mkdir_p(Path.new(real_dest).dirname)
+ File.copy(original, real_dest)
++ File.chmod(real_dest, 0o600)
+ dest || source
+ end
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch
new file mode 100644
index 0000000000..cecbeb750b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch
@@ -0,0 +1,11 @@
+--- a/src/create_gtk_docset.cr 2023-07-17 14:28:04.882620660 +0300
++++ b/src/create_gtk_docset.cr 2023-07-17 14:27:09.660643747 +0300
+@@ -136,7 +136,7 @@
+ end
+
+ def find_modules : Array(Path)
+- basedir = Path.new("/usr/share/doc")
++ basedir = Path.new(ARGV[0]? || "gtk-docs")
+ MODULES.compact_map do |mod|
+ print "#{mod.ljust(20, '.')}"
+ mod_dir = basedir.join(mod)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch
new file mode 100644
index 0000000000..503faf5245
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch
@@ -0,0 +1,30 @@
+--- a/Makefile 2023-07-17 17:18:28.000000000 +0300
++++ b/Makefile 2023-07-19 12:13:44.627168135 +0300
+@@ -4,8 +4,7 @@
+ all: configure .WAIT rtfm docsets
+
+ configure:
+- shards install
+- ./bin/gi-crystal
++ gi-crystal
+
+ rtfm:
+ shards build --release -s rtfm
+@@ -29,13 +28,15 @@
+ install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml
+ # docsets
+ mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
+- cp -rv data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
+- cp -rv data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
++ cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
++ cp -r data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/
+ # License
+ install -D -m0644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/rtfm/LICENSE
+ # Changelog
+ install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md
+ gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md
++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor
++ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+
+ uninstall:
+ rm -f $(DESTDIR)$(PREFIX)/bin/rtfm
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix
new file mode 100644
index 0000000000..f6882397d8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix
@@ -0,0 +1,42 @@
+{
+ db = {
+ url = "https://github.com/crystal-lang/crystal-db.git";
+ rev = "v0.12.0";
+ sha256 = "1in8w2dz7nlhqgc9l6b3pi6f944m29nhbg3p5j40qzvsrr8lqaj7";
+ };
+ fzy = {
+ url = "https://github.com/hugopl/fzy.git";
+ rev = "v0.5.5";
+ sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv";
+ };
+ gio = {
+ url = "https://github.com/hugopl/gio.cr.git";
+ rev = "v0.1.0";
+ sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8";
+ };
+ gtk4 = {
+ url = "https://github.com/hugopl/gtk4.cr.git";
+ rev = "v0.15.0";
+ sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1";
+ };
+ harfbuzz = {
+ url = "https://github.com/hugopl/harfbuzz.cr.git";
+ rev = "v0.2.0";
+ sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
+ };
+ libadwaita = {
+ url = "https://github.com/geopjr/libadwaita.cr.git";
+ rev = "23ce21d6400af7563ede0b53deea6d1f77436985";
+ sha256 = "09jz6r0yp4qsm47qcknzgkjxavr5j3dkxf2yjbw0jkaz1an58pfw";
+ };
+ pango = {
+ url = "https://github.com/hugopl/pango.cr.git";
+ rev = "v0.2.0";
+ sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf";
+ };
+ sqlite3 = {
+ url = "https://github.com/crystal-lang/crystal-sqlite3.git";
+ rev = "v0.20.0";
+ sha256 = "0mqy6rc26i0sf2fdllbbzdhbd1d35npmpqqjz0b1n1vrzrm6fg05";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
index 387f54e215..6c839f65d9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix
@@ -7,6 +7,8 @@
, libnotify
, wlrctl
, gtk3
+, safeeyes
+, testers
, xprintidle
, xprop
, wrapGAppsHook
@@ -16,11 +18,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "safeeyes";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I=";
+ hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM=";
};
nativeBuildInputs = [
@@ -49,7 +51,7 @@ buildPythonApplication rec {
postInstall = ''
mkdir -p $out/share/applications
cp -r safeeyes/platform/icons $out/share/icons/
- cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop
+ cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop
'';
preFixup = ''
@@ -61,11 +63,14 @@ buildPythonApplication rec {
doCheck = false; # no tests
+ passthru.tests.version = testers.testVersion { package = safeeyes; };
+
meta = with lib; {
homepage = "http://slgobinath.github.io/SafeEyes";
description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo";
license = licenses.gpl3;
maintainers = with maintainers; [ srghma ];
platforms = platforms.linux;
+ mainProgram = "safeeyes";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix
index 5b1332a91d..0f4f39d74c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix
@@ -1,5 +1,5 @@
{ desktop-file-utils
-, fetchurl
+, fetchFromSourcehut
, gobject-introspection
, gtk3
, lib
@@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
pname = "shipments";
version = "0.3.0";
- src = fetchurl {
- url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz";
- sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf";
+ src = fetchFromSourcehut {
+ owner = "~martijnbraam";
+ repo = "shipments";
+ rev = version;
+ hash = "sha256-8wX1s5mPCdMINIQP4m5q5StKqxY6CGBBxIxyQAvU7Pc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
index ad849bf699..24d0253aaf 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/theironrobin/siglo";
changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
license = licenses.mpl20;
- maintainers = with maintainers; [ tomfitzhenry ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix
new file mode 100644
index 0000000000..81e54007b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, python3
+, makeWrapper
+}:
+
+let
+ pythonEnv = (python3.withPackages (ps: with ps; [
+ pyside6
+ py65
+ qdarkstyle
+ ]));
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "smb3-foundry";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "mchlnix";
+ repo = "SMB3-Foundry";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE=";
+ };
+
+ patches = [ ./fix-relative-dirs.patch ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/app
+ cp -R smb3parse foundry scribe data doc VERSION smb3-foundry.py smb3-scribe.py $out/app
+
+ makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-foundry \
+ --add-flags "$out/app/smb3-foundry.py"
+ makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-scribe \
+ --add-flags "$out/app/smb3-scribe.py"
+
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/mchlnix/SMB3-Foundry";
+ description = "A modern Super Mario Bros. 3 Level Editor";
+ changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}";
+ license = lib.licenses.gpl3Only;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ tomasajt ];
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch
new file mode 100644
index 0000000000..d49ddde897
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch
@@ -0,0 +1,34 @@
+diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py
+index ace83d7..46012df 100644
+--- a/foundry/gui/WarningList.py
++++ b/foundry/gui/WarningList.py
+@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance
+ from PySide6.QtGui import QCursor, QFocusEvent
+ from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget
+
++from foundry import root_dir
+ from foundry.game import GROUND
+ from foundry.game.ObjectDefinitions import GeneratorType
+ from foundry.game.gfx.objects import EnemyItem
+@@ -216,7 +217,7 @@ class WarningList(QWidget):
+ return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id]
+
+ def _build_enemy_clan_dict(self):
+- with open("data/enemy_data.json", "r") as enemy_data_file:
++ with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file:
+ enemy_data = json.loads(enemy_data_file.read())
+
+ self._enemy_dict.clear()
+diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py
+index ecef169..8bba57e 100644
+--- a/smb3parse/util/parser/__init__.py
++++ b/smb3parse/util/parser/__init__.py
+@@ -302,7 +302,7 @@ def gen_levels_in_rom(
+
+ print("---------------------", level_count, "------------------------")
+
+- level_data = pathlib.Path("data/levels.dat")
++ level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat")
+
+ missing = 0
+ levels: dict[int, set[int]] = defaultdict(set)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix
index de787ca669..be0d29ee50 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix
@@ -14,13 +14,13 @@
# instead of adding this to `services.udev.packages` on NixOS,
python3Packages.buildPythonApplication rec {
pname = "solaar";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchFromGitHub {
owner = "pwr-Solaar";
repo = "Solaar";
rev = "refs/tags/${version}";
- hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg=";
+ hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI=";
};
outputs = [ "out" "udev" ];
@@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec {
pyudev
pyyaml
xlib
+ hid-parser
];
# the -cli symlink is just to maintain compabilility with older versions where
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
index 990aedbc71..0073c4a0f8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
@@ -2,11 +2,9 @@
stdenv.mkDerivation {
pname = "spacenav-cube-example";
- version = libspnav.version;
+ inherit (libspnav) version src;
- src = libspnav.src;
-
- sourceRoot = "source/examples/cube";
+ sourceRoot = "${libspnav.src.name}/examples/cube";
buildInputs = [ libX11 mesa_glu libspnav ];
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 9713be07e5..3f77420a56 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "2.20.3";
+ version = "2.22.1";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
- hash = "sha256-1Auvx2KZ97iD9EDm6QQdgS5YF9smw4dTvXF1IXtYrSI=";
+ hash = "sha256-EbTmxnUk2taAKWPNuoVcKybKgdvPegFjz/ImTIabZ7Q=";
};
- vendorHash = "sha256-61j3HVDe6AbXpdmxhQQctv4C2hNBK/rWvZeC+KtISKY=";
+ vendorHash = "sha256-Ypu3AKnjh2lDh43t1GZMJo7ZyEDyNbPWvoePLp+WQdI=";
ldflags = [
"-s -w"
@@ -38,5 +38,6 @@ buildGoModule rec {
homepage = "https://github.com/spicetify/spicetify-cli/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jonringer mdarocha ];
+ mainProgram = "spicetify-cli";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix
index f3dc8e136a..062f106369 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ssw";
- version = "0.6";
+ version = "0.8";
src = fetchurl {
url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz";
- sha256 = "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj";
+ sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix
index 1bc2c2b6c9..6831cea6c4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix
@@ -44,7 +44,7 @@ let
src = subsurfaceSrc;
- sourceRoot = "source/libdivecomputer";
+ sourceRoot = "${subsurfaceSrc.name}/libdivecomputer";
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
index 96e77baf30..65c80cc81f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
@@ -70,7 +70,8 @@ mkDerivation rec {
cmakeFlags = [
"-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
# See https://github.com/Martchus/syncthingtray/issues/42
- "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5"
+ "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
+ "-DBUILD_SHARED_LIBS=ON"
] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"]
++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"]
++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix
index 1002fb13ae..fe39f3afb7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix
@@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "system76-keyboard-configurator";
- version = "1.3.7";
+ version = "1.3.8";
src = fetchFromGitHub {
owner = "pop-os";
repo = "keyboard-configurator";
rev = "v${version}";
- sha256 = "sha256-73D24g3jvPPregR/bLSpWzSGQRlhjp2/0kHuDDSqSBY=";
+ sha256 = "sha256-fjuX/fOQMdJvqpZCfyUkYS/NRPFymAvMrD3/+ntwXGc=";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
udev
];
- cargoHash = "sha256-AGWrMMJ5FihIVc7HvzpsL1Vmi/fvuFowX+ijgwGRJCo=";
+ cargoHash = "sha256-Cav2W8iUq1GYUOnXb/ECwwKQ8uzQRW/7r5EzV7IS2Nc=";
meta = with lib; {
description = "Keyboard configuration application for System76 keyboards and laptops";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix
index 6ae3ede11b..7a280285ac 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -6,10 +6,10 @@ rec {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
- sha256 = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA=";
+ hash = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA=";
};
- yarnSha256 = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE=";
+ yarnHash = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE=";
meta = with lib; {
homepage = "https://tandoor.dev/";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix
index 887cdb8760..829def809d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix
@@ -66,7 +66,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
django-storages
django-tables2
django-webpack-loader
- django_treebeard
+ django-treebeard
djangorestframework
drf-writable-nested
gunicorn
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 98da59a1d2..dd6380449d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${common.src}/vue/yarn.lock";
- sha256 = common.yarnSha256;
+ hash = common.yarnHash;
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh
index 49b6d5f98a..63021d76f6 100755
--- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh
@@ -23,7 +23,7 @@ fi
package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version"
-src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256)
+src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .hash)
tmpdir=$(mktemp -d)
trap 'rm -rf "$tmpdir"' EXIT
@@ -34,9 +34,8 @@ yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
# Use friendlier hashes
-src_hash=$(nix hash to-sri --type sha256 "$src_hash")
yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash")
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
-sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix
-sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix
+sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix
+sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix
index 56f4c43624..2ec1097338 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix
@@ -24,14 +24,14 @@
mkDerivation rec {
pname = "tellico";
- version = "3.5";
+ version = "3.5.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = pname;
rev = "v${version}";
- hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4=";
+ hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix
index bfb20c5ccb..5d704acb23 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.1.2";
+ version = "24.1.3";
src = fetchurl {
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
- sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU=";
+ sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
index dcddaab34d..35d56e8be7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
- version = "0.14.8";
+ version = "0.14.9";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI=";
+ hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA=";
};
- cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk=";
+ cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix
index 131cb0f22a..ac50a46fde 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitLab
+, fetchpatch
, pkg-config
, cmake
, gettext
@@ -24,15 +25,25 @@
stdenv.mkDerivation rec {
pname = "tint2";
- version = "17.0.2";
+ version = "17.1.3";
src = fetchFromGitLab {
- owner = "o9000";
+ owner = "nick87720z";
repo = "tint2";
rev = version;
- sha256 = "sha256-SqpAjclwu3HN07LAZgvXGzjMK6G+nYLDdl90o1+9aog=";
+ hash = "sha256-9sEe/Gnj+FWLPbWBtfL1YlNNC12j7/KjQ40xdkaFJVQ=";
};
+ patches = [
+ # Fix crashes with glib >= 2.76
+ # https://patchespromptly.com/glib2/
+ # https://gitlab.com/nick87720z/tint2/-/issues/4
+ (fetchpatch {
+ url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch";
+ hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc=";
+ })
+ ];
+
nativeBuildInputs = [
pkg-config
cmake
@@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://gitlab.com/o9000/tint2";
+ homepage = "https://gitlab.com/nick87720z/tint2";
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
license = licenses.gpl2Only;
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
index 14d3cd8f0c..3d85939b37 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
@@ -2,19 +2,19 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
- version = "0.36.0";
+ version = "0.38.1";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "refs/tags/${version}";
- sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc=";
+ sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ=";
};
nativeCheckInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with python3Packages;
- [ requests beautifulsoup4 future wcwidth urwid psycopg2 ];
+ [ requests beautifulsoup4 future wcwidth urwid psycopg2 tomlkit ];
checkPhase = ''
py.test
diff --git a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix
index 6337249813..59917a4604 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "transifex-cli";
- version = "1.6.7";
+ version = "1.6.10";
src = fetchFromGitHub {
owner = "transifex";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-5166P44HSRKQ0pCh1BCPd1ZUryh/IBDumcnLYA+CSBY=";
+ sha256 = "sha256-76nmlZFLon9EquM7tQ/PReM1rxkzh7x1rNdaP3n4KKg=";
};
- vendorSha256 = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
+ vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
ldflags = [
"-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix
index 9a93edb30f..83db22260d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitHub
-, cmake, ninja, git, pandoc, pkg-config
-, libGL, libGLU, freeimage
+{ lib, stdenv, fetchFromGitHub, writeText
+, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip
+, libGL, libGLU, freeimage, freetype, assimp
, catch2, fmt, glew, miniz, tinyxml-2, xorg
, qtbase, wrapQtAppsHook
, copyDesktopItems, makeDesktopItem
@@ -8,38 +8,88 @@
stdenv.mkDerivation rec {
pname = "TrenchBroom";
- version = "2022.1";
+ version = "2023.1";
src = fetchFromGitHub {
owner = "TrenchBroom";
repo = "TrenchBroom";
rev = "v${version}";
- sha256 = "sha256-FNpYBfKnY9foPq1+21+382KKXieHksr3tCox251iJn4=";
+ sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA=";
fetchSubmodules = true;
};
+ # Manually simulate a vcpkg installation so that it can link the libraries
+ # properly.
+ postUnpack =
+ let
+ vcpkg_target = "x64-linux";
+
+ vcpkg_pkgs = [
+ "assimp"
+ "catch2"
+ "fmt"
+ "freeimage"
+ "freetype"
+ "glew"
+ "miniz"
+ "tinyxml2"
+ ];
+
+ updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" (
+ lib.concatMapStringsSep "\n" (name: ''
+ Package : ${name}
+ Architecture : ${vcpkg_target}
+ Version : 1.0
+ Status : is installed
+ '') vcpkg_pkgs);
+ in ''
+ export VCPKG_ROOT="$TMP/vcpkg"
+
+ mkdir -p $VCPKG_ROOT/.vcpkg-root
+ mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
+ mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
+ ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
+ mkdir -p $VCPKG_ROOT/installed/vcpkg/info
+ ${lib.concatMapStrings (name: ''
+ touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list
+ '') vcpkg_pkgs}
+
+ ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ '';
postPatch = ''
substituteInPlace common/src/Version.h.in \
--subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
--subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
--subst-var-by GIT_DESCRIBE v${version}
+ substituteInPlace app/CMakeLists.txt \
+ --replace 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
'';
- nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
+ nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ];
buildInputs = [
- libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
- xorg.libSM
+ libGL libGLU xorg.libXxf86vm xorg.libSM
+ freeimage freetype qtbase catch2 fmt
+ glew miniz tinyxml-2 assimp
];
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
QT_QPA_PLATFORM = "offscreen";
cmakeFlags = [
+ "-DCMAKE_MAKE_PROGRAM=ninja"
+ "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
+ "-DVCPKG_MANIFEST_INSTALL=OFF"
# https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780
"-DCMAKE_PREFIX_PATH=cmake/packages"
];
ninjaFlags = [
"TrenchBroom"
];
- preBuild = "export HOME=$(mktemp -d)";
postInstall = ''
pushd $out/share/TrenchBroom/icons
@@ -71,5 +121,6 @@ stdenv.mkDerivation rec {
description = "Level editor for Quake-engine based games";
license = licenses.gpl3Only;
maintainers = with maintainers; [ astro ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix
index c30fc4beaa..f970fe3776 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.10.0";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
- sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ=";
+ sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U=";
};
- cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU=";
+ cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q=";
meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix
index af2e089a54..5b97307abc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix
@@ -19,18 +19,19 @@
, libsoup_3
, libsecret
, libwebp
+, libspelling
, gst_all_1
, nix-update-script
}:
stdenv.mkDerivation rec {
pname = "tuba";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "GeopJr";
repo = "Tuba";
rev = "v${version}";
- hash = "sha256-PSEPpJn/lYpeI6AN2AY73NpOcDkMm0zNqeSdELn5HvY=";
+ hash = "sha256-sLdkSIevz2spL+Q5sS+ugqEbqJTXrLxmszzijtKvY6k=";
};
nativeBuildInputs = [
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
libadwaita
libsecret
libwebp
+ libspelling
] ++ (with gst_all_1; [
gstreamer
gst-libav
@@ -64,9 +66,7 @@ stdenv.mkDerivation rec {
]);
passthru = {
- updateScript = nix-update-script {
- attrPath = "tuba";
- };
+ updateScript = nix-update-script { };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix
new file mode 100644
index 0000000000..ebd274125e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+ pname = "typer";
+ version = "unstable-2023-02-08";
+
+ src = fetchFromGitHub {
+ owner = "maaslalani";
+ repo = "typer";
+ rev = "02aa80b3be8a6c2c9d08d9a56b3fe784adf00933";
+ hash = "sha256-J3wTqWxHEQz1AAt7DfUmpgc7wmfILBtyHuDrmqN96fI=";
+ };
+
+ vendorHash = "sha256-t4zim6WhqGAf1zHmmbJbpVvQcE/aoNL7ZLdjU7f3rp8=";
+
+ ldflags = [ "-s" "-w" ];
+
+ meta = with lib; {
+ description = "Typing test in your terminal";
+ homepage = "https://github.com/maaslalani/typer";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix
new file mode 100644
index 0000000000..d91d8c3ecb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, typioca
+}:
+
+buildGoModule rec {
+ pname = "typioca";
+ version = "2.4.2";
+
+ src = fetchFromGitHub {
+ owner = "bloznelis";
+ repo = "typioca";
+ rev = version;
+ hash = "sha256-gSHJkMyRgJ58kccQAh1bJNveirDaqGjlhrzgvEX5c8o=";
+ };
+
+ vendorHash = "sha256-umtBvcfQoMQdWmQIAReeOkhRq+pelZzPvFsTq5ZwPXU=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X=github.com/bloznelis/typioca/cmd.Version=${version}"
+ ];
+
+ passthru.tests = {
+ version = testers.testVersion {
+ package = typioca;
+ };
+ };
+
+ meta = with lib; {
+ description = "Cozy typing speed tester in terminal";
+ homepage = "https://github.com/bloznelis/typioca";
+ changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix
index 726c749d60..6b95a9b973 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix
@@ -1,30 +1,42 @@
{ lib
-, python3Packages
, fetchFromGitHub
+, python3
}:
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "urlscan";
- version = "0.9.10";
+ version = "1.0.0";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "firecat53";
repo = pname;
- rev = version;
- hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-IvCdc4f784hBM+TEa0zIACz/1/FUnEpGxHUGiS85tt8=";
};
- propagatedBuildInputs = [
- python3Packages.urwid
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = with python3.pkgs; [
+ hatchling
+ hatch-vcs
];
- doCheck = false; # No tests available
+ propagatedBuildInputs = with python3.pkgs; [
+ urwid
+ ];
- pythonImportsCheck = [ "urlscan" ];
+ # No tests available
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "urlscan"
+ ];
meta = with lib; {
description = "Mutt and terminal url selector (similar to urlview)";
homepage = "https://github.com/firecat53/urlscan";
+ changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dpaetzel jfrankenau ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix
index 047622e545..1b8f78cd61 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix
@@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "valent";
- version = "unstable-2023-06-11";
+ version = "unstable-2023-07-31";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "valent";
- rev = "e6a121efa7eb7b432517d610de4deea6dfa876b0";
+ rev = "698f39b496957d50c68437f16e74a7ac41eb5147";
fetchSubmodules = true;
- hash = "sha256-8X4Yu8VY5ehptJN1KtsCuoECtEZNLZMzOvU91j8UmDk=";
+ hash = "sha256-AdW6oMRVIgat8XlH342PEwe6BfkzKVLSadGOTLGwzwo=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
index 90b776d212..c8991cf2ac 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.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
- hash = "sha256-d7oHPe1R0KZaVTTxmed27VZ2PphiQfy7CXYhVKHWUhE=";
+ hash = "sha256-JKhijruaRjdMEbsIrcu2swSCb/nTxwIG/F9c2eGncnQ=";
};
- vendorHash = "sha256-jrXdbxH5hJrd5yyVsTOeIYJciJ6wVTydkD6aSuWYKPQ=";
+ vendorHash = "sha256-IpybcyW4up9QVV7fJCh+2Lrpi571tfravN17vh/G1bQ=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix
index 4755ce24b7..0a803a4bfd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix
@@ -1,25 +1,27 @@
-{lib, fetchgit, rustPlatform}:
-
-let
- repoUrl = "https://codeberg.org/explosion-mental/wallust";
-in rustPlatform.buildRustPackage rec {
+{ lib
+, fetchFromGitea
+, rustPlatform
+}:
+rustPlatform.buildRustPackage rec {
pname = "wallust";
- version = "2.4.1";
+ version = "2.5.1";
- src = fetchgit {
- url = "${repoUrl}.git";
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "explosion-mental";
+ repo = pname;
rev = version;
- sha256 = "sha256-7zSUyj8Zzk8rsDe7ukPaV02HH7VQ+yjh+wM5TZzJxSA=";
+ hash = "sha256-v72ddWKK2TMHKeBihYjMoJvKXiPe/yqJtdh8VQzjmVU=";
};
- cargoSha256 = "sha256-toqt5vqEsflhqFargEcCXrb6ab748mn6k6/RH5d/3RA=";
+ cargoSha256 = "sha256-jDs4KeVN3P+4/T1cW4KDxoY79jE3GXiwzxLrR2HybWw=";
meta = with lib; {
- description = "A better pywall";
- homepage = repoUrl;
+ description = "A better pywal";
+ homepage = "https://codeberg.org/explosion-mental/wallust";
license = licenses.mit;
- maintainers = with maintainers; [onemoresuza];
- downloadPage = "${repoUrl}/releases/tag/${version}";
+ maintainers = with maintainers; [ onemoresuza ];
+ downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}";
platforms = platforms.unix;
mainProgram = "wallust";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
index 24c123325a..c4a764fec9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
@@ -48,13 +48,13 @@ let
in
stdenv.mkDerivation rec {
pname = "waybar";
- version = "0.9.19";
+ version = "0.9.20";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
- hash = "sha256-55ZPqq/tJmF4sNdK72cgjXUWR4YtUfOrpePHn+E9T74=";
+ hash = "sha256-xLcoysnCPB9+jI5cZokWWIvXM5wo3eXOe/hXfuChBR4=";
};
postUnpack = lib.optional cavaSupport ''
@@ -142,5 +142,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ];
platforms = platforms.unix;
homepage = "https://github.com/alexays/waybar";
+ mainProgram = "waybar";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
index 0b76fb278d..e64426365e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
+ mainProgram = "wofi";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix
new file mode 100644
index 0000000000..4e4a849881
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wttrbar";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "bjesus";
+ repo = "wttrbar";
+ rev = version;
+ hash = "sha256-RQeRDu8x6OQAD7VYT7FwBfj8gxn1nj6hP60oCIiuAgg=";
+ };
+
+ buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];
+
+ cargoHash = "sha256-hJCEA6m/iZuSjWRbbaoJ5ryG0z5U/IWhbEvNAohFyjg=";
+
+ meta = {
+ description = "A simple but detailed weather indicator for Waybar using wttr.in";
+ homepage = "https://github.com/bjesus/wttrbar";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ khaneliman ];
+ mainProgram = "wttrbar";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix
index 899468fbb5..abb5d0b960 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, curl, db, libgeotiff
, xorg, motif, pcre
-, perl, proj, rastermagick, shapelib
+, perl, proj, graphicsmagick, shapelib
, libax25
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl db libgeotiff
xorg.libXpm xorg.libXt motif pcre
- perl proj rastermagick shapelib
+ perl proj graphicsmagick shapelib
libax25
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix
index a27c76fde3..812ecfb16d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix
@@ -15,13 +15,13 @@ let
in
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "6.19.3";
+ version = "6.20.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- hash = "sha256-mvEmxN7spyQkavAcjW4bVt7xjtRTP77OwHzJ5UqsSoE=";
+ hash = "sha256-csJfmjKm/uAlINhijeqUsDVTemchlzWqJg/YHtmNlAk=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix
index f2696c36db..7d974bf87f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix
@@ -29,22 +29,23 @@
, x11Support ? true
}:
-let
- inherit (lib) mesonEnable;
-in
assert (x11Support || waylandSupport);
stdenv.mkDerivation (finalAttrs: {
pname = "yambar";
- version = "1.9.0";
+ version = "1.10.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "yambar";
rev = finalAttrs.version;
- hash = "sha256-0bgRnZYLGWJ9PE62i04hPBcgzWyd30DK7AUuejSgta4=";
+ hash = "sha256-+bNTEPGV5xaVXhsejyK+FCcJ9J06KS6x7/qo6P2DnZI=";
};
+ outputs = [ "out" "man" ];
+
+ depsBuildBuild = [ pkg-config ];
+
nativeBuildInputs = [
bison
flex
@@ -76,16 +77,17 @@ stdenv.mkDerivation (finalAttrs: {
xcbutilwm
];
+ strictDeps = true;
+
mesonBuildType = "release";
mesonFlags = [
- (mesonEnable "backend-x11" x11Support)
- (mesonEnable "backend-wayland" waylandSupport)
+ (lib.mesonEnable "backend-x11" x11Support)
+ (lib.mesonEnable "backend-wayland" waylandSupport)
];
- meta = with lib; {
+ meta = {
homepage = "https://codeberg.org/dnkl/yambar";
- changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}";
description = "Modular status panel for X11 and Wayland";
longDescription = ''
yambar is a lightweight and configurable status panel (bar, for short) for
@@ -112,8 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
To summarize: a bar displays information provided by modules, using
particles and decorations. How is configured by you.
'';
- license = licenses.mit;
- maintainers = with maintainers; [ AndersonTorres ];
- platforms = platforms.linux;
+ changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ platforms = lib.platforms.linux;
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix
index 2c188d833a..e40f6a78c8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix
@@ -16,7 +16,7 @@ buildPythonApplication {
pname = "yubioath-flutter-helper";
inherit src version meta;
- sourceRoot = "source/helper";
+ sourceRoot = "${src.name}/helper";
format = "pyproject";
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix
index 586d9f95f1..79d386e349 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix
@@ -1,41 +1,12 @@
-{ appimageTools
-, lib
-, fetchurl
-, texlive
-, pandoc
-}:
+{ callPackage, texlive }:
-# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
-let
- pname = "zettlr";
- version = "2.3.0";
- name = "${pname}-${version}";
- src = fetchurl {
- url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
- sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
+builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) {
+ zettlr = {
+ version = "2.3.0";
+ hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
};
- appimageContents = appimageTools.extractType2 {
- inherit name src;
- };
-in
-appimageTools.wrapType2 rec {
- inherit name src;
-
- multiArch = false; # no 32bit needed
- extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
- extraInstallCommands = ''
- mv $out/bin/{${name},${pname}}
- install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
- install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
- substituteInPlace $out/share/applications/Zettlr.desktop \
- --replace 'Exec=AppRun' 'Exec=${pname}'
- '';
-
- meta = with lib; {
- description = "A markdown editor for writing academic texts and taking notes";
- homepage = "https://www.zettlr.com";
- platforms = [ "x86_64-linux" ];
- license = licenses.gpl3;
- maintainers = with maintainers; [ tfmoraes ];
+ zettlr-beta = {
+ version = "3.0.0-beta.7";
+ hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U=";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix
new file mode 100644
index 0000000000..4a8bcbd854
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix
@@ -0,0 +1,42 @@
+{ pname
+, version
+, hash
+, appimageTools
+, lib
+, fetchurl
+, texlive
+, pandoc
+}:
+
+# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
+let
+ name = "${pname}-${version}";
+ src = fetchurl {
+ url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
+ inherit hash;
+ };
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+in
+appimageTools.wrapType2 rec {
+ inherit name src;
+
+ multiArch = false; # no 32bit needed
+ extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
+ extraInstallCommands = ''
+ mv $out/bin/{${name},${pname}}
+ install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
+ install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
+ substituteInPlace $out/share/applications/Zettlr.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ meta = with lib; {
+ description = "A markdown editor for writing academic texts and taking notes";
+ homepage = "https://www.zettlr.com";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ tfmoraes ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
index 88a683b2a3..8a13341b11 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.10.4";
+ version = "1.10.5";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
- hash = "sha256-aeO1rjKYoO6KF+oe0FKIa8D3j6G01uyC79OvUg9Qpfk=";
+ hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY=";
};
- vendorHash = "sha256-Rh3S7Qy89ctsKlFz0lNNs8pZ5lHG5yB//DQzffD6eL8=";
+ vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index 5f7d0b5ab3..5d9e4c838d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -91,11 +91,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.52.130";
+ version = "1.56.20";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "sha256-TKCAv1gGdAU9KDcrrREPgFjZOPNwTAfLrCh33DAf41U=";
+ sha256 = "sha256-ub44AI0Fu3V8SRhiBrQueJZaSdl4/cI6DQ3QYJfGseo=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
index 225e7a0e86..ee04f9ed04 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
pname = "browsh";
- sourceRoot = "source/interfacer";
+ sourceRoot = "${src.name}/interfacer";
src = fetchFromGitHub {
owner = "browsh-org";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md
index 4c93daee4a..c5a537147c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md
@@ -17,9 +17,9 @@
Hydra). We use these channels for testing and to fix build errors in advance
so that `chromium` updates are trivial and can be merged fast.
- `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via
- Chromium's `upstream-info.json`
+ Chromium's `upstream-info.nix`
- `ungoogled-chromium`: @squalus
- - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built
+ - `chromedriver`: Updated via Chromium's `upstream-info.nix` and not built
from source.
# Upstream links
@@ -35,9 +35,9 @@
# Updating Chromium
Simply run `./pkgs/applications/networking/browsers/chromium/update.py` to
-update `upstream-info.json`. After updates it is important to test at least
+update `upstream-info.nix`. After updates it is important to test at least
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
-reuses `upstream-info.json`).
+reuses `upstream-info.nix`).
Note: Due to the script downloading many large tarballs it might be
necessary to adjust the available tmpfs size (it defaults to 10% of the
@@ -75,7 +75,7 @@ All updates are considered security critical and should be ported to the stable
channel ASAP. When there is a new stable release the old one should receive
security updates for roughly one month. After that it is important to mark
Chromium as insecure (see 69e4ae56c4b for an example; it is important that the
-tested job still succeeds and that all browsers that use `upstream-info.json`
+tested job still succeeds and that all browsers that use `upstream-info.nix`
are marked as insecure).
## Major version updates
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index 7678d87ccf..1e203fc12e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -6,7 +6,7 @@
mkChromiumDerivation (base: rec {
name = "chromium-browser";
packageName = "chromium";
- buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
+ buildTargets = [ "run_mksnapshot_default" "chrome_sandbox" "chrome" ];
outputs = ["out" "sandbox"];
@@ -86,7 +86,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/";
maintainers = with lib.maintainers; if ungoogled
then [ squalus primeos michaeladler networkexception ]
- else [ primeos thefloweringash ];
+ else [ primeos thefloweringash networkexception ];
license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3;
platforms = lib.platforms.linux;
mainProgram = "chromium";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 36e2593996..f555ab2893 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch
+, buildPackages
+, pkgsBuildBuild
+, pkgsBuildTarget
# Channel data:
, channel, upstream-info
# Helper functions:
@@ -8,8 +11,10 @@
, ninja, pkg-config
, python3, perl
, which
-, llvmPackages
+, llvmPackages_attrName
, rustc
+, libuuid
+, overrideCC
# postPatch:
, pkgsBuildHost
# configurePhase:
@@ -116,6 +121,33 @@ let
inherit (upstream-info.deps.ungoogled-patches) rev sha256;
};
+ # There currently isn't a (much) more concise way to get a stdenv
+ # that uses lld as its linker without bootstrapping pkgsLLVM; see
+ # https://github.com/NixOS/nixpkgs/issues/142901
+ buildPlatformLlvmStdenv =
+ let
+ llvmPackages = pkgsBuildBuild.${llvmPackages_attrName};
+ in
+ overrideCC llvmPackages.stdenv
+ (llvmPackages.stdenv.cc.override {
+ inherit (llvmPackages) bintools;
+ });
+
+ chromiumRosettaStone = {
+ cpu = platform:
+ let name = platform.parsed.cpu.name;
+ in ({ "x86_64" = "x64";
+ "i686" = "x86";
+ "arm" = "arm";
+ "aarch64" = "arm64";
+ }.${platform.parsed.cpu.name}
+ or (throw "no chromium Rosetta Stone entry for cpu: ${name}"));
+ os = platform:
+ if platform.isLinux
+ then "linux"
+ else throw "no chromium Rosetta Stone entry for os: ${platform.config}";
+ };
+
base = rec {
pname = "${packageName}-unwrapped";
inherit (upstream-info) version;
@@ -130,16 +162,35 @@ let
ninja pkg-config
python3WithPackages perl
which
- llvmPackages.bintools
+ buildPackages.${llvmPackages_attrName}.bintools
bison gperf
];
+ depsBuildBuild = [
+ buildPlatformLlvmStdenv
+ buildPlatformLlvmStdenv.cc
+ pkg-config
+ libuuid
+ libpng # needed for "host/generate_colors_info"
+ ]
+ # When cross-compiling, chromium builds a huge proportion of its
+ # components for both the `buildPlatform` (which it calls
+ # `host`) as well as for the `hostPlatform` -- easily more than
+ # half of the dependencies are needed here. To avoid having to
+ # maintain a separate list of buildPlatform-dependencies, we
+ # simply throw in the kitchen sink.
+ ++ buildInputs
+ ;
+
buildInputs = [
(libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy
libcap
- xdg-utils minizip libwebp
+ ] ++ lib.optionals (!xdg-utils.meta.broken) [
+ xdg-utils
+ ] ++ [
+ minizip libwebp
libusb1 re2
ffmpeg libxslt libxml2
nasm
@@ -162,6 +213,7 @@ let
++ lib.optional pulseSupport libpulseaudio;
patches = [
+ ./cross-compile.patch
# Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
./patches/no-build-timestamps.patch
# For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
@@ -225,6 +277,7 @@ let
'/usr/share/locale/' \
'${glibc}/share/locale/'
+ '' + lib.optionalString (!xdg-utils.meta.broken) ''
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
@@ -268,9 +321,27 @@ let
# weaken or disable security measures like sandboxing or ASLR):
is_official_build = true;
disable_fieldtrial_testing_config = true;
+
+ # note: chromium calls buildPlatform "host" and calls hostPlatform "target"
+ host_cpu = chromiumRosettaStone.cpu stdenv.buildPlatform;
+ host_os = chromiumRosettaStone.os stdenv.buildPlatform;
+ target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform;
+ v8_target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform;
+ target_os = chromiumRosettaStone.os stdenv.hostPlatform;
+
# Build Chromium using the system toolchain (for Linux distributions):
+ #
+ # What you would expect to be caled "target_toolchain" is
+ # actually called either "default_toolchain" or "custom_toolchain",
+ # depending on which part of the codebase you are in; see:
+ # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44
custom_toolchain = "//build/toolchain/linux/unbundle:default";
- host_toolchain = "//build/toolchain/linux/unbundle:default";
+ host_toolchain = "//build/toolchain/linux/unbundle:host";
+ v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host";
+
+ host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config";
+ pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config";
+
# Don't build against a sysroot image downloaded from Cloud Storage:
use_sysroot = false;
# Because we use a different toolchain / compiler version:
@@ -304,16 +375,18 @@ let
rtc_use_pipewire = true;
# Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
chrome_pgo_phase = 0;
- clang_base_path = "${llvmPackages.stdenv.cc}";
+ clang_base_path = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}";
use_qt = false;
# To fix the build as we don't provide libffi_pic.a
# (ld.lld: error: unable to find library -l:libffi_pic.a):
use_system_libffi = true;
- } // lib.optionalAttrs (chromiumVersionAtLeast "115") {
# Use nixpkgs Rust compiler instead of the one shipped by Chromium.
# We do intentionally not set rustc_version as nixpkgs will never do incremental
# rebuilds, thus leaving this empty is fine.
rust_sysroot_absolute = "${rustc}";
+ } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {
+ # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html
+ arm_control_flow_integrity = "none";
} // lib.optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
@@ -343,6 +416,11 @@ let
# our Clang is always older than Chromium's and the build logs have a size
# of approx. 25 MB without this option (and this saves e.g. 66 %).
env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option";
+ env.BUILD_CC = "$CC_FOR_BUILD";
+ env.BUILD_CXX = "$CXX_FOR_BUILD";
+ env.BUILD_AR = "$AR_FOR_BUILD";
+ env.BUILD_NM = "$NM_FOR_BUILD";
+ env.BUILD_READELF = "$READELF_FOR_BUILD";
buildPhase = let
buildCommand = target: ''
@@ -375,7 +453,12 @@ let
gn = gnChromium;
};
};
- };
+ }
+ # overwrite `version` with the exact same `version` from the same source,
+ # except it internally points to `upstream-info.nix` for
+ # `builtins.unsafeGetAttrPos`, which is used by ofborg to decide
+ # which maintainers need to be pinged.
+ // builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info));
# Remove some extraAttrs we supplied to the base attributes already.
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch
new file mode 100644
index 0000000000..7df73299bc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch
@@ -0,0 +1,31 @@
+diff --git a/build/toolchain/linux/unbundle/BUILD.gn b/build/toolchain/linux/unbundle/BUILD.gn
+index a091491236bb1..d36fd4e652fbf 100644
+--- a/build/toolchain/linux/unbundle/BUILD.gn
++++ b/build/toolchain/linux/unbundle/BUILD.gn
+@@ -9,6 +9,7 @@ gcc_toolchain("default") {
+ cxx = getenv("CXX")
+ ar = getenv("AR")
+ nm = getenv("NM")
++ readelf = getenv("READELF")
+ ld = cxx
+
+ extra_cflags = getenv("CFLAGS")
+@@ -27,6 +28,7 @@ gcc_toolchain("host") {
+ cxx = getenv("BUILD_CXX")
+ ar = getenv("BUILD_AR")
+ nm = getenv("BUILD_NM")
++ readelf = getenv("BUILD_READELF")
+ ld = cxx
+
+ extra_cflags = getenv("BUILD_CFLAGS")
+@@ -35,7 +37,8 @@ gcc_toolchain("host") {
+ extra_ldflags = getenv("BUILD_LDFLAGS")
+
+ toolchain_args = {
+- current_cpu = current_cpu
+- current_os = current_os
++ current_cpu = host_cpu
++ current_os = host_os
++ v8_current_cpu = target_cpu
+ }
+ }
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 3b4826930e..6419fa6a14 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@@ -16,17 +16,23 @@
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? ""
+, pkgsBuildTarget
+, pkgsBuildBuild
+, pkgs
}:
let
- llvmPackages = llvmPackages_16;
- stdenv = llvmPackages.stdenv;
+ # Sometimes we access `llvmPackages` via `pkgs`, and other times
+ # via `pkgsFooBar`, so a string (attrname) is the only way to have
+ # a single point of control over the LLVM version used.
+ llvmPackages_attrName = "llvmPackages_16";
+ stdenv = pkgs.${llvmPackages_attrName}.stdenv;
- upstream-info = (lib.importJSON ./upstream-info.json).${channel};
+ upstream-info = (import ./upstream-info.nix).${channel};
# Helper functions for changes that depend on specific versions:
warnObsoleteVersionConditional = min-version: result:
- let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version;
+ let ungoogled-version = (import ./upstream-info.nix).ungoogled-chromium.version;
in lib.warnIf
(lib.versionAtLeast ungoogled-version min-version)
"chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
@@ -42,7 +48,7 @@ let
callPackage = newScope chromium;
chromium = rec {
- inherit stdenv llvmPackages upstream-info;
+ inherit stdenv llvmPackages_attrName upstream-info;
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel chromiumVersionAtLeast versionRange;
@@ -60,7 +66,12 @@ let
inherit channel chromiumVersionAtLeast enableWideVine ungoogled;
};
- ungoogled-chromium = callPackage ./ungoogled.nix {};
+ # ungoogled-chromium is, contrary to its name, not a build of
+ # chromium. It is a patched copy of chromium's *source code*.
+ # Therefore, it needs to come from buildPackages, because it
+ # contains python scripts which get /nix/store/.../bin/python3
+ # patched into their shebangs.
+ ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {};
};
pkgSuffix = if channel == "dev" then "unstable" else
@@ -71,10 +82,10 @@ let
# Use the latest stable Chrome version if necessary:
version = if chromium.upstream-info.sha256bin64 != null
then chromium.upstream-info.version
- else (lib.importJSON ./upstream-info.json).stable.version;
+ else (import ./upstream-info.nix).stable.version;
sha256 = if chromium.upstream-info.sha256bin64 != null
then chromium.upstream-info.sha256bin64
- else (lib.importJSON ./upstream-info.json).stable.sha256bin64;
+ else (import ./upstream-info.nix).stable.sha256bin64;
in fetchurl {
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
"https://dl.google.com/linux/chrome/deb/pool/main/g"
@@ -135,14 +146,10 @@ let
};
};
- suffix = if (channel == "stable" || channel == "ungoogled-chromium")
- then ""
- else "-" + channel;
+ suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel);
sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
- version = chromium.browser.version;
-
# We want users to be able to enableWideVine without rebuilding all of
# chromium, so we have a separate derivation here that copies chromium
# and adds the unfree WidevineCdm.
@@ -159,7 +166,7 @@ let
in stdenv.mkDerivation {
pname = lib.optionalString ungoogled "ungoogled-"
+ "chromium${suffix}";
- inherit version;
+ inherit (chromium.browser) version;
nativeBuildInputs = [
makeWrapper ed
@@ -213,8 +220,10 @@ in stdenv.mkDerivation {
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
+ '' + lib.optionalString (!xdg-utils.meta.broken) ''
# Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used):
export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin"
+ '' + ''
.
w
@@ -238,3 +247,9 @@ in stdenv.mkDerivation {
inherit chromeSrc sandboxExecutableName;
};
}
+# the following is a complicated and long-winded variant of
+# `inherit (chromium.browser) version`, with the added benefit
+# that it keeps the pointer to upstream-info.nix for
+# builtins.unsafeGetAttrPos, which is what ofborg uses to
+# decide which maintainers need to be pinged.
+// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser))
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
index 380d33c124..b8af11ee61 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
@@ -1,8 +1,8 @@
#! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3 nix nix-prefetch-git
+#! nix-shell -i python -p python3 nix nixfmt nix-prefetch-git
"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium
-via upstream-info.json."""
+via upstream-info.nix."""
# Usage: ./update.py [--commit]
import base64
@@ -23,16 +23,23 @@ RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/
DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
-JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
+PIN_PATH = dirname(abspath(__file__)) + '/upstream-info.nix'
UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml'
COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py'
-def load_json(path):
- """Loads the given JSON file."""
- with open(path, 'r') as f:
- return json.load(f)
+def load_as_json(path):
+ """Loads the given nix file as JSON."""
+ out = subprocess.check_output(['nix-instantiate', '--eval', '--strict', '--json', path])
+ return json.loads(out)
+def save_dict_as_nix(path, input):
+ """Saves the given dict/JSON as nix file."""
+ json_string = json.dumps(input)
+ nix = subprocess.check_output(['nix-instantiate', '--eval', '--expr', '{ json }: builtins.fromJSON json', '--argstr', 'json', json_string])
+ formatted = subprocess.check_output(['nixfmt'], input=nix)
+ with open(path, 'w') as out:
+ out.write(formatted.decode())
def nix_prefetch_url(url, algo='sha256'):
"""Prefetches the content of the given URL."""
@@ -160,7 +167,7 @@ def print_updates(channels_old, channels_new):
channels = {}
-last_channels = load_json(JSON_PATH)
+last_channels = load_as_json(PIN_PATH)
print(f'GET {RELEASES_URL}', file=sys.stderr)
@@ -225,9 +232,7 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit':
version_new = sorted_channels[channel_name]['version']
if LooseVersion(version_old) < LooseVersion(version_new):
last_channels[channel_name] = sorted_channels[channel_name]
- with open(JSON_PATH, 'w') as out:
- json.dump(last_channels, out, indent=2)
- out.write('\n')
+ save_dict_as_nix(PIN_PATH, last_channels)
attr_name = channel_name_to_attr_name(channel_name)
commit_message = f'{attr_name}: {version_old} -> {version_new}'
if channel_name == 'stable':
@@ -238,7 +243,5 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit':
subprocess.run(['git', 'add', JSON_PATH], check=True)
subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True)
else:
- with open(JSON_PATH, 'w') as out:
- json.dump(sorted_channels, out, indent=2)
- out.write('\n')
+ save_dict_as_nix(PIN_PATH, sorted_channels)
print_updates(last_channels, sorted_channels)
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
deleted file mode 100644
index beb0c15037..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "stable": {
- "version": "114.0.5735.198",
- "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9",
- "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92",
- "deps": {
- "gn": {
- "version": "2023-04-19",
- "url": "https://gn.googlesource.com/gn",
- "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
- "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
- }
- },
- "chromedriver": {
- "version": "114.0.5735.90",
- "sha256_linux": "0i3g79c4vdi5mys295lpzmmh0pgxhh14mjmz9amhq5rrn7w7wy57",
- "sha256_darwin": "0l0nzx64vrr2wggwdyrcv0xbv79avr431cppprl4dg62b39wkgba",
- "sha256_darwin_aarch64": "0z549y1w855ljia5w8sf9w6398pnn89y28pg26ygqad888b3msql"
- }
- },
- "beta": {
- "version": "115.0.5790.40",
- "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58",
- "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw",
- "deps": {
- "gn": {
- "version": "2023-05-19",
- "url": "https://gn.googlesource.com/gn",
- "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7",
- "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"
- }
- }
- },
- "dev": {
- "version": "116.0.5845.14",
- "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675",
- "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2",
- "deps": {
- "gn": {
- "version": "2023-06-09",
- "url": "https://gn.googlesource.com/gn",
- "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d",
- "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"
- }
- }
- },
- "ungoogled-chromium": {
- "version": "114.0.5735.198",
- "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9",
- "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92",
- "deps": {
- "gn": {
- "version": "2023-04-19",
- "url": "https://gn.googlesource.com/gn",
- "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
- "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
- },
- "ungoogled-patches": {
- "rev": "114.0.5735.198-1",
- "sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii"
- }
- }
- }
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
new file mode 100644
index 0000000000..5bf8819390
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -0,0 +1,65 @@
+{
+ beta = {
+ deps = {
+ gn = {
+ rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
+ sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
+ url = "https://gn.googlesource.com/gn";
+ version = "2023-06-09";
+ };
+ };
+ sha256 = "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz";
+ sha256bin64 = "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59";
+ version = "116.0.5845.50";
+ };
+ dev = {
+ deps = {
+ gn = {
+ rev = "fae280eabe5d31accc53100137459ece19a7a295";
+ sha256 = "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj";
+ url = "https://gn.googlesource.com/gn";
+ version = "2023-07-12";
+ };
+ };
+ sha256 = "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia";
+ sha256bin64 = "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh";
+ version = "117.0.5897.3";
+ };
+ stable = {
+ chromedriver = {
+ sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk";
+ sha256_darwin_aarch64 =
+ "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d";
+ sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j";
+ version = "115.0.5790.98";
+ };
+ deps = {
+ gn = {
+ rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
+ sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
+ url = "https://gn.googlesource.com/gn";
+ version = "2023-05-19";
+ };
+ };
+ sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
+ sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
+ version = "115.0.5790.110";
+ };
+ ungoogled-chromium = {
+ deps = {
+ gn = {
+ rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
+ sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
+ url = "https://gn.googlesource.com/gn";
+ version = "2023-05-19";
+ };
+ ungoogled-patches = {
+ rev = "115.0.5790.110-1";
+ sha256 = "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b";
+ };
+ };
+ sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
+ sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
+ version = "115.0.5790.110";
+ };
+}
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 3acd530adf..5a09f83355 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,1015 +1,1015 @@
{
- version = "116.0b5";
+ version = "117.0b2";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ach/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ach/firefox-117.0b2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "b8bac9ac088136ab2bfbb66213e80a1a64382d2bd3110ceee75c7b981a512f11";
+ sha256 = "5be5960dbfd290917b99836883dd79bed96b7ce64587745d3a7a5c4d96127356";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/af/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/af/firefox-117.0b2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "09b7bba8b9610932af18899fe8968e0f1014df20e59cca1d138e0c3fc3cf99b1";
+ sha256 = "cb6c501f6e1fe74b6d46ff3de00cca7a9565d687a2938ed290969fb1e8e40310";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/an/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/an/firefox-117.0b2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "5b6675e769b9ddd103bc7d00a13e7a03bec39968eac11204ef9aa15bb68553da";
+ sha256 = "a66c37468d2fbf6622e0caae6b5cd373750f7cfb5b5d95390c2678214312b1fd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ar/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ar/firefox-117.0b2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "f063ee602d56123449011f85de0a0267962dd79071647b92b38d448e56641724";
+ sha256 = "24585670af81ce2bd7003c1f14c7915737d60deacb97fe8f7912832a8221c9de";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ast/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ast/firefox-117.0b2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "f366cce66b6b7e94ef19d76bf67d9fba9535fc237cb3bb5f6158b1567faf4602";
+ sha256 = "0acfcee87d21cdaadce5f6c335f60f40361e64241790c8629ca438a2590518d4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/az/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/az/firefox-117.0b2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "f2b7e8d9f2effac569a6cb520a9e6326544561ad6f9c1a5daa0a257be0b76b3f";
+ sha256 = "1a40539754405f69a0c3d9cf7a76e4e0481f16f85c05f5cec2a0fc3089904cf0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/be/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/be/firefox-117.0b2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "732cfccf574e88d47d23a7e8b5db53c913634c0507298cec05df75f63424beb5";
+ sha256 = "89803701e298fbb09cdacd910f318e8dfb3b47096246ca9e8e162d8eb3599310";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bg/firefox-117.0b2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "568c48f5a1eba778cffc11469b2f9b72bba33f11b56ac82a6d4247ca1af361a9";
+ sha256 = "af4c65bc9ebc1a4529bd6f6834fa6d5566805e424f11c2da3db07427f622be06";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bn/firefox-117.0b2.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "455f7f5e2f35a61a6e9ae47274eec2445cd03c9e92806152b513a2c6825c67ee";
+ sha256 = "e663d1a80f1367b5b6941af98a980825e28b15cb287c1e33a508157dc2abbf11";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/br/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/br/firefox-117.0b2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "542d4532bae454153625fd2de741df976a47122cd6144930cef5871d5908d57f";
+ sha256 = "40aa6681094ace0423f1970b7812bfb8bd9fcbf3feaa485cb23ff21a7fcb5f12";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bs/firefox-117.0b2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "f9cfcbec96bad8db2b9d8e0c2850295efad8710bcd250157bdbdbb3d648c3de6";
+ sha256 = "b12da3d20a65b99a3c43ce358d059d9e071a4be699f65452436b28d286deac39";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ca-valencia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ca-valencia/firefox-117.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "583638798cf0211905b568fba95aa2a6bb83124b9855bcc1f1fb41938e1a3760";
+ sha256 = "d3fbd579d56f2f11e291917b4454d22caec38f7ad1cdffdf4346e1801d89d9b4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ca/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ca/firefox-117.0b2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "f909cc40dbdde4e53d76b0eee067386b9c125c2121c30c2071970cb964efe636";
+ sha256 = "28e0e6dc86dd3824fa6b4703e4cc72c9ef492105763469ee66d9524ecf08a143";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cak/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cak/firefox-117.0b2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "c4fde652605aa213c7d4b6104739861456c34c9e51203623684982d94771f843";
+ sha256 = "cd99652388e4d141dedd64f0af899d8cdf9a6927501505f6e610ee1e33e07542";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cs/firefox-117.0b2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "faf850d13389f2de6a084a976d55ac43cd8860bd8c01a703ba424f4eaf769640";
+ sha256 = "f10daf296e60e96e05e00c49b559f3b765b073f743ba3bb53d14f2d5496f2fd2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cy/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cy/firefox-117.0b2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "99e0331f9de6a5629b3ace5408c8c8704c5db46047e08362cf6cb3fd739302bb";
+ sha256 = "d49fa5e6174cae11dcaaddb55ce441c0edfc87453c256579e84072dab997b7e8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/da/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/da/firefox-117.0b2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "19cb46d2383c9a1ba5af6d3a45ad1b6f3a4824f5b5539596b1210e4405633bbe";
+ sha256 = "dc4289ec28b16734125f51143ed1264a2977a038b9ccb12565909ddf7bba9e40";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/de/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/de/firefox-117.0b2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "01db84b20e3b26dc59cacc75e28c36d1b2a999cf74bec57d514fcd28cea81a1f";
+ sha256 = "cae9b5a538432ca4d9d3f8069f14e2062e1b23d0c3d2265d413d3346e9a8c2c3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/dsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/dsb/firefox-117.0b2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "6d6ac324be1e86dc3c327fbe9eca7a9bd07e8610f0758e7491f8e072e65d6d92";
+ sha256 = "bf636d5851fe7a2fa695fbe7082d0780b9d0bc3ac2690b65c09cc5d15ffed275";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/el/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/el/firefox-117.0b2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "552f376006b17bd3b03bf7b47c905319d91c35592990fedbd459ead8029b7c96";
+ sha256 = "b94b8c113f9c849f3466c50f2f608d54b0ecd5dbc75390184bac509d6763127f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-CA/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-CA/firefox-117.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "9865827f4c325cabfb8860d550a1cf1242a1fe9ccf66b835b97f7e47e36d9d16";
+ sha256 = "4b8a4164aa503056b7190f557aa4e4c8a54d871d40a34505af5ebb27b78bf8f3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-GB/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-GB/firefox-117.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "7b326d8895889be3c6cf13e34856daff7255a022135f2c8a4bea662220afd34d";
+ sha256 = "7218f7c616b1f1d44e897c3a136e9d95783ae656bfe529ecd98b39f758f9d35f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-US/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-US/firefox-117.0b2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "7e8193678b097704dab2f0d15701aac927444c51a4855c46046f5cab2c40f33d";
+ sha256 = "f29362399cb7f700e66ccf9d29c173f26ed73bdd0c8135e198212a9627789f93";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/eo/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/eo/firefox-117.0b2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "5031c4fa734615a0aab4c1193dd9116fb8de37c75ebb3b974216c1dbe6612801";
+ sha256 = "350de0dd1eb551cd35ec7a218ba261d11e932044439d178fe24661f560a5a93d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-AR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-AR/firefox-117.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "7113657bdd0b8fc8aa76be6cddd99976213a80c02566c5d8ca49a90a163036e6";
+ sha256 = "3ae2e20e5be67601ab20921b9e1b8a53972881261f3aa288a5f1fd7d0f20159c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-CL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-CL/firefox-117.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "2164ef71ad9490706e23996ac523cbe63a0471f7185dbd0c8fcfefef288694ef";
+ sha256 = "c241e3d71c44c8329fbeedc225bbd9ea35addeb75b6f76002ac60ac93884a45a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-ES/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-ES/firefox-117.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "5369884a490e329390ae5dff662a71a405e870110f26e8d9767144c087e717b8";
+ sha256 = "05e4daa4351b6927bf300cf3cd95cf25ef749a8ae217be83f88937a18913ef24";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-MX/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-MX/firefox-117.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "bbcfc6e7be3b94e132eb2142de0259e765a5708e3848cfd84bc079b5cffcd98e";
+ sha256 = "1e8bbef69e2e870765d6d32a17f7c81dec5f2683a979fb9a2185bac0982c0e4a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/et/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/et/firefox-117.0b2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "2c6b545653a37f4b5730952c1d6fb57cab447eadeca6b63e01443e4d7cc13bd1";
+ sha256 = "2fbf2abd087dde63ee5c51ba4344c397d74aa2a6c082174b4abb5d390162b020";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/eu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/eu/firefox-117.0b2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "85ceb4d6f92edd628f1668b58f422000bef90a7d0492abc1822d39b61f262b4d";
+ sha256 = "97dfe7170990cc9e1605ed73f86cb2fdccf6ce896b83eca4277bc54d25fab570";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fa/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fa/firefox-117.0b2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "08c1e4f78416b47d88e84860c8a75c4c504543064666de8fdfba223f6b14765b";
+ sha256 = "d694934c93c4c75bc65a0aa969fc544f2a3c2f9534847ae161998f000243ad1f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ff/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ff/firefox-117.0b2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "e1c9e68ecd22532f7b8f7437723e88e890bdddb6a505d752ac21597eb3f6799b";
+ sha256 = "4480f7787c613d2cdfa63ea0afa76be4d7f8fd5976257e7c8e3ee83df2810fed";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fi/firefox-117.0b2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "7f7959a9644d285c260eb3d78e6757aa705188e915c438a09da3a5eb83ac6fa8";
+ sha256 = "8005177aaf38c1ddcdf70c4145bb3b2af333c851adce36b399c133331cb53e59";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fr/firefox-117.0b2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "e54bbce7f261babf234e726753b4bd828ca04ede00391effef17b7673d3a9112";
+ sha256 = "69a5a997e57e01ca402b78a7ba58f65a54de771a2a83912a964788699538c97b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fur/firefox-117.0b2.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "1339cdebb9a69815039b746a605d6553f16608da1e0b6bdb0e7412b9951f4e18";
+ sha256 = "90bbde6112b8293f1bd4441d2def3c1b7b079e64df3caf3c2cc2e9d5d0f8c367";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fy-NL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fy-NL/firefox-117.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "3986fe4ac24c3041e794af5e62dc5d66872f89ce6e3cb53c80461faa0f2f4b66";
+ sha256 = "bdd94ae75e841544506a51f99bbeffe53f76d6cd4225f623594fed3589082e93";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ga-IE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ga-IE/firefox-117.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "0994dfe19dddd8ff6293095dded1f23306c07bacb1a6955b3caf751bcf27ed66";
+ sha256 = "d67b40a50dde8c0ebf4f395cd0575e1042aadfd68261bcb4fa31df6f9fe26f67";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gd/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gd/firefox-117.0b2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "0454979081f2808a4db30a2ca676b0d86b6e5bed323d4d3931fcd8971fcdde7d";
+ sha256 = "13290f13ef8df46fd26112060b61cafa18ff76ab0044b2cf1684d6de79f537bf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gl/firefox-117.0b2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "f3a1900c967f51935d3f721093b75241ebb04e4c8734695492c78ea3a53482a5";
+ sha256 = "7a9afc0af30899cd85ce1d396e892954ee80100993d5a52a16b25802df7491d3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gn/firefox-117.0b2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "9f27a249f2f90be13eb25a652185c3d89f21c0a095a8ddf35310d5227b346d2a";
+ sha256 = "a7be5a715851b6ba9440b7b243408a2e069386fcd6b07bcaa0ee52893fc89900";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gu-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gu-IN/firefox-117.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "c83e792af6a12b094611d9f17aff8ceea56344c27dfaa7a32aec6a9225f04ca7";
+ sha256 = "5c75b3fc7671659907309ffa2596e921d47dae854a1107c5943b024014399bbc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/he/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/he/firefox-117.0b2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "a142cb929a23c6e3a4d7f634eedd47fbe6c9679fbc91a4c1569ed3982e9b879d";
+ sha256 = "92d9a6a76e24086509e5d663c689c0382fa4aca12c5761192949c3bd43ac90d7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hi-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hi-IN/firefox-117.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "6d7b7792105b4b8f45983a946f0a08ef1486badba65aec5b1ca70bac1979d027";
+ sha256 = "738800efab05283a30d8c27eb18194dc4f23c3bc2f622371f6180ef252cc6082";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hr/firefox-117.0b2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "93b52787ecae1daa409fe48812421b291ab9e7d9e7c5ceb0e0783866c14bdf57";
+ sha256 = "6454c78a8f2a98a9b63c6ab756abb26e3a95670de8b11f8f5064bd74910aaad8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hsb/firefox-117.0b2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "69071ce119d25f42bce8ad2be667ade0da17087af4a6d43bf1fce7e5808e407a";
+ sha256 = "2626e53b477cdca02108b8a8b89bb780f74523235af43f03ed66c89fd3adc2bf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hu/firefox-117.0b2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "b4937186a57e2fe63b3c3384f7253aebaf5536da29c54ba6f1ad26ea6607d91d";
+ sha256 = "b76dbdf3b029d2be0b5f9c27c1085f51d674f103f3d0d6268ee8cb655da416bb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hy-AM/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hy-AM/firefox-117.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "89ca646029a2cdd53bb9b843d3b4177c1c18c7957f01fc802bc2a6f4969db890";
+ sha256 = "e6df98bee2cfbcdaf0d3eb4d40c7fef4fa7bd8a40ae6a25fe69936f45982caa4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ia/firefox-117.0b2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "be586de3a9b3bdc583adf6ad8bc934b63c5f991825b92f3a20877757a79f5ee2";
+ sha256 = "95c882ca170917cc9cee44a6bbc62619e1e17fbda11fc91868e0c9755b945888";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/id/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/id/firefox-117.0b2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "12f0379cb5def8d47e6939fcc350d016279cfa67c4a5e18ca5d5abc2f0b33d0b";
+ sha256 = "32b2e51252020d5a488b6889d8d673b378af41c15151b5e6cc4f454aa1cbb55b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/is/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/is/firefox-117.0b2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "250eccd6498dc2a2ff3f494eaee1b0c406bcbc3053dc08ccc497a07a34dd654c";
+ sha256 = "260fda1ddd2734e6f43ec7d359853dd9b326d656c938b9350e52024df12841dd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/it/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/it/firefox-117.0b2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "16dbd81e2805b26134dd1de5ab5f808f8fac779069aba3ada1314bc7da31473b";
+ sha256 = "acb76da212c0c3625123c618a396e1c1200b2639119a68f24aea9bb720aa15f4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ja/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ja/firefox-117.0b2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "33192987ce7480b829dc792504df487cd7ce9df9aeda5e9249e26f7dadd0bb70";
+ sha256 = "aafd622bcf8bc95b4c0ec9e88dad3bc71ecfec2ff8cb1c128a55ae1d1b276c46";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ka/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ka/firefox-117.0b2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "232400d5760eaf56e9bf2607ffa13a705a469f86f60a46119bf17b8bcddd5626";
+ sha256 = "a8ff510bbb825d0fa311d02d164f2490dfc4babab651145733375d0b5c777e44";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kab/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kab/firefox-117.0b2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "303bd4e2b25c75d530be41080740e90bf628820609a0c384229c4eadd34631f0";
+ sha256 = "1bb2462dfa955cef8accdaf42684204194fb5cd572d865e519b578e7003ebfd8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kk/firefox-117.0b2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "5519669e6f20469875cdb51571b5d9fd6b6e11918921a2797c2fdb4cfe8ec555";
+ sha256 = "fcf985556aa7c8ce7a78701612de5c4efdb78a1503b886b07851873459d8ef0a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/km/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/km/firefox-117.0b2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "6b09af241fa921b069229ce815910615ea58ff77a13e90c11a9898050e201db1";
+ sha256 = "20ef1427e02a863eda9bd992a06654dfce6748c1c7bd4517f862b62d26935973";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kn/firefox-117.0b2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "d3ab47b6737b3598166b993d319f08e4e2398ad7d9e785a97308e145c17d0421";
+ sha256 = "0e3fc396498779eeb64fbe5ad024c3bf753c66aac67454130d38b50e8a549779";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ko/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ko/firefox-117.0b2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "d82d5d1462a660c9b7752345efbb97ba9fd85bbbb5a07db3ff97af4d4828d91f";
+ sha256 = "eae2ad60e64e820446fc262c12e457dc588a488124dd12a69954cd54718e0898";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lij/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lij/firefox-117.0b2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "9eb1268c3def8210ad43bdb816cd8177f90b3c05411748962ddb94d608e61911";
+ sha256 = "cc94927ae0749e77874b1bed74245ee75cc9a745818f176461faaa4eec8f9550";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lt/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lt/firefox-117.0b2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "c55fa7f438b491e6710d0e1e45cabc36ce633978b020285e6b2c150afe70b8a7";
+ sha256 = "06244073ade9edbea8d2afc209a17c1093b9256eb7069b8974f179c9a1461db6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lv/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lv/firefox-117.0b2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "494a0f93d62c4f4edf1b4a1f0acc366c11ceb39ee36e10229f0dea4069a14c07";
+ sha256 = "1f1135aeaf6a53c2bc17e5a8c6ce92e64a48c3e6e5b4fa5f182e3ed5049747eb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/mk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/mk/firefox-117.0b2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "2d54ad1b167fcf29bd41eecda9b91b1f07c7e022a3cade1ca39833731414448d";
+ sha256 = "b64978bae5ab9e2cf1c8bb756fee30f906c07e04406960564739f35761593923";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/mr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/mr/firefox-117.0b2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "b646c4b81b1346e41630a3839f7b30f9ffbc0ea2fa185ddf141745e18fbf6fca";
+ sha256 = "6e82be56f8a4f6bed894ecf654fcd4eef14c1635222ccfa81f57645e63e6bc6c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ms/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ms/firefox-117.0b2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "428cbc47808e33d6e83ce14030070deeeb86ab5b1a0bfdd69209d38a3d47a012";
+ sha256 = "1935b6eb9a70b10ee103e614d811048849240f7d3411fc6c77d450516840cbdb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/my/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/my/firefox-117.0b2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "1ae9bd8d9b1af660886e3089d5861dd9cde61f2feb35b4db92e47d97da349ef3";
+ sha256 = "08a4a0aeb9940ce968268c0dd798da4f8af5e18122ae117a9800a4c2693795ac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nb-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nb-NO/firefox-117.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "751b6e20b84c23c496383b41577c822b86dc6ae0bcce70e01b92b5b9e704f969";
+ sha256 = "3b47164175c0b489c882ae026f2fa3b194bcb66fbada68e26d77b90dda438061";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ne-NP/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ne-NP/firefox-117.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "cb44030ccbb421386b53782ef4a9b21b1647609c960b0582ddf6f6c1fcf5e7ae";
+ sha256 = "9cfbec702d4ee33e337f520b791a71876bcfd34a987a6df6738b0581281912e6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nl/firefox-117.0b2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "0c25345450231b342ae76c6a062e370d10be1aa1758125825cec1a23ebf2bd77";
+ sha256 = "2caa7e2cc44dfebe4d1bd275f3d1e1808714d839a8e88460f017e45628918e33";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nn-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nn-NO/firefox-117.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "f25a7fd74dd4cc31573b92532c807c4bdc5b81e4cfc9f9cdcf77e2bcc8cd021d";
+ sha256 = "ff1eb7b00e33a1be9b14f5cc4d225e839c0c31dd18b1edb6a10af910ebf189d1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/oc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/oc/firefox-117.0b2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "388cdc2a98ffa8f1c74198a5dd521a49a14b76cc7ddbb82680281c2f6448a38c";
+ sha256 = "80373bdb425ab51984a282043aae95b7b59b7d7d501324706a5e79701eb75e3d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pa-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pa-IN/firefox-117.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "f319c6e76b663c87065189bd76bd6a181f3e30cd8e58940136ff7caac1447370";
+ sha256 = "0b9685da82df6610268aee5ebcb8667d457a60f3d4a6d3168a36398b0abf36a1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pl/firefox-117.0b2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "c5c30656e1e93c38683264d7d08fb54bd828389afb680d37ef95b8d10fde0df6";
+ sha256 = "bb6957a8fc557c44eb328e0a6a822a2eb4ba04e97c31691e848d54485c86532b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pt-BR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pt-BR/firefox-117.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "71f10ef3b09135a9419252e7b3c000bd9cf3dde7a7b901a612b899ff2b60e562";
+ sha256 = "65157df63022539277c6a820dc30ff4d1bc2b1bb7edff521d102dace291e4727";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pt-PT/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pt-PT/firefox-117.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "fd1a25d85f4293b73517cad84b9e49955547c2e063a5ee6b3388b012472dfd66";
+ sha256 = "ca999f469f6166aede7977924a470957b1ba62b890dff090f558a53ccb420a83";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/rm/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/rm/firefox-117.0b2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "3229f6f3bc3e551cac971d85c2103c7dbab5912f85e4bd0fe5f25e80d6666915";
+ sha256 = "d0b8acfb9aa211733a0236dc2644f3dc42916f986178d5dfac5e0a0080c68600";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ro/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ro/firefox-117.0b2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "40fc13663d288ab0e17b6ae2a33fddc984eb997e72e9dc097e8192f8cc049ebe";
+ sha256 = "454f255701b564573fc6e57a859afd42c247462d55a6e945289f41dae8776ef1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ru/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ru/firefox-117.0b2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "7496bd0225c462605f7c10076f2a494e632d9b850fa8c7c0c8add4e76ecfe796";
+ sha256 = "ce9aedec07575cae626dd5a118b8374e4927431c7f5320a383b1f95ef30a7dbc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sc/firefox-117.0b2.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "e4548e1bfdd80da9b79251b3a52118dfd4df6d41e36c331efa3e1d7e52b92e1e";
+ sha256 = "f45c8b9244c808042d0e766e3b35fdd5a8e29ac8f2ba09082aa98427da031db7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sco/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sco/firefox-117.0b2.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "68ab3f3cae893e3a7233efabcd345dc91817e0df265b7b1de9a4264b27650818";
+ sha256 = "f0a7538119eb3cf677eb67dbbc5aabdc55689bee469187528b7916ec5f8e6218";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/si/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/si/firefox-117.0b2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "7889bd3987008aaa6f0f94b62cf52cdf7f5b3cb3fc186aa494c18a26931bcffb";
+ sha256 = "4c949aef6dce504d571bbb20d8c7f3da238252382ec53f8c9a6998fc6e7e6d74";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sk/firefox-117.0b2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "025018f5bac8047c4b92018c02b2294aa6e0b75f4c840520dd6e3317fde83027";
+ sha256 = "fe9c97f52bfe99f7fbe99670528a47446c944de6a96324b7f736a9b06dcdca0b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sl/firefox-117.0b2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "5f9a36094f528aaaad4b3d9d71226fda78678a97d9e404e9c881d11a8aca3ca0";
+ sha256 = "1472efdd9536fcebe37959379844205fcf71fd18fe8bb4fdacdb310d89b3be12";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/son/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/son/firefox-117.0b2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "2c2abd89a8f10679fda89bcab8e4840776a7ed41174f651f6c85656e9b231ee4";
+ sha256 = "8b39b9fda8b2a05f61413bd8da2850df9c85c6ecebe82b474d43895246f1f1b5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sq/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sq/firefox-117.0b2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "ae820e6019eb546ca0762fea512324ad695b9542ae70969b6af1aa14fe74c7d6";
+ sha256 = "c40a93aed7f359a284e415bec2471e8a2f9a85da1e05169425265aadf0ba3546";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sr/firefox-117.0b2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "3571e800c5a8a8ee8cb6d278295685b6caf86cba9c05e2e938158cdf28bbfd2f";
+ sha256 = "7165e5ade086f3cb1fac0903fd14194ccc3b9cae5fe6799c2044c1a77802daac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sv-SE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sv-SE/firefox-117.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "277883886d73b1955bd67c01095fa5ec2a5d56014f44d5a1ade74ecbf3243fec";
+ sha256 = "2b5f4c1446b91cfe246a37a0c8b1fc85e40fd758d0f65986c0dcf159baab8172";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/szl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/szl/firefox-117.0b2.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "422f86906d958e4ad4eb6284247a34037ff42503f9939789975235d333abee57";
+ sha256 = "37012de37ea595c6ffea426ad67c654b3f7eea380f25cf847f2448b671cfe53f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ta/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ta/firefox-117.0b2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "b6c4350809f2e243fc6e526ef4c78c813fe7502ab644fef207cd94633c94524a";
+ sha256 = "49a427f4a02cd2f30bf3856b2c5f1e99248c1cf8746fb27b67b0eb72106b9ff0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/te/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/te/firefox-117.0b2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "781652110e86636a1c07f7a21eb86cc168c5096f79e0c7237fc9fc7f145e1bf9";
+ sha256 = "59ca40d50cb8f92be34cdbd42be87ecfe65c68b3ffe112bb61417701c402db0d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tg/firefox-117.0b2.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "24fb993f0ac0a623a1be4dd479161d23162b2b66e36684fc5010480382449c6f";
+ sha256 = "2631e84e399f9dcaefeef4ad1a7ecb0fc0d311725a00dbb0e87e3acff58cb485";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/th/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/th/firefox-117.0b2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "a44c5a6c33ecd1adc6874ed36a0178fae38da5a767424c963958a4551e23d8df";
+ sha256 = "624c31fde2b5728710a654709bdae59135323a33a2b33e251feb2fe2f1f027f2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tl/firefox-117.0b2.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "ec3b8cc36c65a4402fdffa1f1e4e86d3e833f50cf1eb590a9305cb20801d380f";
+ sha256 = "3884cbb7806642bc7698c0d0c7b6436e1facba8fef6470bdc4a2abf9fe0c2a31";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tr/firefox-117.0b2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "0b7ab6a6b2a0fe265d504045b326fcd8276f6a9efa01b212c5985eea5a4bcab7";
+ sha256 = "9b1ab72c5c795652fcf1cd6105075114e7fb42becd4cbf5f0ff285a6310c2eb6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/trs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/trs/firefox-117.0b2.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "d881ed260e1ede9c6125b4d337e91012a4114f3c7a97d23691c71772f6bdc57f";
+ sha256 = "acc69edc00fa835e54ac850b5140d0578b75f7af0257c20e0afc4ff68cf5e9fa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/uk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/uk/firefox-117.0b2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "6b562d9ae8215993a28aff22b412d964c1460a417c129888979cc97b2e698478";
+ sha256 = "972afc6d4c7f875f40185a9544a572acb2f8174a9bd828502dc779318b5fb1b6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ur/firefox-117.0b2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "4f067e62f0d435f28c4c9cc2481629686485bd607fd4ef97ad7eb2f69a575adf";
+ sha256 = "03e9ab51177e7f6d8f18e0e02a8d32c5124d9d7aebd12c6a59bbf561bbc7308f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/uz/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/uz/firefox-117.0b2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "075b1ea1e9d2663e5355a61ea0923ae99ba410853cc1bd2935a126a529087860";
+ sha256 = "583afcedbb8e89fae81c2af09db09bfb3006528595f7d4bb50c9d73a7fe9249b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/vi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/vi/firefox-117.0b2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "29b4edc0db6fcbbc962fb71132ea40f3579756ac6ab66409c8f841165e98fb22";
+ sha256 = "910895705c695c0950e4cff30587c3df8cc845e1b4766474701c0e4464592760";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/xh/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/xh/firefox-117.0b2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "9d4ce8fe7e4e3387d8af06fd0a807884b30057c23dac4c5f0ab1e298314f9b7f";
+ sha256 = "3253590a5dc23f74a88be28665066649c12451fefe94d7cf5d49fe541464238b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/zh-CN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/zh-CN/firefox-117.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "36f7d46e728fd35c972c400fc2bd64383a324cd321f005496ddfd801565d05cb";
+ sha256 = "994205cbb71ccb6f95091fba03f89ba510579f2f53c56544269abd29d06165d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/zh-TW/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/zh-TW/firefox-117.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "f7fc92f3b13657167a88f3f8f4406c377631e306cd3b38bc2e5b260045d1ca1b";
+ sha256 = "6b6744c78ce82fa3872d3b1123ab518acf68a0dba6629e6c995c363886a68c27";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ach/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ach/firefox-117.0b2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "db5b086a0e7e8ea1e82c9dc5aa97fa44f95c374e2f4f4e285e0f8ac74e6d457b";
+ sha256 = "674f22adf82e4b501b4dcbc2dde0563c0017fb1fa47a514b96b06f6f8ea6f606";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/af/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/af/firefox-117.0b2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "825394bc2c7abd603daba03dc98023e9d6ae6561afe52c98ef2fe331b8fba151";
+ sha256 = "7e70bb2dbeb0e8eb11b6d7df82c9e1f7575c37c9265ade4f69eeb2ab16737e06";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/an/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/an/firefox-117.0b2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "907b73eaf12fc7d45b54559d47faf261aecf2d6ada435d41964875df5e63c7a8";
+ sha256 = "5094902ef0b75c790d538dd32c06e7b30ae2a5f4ddc25b669557c5eeb438c06f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ar/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ar/firefox-117.0b2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "2b3be725f214bdc27763a33df8ff5dae328233f0bd470b07cb882436528b46ef";
+ sha256 = "ddd97b5f9cc1d93c919c61a84c1bd4436ae6a932391e01838ac224240f982259";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ast/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ast/firefox-117.0b2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "23cdefb62c37a1b87b8b549a40e0a9bfa4d07cd399fe6ed1ef3c9f904b59d744";
+ sha256 = "7acff2731fd81c99b734c3c57a90a1145a1a8114b303758613be61335d6cf60b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/az/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/az/firefox-117.0b2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "154e3802742ecee793a3df5307759210a74c6f2d50df1aa0ea0b5a03ef2d1a5c";
+ sha256 = "c26f43ca801e67a22543310d78f30b47909f4c827c137110d516330d481c4fff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/be/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/be/firefox-117.0b2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "596deb0ce71017805551f79bc0cb0486020c0934a588fed939dd08754f8e6f04";
+ sha256 = "c70cf35c7752403f0094d74be0f666760a9131e6feb8777c5e6f254170387389";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bg/firefox-117.0b2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "0305e6b265430cd052dc3873e5d94690ab63968d7293c80aad5971a82e3d9509";
+ sha256 = "a58ff64c5772f58664fe3b817647a3838eba1a6643509d0eb6cae57c919638d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bn/firefox-117.0b2.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "8572aaef6049cd6c31e41dc27661d7521a7267c30602479a639e7fbd34609f46";
+ sha256 = "e9ea1e2b4297b95c5a6f8a4b0c11401890aceac6fbe522a924ca40e804b66a55";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/br/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/br/firefox-117.0b2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "9f5da7688f27dd1c31c4d79d5bb2417109f31d72e4622a57d3772ba6a3d2a49a";
+ sha256 = "0ae9571cf34f2e15f9adfd6a166e63a4d887f5af290a325bf029184fbeda5623";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bs/firefox-117.0b2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "e8fe2eb1b3e7d43990c93b5e183cc5383baa3bbefdb5897070c79a7cffbeaab5";
+ sha256 = "391a8d56c2f62efab434b3a16dec3c80d03cc4dd4845cf4ca9a7a0e9efca8587";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ca-valencia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ca-valencia/firefox-117.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "cc397ed75c0681e1ae84769d32f78bb2dbb088f531c1da8fc576c0a97c1335a0";
+ sha256 = "d57481627f38a1eefe1be4cae710ad22df3816f975e11ad82fea7d5b9502dac9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ca/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ca/firefox-117.0b2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "e151fe8c256bc55afb195aaf8c43ba8d10222b2253cd8f61a9a3211c11761809";
+ sha256 = "3c88344b0625730372f05778fd1066c3041bec800aab99c39353f1b9213a5165";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cak/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cak/firefox-117.0b2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "889a2dbd923d06e0ba8a06d337af85b64153dbaa486c28cfc72a6e83c099704b";
+ sha256 = "15b3c545e978087d80b6dfe0ecca09743fcebda735eb9bcb580dccf33dcf7bfa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cs/firefox-117.0b2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "969e13b31b2f3ca0b5be66beca0625ec8b1d67dc8b7724ff48e9efe13773f2a1";
+ sha256 = "589803870d6061d4e37f757fe72d830a9b6f4b1126bd3fdebe2c0e6e14e9f453";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cy/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cy/firefox-117.0b2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "98b7dec95803e858e7f57d8fbcb5b609d06650c8ce9d42a4c328b8dfe16e88fa";
+ sha256 = "adae4600fc298dcd2539b81c89b3cd63e8e2cffc9b833bfbfaef2d5d71e9d7a4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/da/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/da/firefox-117.0b2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "e005c9973fb21aff95f68f4eabc28af76c54458e1e49943d6fbf4dcac3f25dc8";
+ sha256 = "34896888eb59964443097e9e94799838e118669195aa4a7a41476849fdae8483";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/de/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/de/firefox-117.0b2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "2c9ae6a06194c0c966131cf8d4b96426625cc9383fdb1876c1722516131e1bbe";
+ sha256 = "f1a058188fa418c2afd252869fb2fef07ef4954543d4b0bdc181f606d7f72547";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/dsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/dsb/firefox-117.0b2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "58c9920d3976dca9238ce0898529a11f89864334b2508707b42aeef0f42fc255";
+ sha256 = "a040ee68da6570b58de852720a5d7e8662f1c896699a07fb217f868f4dd4fa86";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/el/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/el/firefox-117.0b2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "8648756905fd48fbb71b0f6d988a6474412d789459342acffd16c821c86ff659";
+ sha256 = "3f38ea8a360f28f25401de8088189f1df67027f9bd52f0e402c69dd4c8f71449";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-CA/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-CA/firefox-117.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "261147b2ef270422252c6088d85257754da46e925040ccd69a4a818f27604e69";
+ sha256 = "59ef45a6128f219a76c728fec2f71e6293d0f2f76570793951180002da476d29";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-GB/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-GB/firefox-117.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "aafacfa89cfca1efa8622d5f2eace4b5ccbcf081a54e27e6ef6292e6d829dc2d";
+ sha256 = "de4aa5890062f508625b719888165860e37a63a004240dfd6cbe7f3adcbe8177";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-US/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-US/firefox-117.0b2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "29201908690a260c3abc181f684d328917f5b013e550b046c064564cd66fcc69";
+ sha256 = "100574a66d80a7b35f4f115378345aee7e2fc9a1cdaac0dd006c9a340a8e10e5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/eo/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/eo/firefox-117.0b2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "073c38c03fcd21f01e38b58086b5780fb5528e48206d9d56b18b79e0391fb03d";
+ sha256 = "0b53003126529449b56579409cb78cc13843371f22ebde42644395896aaab746";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-AR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-AR/firefox-117.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "15453085e803f187c15e74e2be3117d3a1de9be136183b69c25a5dfe6cd37f28";
+ sha256 = "3dc0055b2d636c1cdf93c4507f2aa9955786e7aea172135ed93c1e8728e78843";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-CL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-CL/firefox-117.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "e743eee78da1b4d3be250c116a0e536cffd05c64f03f7c4d87ddd021bde30894";
+ sha256 = "c292c78e9c51bf01b6acf0f4b1502e02790c8959ec1f4f43a253b15d8b543b80";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-ES/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-ES/firefox-117.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "3a6969ca3b7304674e3298d1aeda5dd7190e809b55e7271ea4893b36ac67db73";
+ sha256 = "a400d50f129fd34df8d82505f1a243c4934e9a694790ad278f879110dc10112c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-MX/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-MX/firefox-117.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "e8ac22797f6785e094eb30b0dbbc3ff2c8840b6bf1ded1c40b667767c12794d6";
+ sha256 = "15b998c84010c6fb28fed96d6e88094e8d6007be271898328e576397222b25a3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/et/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/et/firefox-117.0b2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "820f46c0734b6cd4d58ffcf9abf57e80d8335229294409143b09a29b9513c811";
+ sha256 = "df806c985e24e393fcec3db8c846e8f45a709f76dbb81cca257fff1bad4e118e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/eu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/eu/firefox-117.0b2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "3f5a29ff9da649acd7c5db57d6f97220210382f1482c729f676ea19a646d8a10";
+ sha256 = "c940d060855caaf7a054369358c2d25e6a875c428f525c804c09d114f4166b7e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fa/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fa/firefox-117.0b2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "99d06e8373d3d700906593c0f15ad0f546f52af596a890efe60510f239988a01";
+ sha256 = "6efc141ea385155609ec0852002e8abc0a2d66d949cbf211a30ccaf8c2f1e725";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ff/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ff/firefox-117.0b2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "268e44bcdb7d156d5c6fb2fe9582fc016662e6dd65c8f219bfdb85a77627f06a";
+ sha256 = "e6f34b243ff29097758ca1097523e7b0d5ea203585233246998e711ceb5ea426";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fi/firefox-117.0b2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "df30b7607e35d7e8cff0f91ee7a344c3b3fbb39d83f1eaea855d6daf234ea88f";
+ sha256 = "3ff8401e41192edb8acd7d3b073991d048a8a0851ea67dba74d23e994a5aac0c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fr/firefox-117.0b2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "eb0430164299a03f356ae2ec58c8863ddd73199e95d886fb2e3e2bfd47d8e234";
+ sha256 = "0fc6a622b222d97cd73827d80c8d0f3bdd8f77c181588b905790384bd29f52ca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fur/firefox-117.0b2.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "81a5f3ede8d0f7b7d834b20cdbf468e43586b152a452ee628786df37ba2dc4cd";
+ sha256 = "9de1abff2f0f5b3a90da277ba580f5868175672222312e6ce8d5bed2db91f38b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fy-NL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fy-NL/firefox-117.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "d26a9cbee89f4e93ff123a88f96834bfbeec8dc16dc5093373c9f6182343a234";
+ sha256 = "8f2aaac5148f0ac03204c9034df4b7fc5cdafc3c03c76f8a1e7bdccb7a4c0ee5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ga-IE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ga-IE/firefox-117.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "56c8ecbd5f59fe5bb627450dca2897c8e148df6fd21850c5dcda952750f3aa8a";
+ sha256 = "22cae5d773b5276a74e71f5cacb936fe2c5a13182c6d7cfc2fbe57854e84e472";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gd/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gd/firefox-117.0b2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "5331c5f711a9095f592af78c8aa34081f288c782ce88f22c3713bba8314062d1";
+ sha256 = "1b5e6d3e0f0e4112696e5aaf018d96f950990389b1fbe73797b7856aae59fb7c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gl/firefox-117.0b2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "161474bc0beb781168a036fb82ad1afd52200582b803a59737fe4c2e9d4452b3";
+ sha256 = "92c373037b764e68f8b283a9720bf996e57b13c356fd918d2c26cab8fb9ccad9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gn/firefox-117.0b2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "3ec03ac25e58e422c8403c10bdf6579d3a445bdc9bb460785821707d00ee4ce7";
+ sha256 = "3c8584c884b18d991e9cf2a60cc882ac9b6c36c1a0e72c267a419f9294b538d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gu-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gu-IN/firefox-117.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "33c1e327690864514d4cd90dfa48d0b8a18ea3c9561670fdf08faaaca6330cf5";
+ sha256 = "8b2298e67515d47fc1ec1fc5b7cefdf7df7665b507936cf267c4812fdfbd1dbd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/he/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/he/firefox-117.0b2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "6a25383f22241ed689ede3d70bd5c229ff7f679218ec2555643d9cbb5e9fb11c";
+ sha256 = "e47ffa5982e5054fc9d1fa2dd51ee123c329da1abbcfeedc151bd7174ed2d560";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hi-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hi-IN/firefox-117.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "6e00cb46b6b1ec655c6e32af90efe2219058ef2016320b43299515b5605ea0e9";
+ sha256 = "4cd75bf57cc88872a31a70bef7d6f073cc3d49bf872faf911bdccb43abc38a67";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hr/firefox-117.0b2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "64e1957cbee9d5f68fe05af3a567ffd50ea705b77f769a67ccceaaefafee129e";
+ sha256 = "9d21deb1383927bc0c5b478c03261f8dc3de36302ec8555cdf40b59428f081aa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hsb/firefox-117.0b2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "0ac388e1aebb0deed0ed5c05bd32f1909deeb67760be51135ccdea5fb7af8f23";
+ sha256 = "1b83ee5a99608479b229a3e6f13d4a48e05fa0bd1c52af147a4bea4c7631b22e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hu/firefox-117.0b2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "c28c4916ae05e4f601cd5f1a761c1adb65d6e15bf7d83483bc8f995ff8f10a6d";
+ sha256 = "8cac12a7f90eb3d5459ed40b832c963a832370b215a9cd020381a41f0b90db3a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hy-AM/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hy-AM/firefox-117.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "d5c78b5c919dca4200780acf22e4957a02ab514ff1855f985b7cbd536f29d332";
+ sha256 = "4c51a1feeaa828ccd2fbbcec5d5659e585d0eb85f19e2ac0dbc5083d754b3a1a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ia/firefox-117.0b2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "412e5bf0054df0a50cbb3d2c97b73500d3355669fabd4ead4b9ec72163b9f6ff";
+ sha256 = "d012be5237056163fba871700859ef01516a40cab3a2af96093f606508710df7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/id/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/id/firefox-117.0b2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "b25b5cc3f1377f98a396f11428eb79c6fab804515984895dd3af250980744121";
+ sha256 = "f170449bb6e4b3537540bccb3577189a3f56c3952101f287f864c1053b723452";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/is/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/is/firefox-117.0b2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "cf144e944f95dee2fc7a176a615e3b4cd0405b7e3eba3aa4d1cdf16c93e31580";
+ sha256 = "6583bd2c140859b350605226343c8a6819a954991eac47709b91a3aa1726bb14";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/it/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/it/firefox-117.0b2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "b7e5cc1d2c22d11551bf5af8e9cb96a4df453de9fead864aa8483ed5cf762f59";
+ sha256 = "fdab4093b9517f62f4bfb6055d2ad999189c18307c3ad59ce0fd909612ea9417";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ja/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ja/firefox-117.0b2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "e0437911c63ba8c6f0fba06eb80bfb177f612522c58d78355608a1cf6e4ae394";
+ sha256 = "f9902c2a3b00ff4114549cbecf25960e54340b87115129b26a2a92b66b2c4f6e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ka/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ka/firefox-117.0b2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "bc89dbfd296e968cc5dd9cef660495b62ffcc0c8952941baca4a32df19128aef";
+ sha256 = "7634e8840a7a9c37ee094ca69cc6eb48a9c8b705ccc369464dcd454f6259d0b1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kab/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kab/firefox-117.0b2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "7745a8bb9a99d18851aa05a8c3c735aaf2e4871eaf9a356b862ac7b92072ed68";
+ sha256 = "206c0ee2dc8f56b07e62379077ed8721c3fef692b0acd7910f47cc4277c88535";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kk/firefox-117.0b2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "fe56296b7979219be58e8d5fb77a7f72e56c565a7e64541b94b538da25ae56d7";
+ sha256 = "2f0f08f46a0053841398bed6ed2e3a4e6a49ffbe23843fc10dc783d86b8f5cae";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/km/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/km/firefox-117.0b2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "028416c32fc42132d8d886d290e498e0f2c787f3103f79c00937aa42309479b6";
+ sha256 = "d0af015e51535b3bef8a46956108b5058947468ec528f1c051c79a1392709439";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kn/firefox-117.0b2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "8056ebbd41a40a43eb95220df98295bdabde914a37f25b88bc5dff606ea07287";
+ sha256 = "a98a27e3173f7fd8ba7cffcfc7d470ff3b2983adfc1c90de2c16dc2de2c33609";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ko/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ko/firefox-117.0b2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "75e56b5b8b9f7f627fdb3dc9c3b564b9e0616ff2b4f49deae0f2ff54a5982f78";
+ sha256 = "03b30da223ecd953c22d43b99780056ce5d12a08dd4c1bf32ff85dec6527a78b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lij/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lij/firefox-117.0b2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "4c2f47091b172efde0088fbb6025fbf2d9613521496741d6277b747dd5611919";
+ sha256 = "bc492610a2549b1dab72a8de64eb1b0d3b68ddf73ad9d7926e2c263958de86c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lt/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lt/firefox-117.0b2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "425b64cf349ec8d11f58ee4107eb3cc320041312aa133c51229eda1fc1dd5216";
+ sha256 = "f3019edb15fbc3372e6041775fe8330cad9040821c87213644518d59b3f29c2b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lv/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lv/firefox-117.0b2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "85704741c95de2fca144067e4f0f3d53051d05beb21e464d5e2c1922232d7c0c";
+ sha256 = "d2a7818fe580a365b48d52205b63e2205ea5362200e029ef2822389f2b956d1f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/mk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/mk/firefox-117.0b2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "6e57e96c7c5c5616836e8eb05b5d53c35a4b3ef51456096d32821f584352bf7f";
+ sha256 = "59f72dbbf0be639e728b061bce1fdf07085d099722954f855ef2573d87e543e7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/mr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/mr/firefox-117.0b2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "bec6bdafe6bb92a8b8568945a779aafaa6e679eb69556eac525dc2885057cf02";
+ sha256 = "4ec149737e5de4fcb6c4e46079f9762c6477e9c1dce653fd53f52ee25dd267e9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ms/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ms/firefox-117.0b2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "9f73f9e02cb94711b9d234741304043497da10647e29314571a885759cf89a8d";
+ sha256 = "485222774fd8d7291a2660dea3967f7956b0d0aa430704dce8f7cf5d34fe7612";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/my/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/my/firefox-117.0b2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "50d9aed2759ad1ba9740652a50f55975a0d9be1db7d91508e7117cd49665dfad";
+ sha256 = "fdcbd22170d70dc38fdad90c250f2fc0e61d12cffc9333140b4b663ad1b89a53";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nb-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nb-NO/firefox-117.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "326ccd5dfa384372823714a8fbd534785813eb64ce9911866357c50bc560bb9b";
+ sha256 = "3f5ce0a793b9ad6b4bbbbfd010620df1d087bc86c0fbd4f90beafa6b7da4e1d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ne-NP/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ne-NP/firefox-117.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "d64d1c27b8fbff339bf9a455f80be09b5adc4b008d5bee342e3206704c14179a";
+ sha256 = "e34dd0d396b66c807c97e64043a4991780a352295bd4030d4d40b145b3c24051";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nl/firefox-117.0b2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "615b44ed83f18a36f6b844e9d6d9ad8076b2139de26d9e40c14dd36590c7ebc9";
+ sha256 = "7f82d807ff4a128d8823810330121627020e7e93994b0eb1340684d683b8af4d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nn-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nn-NO/firefox-117.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "a5e6b674dfccccd0746e99147843ef5a53518c09600b8463b725a7bf365aa83d";
+ sha256 = "6dc01d88fc87f2bf918e95fc926b7e8ed2494d7f21bef84a8ed14d11d61ae12a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/oc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/oc/firefox-117.0b2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "cc56bd1394cca429f3ab8dd876a52b08891211eb157aba5b1b3f7dcf7008af82";
+ sha256 = "c8e1c4e9a4f4df353c6c9a197ad1ad962ea62b34027b282864c709da44897b23";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pa-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pa-IN/firefox-117.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "aecfb4613310f8364fc8ad0fad130f72a4db62285d19892f764c7cce0ecd7eff";
+ sha256 = "69e18994d6ee9eb305ae9a97cd20accec246f76c2a0a9b7636e6cca0b478fdd6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pl/firefox-117.0b2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "679374b0e2ccedd15bca6e69fbb91163360f8cfd355bbb041224a49d80fc8674";
+ sha256 = "fdc634861c7a99cf5e10c0818f0c981718f0252b75265bc7594fa7e87933c6ff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pt-BR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pt-BR/firefox-117.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "a0a8e7d70d2a8c1dc35639ef6b762c447adc9aff82f45e4b98c662676b685796";
+ sha256 = "ccb3fedc57e98dabfd29ce402cec8e67c956d0dc557d714011ff67d5754fe549";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pt-PT/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pt-PT/firefox-117.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "39da07221427c9345e97b0459d024cb6594b3114c6057ab9df19979a7f891599";
+ sha256 = "a9614e9f15eca0576bbb81a4dcb80d9f38702a8743fe8e7c08683e9a4d57b3b0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/rm/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/rm/firefox-117.0b2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "3733ba39b413218b34358be737a405fc36f73efcd2024092e419d671126b15f3";
+ sha256 = "23926089dd676ad76ee83403d7cde7c21f08df2a3d90be6fbf210c0b4573e0c3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ro/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ro/firefox-117.0b2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "46fcfd2625461462b8f56a00b9888a62d8aff2ad3985a311794670064c4fe64d";
+ sha256 = "1a158ee87a1eef61570dd07700538f29872cfb9ad852ceee6a150c0e34c8173b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ru/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ru/firefox-117.0b2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "dab3ce08447c69f8a92a9c08ad747c41c9d97947b69aad10ac9ec8b73a2c7f3b";
+ sha256 = "7e71f844fa1a48201991adef53011b294a2cdb664c096c112653fb2da240a3ae";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sc/firefox-117.0b2.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "afd88e349383d140cec709208ea9432a497381ae3ff7a098c90f55649b57ece6";
+ sha256 = "ec009d4e46a29a50bb00a9cb562f8f328eec245f7e51ee0d4ce01af056f4a9b8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sco/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sco/firefox-117.0b2.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "a5bb99b12b79554a5fd94c1f378c6181f3698c11da26b1493d00261e3286c3f1";
+ sha256 = "fa5922982650314aa65a05d1efecdccaec2368789a814229c5426cda7a0ee595";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/si/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/si/firefox-117.0b2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "ca5496f43520008d2b4b358ae55f217d429dc051978151b6d24d8bb397016ba7";
+ sha256 = "79871205175807e178a70468b65ba072fc16706cc92a42d313000d1447871a07";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sk/firefox-117.0b2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "6923c82110644f614d90a974ad61b08a23b3800cc98a19fba3679693cf795713";
+ sha256 = "54b6b1160421cd0ab149f804c38367b4522789ce857c1899a442c9d49a9d5f3a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sl/firefox-117.0b2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "b5c0c027a321fddb951fc35316ff3e339f32dcb79272ee8d63875a1e77d3e965";
+ sha256 = "54a0791d3cefd2742f1705783706f2ee495d819b2846f153ac1d4115b900d0c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/son/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/son/firefox-117.0b2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "296d422ea46dc41ba5fe32e5dfc82ac8769f4487d0386e316532fee3d8f39005";
+ sha256 = "2b914478868dfeef412a88c925bcc7b12189ae562f0cf01bce39597b8210b677";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sq/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sq/firefox-117.0b2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "eb89c11e801fd1089e7942285cacb4d0f675220b46bcf9f19bea6ca8f114d017";
+ sha256 = "e60ee2e21762a43d30c2cb28b48edd406aae275519c1f2396e1bbbd711e917aa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sr/firefox-117.0b2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "61f2c8c752284ad5e64554d49e3054cb26032ce80b1fa92464cc5912b4834d02";
+ sha256 = "58abe25c545849d105c205170f6ba4809e7f72084e9cd86547c454cc7440c93e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sv-SE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sv-SE/firefox-117.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "fd2654d7e0136f9692d4b677d23feb1b8021deb90d66d22aeda242c58b434a29";
+ sha256 = "f9e6c98031ceab6df21eb0cfcd62da23fa18483629d4b135016deda28dab67e0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/szl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/szl/firefox-117.0b2.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "83d735c45c8f332db5875391fd70836e3fd24f4e726328b92ff2a3a319dd83e7";
+ sha256 = "cc914145fd41190032b0b9737f95e3f6d6ed75247a1a431a7061d19ccefd5aad";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ta/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ta/firefox-117.0b2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "8bdcfa9f9c640f01961bf4ce2e20e2b181c71e3c7a5958812e27c3996d7ed911";
+ sha256 = "4322c978e5e1b4fb32d7d266e869ebf1653da89957d10e40b5e5598418cbc729";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/te/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/te/firefox-117.0b2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "e8b51b06401cc9cb4f8cb2acdb7b61d8dbed656da862e69358900d6e7493001c";
+ sha256 = "9192e4559fff799821137f22874bed039ad1ec2013beef9bcbea980d8f3a3f12";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tg/firefox-117.0b2.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "0de057287c0c41686e7af64fbddbb06c7729f0047070dde2dc510207fc44121d";
+ sha256 = "d889d72058830ef898f4599b237c00da1854592f985b9684907caacb2b374fe2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/th/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/th/firefox-117.0b2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "b2ab52574000fae3406d1b1a785abbfcac6929f36e7ceda3f6e94dbc9540c055";
+ sha256 = "67f352a7c6259c9ef7c0afee8907a8ff6f5b1ae218f004348ff09d4077467175";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tl/firefox-117.0b2.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "4e3c341c5a2f04f859c50747d948c2a61a577beb3a2a3b4af234c2ebd8ec77dd";
+ sha256 = "e76bbf9f7d85990e4dc716b2aa162e92df7f9f12f42bda6e13dcbbf03b0f9fb0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tr/firefox-117.0b2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "c775637199e81daccfa60d25b1e16f3575a40d9980d7e5f0f5808b4ad8d6f079";
+ sha256 = "e9641fe3eb7220835590328d34132c41f2e7da1c4eaf7e04f009d7f372247aed";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/trs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/trs/firefox-117.0b2.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "4816338c59b95eea2cb2a4d16da7e2be647dc6a0fc7980b98e9af7de6f60eb6b";
+ sha256 = "fa65898b94c5d9afec9f5929a4c895274eb00b3857bdfc739c90e5ce1763f755";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/uk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/uk/firefox-117.0b2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "0819119ef6c4cf380d1a6d6bb67e5de13eed3c4eefcf815b084b73319f168d7e";
+ sha256 = "37e8e5d812bca673c791fb155ac805e3f2d9bad75ac6b33d91c1046010d95005";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ur/firefox-117.0b2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "ab342a44f56ede8effa7c7f02a977330eab60f3daf6c6de05efcca1e85e1f787";
+ sha256 = "16c7a777e9476ea136e39baae187934b28e88220a32cf0ef7116ef4a70a9160b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/uz/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/uz/firefox-117.0b2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "a99264fd7e873896ee59a125c92d53670b48e727956d970eac47cc87c6dd5e56";
+ sha256 = "0c765d39bc39d454e5d919b85c524bcc52f9efe3109b05b65d33fd87e71065b2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/vi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/vi/firefox-117.0b2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "2336861991c33e273f4fd484155e5e9af2973bd70c417aacdcee813e70d500a0";
+ sha256 = "e8d01f984d03960b5cea326e602bd1630d11a86be9fde837bde08db791340373";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/xh/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/xh/firefox-117.0b2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "d889e0676441ad7121645050aa0441b662c5fffa312f5d0902262d31dee64e9b";
+ sha256 = "0824721f5a4cc3fd340ef2b9a174f0bbaa2f1513b4335ca6921feb72c8e365c5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/zh-CN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/zh-CN/firefox-117.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "b51e73e3780631a3d271c5c0c914aeab26cf42548a88fe38ac421bfa39379649";
+ sha256 = "adce28bc5f1d91d5a11edbb7ccf1148a13c76486783be79471ff5f26a129d3e8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/zh-TW/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/zh-TW/firefox-117.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "d80c354ff846e60d2176f68d5ef71424295b2ad0753aaf77a2e9444ccda48d60";
+ sha256 = "bc0a79202b6566bf9371eeee509eef8025f27147b1aa8f685127123b2e8712f8";
}
];
}
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 9e6bb94a92..adb45c107a 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,1015 +1,1015 @@
{
- version = "116.0b5";
+ version = "117.0b2";
sources = [
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ach/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ach/firefox-117.0b2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "9bbb4940b939082c23bb7ab08c938a128f703c28d502aada9f0216cf0e4b1946";
+ sha256 = "08d7bcf0f862c1d0b1ec98f1134333249c35b26460059cbf5ecd52af6ed5f267";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/af/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/af/firefox-117.0b2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "8d1bfe44fb21e800e4985a95c9ce01f5a69c697abd6f8892804dde3f4b9d47ee";
+ sha256 = "5286b8659461b869945abb10e851b4ed3f8bc203bc5497ff971658ed4f160e96";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/an/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/an/firefox-117.0b2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "17831e8c36aea42896df71579f9853fab03f87e64a5956f818b05b5b7cacb6e3";
+ sha256 = "09a600d0bb529f879819e293730f3b74f63e2aa00a013ac0956f11b899eaef39";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ar/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ar/firefox-117.0b2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "0fe4d6196254d6980e0f73e6b6d372a30b44f227a333333503bc5453122d50fd";
+ sha256 = "06c56084f5875df288392c9b990ccb6b8af3245af9303ae852fc2172249bd61b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ast/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ast/firefox-117.0b2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "57691d55d54d0ea31cee189c03e7e7d23ab7e72d23b05244238d0ec38e257e36";
+ sha256 = "eba456e04f869eb03609ea5ec661daddabe5802ef10c758c31ab2486e43380a6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/az/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/az/firefox-117.0b2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "0d613e0fd22a59f95105f6324e6ce6160de3d38c28e94ce4ba0e8aaf50d34fc7";
+ sha256 = "36badebaaa2df83816611fb7e10002f9bb9b34c1c2333cfb08c96b6230f9b21e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/be/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/be/firefox-117.0b2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "12987c844112f1d1db5341cbdb98f84fc44569a3017fa600a492c0e44ba864fc";
+ sha256 = "244c6e9b810f89a3b620da7e5479973e97915c6b26bce6bf038d609504a9c629";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bg/firefox-117.0b2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "a76964cfcde92d4f53b09c3f36cdb5ffbf427a0edf0c37f8c8c784c821e617b4";
+ sha256 = "ec0e11eb1096823c407ea4cb20570408f62913d7ef6f9104c51885a8e9ec0478";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bn/firefox-117.0b2.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "3e841d48991e9dd6c5d686bee196b29e10419a7d851181bf33a5f8fdfbb821e7";
+ sha256 = "a4378e81a58d2a9399ac17b2a95a46d56b2131a646701676aaa359c899a4a121";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/br/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/br/firefox-117.0b2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "4136e8e0add6e062c707b7b37ff9bd1b509b095ee6a7736f8ffe118d0692092f";
+ sha256 = "f4013ae885313e95db1b33f00731529e4dc7744cccf33b2c867e034e1b2b028c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bs/firefox-117.0b2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "67346962f0799b903b46bbcc830e3ac2ec718d554e09d97df6deeb5fb223461d";
+ sha256 = "3b9aa6dede441bd95abc9790f62768c04658aaac75a4deb5a715f649b2884066";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ca-valencia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ca-valencia/firefox-117.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "c1b5edce12aa15d3be46c48903f7cbf0f229f8a25f8eeaa2c7fe8b1e7688a7af";
+ sha256 = "55e556bf325b58fa952cbf7f1c55bbc74e74dd6c35888d45d8d55986d011940e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ca/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ca/firefox-117.0b2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "01d688c83a2c380cca544d4b201a6206854513e9a6473cbaddaf7a98d4b5c2c8";
+ sha256 = "5e58df0160486795689a87469dfa4f3c358df54975159ddd3e9d023a596e8461";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cak/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cak/firefox-117.0b2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "03fb4e7158a98ac51e81bfa49c46e615526abf5c778f7432c39c4b2affea9c3e";
+ sha256 = "82c9ee334f146731f8ecdee8edceff83a0dce8ad7b6003c539fb127324094700";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cs/firefox-117.0b2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "e8b46a90cf1e79915c48eb86dd521307cc6a690eb80cc60551e6619e3c82d2f7";
+ sha256 = "b933100ee4056f5e4e56aef0ade2b03dcc8b70a04f6f09e839fa29d959ee9c80";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cy/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cy/firefox-117.0b2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "1359b57e63c93d12ceab4c0a9bbe34fdb10dd63ea4e1acb2880c25fa2f97b9ad";
+ sha256 = "ac0c728c15e175731dffd7745de50720c8649abd5d49dc0fd9c48e544175f5bc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/da/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/da/firefox-117.0b2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "6543dd8fd55c3c48a97841c0bfddefb4d89f5343af8fdb44be251027b254ed78";
+ sha256 = "18dc59d522c75ce890e91d1521c4efe206248d1dcf015092709ad56cf6e0afd3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/de/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/de/firefox-117.0b2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6f741ea240ceda836a6eda5d6adf9f2752562b490b5cae1c4ddec161e8c00ad8";
+ sha256 = "19139e401f30604f3b472a5603082a50bdecab8dbc8ac5c667c916a0b3fc5243";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/dsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/dsb/firefox-117.0b2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "5dd1b14a2bf861f579be41f4d0de2970ffdc99ab176d409164a1d406bcb9d4cb";
+ sha256 = "720880f54637c4b23a4968b56620085e4224711e5cfa51e933d258bdbddb4a5a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/el/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/el/firefox-117.0b2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "0b59041d0ad1a4bff0f9a596f9baa373d6c3195bd8e9026adc8cf83e228c5b09";
+ sha256 = "35ac6d4585bc30fe72ea98f860b42e84d8ad361358645d5a50bd52d26af67b27";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-CA/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-CA/firefox-117.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "2a8826db1c76d4b87470916963be08e5796d75e39905d703cf773a06512a1f33";
+ sha256 = "0e230f4b59482b0b050f6357d42bb687ec4a0da8baf48863710a8ca58bd64598";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-GB/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-GB/firefox-117.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "a4275c8d1e7349c1caaf762d1f9ed988d28e243afb559d9ceeb4599e768570a7";
+ sha256 = "f36eb33aa2e28b459824d3ab765a678cff5bd158c4dba64a196ee86213951f83";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-US/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-US/firefox-117.0b2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "dcdee4d1074af06ebd7f1d5381cfc3dce04fae9adad32a6017dfb58173a49857";
+ sha256 = "c8faee63cdf678e606f71aff0862cbd495480fdbcb0ff335e0c57267fbbf6eb9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/eo/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/eo/firefox-117.0b2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "8353acec011db126b600b3d8fe00b19b906beaabc1b7b76a378307492b708808";
+ sha256 = "d0762e9f11104abdbe6af659f1cf6cd1f96c61cf25fbf604332411004f14186b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-AR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-AR/firefox-117.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "5450443e0d7b04f630fa271786594005292cee235cfd4024e3beea6084e1fae9";
+ sha256 = "ae3344bd24c5640ff22ef2fb99001b891270917bcb916b10ab9cb6724bb9003b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-CL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-CL/firefox-117.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "8f17c5a0e34518a867598f29390b9c46157a3d80f57cf49a577db8b7910cec10";
+ sha256 = "b77a8ef75a27a8f3f640eac8d938b62415a3f95a80143abd84cbeeaa2b6bb772";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-ES/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-ES/firefox-117.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "732986fad6fa0b945d184fd3e337023da57aece055f1eebad004537e166e0183";
+ sha256 = "8b0fd46297ea383ffa30d1c7b6cd18ba71c05a303d4786b2a533bb8bcbc3b694";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-MX/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-MX/firefox-117.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "978ee64f2a4d7b38f7bfd73a332b8c0595fd7003e55864e87f2ab72c7c1df3f4";
+ sha256 = "5a66510acbe5db601368f8e0062c6c816316f1553afc709aab42941ee09b3509";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/et/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/et/firefox-117.0b2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "cac892189fbc4509319d38b1659dd3252dbafad89191a38e409f2231e7f94f59";
+ sha256 = "33ce87dbffba3abffd6e6d742b9b0d3a6d9cbe5fb5fb63228204edd77106e0fa";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/eu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/eu/firefox-117.0b2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "3ea4a47e25963262e924cc05ea81c495c98df3a92c6f2917e0be428da98caf5d";
+ sha256 = "646c6fb07b37581db321d4f3b5a8a37acdaa868e0eebb836583ed1172334868c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fa/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fa/firefox-117.0b2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "a3d7917f338c4cca2cc2f60cf67568956c304cd12ec88f031d54ff0e0d520775";
+ sha256 = "8b509dc4d8d267feb76954f0641d2ce40835a3271dc9ce4773fefeff87918a44";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ff/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ff/firefox-117.0b2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "d0851545c5f9a3712f0f43c58efa16217d85866db9eae058e4872df2a1c25012";
+ sha256 = "b5f320609aaf7915c119b9daac62b840d27b75ff3aa818cb5e544e108d32d2b0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fi/firefox-117.0b2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "a3ca9dfffd544ca40b51a54110bcc1ee6c7e9ac0b2bfc639b044d348f02d1bfb";
+ sha256 = "69acee03128734f92b24c4a0a2ed8259f0a5c738c2e6ac105b4b5c37fad6515e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fr/firefox-117.0b2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "efaad8637c20badd49ebed750d35347e23122b1dc2950701d11c72dca19b48a7";
+ sha256 = "8673ffec2d180bc5032d7843451f6674fce45eee124ad4f5dcba859766c10ad8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fur/firefox-117.0b2.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "a13936666cfd92972075814fe3d28b9772098c04e1316d5c4e18cfd51bff4e2f";
+ sha256 = "44663b389e26b4299044a01bf446be2de2ba6aef49b5496a17e7f283844f9512";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fy-NL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fy-NL/firefox-117.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "5a77f56fdf724fb4c1ba22031cde09b1162bed1687bd8731bcc4a2d181158db9";
+ sha256 = "c4819443cb54e786efcac84ba34e9fe67fbb7cb6f269a7d72a253a9678507d55";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ga-IE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ga-IE/firefox-117.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "cf3f528c10925b6e2f7dc29af6d7482de3078a6f7a6558aec5bfa0a6fc208869";
+ sha256 = "ba752c92e9aa842d227522a4ecc23cad14043f52d757f39ffdd83f2647da87be";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gd/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gd/firefox-117.0b2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "1ac32ab45474be72375e60fb918d1e0e05660224b7fb2e9bd4ea3ee843586274";
+ sha256 = "49a111b6eea9d357de2f1dca5607463622dcbdbde0bac512f792993641e4209d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gl/firefox-117.0b2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "4e3ec830483236cbd9a8cb8a11073f9df86782eb7c9945e83e28ea4110fec17a";
+ sha256 = "bd6b23e8cc8837cf48e29d6329814df0fe518c0cb8a562989802c17a2c7bf361";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gn/firefox-117.0b2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "0f7f99a5e476cc326aaaa1daa5c46acea01c251faa764e446b1fa54eb68fbc2d";
+ sha256 = "075a90ce96d5225855e74bbbb81d3c97cf492c7999afda81e19c434b72a963da";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gu-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gu-IN/firefox-117.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "9901b3fde114d69588e415ac6c9e5eafa112b5a07137add8f381ccdfe1871837";
+ sha256 = "3dece4effb88aed44b97c56ff3c0ca5b0c791050daaea4c857d6eb0dd6280ae4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/he/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/he/firefox-117.0b2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "c510b05ea5e7c3e8fd9a0bb2407580c4c505e6fac4287ff342d98f89a33db8e1";
+ sha256 = "e5a9f8e8d1762eb20ce8f9275c8d1d39b89898a6d4171666fa2547236653448f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hi-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hi-IN/firefox-117.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "e2e9cd72cb878e5e4a9e1df380d63592981d93782b07345a3276675e0d4d9612";
+ sha256 = "8ab570186883db665811166cbb6e54f3967bc135b434935c803e54ce33446305";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hr/firefox-117.0b2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "71d79bb87a0bf0f1bc35fb5e649637c355f0f159d1d259e316dc6ffa634730b4";
+ sha256 = "116f955b10213eb475e950ed667c22b2807805374c128b2c62c90a27c7b09faa";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hsb/firefox-117.0b2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "b789306192759b7a8362c0e96218b672ff4aaa59284940d7be0d017d8d308364";
+ sha256 = "0160a52f6ac8f4515f4b66a3cf7ff9fd8c1fb4423e334b765f56521d4cd8c921";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hu/firefox-117.0b2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "68a4da300754165c7ba93e3273d90bd3d9863c457b25d6dc24113dcb9eefc68c";
+ sha256 = "c3a33a833c678271db77ba68f8d470bacd985a36d32eb12805f06cc825f69efd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hy-AM/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hy-AM/firefox-117.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "4ba2a4dd17eb4eb4e17a6fccc0b7e614727be2960491d54438283e233b544171";
+ sha256 = "ea72903b2251bbc1e9563c0af655ee0a43133f6b8ad5dead51d73c2af1a46f10";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ia/firefox-117.0b2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "d5e8255fc4b2af1c5e96568434cacbe0c5472f367816cd8faf13b45c65b22633";
+ sha256 = "5a7018c9366ba708b5e4183e0ea3632d9ada23017cdaa261254e9ba289e936a6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/id/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/id/firefox-117.0b2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "ec930eeafe23b850fd01d43651cbd1f60f0eb8956163d3344813aff759fde5ff";
+ sha256 = "3c61a962c2fac6f6a89cc7cdd2803de3f4937ff7084133c3104b8be0f37ef923";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/is/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/is/firefox-117.0b2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "e98564458a6dec775226cd74406eca684928db89a11012ceef8cdb1bd5e9240d";
+ sha256 = "f3de4793e6745a98dddd58ada32031e807f146c0be08f797fbd7d4c105f0bd90";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/it/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/it/firefox-117.0b2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "c2b88116a25894a3ae969c4868079c35998f26f9ace4f3ab59480c482d8616e5";
+ sha256 = "afa74a3275d1c94cd9eff2a72f113a363c6a5f9d2b3b818fbf2d6ffcdea48359";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ja/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ja/firefox-117.0b2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "9bed9d4dcc76a47977d5e3f3950655a3e19f2ef59a321a049d5f0f872276bdb8";
+ sha256 = "428af569236c9309c6c9604d9202c8d42520d8876b4c4b8f81ed393a4e94e95b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ka/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ka/firefox-117.0b2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "c2f91ac70e57a7687d6760712d9bc09df29ee9ec529e28019727eef165bc68c9";
+ sha256 = "6c09fd719915bd08c77cbd7568e80dd365cf35f92286edc2aa250f13866abb5b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kab/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kab/firefox-117.0b2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "07470a1a7f911035b072d506d34807941bde1b44ef4be194283402e3485176ac";
+ sha256 = "0bae08a35c4b568439d3083689e9b67670989bf4daa42b65a89df7a30f5d961f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kk/firefox-117.0b2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "54145722c779687f888cb7c46b2fc9f73eb66b52692af87076a9adfd4307b3a5";
+ sha256 = "d57143735f3fcd0f93993fb8a095180f28325a585f24f217c949338d5724db24";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/km/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/km/firefox-117.0b2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "985252e7b7b0c6c46bd47e4262ea40aeda4617c111c5f387479f6b60f3afb8d3";
+ sha256 = "11e19ead61e405a04a0ea90256c9980affed0a108c3cd2746e0f4a5aaaa625fc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kn/firefox-117.0b2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "f0521cb6d6b359f7e1f5102d0890aed881779ea3bce29f6c45111ecd63f9de3e";
+ sha256 = "c30d4acb50a5b28d35447528fae40bf7ae56bdb606c8eb0de1d006bb11ea397b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ko/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ko/firefox-117.0b2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "4178338298ac6b210509594b19f71f71ca9abef831e301b357f746ddbcd12fc2";
+ sha256 = "ae25dc8d290b3181aea7c59a5097f4356aedfda4e945ffd6d14d51e198464740";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lij/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lij/firefox-117.0b2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "18ae0adefd8f0fcc1f92c2a2dec922c5db6bbee570e8d76902bb473272eb3cf6";
+ sha256 = "0c7b229256c096462eb74ef70531fdae586a748174cb0bc3bcc00f8356ae7775";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lt/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lt/firefox-117.0b2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "2a725af3be4460d9c26e794e5a5c990a14c724b0d7c4831a140e32a4783d4f75";
+ sha256 = "b68a443041b224a0ca8f7b6a3995d337594e880c9a85928b764dbc2aaec6891c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lv/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lv/firefox-117.0b2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "51a081450b7278b78dfc42ee5f7f69a34c6c7c2857290fde920858178834eed4";
+ sha256 = "24ad5a0c8a399e893b9b975b955a28b2d6aa5307ef71f0b58b427f4181212e9e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/mk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/mk/firefox-117.0b2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "61499e809c0c49563f113684fed133e0d768afd4d4131f7c98622bced65e77a2";
+ sha256 = "d346538b834adc2f710be22cfa13661223c7a4e2a7a0c1cad9f4cd720dfb5811";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/mr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/mr/firefox-117.0b2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "e10507db2730ae374c4327df5f8f3636d75834aac26123a0fdf467a246102eea";
+ sha256 = "7640d344039ffd36aadca3370ad1320ebb73f2cf3ce95f95d9100a3a3a22357d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ms/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ms/firefox-117.0b2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "96b7d5c090e4ab79448a5a0a96805d8edd2448dccb26bb0a01bbe235ede1cdb7";
+ sha256 = "b75c2aef50aab8dba0833afbc863f94e1e0995a8970d92f426da7ef41eb3936e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/my/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/my/firefox-117.0b2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "9fe9497421e76e64108fb0731c61dff275cd6c7f60c84eb5f2cf452bdbd1b937";
+ sha256 = "cce53b1f34cd8f83756d657c8aac0eedab0b4ed12b278991c6c53e5407c6255f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nb-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nb-NO/firefox-117.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "f29a33b95aaa0dc20d5a29ecc75b12ff86d390a7962ff08fc0b4bb040c21422d";
+ sha256 = "42616b99958178ad4b4bfd1f6d5179e7ff85ae38c8c87f2d22b2dfbd09e35282";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ne-NP/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ne-NP/firefox-117.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "ad43efbf81fb877940435da8b87ebf844502da60e5b5683dcadb8bf37d796d3f";
+ sha256 = "d7c61ad37f7a4d1799640141a71d216b7aa286b70ce7e06357ac82a22887c06e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nl/firefox-117.0b2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "210d99944bb56d418f47ea7bf8880a4422ce0048ff7275b368ed16b5b9cf92f4";
+ sha256 = "fa8324a01507d18c6b8cc2afeec5f9187a3970cdcda87794ad2145481c4eb451";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nn-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nn-NO/firefox-117.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "69c2cf3edb67e1cd22ce8776a2e45b57ec770f08edf0d4007b86b3dd5ab54f8e";
+ sha256 = "f6af2df55301f16efb5f02f65bdcf43416951fad8763b61de7c776162344f2a5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/oc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/oc/firefox-117.0b2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "4cdc3d9833f6d813dffe9f65d5ca1f4deb4290fd5127282b5f74b936186e44c9";
+ sha256 = "b52637ca1e87749f9963d292560da1ade938395b2d2888b617e363ef557c37c3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pa-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pa-IN/firefox-117.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "4425772fdb76f06696113b254162d1b12eb5daab5ca47ae8da6a427730b7c34a";
+ sha256 = "ada654c1b96c24c176640610e2279e9aed18e01f9baeacd89f117590ed895593";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pl/firefox-117.0b2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "60b5f5cd2a332252cb6deb181268783a1620b10b519fc03d09dc872b803a63cb";
+ sha256 = "333b262dbbba9cd50ce779c92768bf9de3f9f392f1e8afef1f90c00f36c9aee9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pt-BR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pt-BR/firefox-117.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "c34aa4b9328ecb50f147d11f36b40068ede5d8cc7f999bfe01e9cd4fe066646b";
+ sha256 = "1022496db4b089a8fe9cfbfbc778d5744b7ffa3576567c8687400570b76c86fd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pt-PT/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pt-PT/firefox-117.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "f801f96207e13f32a4c92a8c3d81771593c867dc078a29c6621c680442cf8b1f";
+ sha256 = "b60aca7910a7a0ed4433a70bd60dd435828aeb568f754dfc375ed718d43603e4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/rm/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/rm/firefox-117.0b2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "530f69183566b76738863ab1d35cfeea34388089caabb845835946cac6ea765f";
+ sha256 = "d5099ca371ceeff83f81086719991021ae035cf30046be4eabf34f0dddc27d4d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ro/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ro/firefox-117.0b2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "21716632a24ea27d57573bacfac55051dd136decced8fdf5f4d117e86f014f05";
+ sha256 = "1d6ec98e3227cf42da3de471cfb803ce011056b990b09efe45119c55e3ad5732";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ru/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ru/firefox-117.0b2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "d7fcaef1c71d07cf42b3e7bfc74f305ef75199451b25f573adba45535c49ee46";
+ sha256 = "30e549d2da8109826629545b122669f874b34c72afc0d93c9e079e0db2c99bf5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sc/firefox-117.0b2.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "6fd1c1647a8ae2586cda50403a564ad37b7fbfc3ced2c62ae2dec1934cab3a12";
+ sha256 = "9f8e5fbbc3280a10ff09e2bc06320d6bb7a20563e0feb2ff1ab80c13f66ddf06";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sco/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sco/firefox-117.0b2.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "ca4263b1d21ff1cce8bc43c503363447dc19724abae91c900e3c2632038b2908";
+ sha256 = "c22696faeaad79093b74e8775085fb30aaaacc91aeb9ddc7656a06210e057148";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/si/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/si/firefox-117.0b2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "051200eb96f21c795494b01b94a48d0331cd0c3bc4b9ced8b5e2342e126edae1";
+ sha256 = "f0a7b1e28c0e6f0cff93053767f69afce01374169635674b5670a1b5c8fbf43b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sk/firefox-117.0b2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "615a078479f73d61459d59756e58dacd712245f95510e226d93e26758de43eb4";
+ sha256 = "4bd7119df5fd52d24ecd1f21746bb0b07584f99fd70985bc1ddc55062eaa69a3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sl/firefox-117.0b2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "06249e9b5254da179b924207f81819cd1f4abcc2956bd113e5362e728a531064";
+ sha256 = "b70d91253e6aa44beb1ab1f1914c532aceea78dd4e173b7a1c95e71bf77b9ca0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/son/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/son/firefox-117.0b2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "ecc73e86bfd2e7b7d3344b1f6aacaab6a6d0e11d0bb9df468a5d9c76e5cf388d";
+ sha256 = "62a0788982eba7010f7cdb8f7fcb335e2c3eb9194d65c3b9ad7b7324cae7264c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sq/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sq/firefox-117.0b2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "be624e20ab9355b499dcb3861fb9edaf50ef5cf8e65c5dea511df18a1b25bacc";
+ sha256 = "fb85d86840ad492c7aac3216e056807cccb8dc4722387d8dabe9198e4e3b9a6d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sr/firefox-117.0b2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "9ec8b3ca6e3c8af537ed7e6a0ea08caeb76425a18e0de35a3e1f05250b5358d4";
+ sha256 = "95335bdf009729705cb42fe64c64173480bb2e1cf57ba381588e24cb8f723f38";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sv-SE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sv-SE/firefox-117.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "3750ff90c0fb47e21c57ea6c84bdabfb1459f741aa1d82cc2a1fc969cd6d0438";
+ sha256 = "1f0705e482088b4313339ec4e7ba5954026c0a90dfde5d3454de7ce39e32b220";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/szl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/szl/firefox-117.0b2.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "ccd80051479f0b57c610b4bb9776f002d1e019a3b2c38188f21c14992caa5193";
+ sha256 = "5a3ecd48184f50c93f87c092bc7f6947d581ec94bf13bd8b8bc54fe77ab05b90";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ta/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ta/firefox-117.0b2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "e6247aee65cf2dd3708d591f3674b1c33eb6d52261690e5bca10a22b66ced04a";
+ sha256 = "4bc5df0b1f12f94441e807f2833aed96f6eea4ab1e0b3b8bc72f880ba21b89d6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/te/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/te/firefox-117.0b2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "20b5f9c1f14c82fb200b1be5eecfcc6dbed59459c7aff4c5a9f4ab5e19f9967b";
+ sha256 = "dc84283879450653fc05be5b87c9bd5a7588f772ce093b1098b61dbb433d867f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tg/firefox-117.0b2.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "49bc2d4a95506ff6bad793f8afe31c2bddbfc6a732c37779891abc44c6e0d71f";
+ sha256 = "7154dc9c9d7154f9bb2e65374fd9e6ff2354e8576b2ac43b74fc9e0fa3586b24";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/th/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/th/firefox-117.0b2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "6910f36379df34ab1f97b8b6ebc25eb9dd9b83cbe857b453a4c71c702aac4481";
+ sha256 = "dfc2bccf0b12875a9f41ab4c92e18c321758c5444eaff83d08371db75f1e00d6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tl/firefox-117.0b2.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "788b50ab7fb170b49cce6cbf2785204b25b23bd7120eb18c8ec29a15118b739f";
+ sha256 = "77b8e0fde9d46a6ee93453961c0df3a884346e1c9382c583271459ef032df27e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tr/firefox-117.0b2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "c1ff5a3d891bd88a8fa6f89b2f561600ff9221a77c6edd4d2d217f40a1953aaa";
+ sha256 = "2d83edb71ac976a4800c562279148bd365096a6f1190b18e3655e31718a479d7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/trs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/trs/firefox-117.0b2.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "56f819381a564e4de3ff5968aea21b71312e6381ab29a2739890844310b2cc7c";
+ sha256 = "8178396de71e6b4748954cc4c18889f78490a076a9f665224fc075df995e659c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/uk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/uk/firefox-117.0b2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "8f6ba4cee9824470abb62f5610b3bdde1f4df6a15209a3ccc56af06f776280ec";
+ sha256 = "bef3102ab0918d76865f73057d99670a339c60643d36a34bfa3d77d5d8b1b27d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ur/firefox-117.0b2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "d2d5bd799a9bd1de740066128a281f8acaa70fcbd8f7d0ad1afe2e6ba451735e";
+ sha256 = "b09154c22386174f157e73b7aae3717ae00e05c1496c267994f9c7944237026d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/uz/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/uz/firefox-117.0b2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "52acacd060c7ee6dc80164885c74594e4ba066ee981f65110d085ff3aedeb57e";
+ sha256 = "7f592d18df3f777ddca77a04cdcc03e81077ae6140d1e0817dd414e9cb875f03";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/vi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/vi/firefox-117.0b2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "ee0d42e366670c54473814675a9ddf5feb56c340ac756dbdd873307ab0493b07";
+ sha256 = "db0f4465154f2ded785a57c6f7e42c0ca09831002172155877ef7bd88150daa7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/xh/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/xh/firefox-117.0b2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "f8e050a6c12488301a0a52ef6b617bcfc11353da6d7614b0badf521e91010971";
+ sha256 = "10dcfedd7385b253c2c54e666312f989f2ecd4f89b8ccaa3c7a8af5448f64038";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/zh-CN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/zh-CN/firefox-117.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "e98dfc8a86537636f608cd47b92002656e9641b93a5010ff91e4612adb9b1f47";
+ sha256 = "7b9f108a01441f8061e5df76d639c5d3da0af01c279f8e13cad371ce4ebfda90";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/zh-TW/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/zh-TW/firefox-117.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "8f8a1e1ae1daae93bcd0d0aa33e14eb8475bacfa7332b6430614b5a608aaf546";
+ sha256 = "88169d7b0162e26ce08385c7dfbbff4747fca56e468d20c5c6f18fecfb0b4519";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ach/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ach/firefox-117.0b2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "d5ccd23f477053d2fd29536b096947448bda84bc8bd496f6d67ede2645003e38";
+ sha256 = "79035da9cb12a3a1d5b95aedc49b4e35a1cd2c7bd2cf75192e4de8e893c82188";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/af/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/af/firefox-117.0b2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "3531a77ac162a13721060f5a1cf42a0412b00d3545be9361658499c875f65b5f";
+ sha256 = "6a67f68914abcee485d0328714687209d67853a8fc73cc5627a9ea9a66ac063f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/an/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/an/firefox-117.0b2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "7213b9df3794d3882e5f7264e13525d170f7d3b6f6509e9ee6dd9aee5d3b40d5";
+ sha256 = "8ceb7d9d06fc53a82f5d9348bd3fd7857c42417f6b8d04c3fafaac3cfb65da4e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ar/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ar/firefox-117.0b2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "4092fbdf1a2c9984c0636932e3098c6685a50b4ccd47955d4c218b8e22a4ab88";
+ sha256 = "d26458dbecfe2c5517ddf7c4edac4974a995f3235d1c3fdee471008532e2cdd6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ast/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ast/firefox-117.0b2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "c5e12f623e0497ba9058c3346c54756c35ec986d9ad6ba8f318e9150911469a8";
+ sha256 = "f2df64623e0adcc3a616c5591fcfee1a071f7278662550a440f81152abd25f93";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/az/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/az/firefox-117.0b2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "48afd4136bf550d0fbc54ab00fa60ecbdfcf9a5588d2b69eb178834843a3d199";
+ sha256 = "0651ed1b61d8c21794b7fd01c71b001ad2281748a79e7b68c7cf99745bcf0f0f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/be/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/be/firefox-117.0b2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "f68b8e8167a14e414a2c2829e9a8a9471fb53509f02276f12097964982ce6bdf";
+ sha256 = "e3749e5e647dd70033d50f5a62280d72e34e5ba5878e0f74bf7039165ccb3dea";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bg/firefox-117.0b2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "04a8f6a9f3ee83cb449e395248da7e49db5639026c40fa923722b25f6b487102";
+ sha256 = "7a65b012cc02b4d30de1eb0a570a97826b1af9f9af8a330de22dd0f8b9c4b238";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bn/firefox-117.0b2.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "a0ca76eb610b85077a84a6b154e0cb789bca6763b9804e750e2dfada7ff294d3";
+ sha256 = "4e99f11d18135dfa180773b1d1c3247710986f45e7401837a75d00c22e528501";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/br/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/br/firefox-117.0b2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "35b8bc7b4d533b51ee3c5d36fc72625c981674859d71aa8fa4cc35117bf28fb6";
+ sha256 = "ab7dbd47d454864726f7d62e29ace6820b2aa2542bbca1bb2c199ef48411fc2d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bs/firefox-117.0b2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "6100aa7629763300623f6c3880208897e7a12da9bab1bdc616b480ab7ad8f2fa";
+ sha256 = "50b9b42ba59c6ed8d8cab57e4f40d4ffcc9813c61d55f7a1a2558f5c11bfac10";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ca-valencia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ca-valencia/firefox-117.0b2.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "d389421bc508d6bdd0f56bb93dc5a5b2643e15597ce7ba6dd230c9b54d693425";
+ sha256 = "974c1cf8c3c54b7b16b6c86a9c76998330d292fc4f98edde91d671c15a970d79";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ca/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ca/firefox-117.0b2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "776219a92a9cbb3e58fb54cd1f5513a3a26cdec1935040062718b0b1893bc6f0";
+ sha256 = "430ad9ec55366b8f701ae04c3e742c6e3a5a154f05ded686ebdbbd50e782da43";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cak/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cak/firefox-117.0b2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "be34c1f421d99257a3d05a82c48552a5f3aceaf54c0db6cc2137fb3972d29be1";
+ sha256 = "83335010789e56a3562edc9070131ca78a1c8383d76a3a62f133ca1798e89158";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cs/firefox-117.0b2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "8cc51892774938280fadfb5c98ab848d03310b6b8d0897f80d36b65519df05da";
+ sha256 = "92530cf260c896214f37f6444b09cff55e7d11cc53f3b94e5c7fbd551e6db767";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cy/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cy/firefox-117.0b2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "18b6c599d989abd0f9212d75e406237f417fe7160984ec8c4cbc4845d256e8bb";
+ sha256 = "95a57db70e0f77ac171614fa01caa56fdca301b3c281a62be60f1321c9328036";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/da/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/da/firefox-117.0b2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "a3ce7852cc6ab16d6946921ebffa36465acbfe6f9f819dc9091e27f1d31884df";
+ sha256 = "35b14d86d4d920e5e1e18cf41b852d68fd1de606c9a9d9ba0913d59f9d1085ff";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/de/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/de/firefox-117.0b2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "99cba98a623de06364eb6d000eabfa853fc80b7599fb170763a8f626089b28dd";
+ sha256 = "40ff8ac7953e38335cf158231ebcf7508595d9f27a2c6bb5068896a33c77a5ed";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/dsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/dsb/firefox-117.0b2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "975c25e04aa35ab9724d0550bf98b2e4556f0a5af87ae77664f43d56354bdcbe";
+ sha256 = "d087dc5a0953484d34effb02c4e6df0d34e2be8427f94eaf17b702f5f109a64b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/el/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/el/firefox-117.0b2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "ce33673dc2b2f0a65e54b620012b194f1a84a84f01bbb72166c2edb4d3ab12fe";
+ sha256 = "5c44fd4f54f97f4f2dab34de311f69cd0040954791b6aaac4214e53bb8021221";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-CA/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-CA/firefox-117.0b2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "d064bb526f0750d32d2708e63c80e002ca6156f7fc20fee12692bdce16b0ef2d";
+ sha256 = "0448a4f07259f0dae3a2df6e249ab7a5f76bb1a053fbac6056e75062c66ae5d8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-GB/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-GB/firefox-117.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "be2c784aa7e8a48d8955f51cbddcca82e063454a75671c5896d7a80005c7e1b0";
+ sha256 = "fbeb90596bd169e29e22849c2cb37f174a22a136f233895de00234461ad20fcf";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-US/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-US/firefox-117.0b2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "ac8df5f2f46588f4daa2e4ffe9dff1ce9ca75283d6db6cae77b5d77a5e5640a2";
+ sha256 = "1b765fdb1f632e934531c3508295b35b95325585d412cfc9d5f936297a608709";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/eo/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/eo/firefox-117.0b2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "51a3b48855144ef476c4011e978fd01aed48ec84844dc673e46b76eeceb5366f";
+ sha256 = "25d2e49d8ef84aa5c059942f413a72bc8dca6f636ac25d1a182df6e81318eace";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-AR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-AR/firefox-117.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "45febca3ece693d03ed1ce694d3741f10173593692aef6a54c2a9723a1b93e37";
+ sha256 = "921625e533965984bb5e5c9ddfad9c55767a6f9bce6a7cd1603432d0fa060a50";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-CL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-CL/firefox-117.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "441b1292248d7b8c5819dca9639dc0701cf6f456fa7dde0c5d74c677cb074bb0";
+ sha256 = "2aaa814aa0266121c0ccfa4710dd519820dd895812531f619487bc570e7b11e7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-ES/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-ES/firefox-117.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "6007fae26404f2562d7bbb14f3e0dcc734a763ca444c2709ce8d2bfd5276447a";
+ sha256 = "aec5d39fe3e8086f82df108fc17f22d814570a5a60a379eb51a31d333b4b3f9b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-MX/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-MX/firefox-117.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "aa5122e8685fababaf97cc3937261e0aef65b52c7a43a9d843d6cb0a264e753e";
+ sha256 = "54410375256736369d539651682b89083af2d5ecd451c858deed5494f66890fe";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/et/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/et/firefox-117.0b2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "b8142f93a80ccb685063c41ce5fb18607cc270f25be21784d8c2e4a0045a5aff";
+ sha256 = "27183ff7328757720f622aedd66069693a0becf55b41014d86fc29778278f2da";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/eu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/eu/firefox-117.0b2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "1b4af468d79b052992d4c9500b13e43fbbbcebf73df3f669d771d452d9b39dd6";
+ sha256 = "052896639d429b8a607295cf2b7970245eede725a466b5564668973a36495e0e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fa/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fa/firefox-117.0b2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "b9c1a7c410e1f7262408ae273ae671b0ef95b3711151c76a6206a5f3def16faf";
+ sha256 = "b59e34dfa242cdf5b6ea5efcd1386858988693abb031432f8624fb3d2915e9cc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ff/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ff/firefox-117.0b2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "944612ff8fed847a8548548faa58fecb2e6c39f7343a853e93a7a4bf18c1f2e2";
+ sha256 = "29cb0ccfde16c3cfb2d02bc32ff2b943af40b65e9009d9cb238387245cda5911";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fi/firefox-117.0b2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "c88ce10e9646456a0160f175189aa0cb5b06a88a1bf14445f74e330bd48b08d1";
+ sha256 = "31f2a91eb34ff04b8d9b1f8265074f6341ded0c5e4edbc16ee6529779fad2f36";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fr/firefox-117.0b2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "45c559bf2f31ec5f1cd6cc8df0bbc87a882aaf751dae5723d0fee9282d93c3f6";
+ sha256 = "c75fc05c3aa6078c4f6852afb6f7bca3a4cc3919e79fd11f76e877df92dc28f3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fur/firefox-117.0b2.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "b675ea2673823fc6b27de90aa731d68d7e9046b246e448aecd776b09c5da988d";
+ sha256 = "b52d2bd41427085033f69ddc9cf1188f78792c4bc09b7c65b6ba396b5a3e0384";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fy-NL/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fy-NL/firefox-117.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "07504da6c327f42384be1ed87176d781e0e9c6414801712ec534555e543b31f8";
+ sha256 = "f8f70f092757e6ba18286b1024c1260e550fd953e2af30bbdcc9ba7b46f374f0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ga-IE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ga-IE/firefox-117.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "404e47c18ad46935c6bc3a528bb99fedd27374247b2bf0b5304128b8dbfa6e1a";
+ sha256 = "489a41ac49c7b1e90263cdbcafb9c479b0f169c75a615583afaa4446c28fd95a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gd/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gd/firefox-117.0b2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "93cc4c9a9ec99c6f738a8acf6eeae71226fbdcdae136387d0c28648c372e6279";
+ sha256 = "45f4b4b42a2341e1bbac25a1666213a5c9c8ef10b6266590d85246340ec6e3e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gl/firefox-117.0b2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "9fcbbea723d39fb34fce0435121818982add249e456b2ed1f6a1b1652ff342c9";
+ sha256 = "e141d86f5a078911b2a3a172da22907848d5fd5eaa946fdca0200713582b3c0f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gn/firefox-117.0b2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "f962fe0de779a95ce14d828a82ed336573781f83adde61db10abc4a686b6a2dc";
+ sha256 = "5dc5d61472b1000c02f8bdd89e486a599313aeec6de8db7add1630be4165f7d4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gu-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gu-IN/firefox-117.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "6373fff69de803cc5a077ea45eff6ad2ca37caec1b8a9523a7f91d1924377ec9";
+ sha256 = "10091e45534607d9bfcaf58281832f0e2e9ff6ed87d434a48db977ac800b92c6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/he/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/he/firefox-117.0b2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "9f952724b440cf83cff675ec888910a6bff20233860b258001962cf6ff12e56d";
+ sha256 = "688017dbf1460de4319cd0f7b1f9c0bfdc989caabbd22b1c975b5bb2f0bef302";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hi-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hi-IN/firefox-117.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "7dba0c18877f3b74622e8812f01b3a562c0d0956f0d1f1e64cce3b4b044cd41b";
+ sha256 = "83381f3a5fac2b0728805b975b214967e15c6457c7db519544a1efcdfd56f0f6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hr/firefox-117.0b2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "e69297da941dcdea8ac900b170e0d59ccd432112f52608915cdd6695c70cabc1";
+ sha256 = "b2e09455df9df0cfd71997c2967f514d20cffc837126f438c92f618e81e7adc1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hsb/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hsb/firefox-117.0b2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "e03ab81a6615f71cf31b20e2aa3fdb4ead8a0d7f7b9e61616f8e72d2d8709dd8";
+ sha256 = "b5aeb522ade223ab1d303d939a1e74abaff81a052134d9e80d5767f91244f5e4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hu/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hu/firefox-117.0b2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "ae3937ac22ab3db1de9a2f7117acaf3eae5bfc0dab8833e3bf4ef438fe2f8807";
+ sha256 = "18c40b433149361a0d5b5aa44e5c18416e60a47059972cd745e46cc3e595c05c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hy-AM/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hy-AM/firefox-117.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "08928a362b5b7e29e11b676a17667d3fdc385551cdb84db11fc2d7b8bad79524";
+ sha256 = "5a909fe0e143bda3e49e9c7214d3246512d28cdf6580ab86202979a7de637e3d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ia/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ia/firefox-117.0b2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "b48f4a080bbbe202ee75c3c0ec50de81b410a2545f37b40a458a41ad29dea131";
+ sha256 = "4b20fcd2754601f3e9e026ce3b92d604114da2a7ce8f5166ee01a1ee1ee317e1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/id/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/id/firefox-117.0b2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "861770952348540b1417051571d1efd2cc4c63441d088e772bf1b3ab3cced327";
+ sha256 = "996b0952cce4408a0ced116079442d71f7c605af4e18037b788ce3b75c74a3bf";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/is/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/is/firefox-117.0b2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "fe4e2cbf086372d9b98c25dbf8ec7a0797d2caeefe218363b35227c5b1e3616a";
+ sha256 = "6e1f0d4bb1988a4b0e8736e554508302165cdd7b500302da621867833ca0c3e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/it/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/it/firefox-117.0b2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c36758e897406dd7d9fabc6c4c0793d5f24ecc007dd542420106040de9a81c19";
+ sha256 = "a5f873fd119efe83fcb32401d80528af47dda852f0b77b81b783e9228b14eafc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ja/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ja/firefox-117.0b2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "09410a026f5c902ffb41c2b4138ad3fd975fe9a49e79174b8ccc6971d02f2570";
+ sha256 = "95ddfd0e54d2970116e1d4f9ab75ed808859e41c2dc244de652deba637e82a94";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ka/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ka/firefox-117.0b2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "1c34ab1ab3d784cb07ad7031654b574df610c03b7ff03bf401b9fec9db259685";
+ sha256 = "30233b10193280739ccbe9208bcf4b61d7eccc3242f51bf73045ba470aa2d896";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kab/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kab/firefox-117.0b2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "1fb851a99d4acabacbe0c6bb6cc88d712e01620e94815c9407473351d4a81826";
+ sha256 = "dc94fb2fea8e1a22d1373eee355556ffaf7f50fffa5c8702e541624e22c2ba50";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kk/firefox-117.0b2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "67ac4003b2bb6ee5badb3c5da99b73074432be939a7cd419bd5efd6abbf3b8fb";
+ sha256 = "47385fabe2ebab1ba71f4179044c4b92eedd4dfa356f3d9eee2a51c37672747d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/km/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/km/firefox-117.0b2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "120d5643b12df4376dcf3d25d3f560a629c42e0b68c5294b90710b30663e9c14";
+ sha256 = "17a863d642f6b41a0236478489e196e64a68d196ef135c2834144a863717ba1a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kn/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kn/firefox-117.0b2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "c82cfc77e70b9a1305b6937c4e6ac8486e3326a10c0538a51d2c3db7998e5687";
+ sha256 = "87b7878ae9241c4907bcd05fa025f5f92746dacc96e6045523773b6e42db255a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ko/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ko/firefox-117.0b2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "1e4e2c50c392b85e09cbfed6231cb75d4b5cc4f88118975b6bc7c1937f904ef3";
+ sha256 = "9826065baffd40bbd79e9a030c4241e57fc586e1e46822dacceb2b73c30fa8bd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lij/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lij/firefox-117.0b2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "cd702b70546704302005ce139f4d8cfcee0f63a707890314d24a6cef411393f0";
+ sha256 = "049ec63c52aa35bc848ac4b950a71b5376845f9364ea8f0bc12e964386239011";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lt/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lt/firefox-117.0b2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "0b739761d743e9ca0af510e7c9be3061810e2c88321245c15fb7c7de1800a185";
+ sha256 = "c10aeb412b3b6bbd26efa0b2be9ca82233108ae228297ca2e197a74590806151";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lv/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lv/firefox-117.0b2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "79c5f4f8a490a87048851420c03fe63976bbb4bea655d9d9f6865c32d6a06608";
+ sha256 = "8166b56491d20000830b76678789c30d0d04894dedfdcedcf7a961e365318776";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/mk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/mk/firefox-117.0b2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "46a00b6c16ebafe6c7f5f3bc3da6fa4dd12380d15c923ae409ed7c0e4dcc5906";
+ sha256 = "a1b77b83cd8ece5547c77e4b3443e47dba6779e0cd1c7f01b79cd6a06736aeb1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/mr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/mr/firefox-117.0b2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "303f6c94c47a43e7510d1d1f0d0f6ccf8d745991827949dc60150975f598678b";
+ sha256 = "62f47b0839dc22a5d3e45835b35f8729d731b1ff5d2e95643dbdbe14cf66c6be";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ms/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ms/firefox-117.0b2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "ab6895c7a6afb7713b5d2fedd12cfe1b58a8b026fbadf6652f4aa6d39dd0edea";
+ sha256 = "e966f17f985e2cd5328d2f3d0dc2b487b9600e144f0c28669d3f55a970cfbcdb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/my/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/my/firefox-117.0b2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "e867458bd09b47fb130263951acfa0e1060aeafea63e3bf992a94359db2b41c6";
+ sha256 = "d8f29d2486c377f97d1cf3aa903459987084e8c3679f96a8e38b1db7903a97ba";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nb-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nb-NO/firefox-117.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "726830a51febadb78a9fffc1ea9b6a09e92c7341a5eca9f32b78f9beaa7b5821";
+ sha256 = "83373b5fc11e0b310ab5d9b62d4f6a43514ac86e0f9b112c1c5e8dfed904e143";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ne-NP/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ne-NP/firefox-117.0b2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "d316311340d53f4061e7d721bde9156d1998ab80b7d4c3705eed084cc96bcae0";
+ sha256 = "18b1d0cc4339579cef1d815a63e7f86029070f76956a0d6ac78248ad843d432d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nl/firefox-117.0b2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "fc4ae1f08cec773c2a46cebd18ce88aa6c21471123f79269e27340c7ebeed285";
+ sha256 = "1c817fb50c5339046437ebdeb3f130c7e1866e3113972604a477c05bcc01f8ef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nn-NO/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nn-NO/firefox-117.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "77a9d8683b1918a1f63e486bf3557999f9272130ffb050379ce91c1e1815d91d";
+ sha256 = "ff1d726d05e4d763f68d91193c5a6ab34befdb29b95f28887ea6e4ca13d18dc8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/oc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/oc/firefox-117.0b2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "38a09ac3a8004c8720c16e6d9f466e0d590921cd03690e89392f7054dc4e6d44";
+ sha256 = "6937a3bfb0c0309435622d40c57bdfc9f7dff534d82399c4df3815f54a87f034";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pa-IN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pa-IN/firefox-117.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "74ce7b2855153e594a10513db2823dd917af41c0706dbddc67dc76d37a8aff78";
+ sha256 = "b27ce535e921b5ce90bf60b6b1dfba7e81f55fcc343aa96f9fe2e2f82e59413a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pl/firefox-117.0b2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "8115cc8993082713d0ffcfc154ac7e893c9bebe51a727959ba949cabc7414862";
+ sha256 = "b1837eac3e813cd475d316bcf8a30b3b9f3ae4c32e12b74b1d28d8dc5adae8e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pt-BR/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pt-BR/firefox-117.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "4a5928c7397c52bbf1f77e445aa9481aae76d18183252d00d38c69539c1a4421";
+ sha256 = "cdbb6717a2aca4bb8e5e60f56654dd9fd2523f480aa1d7a0fea80b505d2b6cac";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pt-PT/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pt-PT/firefox-117.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "07bcf3d965b96937895f9377334aa604b1d54ba10ce1a84f1477cea335912e85";
+ sha256 = "776549ec4c919571584d8a6f08d46c321cc65272c5a190ada465623b6a1968a6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/rm/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/rm/firefox-117.0b2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "142ef46293b65eb916fdbcebacf53127350b7549e0073c82be83f8ae8ca7e2d1";
+ sha256 = "03af9926fe76b65114b5e8531fce83bbfdc50208cb855226f27df1edaa2f05f9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ro/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ro/firefox-117.0b2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "237dc722c2217a528fb20e520a79192b1eff085babf954a3ddb98ce152fdfcf2";
+ sha256 = "1f5503ef1d7d8c871d169dd0df1548fd2bf055a3abc791bd4927b9b8ac4608b6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ru/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ru/firefox-117.0b2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "b7e954893adfa5a1099d55d3e6666908a9daf40b87056b8b0d9356b05209cdae";
+ sha256 = "e0306bd225e30674a0d96c0c1891d71442652670142f5a23429db244f674f5ea";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sc/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sc/firefox-117.0b2.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "76fbba366247140ed84223a8bce8b156a17468dfde8d1b5fd54bff3fb1408dc1";
+ sha256 = "499b5d7dfb9c1e2bcf696d8713bb911276f4052e633160a3810966f8933402b2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sco/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sco/firefox-117.0b2.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "d6fc67cd55209e22875aeb225bf82935d111cca77e00f41c4ba97dcbed156458";
+ sha256 = "fcec3d3ec7d558bef968e9a32da0479636efd6af61e335a9b5f8a13298bf2750";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/si/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/si/firefox-117.0b2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "3675f892cc5f0bfa98c8075df297651a4ba0d2f5c099208efa01b33f60fcc1c2";
+ sha256 = "24913137ac7c5fb2a53cdc534a7fce099efa23e68ccf63ced90ee613653bbf38";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sk/firefox-117.0b2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "f217606f8f8ccfabdaa1a4c5a23af8fdd3eacf1502e4da6e28f8504a74a7e9da";
+ sha256 = "c185014629889e9a64e3c3a03442463cb05a8355529c368d38c0e62f2536ba9a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sl/firefox-117.0b2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "c5a089bb04ba83c899b0fab4a81335474a1a0a24c75afcc5bef2864ae7af2c1c";
+ sha256 = "a2ac927e578784ce1ff8992a56b98428b4e636412bf9aaa53172e5f94cb63719";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/son/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/son/firefox-117.0b2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "c73c98ef68e886e3f4ac01f7aa42992c6f9b75a18403c82c0bc54aa9d1630524";
+ sha256 = "649cc48e25f371db9552da98fefe69234cb6424874547954a2c7210812db0831";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sq/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sq/firefox-117.0b2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "b7c7bcb08a3b81d266aedefb7de9566b2d11781c66dacf94e52c9c60474a2e13";
+ sha256 = "1800e17cd1639e4d9ea083394bb847bfd61551fb4f08f7d021f48d641e03f60f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sr/firefox-117.0b2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "5c8a3db26ba7acd76dba7f9a4affa2fb932e76cd40becd9052444efd5f1eb7cf";
+ sha256 = "133d85ed15c4f4f3b967f3d8a1959838169176f14143c3e074e0058572b626a5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sv-SE/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sv-SE/firefox-117.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "9796c48e19a4860bceb7cb3199ca0d3605522185cf6b5be1e8d5ed036bc523fd";
+ sha256 = "96c617e8da39a91ac8a43f254d6408a14ea852184b02aa894e2aa30a72c47cd6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/szl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/szl/firefox-117.0b2.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "3d5b4cc385399b4b543f66c707c3d5fb2b6920f7d7344fdbb4aa5f34e5666c9a";
+ sha256 = "5783038284e5780401d48fdb85af3b6a61c59900914696ddacf91d1cfff9fdfd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ta/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ta/firefox-117.0b2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "34033dd438cff4740a366d91eadd0e34c2fe3e24fdd41b5dfeb10a2d425e7388";
+ sha256 = "e36ad0b248d70f52f878395af2cab95ff67e54516f3973df008fd76bb1c5381e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/te/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/te/firefox-117.0b2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "d10fbb522c1032f4dbd9e46e597efdb6f8eab3d885b09ca355efbad415bbb7ba";
+ sha256 = "c8b8fe6bcdb8c2181714732d95fb98268c411c9579e0b55f7dcea0dfa511620e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tg/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tg/firefox-117.0b2.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "d793064e3de193e7ac8d2046be611211200d5079d20ddac293fd54dc040653db";
+ sha256 = "5c3710584217a173bea7daf6405af811745f63089dcd7845a8e1a3bd3d5092f2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/th/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/th/firefox-117.0b2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "d466b47233a8d3fc3d55aa2fcd08086811306f813a8118fb6235d1733a2d274e";
+ sha256 = "33baf3f17a98df98a3ebc0536d11c0cbb93a458e9aa0af72523cb8a9f532ec32";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tl/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tl/firefox-117.0b2.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "d395cb79206236f8af0f17cfb76c332df6e49271b102de3fcdfbe6072c81b400";
+ sha256 = "93461ffeaa90321e03cd37df29ad5705b3e54fdec426ba20b35dc8a635f2cd49";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tr/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tr/firefox-117.0b2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "ca3e8d335945d265b6fe1d86af58e0dbd4f6c046d5b308c32e13b398fdd1b54b";
+ sha256 = "6740a84d601b1e9d495bff0901c90f8ce47ce88d31b7a08e46f83ba23effc6af";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/trs/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/trs/firefox-117.0b2.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "eafacd352f3cc054499f87c6765a5b41c40229743849d689f69c14fe1975ed03";
+ sha256 = "fd001d23f1fd7f42c521dc6f9d81c7b45fe586b77c66fdf4ae76d1c5dc7c8e52";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/uk/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/uk/firefox-117.0b2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "c4d09799da087987c5de2aa5db90b9f7866fc345fe98820da77581aea1d45e38";
+ sha256 = "cfa90e37906f3a489dc878ec39d327b0b35b781ec4ff7cd977e3c4e450bd184c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ur/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ur/firefox-117.0b2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "75856c9b34b3117e10a403b6c1859e3c1d8faa6cad8cae345b22a4b31bd119a3";
+ sha256 = "3dc51cf49836a17a8485708037b9d22535367792a2660c1e5259eb5ef5c8c0c6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/uz/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/uz/firefox-117.0b2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "26974ca448092c64b131d040ca6f88848695c25703610490c1d55b68d2be5546";
+ sha256 = "a36be7db81dac21ad591eb9d47f5cf099e9213c4a5ff165f168d1ed733021504";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/vi/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/vi/firefox-117.0b2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "1bd77f418464127d9712ff09c9e9225d501615b83bc0bf9917e7bed4f4a52c73";
+ sha256 = "05967a951bac6b44f8b3c476aec9fa16904988227e0a21929677c1b643a7f5ee";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/xh/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/xh/firefox-117.0b2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "75575150eb9810d2201832f4af3319645cfff875dc37000e4939a42c3d697832";
+ sha256 = "0c93e845d9e2db561e5bd159ce3635a1e06fc33eb54863969c236e091168dc70";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/zh-CN/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/zh-CN/firefox-117.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "ed111f3ebabaa3468ece986491afc5d2bcb40dbe63b5914e63842db5b62d4d64";
+ sha256 = "ba741a532f2a7caf4b9ce8bd522f9487336e9fefca8d79ec5e3739fbbdd3bc55";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/zh-TW/firefox-116.0b5.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/zh-TW/firefox-117.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "cc93da69a1dbf2de7bd0a300209cffed7202b6602d90b535610029e6ace510a6";
+ sha256 = "fa6a8f96b74c570cf192d41e34e4d07e22b1508a2cfed4406993f71cedf8c8e5";
}
];
}
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 2cf7b4aad2..1f12e2879a 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,1015 +1,1015 @@
{
- version = "115.0.2";
+ version = "116.0";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ach/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ach/firefox-116.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "302fe9d08b11203f4ba89d6e6f155e2a4b43853fea7448a7fc9f28cf0296da34";
+ sha256 = "f9f28023f1702d54225f33c6a6bded08a1d17871091ceb7829e000aaf5769485";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/af/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/af/firefox-116.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "0827786e7328aedca6bebf332abb5ced91443ca3c60b4c3d966bda5e377e2708";
+ sha256 = "2936f804f0b40589aaf59b581e11d7296f27671fafffe2696845c22cdccdbb50";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/an/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/an/firefox-116.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "f790637836993199fa048bd6bee023cd044c6907799e41ae784e084adae39139";
+ sha256 = "1572eade803d946b48070822434301ce4000fa348c9f01af3653e253473e0c50";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ar/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ar/firefox-116.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "46fe2248d3c5f8c0932da85e1b6884a64dc49fe729c823b7a419b5d4ee352d47";
+ sha256 = "5668b90b9ad9314cabff710cbd9864acd4f880411952591cfc2770821a7718db";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ast/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ast/firefox-116.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "0e1c20ae9e9ca4450b0c3d0f675805ac23bf9d98fcb2148622a7c1e4a5d5f57d";
+ sha256 = "61865e18b800873881bd88b034480978378086f2bde9d0746aab91c04491cd45";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/az/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/az/firefox-116.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "50da1e0c214723accf840b0547906550e2762a3e47dd3e7169d346f3864df196";
+ sha256 = "485ce8e25658725b98f5596536eb34e832e21c8b995f9eb728f6b9bd3d7d68ca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/be/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/be/firefox-116.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "67909a4d754ed3dd70e5af85d20cf1b42199ae606abc615cd303995b616f72ad";
+ sha256 = "3af6a0fc179bd134fcb78241fe08bdd19cd17f56c53e5f6f4ba49607579b7f5c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bg/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bg/firefox-116.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "1027416f28408dd140b0f79ddda01b68e0af5deb5e6463fbe32acd37d09021c3";
+ sha256 = "a5633fa78ceb33f1bcb3ea4745c809e018b7319140a8d3a9caf2ea10b9b48956";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bn/firefox-116.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "6c0cc293180aafd4616789cb15e810220530e87d3e40646a88274a4a4b868920";
+ sha256 = "221067f2f48985f302c1a20b0a7c0e7a2f9d3ad09e4b59b9cf93af4a39df591c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/br/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/br/firefox-116.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "14493fcac3a147bfaf31c8006131678904aa587389ba7d1349ce567be40ef46c";
+ sha256 = "668cee2552f4d645bc92061e617184b801ceda90f6750a0713ed54955444add0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bs/firefox-116.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "c3120522244a2ecb3eb0f3c35aea7f54e55bbee5f11caaa3cea1c496217122b3";
+ sha256 = "a93be95fa0bc3611cfc44e1f3aebe923b98b77117fe9ac45fdfca2429e003616";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ca-valencia/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ca-valencia/firefox-116.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "1d8f6a1b1511c4096e43ba6d49f4cb6ed1da6c399df2796f1cd4b7fd906d5d7f";
+ sha256 = "85792291eb9fe516c511444630a5079421fdce76a8ebf9135bfb663dbafa9809";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ca/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ca/firefox-116.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "5f9862e85b3cf82d94f63aa0b69e0da202aa04db7d65020a38165a005ec891ea";
+ sha256 = "283ca0073bc7f3e92862d0b7658dace4b82fbf5d9fa28ff0a0db589c27caba2a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cak/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cak/firefox-116.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "9bbc95a9d565a7b702d390dad8d559e6af0a3430226cdfa69f794d92bc1663c4";
+ sha256 = "9c6eb2e5afe7b7d224e486c1614dafbb03c98418419df5d7cf52603fac86b1f4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cs/firefox-116.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "57c12174db7ed92d74b656a0bffda46232eb0745839b0c0340e982e820c7d6e4";
+ sha256 = "2a662ea061c338565ce7a41fb5129906fbfbefd211bc1478c8b5df2da31cd09b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cy/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cy/firefox-116.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "13046011508b3eddff5277ceb2eda99124a42f68e9f84b8cd9308dde4a0382bb";
+ sha256 = "8ed1c5c290f15eee386cc50a4b55ba9e68195cced914830d0b5932dc5c360d70";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/da/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/da/firefox-116.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "7d6e13694aa921909a347a8fc3fbb39c4458d37b68bb3172f255d8e6022e458a";
+ sha256 = "c7fb3d69577feb9ecf452561bca5acc48de0cfda3af9acd650eda02b0c42fab6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/de/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/de/firefox-116.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "3cc18f2396b90a51bc664b27620d624f68df8231bef397b5d7d7320d06d20e3b";
+ sha256 = "a20d2e375059348e3132f68f9bf0adbc82d4a72555844c305a00952fd676461a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/dsb/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/dsb/firefox-116.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "132aa61d5e7315fa36f12c7b05b599526bd8860b4c53a6cee439a7cfef24a404";
+ sha256 = "4ea38c4555ff2ec51c5fca580f907b3394de478fca190638163220c306d8a28b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/el/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/el/firefox-116.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "7546666022300f1a5c302adac0e42600e9c81e1bb20d9e585f75dd9cf5de9f28";
+ sha256 = "7bf38355cde909e73fd9e768bb434ac8e0cbd4c255630f883d7dbda727cd0c66";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-CA/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-CA/firefox-116.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "b0de5d07d411c341700b87c424f4b60f80f3dea1582fe232455bee78d1d87196";
+ sha256 = "a642a2c33a8c2ae92b47799aefd20ee2131e63cc982264a93ac4428fc453abb1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-GB/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-GB/firefox-116.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "990e2ce3a2e37b15c29e6fa94404f6a5dc228125c013e664284d21ecf871b19c";
+ sha256 = "055f2b734363586c61561a57ecb476bd8f31b586ab5ecb77041c23fb1f13a15a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-US/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-US/firefox-116.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "9e4fdf4f798df6a85c3f8e8b996f7998467ccc0f1a5d67ef8aadd27b6944ca0b";
+ sha256 = "c689747d1dfa2b562f665ead7a82a5b399eb8f75b21aab11762f1093d90fea6c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/eo/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/eo/firefox-116.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "e824fc32bf53ef52a26363b8e56a2f6b1e0b9780214b0e6353aa35475f3393ae";
+ sha256 = "035b78e5b5dc8202aa340d47a8922c1e2293eb297da9483df1ce482a46a707c7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-AR/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-AR/firefox-116.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "85192f228e53ca814e8fb9f06a3756b9798e7a998be2770d0e52a8d959cdfbda";
+ sha256 = "0017ae92eeab809311ded78ac062fa65f2a287f907823fe5c682d54418a4ef06";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-CL/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-CL/firefox-116.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "bb186ff9d5715d81ffd573d76a4b17dd80d711633113a8ed3cde56eb7013779a";
+ sha256 = "e30d470f0067f10e55c3b60d1c655fa3980cb1769f203f3b963944094f6c4786";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-ES/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-ES/firefox-116.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "2e4912c8c3c997064f1b0e5a0b89f230366bf42bb0ab7b97ea7323d223463c3f";
+ sha256 = "088d86a0a062e2090ef04253136e9f56afcbdc0cf50b69a9426add68ca2f7303";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-MX/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-MX/firefox-116.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "e30aef804021cf070cf48ed3661d6822fa580b46f3171337deef461ce272644b";
+ sha256 = "275c173dbf244a73a1007d4f1ce7a521fd6fd74315850911fc0119a938afa2ac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/et/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/et/firefox-116.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "fdefcd0764284f84df9167cd56d353cd9645fbbf206f06f6dfc2c0c3ac89f110";
+ sha256 = "4667ed790999da65741eb458191152983a772e0a6c444591231e4b08d186c23d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/eu/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/eu/firefox-116.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "e5d390ea3126ca3567ce19dc523575af8369d33a7e24bd6083f92a59e0d7336c";
+ sha256 = "4bd83d219053b92a5fc33d2736f0e2a756cf71f497217d44bd86b2afeca6ae38";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fa/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fa/firefox-116.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "1f8396309cb6f9969ba4612d00dcab1ddee9c8873d0fc69c8bb8527f88fdddda";
+ sha256 = "069915d3dae6e9fa17ab1ea45d3333ee46026db80cc9e1bff576245c175e692e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ff/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ff/firefox-116.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "b2f2eba85dece7a93409c9ab64699c5a090a64dd3306bd4f37cbe4f82cb8722f";
+ sha256 = "e89f47a6dcde5a053b4cb7e345a8ad45383b89f270daf7e81c332a3c9d2e7c00";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fi/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fi/firefox-116.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "42278f43094325831d7f554081d2913db2fe9a55e433d9e768383d8027bac56d";
+ sha256 = "f37bf620ae7ebb6abe3aa372e4512fe5995d9ad9730b10f3e7e6c182d37b9017";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fr/firefox-116.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "8e502f101012a049cdc657169c51895e3c6d055bc3332d638dcffc545bf07336";
+ sha256 = "177d291f6696edc51672a70ef84747169ac5827cdbae15ee7d4540c95a607d2e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fur/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fur/firefox-116.0.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "aea2b3f1fc397402ed1282e91170137757c61201c683401af04255551ffb91d3";
+ sha256 = "d254b2d3eb99a1d4447b00cf74c2115703d997e8ea913d37353d84ac39b7ebd4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fy-NL/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fy-NL/firefox-116.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "2d2988cad321c0d19e801fb3c40268ab48973f491ec0eadd4a23b6f7e1a0a208";
+ sha256 = "731e4708989bb25a8508672afcc249a4474a7eaa20f23be2e72b11f82ba32f91";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ga-IE/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ga-IE/firefox-116.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "ae28543b4e07225443706bde392f1b63b5a461ac47ed056b23316556d3c3d68d";
+ sha256 = "66b5d0ea2c52c997b58fec04bb102598ba33dae1b5d4086e3a9db25b0e955d10";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gd/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gd/firefox-116.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "8d4e76b1b3d7398695042c44eac7d4db2dc40fb1d2da695bad571891030a6374";
+ sha256 = "9b2452bf68f740323826ef420e09d211376b24aca2fe8375c69af18984e37ecb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gl/firefox-116.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "428bb7afa27e5ca9d998014288aa52a76076908f737d8949ae2835b24346865e";
+ sha256 = "2b850b78a0c4ff25f600c15fceca0949dfecad1513be3f224649621b650ba4b0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gn/firefox-116.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "effa04ae63a6f690614a7283d079c07d6b36b5db0ed1b329c33c59b9d3be1974";
+ sha256 = "010c08f3e89a413acc09f4aa17e7324e6d02933cc76eb9c4283ce0ce3ec63838";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gu-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gu-IN/firefox-116.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "3c5dd2ded0d043e24989c9f502a87f3df0956dfdd81e9715b84f49ffe3129be0";
+ sha256 = "42472a5549c925eef91ead8c73172c5fc2b5171b93ae4e5f2177723c03f7b801";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/he/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/he/firefox-116.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "4c7da88b859b0555c0c89c6d05e0f2e5bad4a79b0d5d6e3f702e14b6fc97f934";
+ sha256 = "677a458b1233f7203f14825fe5cafdefa02f143264da45f63b8f6cf3f49158a0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hi-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hi-IN/firefox-116.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "6574f6f7a25573af9d2734e10869d32bb46e782ba2caf805818382eca794f568";
+ sha256 = "10e74e64414f7c6c3800d30a77d1aabbff98e0b3e08a1620828979d6adcfcad1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hr/firefox-116.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "5d476a4cdd1163d17a5a5c18bdf47e0d4b002bedc7aa7061c027a507ba5e6088";
+ sha256 = "334ac4b63f9e1e41055adefb169c5a9b6117e54dfa665498fe03c3fcff6c8840";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hsb/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hsb/firefox-116.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "6fe4bee14e063c905eec5de7001688477bebec8d20e0e7b9ea0e4c3722d1653d";
+ sha256 = "12ddc0e9593068582edcdd60d75cb5a6bdf2050955a2c3c799021fc03d9615f8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hu/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hu/firefox-116.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "b68c14fbe0af354d9bb57a346b565405239bcad6ca45db243b8a99cf3bd06dcf";
+ sha256 = "79d86bcbdcdc0f72fd0c2b53c14fa0455ec02b80039fcde1ee3238a1a26874b1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hy-AM/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hy-AM/firefox-116.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "83594eb14bd0fd950e844379ac10909c4de8b1098ea087a76294779214e5be2a";
+ sha256 = "e221de9758c8b124322b0ffd9b9bca39f69f3908a0135ebfb916cfb1dfb35bf3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ia/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ia/firefox-116.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "4eae69bac6a0158d4bdf22b8f80c5748397ff9ecb49ec7c2a7d52bd5e85ffa2b";
+ sha256 = "e7a2f9139228a529318040fe18084364c2610d5335e659ddc19cb48f4d2f223a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/id/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/id/firefox-116.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "7431f1d88f53d837a10b0574381fbce14208f70ae3528e60d2b7bad7970db621";
+ sha256 = "644e111edad13668c1c541bfaec46d4319a58420eb0d8f528a8247e39b859544";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/is/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/is/firefox-116.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "f6ade01e395e1a4eb12a7e4dcc41e44e7c73e742b681cf1755b800b69d712c0b";
+ sha256 = "11360ca9d9eae06323d9e73173791700cb981689d0bff68bf4095be709f110c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/it/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/it/firefox-116.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "ae616c3898e15e778159dc9cd22773240573e13551a185aa4ab5a70bac5ca53a";
+ sha256 = "c3afeee0d1edad4e80a377893ee9ca8c1f9c10d9c3b4db490e8dec29d0da5fe9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ja/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ja/firefox-116.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "5189773aea731b8aa3d2df8b425048ef06d851a25de5d14c5dffbc08c506bdc4";
+ sha256 = "4389b9eed95c22df1b3914184458d76daf5648ea681081412b4207864aaaae89";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ka/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ka/firefox-116.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "4b24a1051042ef2dbd0f8e036957ee4e19ba7dfe93fdea2110931d391d09bee5";
+ sha256 = "d0cea36119a3840f9870ddbff2a6af3faed1826003ec4675cd522f049885d07b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kab/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kab/firefox-116.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "ec6f553b9e80a03af6e61f4b154f72c40041fe36e7a0cdbef1da6975220923b8";
+ sha256 = "0e62f892ffa423f342dc78af9e2ec950bcf86b4e4a954fa9b73cb39159be48d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kk/firefox-116.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "031da024a01f366d7c94db5cc9dd0ce3642da97ae7e1dfed33259b965c31242b";
+ sha256 = "2ec97db79fabda5ae1d345aabf494fb398cba1fd45d3198b94f8d48ce972d3da";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/km/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/km/firefox-116.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "09cf778089949b552056cadc450224c7ef8ea3b612873999f43494e3b369db34";
+ sha256 = "0e9192816ecb3f625b77063f5e0abb13a53057dfb91f179fef41d4fbfae42b30";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kn/firefox-116.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "8141f88f8ffb8a2bcbf044afaf95d8054f79ff3f059d863295c2ccc4595e1086";
+ sha256 = "d1c08659b7d08d3cbf5c0b3c7be64ea98fbca50c3e222aeed311b15dfa5345f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ko/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ko/firefox-116.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "81522b564078d7a2a4fbc7d26811eace3da3a4d6eeb2eba2d8c1ec8959a7e924";
+ sha256 = "51f948d0e2547ba1bbede5af396a60731f9170906410db612ed7585b8f0fb309";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lij/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lij/firefox-116.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "f58c4ebeb8382891958589c764a8f17258adfc29382b86b094b96a0989c8dc9e";
+ sha256 = "e1926c02dfc7004057cc0d8a0ccd7eb7b9f66f330548253a056f515028758479";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lt/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lt/firefox-116.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "aa7d7c320a1465d7962e7dddb8b0e7faadb25225a7400bfcba2bea696037ff4b";
+ sha256 = "6b3a0b932816785b0bd996b6242910f7874c9403bbd43780f02df60d6bd03a21";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lv/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lv/firefox-116.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "90649d225591c53e9af212ad6d92d37d92d0e5f54ac3a487e26cd7912251c7d1";
+ sha256 = "a731bc339e153279bf5440c86b583fca21d2e02431c2194a06824951dae52944";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/mk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/mk/firefox-116.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "1dad410c2d113fabbc40bbdfb7d64da2e4b761af266c3cc9cbb2152dbf670acd";
+ sha256 = "667a027b9aec063dee06375420894cd44dd6a6eaeb23c10c0d9dad6541c92507";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/mr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/mr/firefox-116.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "ca9e7638dcbc0c6f0f7f41d54f7931cdcf69528b68057246e73c96e895519748";
+ sha256 = "89c80aec3222608800eea7806365a04b2cc43fc529bc708dc17c805caf21c430";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ms/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ms/firefox-116.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "14c3e2b97839b67ac28219b5dabb3258bce256b4bcac86a74c9815e190dfccc4";
+ sha256 = "990cfb919ed9939aba6ed558d89598b1a8eea1d74fd56d428d06fefec8909a05";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/my/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/my/firefox-116.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "cdca6003923ec46cfa6131d2020d246303798eefdd2483110520d4b57e447977";
+ sha256 = "294cb3be64d7b43fc8d51d5d97800ea162cd39646da87605afc36a181ffaef6c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nb-NO/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nb-NO/firefox-116.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "2fa55b23539b4e5364282ebabe33b34b7e0c84969c4958e5d20a4d10ebe24234";
+ sha256 = "5536ba0a3eeaa80cd54e11b12d44ae6ac7441630a35ab1ead75a0d0a5f6ce8c0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ne-NP/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ne-NP/firefox-116.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "ec70f3903e6aa138222ff12b8d92de9aefc85666f733dd0463ec606d3ba16c15";
+ sha256 = "029672dda24ec01565e2b9fb40ffabf803575a4f9328d1fea70517248a928b38";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nl/firefox-116.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "2faee4ec227a4884ebb0c7b06609f9dff4fee311755ebfad97c6bb48469b1893";
+ sha256 = "5e68a5c46646a6aad221ec997bdd1e2ba837ba41010ee7121991def0ed4da22b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nn-NO/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nn-NO/firefox-116.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "8be68d60ba7e66c1db3dcc18bd6a8a15b5097c529e733447d9a63b417d177832";
+ sha256 = "77284b5caffa342e759e846252fd0598ff7a9fa86f79e0ab7b5f3a647253ef81";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/oc/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/oc/firefox-116.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "405ed291a7c60c30731c5173041a71bb8b6b25a173058ab722eff70f6d090ce2";
+ sha256 = "dfaacd8319b2f8065b8e1924ad5ec420790c43af243cd1403f969a4ad3e250fb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pa-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pa-IN/firefox-116.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "7f4a756e572883fde7c41f87dc9c28a592950bf2c2d42a9c4946a87989d12285";
+ sha256 = "9f0a6eca2dd5a8389416463aff7a61c728389255a93cf928b110c112fc7b73a3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pl/firefox-116.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "892e8881f945467765f7c09baaae864b5d9a553969aaaa2de3c71de577163660";
+ sha256 = "a3ad36159a690f51d4a75f474d315ecf0be0fc2fc4be07fa579ea9c07f5d7dba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pt-BR/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pt-BR/firefox-116.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "47e64cd39361137bb2048a5cd14b037566abbaf343a49dc26292ccf9c878557a";
+ sha256 = "8e9f2ee744da1585af9e2cd95ad7fb8429b8a969c9d73eb5353c4f752566ed17";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pt-PT/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pt-PT/firefox-116.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "94d0213411632150934cc70adfb5f6592e59ca01a02427ef8bf589ff2d9cbe8f";
+ sha256 = "a2c7e6ffec70b39d235d172aa6512fb571af2a874d9999f4f5e4551855e418d9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/rm/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/rm/firefox-116.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "c90d864f61269b7ab1b16b008063dbafaa72cfe6293fb36dd5728361597b5529";
+ sha256 = "394b29f4f35775a6b701cb99960c41024b3379ad22b780e3dff841b8cdaaa4c3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ro/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ro/firefox-116.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "213e3d58d40582f89698f02be2d0ce3b8e89f28c94e6aa85b5226e4ddf03fd62";
+ sha256 = "fc7ef54c87bba2c698f62fe4af111b52b3a11368232bf354d41316f950e982ad";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ru/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ru/firefox-116.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "5148cb7630e2d94151e4c4789e9a9afaf07a1549c48b4a118266d48e724a3869";
+ sha256 = "6bf8f6870ca514d25eb309dc98f1807f18aba7cba9348d4d4043fdae7ddb2242";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sc/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sc/firefox-116.0.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "e5beeff5a45a97c3716956eb639e89ca8415b7c378202bac9bb8d3bf9cbcc0bf";
+ sha256 = "a6892d7ed01d8333491dc3f96309838e02cbb4a4af6e2c46b12f9e1a487ea493";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sco/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sco/firefox-116.0.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "68bee3df088b3529aac46e8a4abeb5446dba9c8d60f850b984bcd7ce82eb66ad";
+ sha256 = "8dc34d7b8c42eac485db88f88522d1c900562be0ec504132a77de7a9005dc0da";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/si/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/si/firefox-116.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "8b0ac50083decdffff58f619905e48b1a32d1a2f3c3d8dc5a0055c2fcbcf4247";
+ sha256 = "f3d7fb18dc07e1dcb6e15646bd6e878d4ab9d856ce5186b04cff14f990c98316";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sk/firefox-116.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "7d04acb8d2279472d9bcdbf500c5c468e807ce126397a7d313de6cea3b4607d3";
+ sha256 = "33be656e28f7fd3f841b8c627e1bb76c2defd8c24456ac8c151b56c2e87bdc4c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sl/firefox-116.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "56d6fdb0157f5aed3dfaa10e1efff1cf5417bf4e6e5377752678ba05be33f30b";
+ sha256 = "e6a639a07ba1313df86b304495c9d945335f8a81ff00369f59ea4d393b8f3927";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/son/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/son/firefox-116.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "ecbd99bfbd6776fb188c184e4fd570053bd2bd89186719eec4eb9d2e2966718f";
+ sha256 = "33c6d2bd9071a4f60112a216e103717140e7eeb98610801977e28dcc442f6375";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sq/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sq/firefox-116.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "f1cf0ec8220118d4a0c069fb63afd17790ca6a49929c6dba38189e4a5ee32cd5";
+ sha256 = "8fc1aba927ac52469172e11f39209775e495e68a381dbaed9c8fc1b6635e77db";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sr/firefox-116.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "794ca6b7e566325c46d9950ec8942ecbe08f51d7f30fd3f492c89660e2e7fc49";
+ sha256 = "b2ae7b024e374f76879ef265239d184dcc06b35bd858fb3fb3773224bf076dfa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sv-SE/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sv-SE/firefox-116.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "304fadd1706fb146553f9d9989a55fe6031f187310e40c5944dc68a0e41b1f3c";
+ sha256 = "3247e74993817f0f2b9d8e687470bd7fa82a62bd4f74a43ca013f86c6ce1d70f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/szl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/szl/firefox-116.0.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "33cb4cb57a76fbd8e199ed3bb5fe97dbd48a71335370687d860503f730feaaad";
+ sha256 = "bfb29ed24ead573e012fc052747aaf441ad7674fa4b76a15d8872d21741cf747";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ta/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ta/firefox-116.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "021fd6a6a235934faf6b167c4850ad36b55234e8748e48ccc401b7353f05624a";
+ sha256 = "e5ddde0bfc7e3ba9b1f426f3dfae2994c5dac638be5437219815579dd68771b3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/te/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/te/firefox-116.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "5a5071f9658c7815234c69b39f26e5a841fe8d6a5eb38c76dc0738537baacab0";
+ sha256 = "6168da2cff453f171f6c9e056b1404b0e655dc0755ac89a1d4cbeff6557c2c42";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tg/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tg/firefox-116.0.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "01c5e8438f1952ec497b7abfef38cdb11af6b08f2b28bdbe8d3332754c4934ab";
+ sha256 = "77a07610b3bf87b4a79ab9947d60ba74c176df62ff531eba6d9a3fc0d7052011";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/th/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/th/firefox-116.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "f31928d3326f0bf7c527fdb3377abdf7dda3bf829a1749c6977ff7c75c966141";
+ sha256 = "ff736c6f62aa6c383196640c146a702b27ff97719980da36d28b125236a1c4d3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tl/firefox-116.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "11eaa8fbc495b3d9e5d33f4d02924160a2afa9e1ad53204b19c712b1e14614bb";
+ sha256 = "998641b7fd1667850b79bca0d047389963768a0b0d7b021092cdcbc6c2c64d5c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tr/firefox-116.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "dbdfa6db945dc0e6459c27108486bbe664c3590cfcfea1c214da69a9ae0039c7";
+ sha256 = "40e634567d96de2bd92e2ee29cdab988682a7e3ad6fb6cebe54b4ab437206ce9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/trs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/trs/firefox-116.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "721af229f401c0b0ba06e2541a2979022b22eb0b6529b93209dee6be3d7206e9";
+ sha256 = "5f53ed35784ed51a1e45cad719c2c132500c15d7351e961ff5e6701bcc78ef1e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/uk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/uk/firefox-116.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "708e0bef8c2a83a06a760ee87f042bf42adac1bcc8ef47bc7a9a927b1db77738";
+ sha256 = "1a3948ef2f7b205eb4a46be098ecaf8e36fbe909e292f5f7dc14ecf58b2e949d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ur/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ur/firefox-116.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "a5d20dfdb211d1aa255dfd96d7fc4e76365c37dd0e9d0a239b27ed1fe70fca28";
+ sha256 = "dc144ff4c139f57e5961cc8b224cb3e7e0d977a93471fae9137f17532afa5229";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/uz/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/uz/firefox-116.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "90a7e516882da1950f71d103efea4d4fc8c00e48f762d6643fb16ba0c94dd665";
+ sha256 = "67bad242f01f97a1c593935c150cd4b46e6d91d6f29cf2ab7dc00341828ae7de";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/vi/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/vi/firefox-116.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "e3d01678239d31232e661cdaf078dd48d363a7853fc8012794b774d907abccb3";
+ sha256 = "7e1522df37328c39941fcf5c005aa86458243747863151557cee090a2fd5b118";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xh/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xh/firefox-116.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "d010cc1a09b9b4d55e56f87b8c29750b2edad38e447eba2b7f45df580e86ceaf";
+ sha256 = "07727195ac9aaa89bcc81d2225cfde5c01f50957be040a16650987a48ce1f172";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/zh-CN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/zh-CN/firefox-116.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "5b2d5d47449ad63624a8259a5142d92380eb18bc3276d637f8d7642c36d8d3f8";
+ sha256 = "ce7f45abebfc69594836a03ab1caf960b39ed64aefc33090a07f687f613f0d3b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/zh-TW/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/zh-TW/firefox-116.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "76a398f30834014992d8f803089285aca64a95a8f7b155686258af71137fe73e";
+ sha256 = "1c0fe6b916b9953fa929a42f99177e2072fb8085856527d54f84aa7c42f6a088";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ach/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ach/firefox-116.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "e59ad1d2aa11bd75578d6eb52ca45ac580607f5bb0feed0f13ca93a17a15df75";
+ sha256 = "b126cded350e4a06f34123da79d71687b4299abe829a35d6258bd41b66db9daa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/af/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/af/firefox-116.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "a3315eeec8d4bb632d5961d4ff01bb1947d51df91aa1a42c5f84da011643c49e";
+ sha256 = "dbe582443a9be366833f0c6a325ef0de50ca268d269acc59ddf26fc551d08441";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/an/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/an/firefox-116.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "ab8ba05987c079122f71c08a3f5e02c40e576ff48a0cd63632b4eb7c29ffa274";
+ sha256 = "bbeea98cbb3059373c37d407bf3b5ae2be39422771a54d98e7cf86e81514d0af";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ar/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ar/firefox-116.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "36ab94565b865944bd9682ad96522367995f02c30c897a47765224f8aa8944eb";
+ sha256 = "73916a69dee407700ef9318c3fcdb41528b7357ed48aa485ad8f2fe3e6744f16";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ast/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ast/firefox-116.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "1f83036e15fc7441199a8da4767c6a57d00264781cb771c1cb2b7048d2b90d33";
+ sha256 = "4b60c751c6fa4bc9c805472ed8106e96fdd0b1cebd34573c8dac5a2002c60be9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/az/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/az/firefox-116.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "40fcff40316def0e74f97ff5e056fe78ee8e4aed3c40d902db8208d6724ac039";
+ sha256 = "6d29b511b45885d63bf90f460fd2e3477c7256d895f77f4f1a6d8d9dc1615db5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/be/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/be/firefox-116.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "d0cb66e4794b7c0ab52c5a92c130ebdc973a2a8e21cb54117388c937b9c0d0d7";
+ sha256 = "d61ef5e3c54dbab254c2119ab523a20e10fe3fa90ff1d28fb3ca276a70e88573";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bg/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bg/firefox-116.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "ba38a8d22cf25a1f42121d6f7cce05e6e45c4852a149e23016493a29e2da4a37";
+ sha256 = "f9511754b2f225335d6fb11683e6a38557e2d490f86b59bd04992e94f0f5140e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bn/firefox-116.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "8a88a8f45b45f0863759abd7e67a67cb6ab61013e7edf1557760b5e1c093a123";
+ sha256 = "aaeef05084c67d31edf00bed8c382c02259c2126923fead97a21b54aa1336a6d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/br/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/br/firefox-116.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "16956cb450c39614cebaf1674a85030858531dc40103b6ca73fe8be6d53123b5";
+ sha256 = "bdf17c9efab7a3abdfc03d7916d9ffb059990528741db9c4fbd8d78a13650de1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bs/firefox-116.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "aacab86198a01c44cf302d31fced8754367be7db9457536b623b7a8c5c211233";
+ sha256 = "3b54b2f8bc8872adef6d831874fb34ab3ccaddd7fc840585847ff7d755879c62";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ca-valencia/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ca-valencia/firefox-116.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "5947b3eeac086164555944f6b922189c55ae81fd012d58178ebb556337be83b5";
+ sha256 = "5c77b600a34d4be2c57ac233662e3a1040d25774c07150e2969bca7cbe0ca25a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ca/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ca/firefox-116.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "269214867961d84ba78c05a11d43e01fcde296e29630be04c267c8cddc23b66a";
+ sha256 = "a61d5f4c256301606a5d4ad8e6d78c7199daeb7a176fb8c47565f76179edd82f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cak/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cak/firefox-116.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "1605994703e21caa768f66b436dc1703a55e09c8562ccdf7ef0c3a19fb3c15ed";
+ sha256 = "6629ac7c563b28887f4b1a14edda03ffcd692a37add09e087f729027c5d712dc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cs/firefox-116.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "a527aad3e4d2821e35878157ad542f013fb7ddfae943c89ed74a1460b7ba7a48";
+ sha256 = "b26584cb0fdb20bf6684682c6d43e2eb1efc7bc693749f7900ecd30161aec46f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cy/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cy/firefox-116.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "c9b47f9a986105a11dd9f886a71d8182f811f1b54a2c7f68a53851fc536421b0";
+ sha256 = "9b2721bcfe203f61a357d4c3ff1ea8985bc198a760132eca9f39089bc39990cc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/da/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/da/firefox-116.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "9d3cd3771bc4c639258905a2f47e315aaccf97bccc8c8e23bb749914a9545585";
+ sha256 = "d17a776bf76ee1ab867deac9d26d60f3f6c3fabba627c971202f858ea505750d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/de/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/de/firefox-116.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "b363031e84a09501e1bf594b7d71866ed9f4eb9cdb71986dcfa8c9bd3c73719b";
+ sha256 = "161d86b84c03193f946e68b961220c5861861695002b8c25b84e82aba22f639b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/dsb/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/dsb/firefox-116.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "54670cb6af892d41e712ca947c5ab9e3e317cd747902f8654848e2fc72aec0ce";
+ sha256 = "662c7dc86f45a743f70225d0b6bf80e360ef25df9ab41f474a1cea6f8cbfc604";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/el/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/el/firefox-116.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "e2f0738dd5992c8c090ce4d8b822ac12fd5422121e83b530dac3530fc28cab0a";
+ sha256 = "ee047283cc8ff68b60c83941681ee5fb8a0497ae9e75f23ddca8616c57bfd103";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-CA/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-CA/firefox-116.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "25120bdb06ab08273691368fb9d5716616106b2d16141ec4943a5dcc3286d193";
+ sha256 = "38cbac9b43901fe44b073a6bb0444dad49ad673e3d8a23f345f68171295c3fa0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-GB/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-GB/firefox-116.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "9b179858f6e9d9ca64fc37913874b1804f0e9b5d31d315b9e3fda544cc23bc83";
+ sha256 = "74f6951f343f33a92ec69b21281d53ad2c6943eb1c4a2cecd48c97dad68af3df";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-US/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-US/firefox-116.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "8c67eedce5a3718dbf0db0c923fbdad496ce9a01b85a8391a0d4c0ca5823b26b";
+ sha256 = "3d97e23cd7ef89cc3a393a4e0d4cfe4d76658557465ba8dba7be4671cd874257";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/eo/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/eo/firefox-116.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "c574d5def88dccb4a380ecb3e9ebad6d38e8c9f2800058e9c1250c7cacb39d10";
+ sha256 = "e0aa9118c2bf4a375b0ee7fd4dba620a07aa21c93d555f02c5fa35ba8a906791";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-AR/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-AR/firefox-116.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "313c28be7bb6a010230660538ffebd27ba15bd2abe8e431e534932bc76edfd3f";
+ sha256 = "5bdd8cfd4f6b06c89a9530206b39c9c3896ed20ed16f2340f92d874f0f4c8c08";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-CL/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-CL/firefox-116.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "79180412d5d8a59ce8f0062ee99aaaec12201abbb87046e16c11c024d03541fd";
+ sha256 = "793f2c9b733849c567c6ca920230ab2b6f54c8913def829267007d0fd371ae72";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-ES/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-ES/firefox-116.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "ea5cd5fc613c70448165ab403f8a452f99e141c7eb4fbfb682258ed8027555df";
+ sha256 = "f314606efbb5874dc04e721a231649d7f2257abed6f6f3fcf50829817de3b5f5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-MX/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-MX/firefox-116.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "40166caeecd8da26e8b3e6f4b18ca71b1791d1581c5848344561cfc8cd3b4236";
+ sha256 = "31eb01a4982db142789a19d6adeac1f056c214158d3bb2e420c7754bb8776b07";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/et/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/et/firefox-116.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "46a1340a46d50ae632682e6b451ce8b041937b05804f1106f67f369d9328c257";
+ sha256 = "d799f76e43522ce3c9ec79603d5b8a33dfdcfcbc06b414f40aeee244ed62a7c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/eu/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/eu/firefox-116.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "ae4d7ae11cc20d7af611c86a68b5ec3ac533a798861c2237f5234ca655c97916";
+ sha256 = "9be4f2530108385b58e92bfd44c122c0c5a16653715051d2b71bdcd9f06b0778";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fa/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fa/firefox-116.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "b14661b217c6c8e4f75c54c99712f30f71d6c0da1fb644bef462ef0ced3eb988";
+ sha256 = "2f508958c449f4ee51ae95b223f1dda10ae51395e4c84663e39ccc19de2afe44";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ff/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ff/firefox-116.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "29c1be0ab22fc99701420aedf6c3aabf46533b05d9d500f29872bc330445651a";
+ sha256 = "72cf4196294f0e94b81b9c0634dd91987cc671c81dca12a4156caef4a73da7b6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fi/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fi/firefox-116.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "45291bb40214e258293c8b09bd471d48e7ab85c33a6edba988235a4d1c565a87";
+ sha256 = "0289e419019d1091ca2d60cb34babc24ac6ddc374b6d8c6d48c7301cc6aa0abe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fr/firefox-116.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "6f0087e682cd7eded088c50ba74ce3d92c76fcd0efb0dbe3ec8bfd028448c257";
+ sha256 = "242c01c05c7206ed60126b07b1d98f6e93af0cf43386e9db5d40bd22578f3bbf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fur/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fur/firefox-116.0.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "a8ed142548916cdf3d16937c965836ec91545d08104767e885ff86609c215032";
+ sha256 = "731dc68715afad1c2dbd4dd5b6d9dcc3f15203411548f3e96de0f5280dd77607";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fy-NL/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fy-NL/firefox-116.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "a9674ccd45f86155524b6ebd03521901be7b5d1651a2c9561c03052358a76259";
+ sha256 = "fafdb4742dc844a66ee269b5fe4745a7069764d33772932001ef724b013c4392";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ga-IE/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ga-IE/firefox-116.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "e9e8fba8a138909956ca10c8c13a22a43ad56331fb46edd77ef534bd8850ebae";
+ sha256 = "f875d5c148f98498a2866a35384632b3f56f7af589ca66f5a0264fbb06e9428c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gd/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gd/firefox-116.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "66747bc30fd19d4d64156c7d4227e0d89d53f661868bf15666c5b6f347e5fe06";
+ sha256 = "11c3bbcfd0e6f442b4c78846aa637412bb55b927b08f59837ec8f2bb97bc5b32";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gl/firefox-116.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "eff745aecc2db4bf0fb3ab39c1bc92a097c927f2c4b58784e01712d2347a9c17";
+ sha256 = "ea40980858d2ed594a98f6565ad89b129bc2c4d46e2149172bb0f51df659d4da";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gn/firefox-116.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "94c113ab79716a7b6d3d2ae1170c84d234022f222f95a13dda1858cdf5825eea";
+ sha256 = "0dd9fb270d3e95bc28bb1bca82272869570ec958927b049d717e9c5a9a9a193f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gu-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gu-IN/firefox-116.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "accacf11527107f0de50c46d5def7ba03f876a5da8a45219f7bfaae5f54bc6fe";
+ sha256 = "f532fd824fd6bf0d7622e36a6ba39b546579c2afac764bedb4e919be4589c486";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/he/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/he/firefox-116.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "2f5ff9c7de5c025f31b6c4facb576b6acdf23c6a7121ae2302c5ff5b119a7341";
+ sha256 = "898a7f44222aa6771c11bd23c6f23b7b001ad299a4b665a4c82b1fdd08275b5a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hi-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hi-IN/firefox-116.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "9fce9758b7045cfd49b45ba6ff21a7e80932a8efac8889f96b02830b10503874";
+ sha256 = "2557dfda455bd0b9ca2a2ed27886e2786450fc4afddc7139e74204e677881569";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hr/firefox-116.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "57895c5b7affbae25eb5afbabe43a373e2a63260a78e6978694120339da825c1";
+ sha256 = "41202b179ec34e20b29ae9fb592881c9514242f73d2826751da04a876d48fb88";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hsb/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hsb/firefox-116.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "3df5f03b68b84418d0bca05fd7dc4ec20c4f25fe97cff5eacbc147e96e07e809";
+ sha256 = "9ddd5b992c2b85105fb507fbc85d9b9003b23bff4e1533c4a964d1ac682eb91b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hu/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hu/firefox-116.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "e2bbb73a37d853d2d2586b10b967086af6e9bbbd102527df1c598322a0e11efb";
+ sha256 = "3003ec7f6aea0ac381ffaafbdcda53b66153e62651c1f33123162a78a567de42";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hy-AM/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hy-AM/firefox-116.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "b4ed9d9aa49c49bd3b5fa4594f838066a6ea49544f190fc3d14aab2f87e3a069";
+ sha256 = "1df38bc677895c3040ee8f9a6a0ffa4bafd5d513a7a731452223c2cf08ecbd63";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ia/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ia/firefox-116.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "89ae5729f02ed650a4f7c631afe8b707a1bb8ff61b513e71f557c8802612172f";
+ sha256 = "03a3f41f74f4c0a72cec369de157b70427d5739daae1662cfe2c99fba586b4aa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/id/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/id/firefox-116.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "8dcb5d802648821da3f57703b6c9d05ea88935d9b540713190e8a98ec1989b4c";
+ sha256 = "3c467edcb2bb7351e2ab95c7c4abbd1cb488cd99e3277bfe4b68d4f9d71d7832";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/is/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/is/firefox-116.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "541e2a5d22c80d16bbcae6d0908a6f0879cada842466f2cd5435e85fa0b76c4a";
+ sha256 = "7c831648d0c9d702876ad9de4c470d64d23650c7cd822dd94656dfe098f62a50";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/it/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/it/firefox-116.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "f4c14eda917afc1529150eabcfec2646d1a6930c2d7e1ef28f9cc720bd4adca6";
+ sha256 = "aacfc7503696f4f028bdef91720c67b2b35fef4422172bfdda745db076f102bb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ja/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ja/firefox-116.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "0f618a4f0446d68fd308be515e9d3bdd892fb6a44760172ed2ee5096a8b29906";
+ sha256 = "72bbbf9c77817648b88ce65702f3c399a80c62fed4bd54ad4a97676015a1b06b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ka/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ka/firefox-116.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "89b42f36359f0abe302874b78d4f8f16d31dbb24f0180061f06b61034f8f675a";
+ sha256 = "61c93af6cc729cf4cea2a62cdf379b22903fb9876fb7f6357c4aff084d6bb9c7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kab/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kab/firefox-116.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "110ad6ebcbd40031af44a955a639aa1772ade4302d4fc6e128f4ecb45044767d";
+ sha256 = "43df4b9ddd7e7e58cd2de8bcf0e612dc489c0e172667a6b2d1931d7e4341eb4d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kk/firefox-116.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "73c9be7ad237e2dfc56f779ace46262c4ada1a5ad82bfeb3b66532dc54f919fb";
+ sha256 = "47898f9fe1b17a424733cc5eec1cb48a1b2de198d3c272f2aed8be05342ee74c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/km/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/km/firefox-116.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "f4181188d02d583e28195f05dd662752b0da01c8dc3a9c4190caadcb213c8f1e";
+ sha256 = "9f21abc634e60797e5869dbbc3a3f0efab58de05a8a7e51748d7d879361b1b49";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kn/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kn/firefox-116.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "f91edfa2a38100f0a0eb4a9ee461fb06c88d6eef57ef8e2dfc13a1060e2b6859";
+ sha256 = "16e038a5d4941da4627d843435abd3e6e5478a6f69dc041de8e3a35657c82b24";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ko/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ko/firefox-116.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "d1537c34512065a33e0a4f720363652a2cbf4d4c84b10dba64d64e56b5b445d2";
+ sha256 = "9d77cb5d87ce74e63b71946662be2f22dfbd348750eb6034309fc8a651957cbb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lij/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lij/firefox-116.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "0908a41031180d9f5dde1056f49b3d5479fb4bec43b6c9fbed8670ce779fa1d9";
+ sha256 = "d13c0cb9b389e97d295dd8584ccb9097eb3d8dd36a0bf2413a99ae2ba21574c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lt/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lt/firefox-116.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "01b0b9f95e07bcc8868eaa1e3bd0b5822897490832d27453430ce07bb84c030b";
+ sha256 = "941977d136f650c43ba1abd7a91ef4e2a30ecba312b32c2be15a70bb29e88f72";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lv/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lv/firefox-116.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "6434bd6669772a9332b9790e1a7f108c5e7d3676ac9711a06b7c3f92e37667f8";
+ sha256 = "8b6c66e6c407094b2e9734c4d5c68c913e0c765938537f1a7380d2d2686d6a72";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/mk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/mk/firefox-116.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "0ebe5d9a101780e2d674ead35e7e02f78b4a4f2f17f3838cffaf64b1c8dd760e";
+ sha256 = "a415aad48d4bb948d908f29675865b0aea98f0382871f98f2e021d290ea41383";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/mr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/mr/firefox-116.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "5854a21f094b5e5b768acbf3173adfcb05be007e91a3f26187ef15e28a55344b";
+ sha256 = "217527cd028640dd698289c0363bd9e54731925de83480320b62e34fdbf6fc6d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ms/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ms/firefox-116.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "de7a7d13471ed218cb56300e033849a121e8e3247980f20f403848376ba7e313";
+ sha256 = "ed1c8e9d1a7f5e9d1cdfa64dfd5308fbcf659ee873e11f1011ffe7ad68eb68ff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/my/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/my/firefox-116.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "e6f3b5993ee26d3e13acda0842250cb1df66c54855fa2706567cb0ebe6dff57e";
+ sha256 = "b8ffef2f300ef5b3c4d579d18a1432aa2ff827dcd77bf1c0af2fc51428cf109d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nb-NO/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nb-NO/firefox-116.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "2f4bdaf1cfd70099bc0061b12e0d571f727ea342b835cd6ce4ce18c7752109f8";
+ sha256 = "5b2275d6bc84e0d5d44d8d1225d25a548712e39398b2d95d2b61235798b4d3a0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ne-NP/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ne-NP/firefox-116.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "c958d4e7b0ec0efa2c9b6014db33c5e0c07956a25da8aba3e0d5fd06600b7317";
+ sha256 = "ce93aaa6181af54c9187861145947b157a7073f5f85300de5cc815dcda91ca23";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nl/firefox-116.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "ed2cf184d2092a08c10638328efd47cce0870615ccfae9fe2ea01b1ad95943bc";
+ sha256 = "44fb66a3951c4d2d2185cac2bae68de9f8c33fbf51b755efb8eb8e65c8244e8d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nn-NO/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nn-NO/firefox-116.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "53f61eea19c64781aef5484318f4f003a59543d9df25686f920b22e855eaac45";
+ sha256 = "1f193335190eb2ec6197ebf40026e687f6572c49371dd9ad8f7c3ac5b4d044dd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/oc/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/oc/firefox-116.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "486c724bb71666a18f73265f844a9b1480f1ed3e4b7cf850624a3800262c0896";
+ sha256 = "af449593909a84a0bf75e3bbca2d5764e791f34d4e0e155b8163d02e95bdbe61";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pa-IN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pa-IN/firefox-116.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "7f49438ed94a0470e9d4dc5c0ab6abe123f50e9a84857e803d399b2dd44e4b17";
+ sha256 = "e0b6a81f200ab2481e0ee6b1a2c711e2494956ae0a1e48746f91a71e3948c521";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pl/firefox-116.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "e61176b20af0cfda2cfd9dbeefb5a7107b9b00d8d93095f3dba5cf966ab37f66";
+ sha256 = "fd7c475d0a9b1bd5d02fa2ac25c3a05805f69fdcbf583a09ab1c62a3f3c91ca4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pt-BR/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pt-BR/firefox-116.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "9bbf433714d068835eb2191f967cd57ee6eaf00b8884c75bcb1b103b018c8482";
+ sha256 = "552449ab9b20abb2bcaaf91d0bb1e20b2bc9fe87b4b0aea7a91b4204adae8a96";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pt-PT/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pt-PT/firefox-116.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "330fcfbab5e5639d678e6b3587fc284685e75a20aba3b94172227060cfc5d652";
+ sha256 = "bfdc36e8c4e88fc059cb60745dfd362f722fea9f7f36ce8c9ae59c098a0001b5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/rm/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/rm/firefox-116.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "c955e19cce4d468f16cc6f19dc462ec4b2bfc75331caf3ee64a105c18c549269";
+ sha256 = "23bf9dcf37362d0fed86ad66c549c7fb316173248d9d21b2305d7ad74e65bf34";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ro/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ro/firefox-116.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "05b1ff4f0474755672fbea5c4ad217c5d4a382e7d96ac4595bffaefdd831f0f5";
+ sha256 = "c3d5de62719dc8a730cc14c46af8d595aff72660ec053c5b982d7d245db2f235";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ru/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ru/firefox-116.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "f12964c16dd0caab6056dc134e760de11b2fae6d2c144570f4d4f81516a90bbd";
+ sha256 = "5a9e4c850f9bb93d2f97004590f4da1ded42031f3212413ce5a419491e5a421e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sc/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sc/firefox-116.0.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "459cd663389eb7ffcc849f5f7dcfaed6674ab8426b15772bcc1981b764c8fffa";
+ sha256 = "c2ebc9d0d3c7364de45ced4960a0a019a649a7591cc87fad570e38426c7660c1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sco/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sco/firefox-116.0.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "ac310430b58a396f0df8bc49d92acb7343a4dd1b44c8b722577af7baec604acb";
+ sha256 = "90cdf54c7c693cf50f47224dc6a91502bbcf7a613e9faea18d3a0b0a1a55a836";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/si/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/si/firefox-116.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "63350129c87bdafef37c627fb2a7f9ee300042cbbb754d211943a89e4a928edb";
+ sha256 = "fe27c606dbd5cf843d449b23107811c1cc900d93926502d152804476559fc061";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sk/firefox-116.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "5b12dbfdea4792fc1753d6719f1da10886e039ec56f0cd6c5a17b384958aeb19";
+ sha256 = "70241a490bda80acda364de47ed926307e2bd79b183fdec0c7288168b5f35da4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sl/firefox-116.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "a086751406db10084ffc4b1a65bdca00bcabe9d31c6ac6060a0ec9a10be2d03e";
+ sha256 = "3d5e2c53238f9c97ee3f6f7a57ea2fcb4c6b24d872ef5af7c88b5df1a974c68a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/son/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/son/firefox-116.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "23b78776d174b7ad5b7a2385ffbafa3e2727d799ce53b60287fdfd6d8bc2ad03";
+ sha256 = "ee6449b80616c9fc2650ed47a9474de9f0cf9857973a82945f07c8f053548ce4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sq/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sq/firefox-116.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "d1f23ac8a7879b142aed1c503f1edd9014a095fe34c6d2c321468ab6eff965a6";
+ sha256 = "9304539492ce794f84f1d95f693c10235c0b87ed412d4dc22a307190fb68c212";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sr/firefox-116.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "2c2900763e39b3fc2322431a782361090ee171b08476b972ebdafb669acd4f8e";
+ sha256 = "2be7297624ef34ac0942c1af82701817691457de0ebac4354d2df649d4d69baa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sv-SE/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sv-SE/firefox-116.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "31a6ff5390b5522981601e3770a9181642fef490960e2f2ad462d0be021bac9b";
+ sha256 = "42a9372113e8ff5edb79f52868dd5fb0ff0f6810a1764c143020ddc4e5885530";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/szl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/szl/firefox-116.0.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "2377483264bf279c24a01cf883fbea79c78c0150f8c4cfd6da762bc7fd4f7014";
+ sha256 = "f699ec97ef95958cfc65191a95b3296618e39eedec9078e8ca28a1a4618ea4d9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ta/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ta/firefox-116.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "d1bce010ccd6512d315014f36fe69c5272804716f62bd47d50ced4902c6b2d1d";
+ sha256 = "eeb24dd7277660b0903124eb59e14fb69a3fa04f5d9030908de27bba137ff4a3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/te/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/te/firefox-116.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "2fe7d6bd5f5341bb3b7a13716ab328736fa3788423d2e226e5a55d1bd1c8f324";
+ sha256 = "627a55d9a260edbd71b0753b5dd878a8018e377e26a7825b035fe1d1e041f152";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tg/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tg/firefox-116.0.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "b0ad430e95ae9bc93047fb3f307a298fb72b7a0a92e907f3d2e756bb191559e1";
+ sha256 = "51036c3e0107e401db38830171b02ed38b490341426baa9b648689d3108a0e7a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/th/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/th/firefox-116.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "6de013658d343173c0387ea31cbd13a13283b94c610d8da045ec132a58a00c55";
+ sha256 = "07f248626ba69c176c28d0b3cd8412d02590db4bad799b4eed6f89551b46bb50";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tl/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tl/firefox-116.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "e61c21f5dd1b501850ad5fa7e4fc78ff2d6e8204e59641a9def848fb2d0e1db0";
+ sha256 = "eae41e5cf45449ad4aa639869ad0ec7c5abe8aab6030bd3c914e19cf37c22904";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tr/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tr/firefox-116.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "dcbe3eb837e43d9c11883e2bbf4402703e7e18bf5bfc80de5e6a3b05439ea09a";
+ sha256 = "0c3527d182e5033d7767400ac85fc97d1f13f3c858ca6302ef167158338fb0c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/trs/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/trs/firefox-116.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "f762bf0c20350079ac9fa8e79fa8711eeae6d8c1cd47d628622b213739ca963b";
+ sha256 = "7c4cec572dabdceae08dde4f23dbe13d8fad56b32672219ce2e7cf2e04336b2f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/uk/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/uk/firefox-116.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "bda43112d1fcde83e319918c5bfcd8d3e7c087b03a995f5657f0b216b90b3580";
+ sha256 = "430c38e381d3dc120716cba77b561ef0707adc8547159719c285b216a0573770";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ur/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ur/firefox-116.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "41bbb5805aea4234a82cf7366768d36c572e87cc6a82e289e13cbb8702a0349b";
+ sha256 = "796f802b79e4a69581d2eedc0936e7921a8cd307c816075cd59db7b3b52b899c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/uz/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/uz/firefox-116.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "410d410e506c6d924ec556e9dbab1fde140c72761613cee028077c316b01e1ae";
+ sha256 = "772260d25afca78633c06cbc931b4356d2dcb0528a95665aae533a9bc3c55833";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/vi/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/vi/firefox-116.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "32d494eb804d88fa7fe0192eca9c6138f3fe6310398342f66e4c739811dd1a3c";
+ sha256 = "5fd11545971f8aae762fb372a25f4b30d21f84acbeab1086d75f5696d96b10bf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/xh/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/xh/firefox-116.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "e8e919beb4440cf96b5d9656d0e2c9fc2fee66aa0c0fc5aa87fedff4b723eb4e";
+ sha256 = "24fc569b9519e902cc570af9f74ff532a680cebc8abd1c151d8f8165c681dc92";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/zh-CN/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/zh-CN/firefox-116.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "79226a3ec389275f85c5d586e53181b6db09813231026b31dcbc41f5ae1f10c2";
+ sha256 = "f0e7fcbf14e0a9f5281a5bdcc4f9fe82708b6211b09f1db22f036e770f0de713";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/zh-TW/firefox-115.0.2.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/zh-TW/firefox-116.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "23db05c309c9753c4b48e027f6c7b4978f102a0226197d11254e703db25ea6e0";
+ sha256 = "931c833b5cffc510b96eeeb356ad8599e0478d2b2b485dd553c4b6656bce23ab";
}
];
}
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 348c93d0c3..753e1c9d59 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -187,7 +187,6 @@ let
# These values are exposed through telemetry
"app.distributor" = "nixos";
"app.distributor.channel" = "nixpkgs";
- "app.partner.nixos" = "nixos";
};
});
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 27f3ec022c..7b839cdfcb 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 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
- version = "115.0.2";
+ version = "116.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b";
+ sha512 = "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d";
};
meta = {
@@ -20,6 +20,7 @@
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
+ mainProgram = "firefox";
};
tests = [ nixosTests.firefox ];
updateScript = callPackage ./update.nix {
@@ -29,11 +30,11 @@
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
- version = "116.0b3";
+ version = "116.0b8";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "6ba3b57750335fa2067669756d69a05e23c1641e9fe892f9ffc879c17bd5a836815f97c90277d6dc1fe1a68173652bcbb544540ce21a9c37892fad70987e8d39";
+ sha512 = "5e34b3eed2ee54de4209af85be80f240c674d22ace072fba5e4cf14a7d733edc0cfd0feafc80b23898ef8c43e5e950b5e683f536d84f12a8a7fcee0120479701";
};
meta = {
@@ -46,6 +47,7 @@
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
+ mainProgram = "firefox";
};
tests = [ nixosTests.firefox-beta ];
updateScript = callPackage ./update.nix {
@@ -56,12 +58,12 @@
firefox-devedition = (buildMozillaMach rec {
pname = "firefox-devedition";
- version = "116.0b3";
+ version = "116.0b8";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "61b07bc9a706af8e947a0f206edb219650f8d64da5db821ca115375e379a11e4623dfe4e5b8734d0992e048ad8017152f8540e921105c3a266ad9347ef7b88e9";
+ sha512 = "06ae0998a537a464a85cf9767555eb1b9d1378345201c9df760cb8ca856fcce61d84ca8398450b80175e9d13e6077df3c5fee9d4781d0879490d30bc6d362a0d";
};
meta = {
@@ -74,6 +76,7 @@
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
+ mainProgram = "firefox";
};
tests = [ nixosTests.firefox-devedition ];
updateScript = callPackage ./update.nix {
@@ -87,11 +90,11 @@
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
- version = "102.13.0esr";
+ version = "102.14.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde";
+ sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd";
};
meta = {
@@ -104,6 +107,7 @@
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
+ mainProgram = "firefox";
};
tests = [ nixosTests.firefox-esr-102 ];
updateScript = callPackage ./update.nix {
@@ -115,11 +119,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
- version = "115.0.2esr";
+ version = "115.1.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458";
+ sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592";
};
meta = {
@@ -132,6 +136,7 @@
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
+ mainProgram = "firefox";
};
tests = [ nixosTests.firefox-esr-115 ];
updateScript = callPackage ./update.nix {
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 6b08a891ec..e909b15f77 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -5,9 +5,9 @@
## 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, web-eid-app, pipewire
+, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
-, fx_cast_bridge
+, fx-cast-bridge
, udev
, libkrb5
, libva
@@ -65,12 +65,11 @@ 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
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration
- ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
+ ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge
++ extraNativeMessagingHosts
;
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]
@@ -304,7 +303,7 @@ let
"''${executablePath}${nameSuffix}" \
--prefix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
- --suffix PATH ':' "${xdg-utils}/bin" \
+ ${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \
--suffix PATH ':' "$out/bin" \
--set MOZ_APP_LAUNCHER "${launcherName}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
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 1af17ad7aa..c29400c32f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -10,7 +10,7 @@
, nixosTests
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "unstable-2023-01-17";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY=";
};
- sourceRoot = "source/Ladybird";
+ sourceRoot = "${finalAttrs.src.name}/Ladybird";
postPatch = ''
substituteInPlace CMakeLists.txt \
@@ -70,4 +70,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ fgaz ];
platforms = platforms.unix;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
index 294f034925..8dad70a3dc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
- version = "1.16.5";
+ version = "1.16.6";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
- hash = "sha256-OLKUw0qimt0WgcW26T4IWVK16nDGSmqHSuSJ8tHhbsE=";
+ hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg=";
};
nativeBuildInputs = [ cmake pkg-config zip ];
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 f903c31f8b..2e364b5c7f 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": "115.0.2-2",
+ "packageVersion": "116.0-1",
"source": {
- "rev": "115.0.2-2",
- "sha256": "092fp608lcxrax391xc33dqgbxspkflvmkmhc4jmji2ij3my12jn"
+ "rev": "116.0-1",
+ "sha256": "1nah5a5l5ajyvy8aw4xdpdfs2s3ybfs5jw9c4qj9qczxdp541a66"
},
"firefox": {
- "version": "115.0.2",
- "sha512": "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b"
+ "version": "116.0",
+ "sha512": "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
index 2af28bb8dd..7f72a42ffe 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
@@ -46,13 +46,9 @@ let
then baseName
else baseName + "-" + channel;
- iconSuffix = if channel == "stable"
- then ""
- else "_${channel}";
+ iconSuffix = lib.optionalString (channel != "stable") "_${channel}";
- desktopSuffix = if channel == "stable"
- then ""
- else "-${channel}";
+ desktopSuffix = lib.optionalString (channel != "stable") "-${channel}";
in
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py
index 4d068862fe..0e9bfa8fe8 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py
@@ -2,14 +2,13 @@
#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian
import base64
-import gzip
import textwrap
from urllib import request
+from collections import OrderedDict
from debian.deb822 import Packages
from debian.debian_support import Version
-
def packages():
packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
handle = request.urlopen(packages_url)
@@ -17,7 +16,7 @@ def packages():
def latest_packages(packages: bytes):
- latest_packages: dict[str, Packages] = {}
+ latest_packages: OrderedDict[str, Packages] = {}
for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
name: str = package['Package']
if not name.startswith('microsoft-edge-'):
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
index 72eeda8152..d9df75b00c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -1,60 +1,108 @@
-{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, check
+, curl
+, expat
+, gtk2
+, gtk3
+, libXcursor
+, libXrandr
+, libidn
+, libjpeg
+, libpng
+, libwebp
+, libxml2
+, makeWrapper
+, openssl
+, perlPackages
+, pkg-config
+, wrapGAppsHook
+, xxd
-# Buildtime dependencies.
-, check, pkg-config, xxd
-
-# Runtime dependencies.
-, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
-, openssl, perl, perlPackages
-
-# uilib-specific dependencies
-, gtk2 # GTK 2
-, gtk3 # GTK 3
-, SDL # Framebuffer
+# Netsurf-specific dependencies
+, buildsystem
+, libcss
+, libdom
+, libhubbub
+, libnsbmp
+, libnsfb
+, libnsgif
+, libnslog
+, libnspsl
+, libnsutils
+, libparserutils
+, libsvgtiny
+, libutf8proc
+, libwapcaplet
+, nsgenbind
# Configuration
, uilib
-
-# Netsurf-specific dependencies
-, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
-, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
-, libwapcaplet, nsgenbind
}:
-let
- inherit (lib) optional optionals;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "netsurf";
version = "3.10";
src = fetchurl {
- url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz";
- sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
+ url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
};
nativeBuildInputs = [
makeWrapper
- perl
perlPackages.HTMLParser
+ perlPackages.perl
pkg-config
xxd
]
- ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook
- ;
+ ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook;
buildInputs = [
- check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl
- # Netsurf-specific libraries
- nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss
- libhubbub libdom libnsbmp libnsgif libsvgtiny libnsutils libnspsl
+ check
+ curl
+ libXcursor
+ libXrandr
+ libidn
+ libjpeg
+ libpng
+ libwebp
+ libxml2
+ openssl
+
+ libcss
+ libdom
+ libhubbub
+ libnsbmp
+ libnsfb
+ libnsgif
+ libnslog
+ libnspsl
+ libnsutils
+ libparserutils
+ libsvgtiny
libutf8proc
+ libwapcaplet
+ nsgenbind
]
- ++ optionals (uilib == "framebuffer") [ expat SDL ]
- ++ optional (uilib == "gtk2") gtk2
- ++ optional (uilib == "gtk3") gtk3
+ ++ lib.optionals (uilib == "framebuffer") [ expat SDL ]
+ ++ lib.optional (uilib == "gtk2") gtk2
+ ++ lib.optional (uilib == "gtk3") gtk3
;
+ # Since at least 2018 AD, GCC and other compilers run in `-fno-common` mode as
+ # default, in order to comply with C standards and also get rid of some bad
+ # quality code. Because of this, many codebases that weren't updated need to
+ # be patched -- or the `-fcommon` flag should be explicitly passed to the
+ # compiler
+
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
+ # https://github.com/NixOS/nixpkgs/issues/54506
+
+ env.NIX_CFLAGS_COMPILE = "-fcommon";
+
preConfigure = ''
cat < Makefile.conf
override NETSURF_GTK_RES_PATH := $out/share/
@@ -67,7 +115,7 @@ stdenv.mkDerivation rec {
"TARGET=${uilib}"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "A free, open source, small web browser";
longDescription = ''
@@ -76,8 +124,7 @@ stdenv.mkDerivation rec {
layout and rendering engine entirely written from scratch. It is small and
capable of handling many of the web standards in use today.
'';
- license = licenses.gpl2Only;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.gpl2Only;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
index 4956c70655..385deef99f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix
@@ -1,24 +1,26 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "buildsystem";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-buildsystem";
version = "1.9";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz";
- sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
+ url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${finalAttrs.version}.tar.gz";
+ hash = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
};
makeFlags = [
"PREFIX=$(out)"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "NetSurf browser shared build system";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.unix;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix
index 409ab80ce3..36bfe10d5d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix
@@ -1,20 +1,23 @@
{ lib, pkgs }:
-lib.makeScope pkgs.newScope (self: with self; {
+lib.makeScope pkgs.newScope (self:
+ let
+ inherit (self) callPackage;
+ in {
# ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)
# requires a terminal that supports `sixel` capabilities, such as mlterm
# or xterm -ti 340
ui = "gtk3";
- uilib =
- if ui == "gtk2" ||
- ui == "gtk3" ||
- ui == "framebuffer" then ui
- else if ui == "sixel" then "framebuffer"
- else null; # Never will happen
- SDL =
- if ui == "sixel" then pkgs.SDL_sixel
- else if ui == "framebuffer" then pkgs.SDL
- else null;
+ uilib = {
+ "framebuffer" = "framebuffer";
+ "gtk2" = "gtk2";
+ "gtk3" = "gtk3";
+ "sixel" = "framebuffer";
+ }.${self.ui} or null; # Null will never happen
+ SDL = {
+ "sixel" = pkgs.SDL_sixel;
+ "framebuffer" = pkgs.SDL;
+ }.${self.ui} or null;
browser = callPackage ./browser.nix { };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix
index db5a39f228..66a3a4057d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix
@@ -1,35 +1,43 @@
-{ lib, stdenv, fetchurl, pkg-config, perl
+{ lib
+, stdenv
+, fetchurl
+, perl
+, pkg-config
, buildsystem
, libparserutils
, libwapcaplet
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libcss";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libcss";
version = "0.9.1";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
+ url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [
perl
+ buildsystem
libparserutils
libwapcaplet
- buildsystem ];
+ ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ];
+ env.NIX_CFLAGS_COMPILE = toString [
+ "-Wno-error=implicit-fallthrough"
+ "-Wno-error=maybe-uninitialized"
+ ];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libcss/";
description = "Cascading Style Sheets library for netsurf browser";
longDescription = ''
LibCSS is a CSS parser and selection engine. It aims to parse the forward
@@ -37,8 +45,7 @@ stdenv.mkDerivation rec {
and is available for use by other software, under a more permissive
license.
'';
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix
index 4c7224f226..328bed30f1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix
@@ -1,43 +1,47 @@
-{ lib, stdenv, fetchurl, pkg-config, expat
+{ lib
+, stdenv
+, fetchurl
+, expat
+, pkg-config
, buildsystem
, libparserutils
, libwapcaplet
, libhubbub
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libdom";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libdom";
version = "0.4.1";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
+ url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [
expat
+ buildsystem
libhubbub
libparserutils
libwapcaplet
- buildsystem ];
+ ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libdom/";
description = "Document Object Model library for netsurf browser";
longDescription = ''
LibDOM is an implementation of the W3C DOM, written in C. It is currently
in development for use with NetSurf and is intended to be suitable for use
in other projects under a more permissive license.
'';
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix
index 9fd04904c8..29a3129280 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix
@@ -1,30 +1,35 @@
-{ lib, stdenv, fetchurl, pkg-config, perl
+{ lib
+, stdenv
+, fetchurl
+, perl
+, pkg-config
, buildsystem
, libparserutils
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libhubbub";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libhubbub";
version = "0.3.7";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
+ url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [
perl
+ buildsystem
libparserutils
- buildsystem ];
+ ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/projects/hubbub/";
description = "HTML5 parser library for netsurf browser";
longDescription = ''
@@ -37,8 +42,7 @@ stdenv.mkDerivation rec {
parse all markup, both valid and invalid. As a result, Hubbub parses web
content well.
'';
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
index 24790c477d..9ae8dafa1b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
@@ -1,18 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnsbmp";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnsbmp";
version = "0.1.6";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ buildsystem ];
makeFlags = [
@@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "BMP Decoder for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix
index d093df4662..079e351ab1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix
@@ -1,19 +1,23 @@
-{ lib, stdenv, fetchurl, pkg-config
-, uilib, SDL
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, pkg-config
, buildsystem
+, uilib
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnsfb";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnsfb";
version = "0.2.2";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnsfb-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ SDL buildsystem ];
makeFlags = [
@@ -22,11 +26,10 @@ stdenv.mkDerivation rec {
"TARGET=${uilib}"
];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libnsfb/";
description = "Netsurf framebuffer abstraction library";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
index 2e1cb37a64..20c990448e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
@@ -1,20 +1,24 @@
-{ lib, stdenv, fetchurl, pkg-config, buildPackages
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, buildPackages
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnsgif";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnsgif";
version = "0.2.1";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ buildsystem ];
makeFlags = [
@@ -23,11 +27,10 @@ stdenv.mkDerivation rec {
"BUILD_CC=$(CC_FOR_BUILD)"
];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libnsgif/";
description = "GIF Decoder for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.unix;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix
index 7189f1c591..f9243ec568 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix
@@ -1,18 +1,27 @@
-{ lib, stdenv, fetchurl, pkg-config, bison, flex
+{ lib
+, stdenv
+, fetchurl
+, bison
+, flex
+, pkg-config
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnslog";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnslog";
version = "0.1.3";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnslog-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
};
- nativeBuildInputs = [ pkg-config bison flex ];
+ nativeBuildInputs = [
+ bison
+ flex
+ pkg-config
+ ];
+
buildInputs = [ buildsystem ];
makeFlags = [
@@ -20,11 +29,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "NetSurf Parametric Logging Library";
- license = licenses.isc;
- maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.isc;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix
index 01e3e401a7..30c91908d9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix
@@ -1,18 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnspsl";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnspsl";
version = "0.1.6";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ buildsystem ];
makeFlags = [
@@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "NetSurf Public Suffix List - Handling library";
- license = licenses.mit;
- maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix
index bba457674c..80e883e4b2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix
@@ -1,18 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libnsutils";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libnsutils";
version = "0.1.0";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
+ url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
};
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ buildsystem ];
makeFlags = [
@@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "Generalised utility library for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
index ac50237cc4..411495b8e2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix
@@ -1,29 +1,33 @@
-{ lib, stdenv, fetchurl, perl
+{ lib
+, stdenv
+, fetchurl
+, perl
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libparserutils";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libparserutils";
version = "0.2.4";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
+ url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
};
- buildInputs = [ perl buildsystem ];
+ buildInputs = [
+ perl
+ buildsystem
+ ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libparserutils/";
description = "Parser building library for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
index 1439978843..19b523ce50 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl, pkg-config, gperf
+{ lib
+, stdenv
+, fetchurl
+, gperf
+, pkg-config
, buildsystem
, libdom
, libhubbub
@@ -6,34 +10,37 @@
, libwapcaplet
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libsvgtiny";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libsvgtiny";
version = "0.1.7";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
+ url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
};
- nativeBuildInputs = [ pkg-config gperf ];
+ nativeBuildInputs = [
+ gperf
+ pkg-config
+ ];
+
buildInputs = [
+ buildsystem
libdom
libhubbub
libparserutils
libwapcaplet
- buildsystem ];
+ ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/";
description = "NetSurf SVG decoder";
- license = licenses.mit;
- maintainers = [ maintainers.samueldr maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
index 47b53b4781..adbd138b22 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
@@ -5,13 +5,12 @@
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libutf8proc";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libutf8proc";
version = "2.4.0-1";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+ url = "http://download.netsurf-browser.org/libs/releases/libutf8proc-${finalAttrs.version}-src.tar.gz";
hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
};
@@ -24,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "UTF8 Processing library for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
index 6a2918fa7d..01c1b6c67f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@@ -1,15 +1,16 @@
-{ lib, stdenv, fetchurl
+{ lib
+, stdenv
+, fetchurl
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "libwapcaplet";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-libwapcaplet";
version = "0.4.3";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
+ url = "http://download.netsurf-browser.org/libs/releases/libwapcaplet-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
};
buildInputs = [ buildsystem ];
@@ -21,11 +22,10 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
- meta = with lib; {
- homepage = "https://www.netsurf-browser.org/projects/${libname}/";
+ meta = {
+ homepage = "https://www.netsurf-browser.org/projects/libwapcaplet/";
description = "String internment library for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
index d08f4dbccf..fc2b992803 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
@@ -1,30 +1,36 @@
-{ lib, stdenv, fetchurl
-, flex, bison
+{ lib
+, stdenv
+, fetchurl
+, bison
+, flex
, buildsystem
}:
-stdenv.mkDerivation rec {
- pname = "netsurf-${libname}";
- libname = "nsgenbind";
+stdenv.mkDerivation (finalAttrs: {
+ pname = "netsurf-nsgenbind";
version = "0.8";
src = fetchurl {
- url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
- sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
+ url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz";
+ hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
};
- buildInputs = [ flex bison buildsystem ];
+ nativeBuildInputs = [
+ bison
+ flex
+ ];
+
+ buildInputs = [ buildsystem ];
makeFlags = [
"PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
- meta = with lib; {
+ meta = {
homepage = "https://www.netsurf-browser.org/";
description = "Generator for JavaScript bindings for netsurf browser";
- license = licenses.mit;
- maintainers = [ maintainers.vrthra maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ inherit (buildsystem.meta) maintainers platforms;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix
index e9f2ea4261..7adb6a1130 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix
@@ -14,6 +14,7 @@
let
pythonDependencies = with python3Packages; [
beautifulsoup4
+ chardet
cryptography
feedparser
pillow
@@ -30,7 +31,7 @@ let
in
python3Packages.buildPythonPackage rec {
pname = "offpunk";
- version = "1.9.2";
+ version = "1.10";
format = "flit";
disabled = python3Packages.pythonOlder "3.7";
@@ -39,7 +40,7 @@ python3Packages.buildPythonPackage rec {
owner = "~lioploum";
repo = "offpunk";
rev = "v${version}";
- sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU=";
+ hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix
index cdae7b7c55..ece75ad872 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "palemoon-bin";
- version = "32.2.1";
+ version = "32.3.1";
src = fetchzip {
urls = [
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
];
hash = if withGTK3 then
- "sha256-brF9ACAG+JM7bk/JarB208f8ihI/1d90l+6e1pHmC20="
+ "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII="
else
- "sha256-205rhW89Jlk4ICraqndTbJ6/88+ZqhtDOIvhFTiEUz0=";
+ "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY=";
};
preferLocalBuild = true;
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 3ed322797f..ee31f79a57 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
@@ -89,7 +89,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "12.5.1";
+ version = "12.5.2";
lang = "ALL";
@@ -101,7 +101,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-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4=";
+ hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es=";
};
i686-linux = fetchurl {
@@ -111,7 +111,7 @@ 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-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8=";
+ hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix
index 36e09e8047..f2359e812a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix
@@ -2,20 +2,20 @@
buildNpmPackage rec {
pname = "vieb";
- version = "10.1.0";
+ version = "10.1.1";
src = fetchFromGitHub {
owner = "Jelmerro";
repo = pname;
rev = version;
- hash = "sha256-g3TW3hl2D9pulEPpbcP1s536yY1o+dMv6nuMrVjgxGI=";
+ hash = "sha256-fEnBsxhRl8SmyTV82SPza5jv5GkCyVpfymeq5k48oxk=";
};
postPatch = ''
sed -i '/"electron"/d' package.json
'';
- npmDepsHash = "sha256-P3VdG8JQ0JVbjdhOIfx8CxwSiWr0pYUJ4e2oOgAgtU0=";
+ npmDepsHash = "sha256-iCuRPC5p7XzKpVjkGYLoZfOySYvO+uL71/qW9rDxI2M=";
dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
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 046200e820..8c25377f66 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 = "6.1.3035.111";
+ version = "6.1.3035.204";
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-0bUe1Rn3pi08SaUxg+PXRXFD8V/TGVh40hkWSKvalhc=";
- x86_64-linux = "sha256-be+dKBxfDLitqstg3mZbwL4bYo4De7rIWp8+k99+a2o=";
+ aarch64-linux = "sha256-i2eIm4AF7avjy3KSUvoOOKWw7Q+BatozGpy/yyX4Esg=";
+ x86_64-linux = "sha256-TLuTYXp6EdQDBWPM1TEXwhdxWWMSPKIi5fW+SGUVdRo=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 68ba61e1ca..5e49e35313 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,22 +1,24 @@
-{ dpkg, fetchurl, lib, stdenv }:
+{ squashfsTools, fetchurl, lib, stdenv }:
+# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi
+# downloads at https://vivaldi.com/download/
stdenv.mkDerivation rec {
pname = "chromium-codecs-ffmpeg-extra";
- version = "112.0.5615.49";
+ version = "111306";
src = fetchurl {
- url = "https://launchpadlibrarian.net/660647727/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
- sha256 = "sha256-mHjvjRG+toRcsOMca+JPXNZPgyQROH2qtSpBPHLmt3s=";
+ url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_34.snap";
+ sha256 = "sha256-Dna9yFgP7JeQLAeZWvSZ+eSMX2yQbX2/+mX0QC22lYY=";
};
- buildInputs = [ dpkg ];
+ buildInputs = [ squashfsTools ];
unpackPhase = ''
- dpkg-deb -x $src .
+ unsquashfs -dest . $src
'';
installPhase = ''
- install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so
+ install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so
'';
meta = with lib; {
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = "https://ffmpeg.org/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.lgpl21;
- maintainers = with maintainers; [ betaboon cawilliamson lluchs ];
+ maintainers = with maintainers; [ betaboon cawilliamson fptje ];
platforms = [ "x86_64-linux" ];
};
}
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 6708cf6301..adfb76f485 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
@@ -51,11 +51,11 @@
stdenv.mkDerivation rec {
pname = "yandex-browser";
- version = "23.5.1.754-1";
+ version = "23.5.4.682-1";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
- sha256 = "sha256-ngtwrq8vDEt39Zd5jpBadouN1V8ly03la69M0AUyhGM=";
+ sha256 = "sha256-ZhPX4K9huCO2uyjfUsWEkaspdvUurB7jNfUMqqIFO4U=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix
index dad293e51a..0f5e807d00 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = "https://ibboard.co.uk/cawbird/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with lib.maintainers; [ jonafato schmittlauch SuperSandro2000 ];
+ maintainers = with lib.maintainers; [ jonafato schmittlauch ];
};
}
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 2c7f08bc54..bbe36cb0d6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "clash-verge";
- version = "1.3.3";
+ version = "1.3.5";
src = fetchurl {
url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
- hash = "sha256-9VsHC0HqV3CavqBw9uK+zC1nHIkK8Dry3zhK1rr+VBU=";
+ hash = "sha256-dMlJ7f1wpaiJrK5Xwx+e1tsWkGG9gJUyiIjhvVCWEJQ=";
};
nativeBuildInputs = [
@@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ zendo ];
+ mainProgram = "clash-verge";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
index 53e5a3f168..68dd94b5ca 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2023.7.0";
+ version = "2023.7.3";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = "refs/tags/${version}";
- hash = "sha256-/ELKUjo16BbPhQu1Gzj68peaAy83sGteqolR+BDIA2k=";
+ hash = "sha256-Sv6f12XXVHIi97Ows1hsqAeb4z+ZtVM5B0v0Xz/b5iY=";
};
vendorHash = null;
@@ -79,5 +79,6 @@ buildGoModule rec {
license = licenses.asl20;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ];
+ mainProgram = "cloudflared";
};
}
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 f4e9d5c1cf..b2ea58eac2 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.7";
+ version = "3.4.8";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "refs/tags/v${version}";
- hash = "sha256-jvrt8CwYkeZky5xg9a2U/CuenoBe86yX31x2iCb/7EY=";
+ hash = "sha256-cN1uLy0QHABks99BJqEpLDf2VbYUzLM2iCTTBvcY0es=";
};
- vendorHash = "sha256-6vHZxBcmhu6s3qQSX0iNIAR0hvXQB/bbpTA1/R08pj0=";
+ vendorHash = "sha256-kO4ME0r3MoOjn+83X+8bbkgF7zL/Id2+hKabQjEob+Y=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index 478200cf61..3f9a7b73f2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "argocd";
- version = "2.7.7";
+ version = "2.7.9";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "sha256-1GFA/zGX9geHgGRWx+sgszr9bJnMhAiiTjrnfvkTzuA=";
+ sha256 = "sha256-KMoHkMHMyAaywdD/+Bg63PSoB1ORwgl1aiIirhDF0Y0=";
};
proxyVendor = true; # darwin/linux hash mismatch
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 791df5177d..06b5031819 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,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
- version = "7.3.0";
+ version = "7.3.1";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc=";
+ sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k=";
};
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 ccc5777286..c552c4ffeb 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.59";
+ version = "1.0.61";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-b0KoSPPwxW/r1LHooZWWyZBuP9v4Xl5zK0GxYubTeCI=";
+ sha256 = "sha256-Q3GIAbQ1I1qsMc5Is9SkYxc+nGuC6z8zu9cW2shwC6c=";
};
- vendorHash = "sha256-8lIVFlz9Zt9+GDVc0MxrwdyC/0G4q5LU2IwSiFu9Bqg=";
+ vendorHash = "sha256-Ye01MmYHK2YGFsbELLVaXBeQbFGABS6WQUoH8AldRW0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix
index e6a907347c..7fd163f696 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
homepage = "https://docs.docker.com/machine/";
description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts";
license = licenses.asl20;
- maintainers = with maintainers; [ offline tailhook ];
+ maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
index 1347c443fb..be01702cdc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eks-node-viewer";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-k8WCD/FirC62WSmcgM5PmTs/hZEmR9xpneyZ1orcoMI=";
+ sha256 = "sha256-zuez0ELtlphMHP/Pxu5ARnYhkmLJW/ehNrTLXSGmGL8=";
};
- vendorHash = "sha256-nUVFQruesP6a74s4UfVrd+2P2lmn1NyVrJBS2dR2QdI=";
+ vendorHash = "sha256-n2H6hiKZqujrJyojO2uQTIMLMHaX//t7328GPK6hxH0=";
ldflags = [
"-s"
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 d20ce5ab17..4c69ffe92e 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.14.11";
+ version = "1.14.12";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-c9JYrStbYhFWVAHHYz036k7DzKfVjy3LD4wg+GYcKkE=";
+ hash = "sha256-0ZrR3y3bTXLCOgN+c96lEfNnT+GKXeEBHifM9jfWTBI=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix
index 16fceff4ee..1a6aa12a91 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix
@@ -12,4 +12,6 @@
helm-secrets = callPackage ./helm-secrets.nix { };
+ helm-unittest = callPackage ./helm-unittest.nix { };
+
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
new file mode 100644
index 0000000000..9b88d99e44
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -0,0 +1,34 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "helm-unittest";
+ version = "0.3.3";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E=";
+ };
+
+ vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI=";
+
+ # NOTE: Remove the install and upgrade hooks.
+ postPatch = ''
+ sed -i '/^hooks:/,+2 d' plugin.yaml
+ '';
+
+ postInstall = ''
+ install -dm755 $out/${pname}
+ mv $out/bin/helm-unittest $out/${pname}/untt
+ rmdir $out/bin
+ install -m644 -Dt $out/${pname} plugin.yaml
+ '';
+
+ meta = with lib; {
+ description = "BDD styled unit test framework for Kubernetes Helm charts as a Helm plugin";
+ homepage = "https://github.com/helm-unittest/helm-unittest";
+ license = licenses.mit;
+ maintainers = with maintainers; [ yurrriq ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix
index b932229092..3b13668abf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix
@@ -31,7 +31,10 @@ in
preferLocalBuild = true;
nativeBuildInputs = [ makeWrapper ];
- passthru = { unwrapped = helm; };
+ passthru = {
+ inherit pluginsDir;
+ unwrapped = helm;
+ };
meta = helm.meta // {
# To prevent builds on hydra
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 38bb84d776..7d9db57dda 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,17 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, makeWrapper
+, pluginsDir ? null
+}:
buildGoModule rec {
pname = "helmfile";
- version = "0.155.0";
+ version = "0.155.1";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-9YOgpXiZegimS81owjHW/in0NbxMTL+DQEgSBWdW7Rs=";
+ sha256 = "sha256-6y+7Jrs/sIpxJjO9Zzv2ht1RprrqcBjwyOsCnqDHxUY=";
};
- vendorHash = "sha256-ioZJr3v/8HhOEJJZpsCw5Gkbg9XvMMEOugyfRhevWBc=";
+ vendorHash = "sha256-MCx+6K3CqVfFEYgkxT1sFvy0vshpKwW07AUngEG2muk=";
doCheck = false;
@@ -19,9 +25,14 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X go.szostok.io/version.version=v${version}" ];
- nativeBuildInputs = [ installShellFiles ];
+ nativeBuildInputs =
+ [ installShellFiles ] ++
+ lib.optional (pluginsDir != null) makeWrapper;
- postInstall = ''
+ postInstall = lib.optionalString (pluginsDir != null) ''
+ wrapProgram $out/bin/helmfile \
+ --set HELM_PLUGINS "${pluginsDir}"
+ '' + ''
installShellCompletion --cmd helmfile \
--bash <($out/bin/helmfile completion bash) \
--fish <($out/bin/helmfile completion fish) \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
index 9e7b1fc236..0e0a69496f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmsman";
- version = "3.16.4";
+ version = "3.17.0";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
- sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM=";
+ sha256 = "sha256-mXc3CVKh4pFAZVppvk5TTg6s6dOA2Gv+ROLNV37DAl4=";
};
- vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs=";
+ vendorHash = "sha256-zn8q3HpyQWNsksYbqJcgnjOxaBVUr3dIYHk+FAalNxA=";
doCheck = false;
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 be498c5c2d..a442142383 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.18.0";
+ version = "1.18.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw=";
+ sha256 = "sha256-eSftWXwV8W/mpxZNvUUDS27z3vU36vJj/z0/Wo5qEts=";
};
- vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y=";
+ vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix
index 473a12c4de..7c60f7f783 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix
@@ -15,15 +15,16 @@ let
in
buildGoModule rec {
pname = "k3d";
- version = "5.4.4";
+ version = "5.5.1";
src = fetchFromGitHub {
owner = "k3d-io";
repo = "k3d";
- rev = "v${version}";
- sha256 = "sha256-3J25Aj/otKDCWJ+YqAsoJogU2vckZMy7fsS8XR2EMgE=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-cXUuWR5ALgCgr1bK/Qpdpo978p3PRL3/H6j1T7DKrT4=";
};
- vendorSha256 = null;
+
+ vendorHash = null;
nativeBuildInputs = [ installShellFiles ];
@@ -54,6 +55,8 @@ buildGoModule rec {
runHook postInstallCheck
'';
+ env.GOWORK = "off";
+
meta = with lib; {
homepage = "https://github.com/k3d-io/k3d/";
changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix
index 330afe6b09..799fd3f9b1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix
@@ -1,8 +1,8 @@
{
- k3sVersion = "1.26.5+k3s1";
- k3sCommit = "7cefebeaac7dbdd0bfec131ea7a43a45cb125354";
- k3sRepoSha256 = "0iz8w24lhb3mgwnks79ky4nypdqbjn91zm4nrj1ar3abkb5i8bg3";
- k3sVendorSha256 = "sha256-yPzpt9OZfW7qY9gFgrRVgmk2l9OSMMF85OY79MDCKTs=";
+ k3sVersion = "1.26.6+k3s1";
+ k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26";
+ k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y";
+ k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
index 722f0f6b73..257b8e28a8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
@@ -1,8 +1,8 @@
{
- k3sVersion = "1.27.3+k3s1";
- k3sCommit = "fe9604cac119216e67f8bd5f14eb5608e3bcd3cf";
- k3sRepoSha256 = "09j940fcyg34ip04jjiwh5sv2l802jgvkpvlbnz4g6hdi7gipd8g";
- k3sVendorSha256 = "sha256-kodrl6fEsKPkxpOCfwzEONU2zhCHwg/xdyd+ajP26jc=";
+ k3sVersion = "1.27.4+k3s1";
+ k3sCommit = "36645e7311e9bdbbf2adb79ecd8bd68556bc86f6";
+ k3sRepoSha256 = "0nvh66c4c01kcz63vk2arh0cd9kcss7c83r92ds6f15x1fxv1w3z";
+ k3sVendorSha256 = "sha256-azHl2jv/ioI7FVWpgtp7a1dmO9Dlr4CnRmGCIh5Biyg=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh
index 3d10acb83c..d1dad25b07 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -114,7 +114,7 @@ cat >versions.nix < 1.17: nix-build -A $name.go-modules --check
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix
index 6804c20eb0..e09127df6d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix
@@ -48,12 +48,6 @@ in
rec {
mkKops = generic;
- kops_1_24 = mkKops rec {
- version = "1.24.5";
- sha256 = "sha256-U5OSiU0t2gyvyNd07y68Fb+HaXp5wQN4t0CBPOOMd/M=";
- rev = "v${version}";
- };
-
kops_1_25 = mkKops rec {
version = "1.25.4";
sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo=";
@@ -61,8 +55,14 @@ rec {
};
kops_1_26 = mkKops rec {
- version = "1.26.4";
- sha256 = "sha256-dHwakorYSQCv5Pi6l32y5cajLd9teXwEds1LFgiH0ck=";
+ version = "1.26.5";
+ sha256 = "sha256-DbKzqfcQCHP3ZWJQcRhPDkKVzHB/MkcfukguUDG4UQg=";
+ rev = "v${version}";
+ };
+
+ kops_1_27 = mkKops rec {
+ version = "1.27.0";
+ sha256 = "sha256-XJOdqOT/vMVXZmVasXRb+pdmWcSd6lsyQDCnZKyqrto=";
rev = "v${version}";
};
}
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 dc8c507670..c19344a459 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.30.0";
+ version = "0.32.0";
src = fetchFromGitHub {
owner = "kubecfg";
repo = "kubecfg";
rev = "v${version}";
- hash = "sha256-sIT5vqcKMZvx+6rvUzH3l7aOXMWJq81Lwl9YsGwE66w=";
+ hash = "sha256-qjXc/2QY0PukvhiudukZGhBkovQMutsLg3Juxg1mgTc=";
};
- vendorHash = "sha256-cJFAI/W5ImWcaU6cf/BFt78qES7wQtYnR863UvGP4aM=";
+ vendorHash = "sha256-9kVFOEMFjix2WRwGi0jWHPagzXkISucGHmd88vcBJfk=";
ldflags = [
"-s"
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 06624f2b29..76f81be00e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeconform";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "yannh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo=";
+ sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
index 0b8edb6e8c..8df27913dc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
- version = "1.20.1";
+ version = "1.20.2";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
- sha256 = "sha256-PFibPL5jBbdGgULiqtt5tKYy3UWsldnbCN2LJpxat60=";
+ hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0=";
};
- vendorSha256 = "sha256-jD8p5RWbCMPmZec3fEsGa8kevTi1curBazlEDvjeuq8=";
+ vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8=";
subPackages = [ "cmd/kubectl-cnpg" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix
new file mode 100644
index 0000000000..e19929b9e3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubectl-explore";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "keisku";
+ repo = "kubectl-explore";
+ rev = "v${version}";
+ hash = "sha256-4WxvVsA05Mta7AcrGe26B+Up+x/gwdlCnb/PN9Ehu18=";
+ };
+
+ vendorHash = "sha256-z/bPfY9UVqOnrA9jNUtM7jg53/URAMAJQAqH9D5KVPQ=";
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A better kubectl explain with the fuzzy finder";
+ homepage = "https://github.com/keisku/kubectl-explore";
+ changelog = "https://github.com/keisku/kubectl-explore/releases/tag/v${version}";
+ license = licenses.mit;
+ maintainers = [ maintainers.koralowiec ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix
index 650f5d5178..6eae71afe1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubefirst";
- version = "2.2.2";
+ version = "2.2.7";
src = fetchFromGitHub {
owner = "kubefirst";
repo = pname;
rev = "v${version}";
- hash = "sha256-pTy7uwPEUmeEQ/3oCeUr5544PRA+xXp5TCbzEuwY8mE=";
+ hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I=";
};
- vendorHash = "sha256-uEZY9erGZ19aNGSraD7Zdj8GTCRM247lYAhwqfMznpE=";
+ vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0=";
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix
index 1712a018cb..1f7d691f0c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker.";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ brianmcgee ];
- broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
+ broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix
index 386327f996..fe1b55bbe9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubergrunt";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "kubergrunt";
rev = "v${version}";
- sha256 = "sha256-d88IEbsk0bwC9Mzag3UOFVcSblCjaWXhKXC8iZr6V1s=";
+ sha256 = "sha256-C3anYYyhRT+/0jO01uEBX1LLQadovO+Z9JA6nHTNXOo=";
};
vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
index 4ac7a163b3..9efefd0646 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubernetes-metrics-server";
- version = "0.6.3";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "metrics-server";
rev = "v${version}";
- sha256 = "sha256-hPI+Wq0mZ2iu4FSDpdPdGEqgFCeUdqeK5ldJCByDE4M=";
+ sha256 = "sha256-e9iFOe2iZaKbYNUk0vuyzcGDCNxot34kRH06L5UQs4I=";
};
vendorHash = "sha256-BR9mBBH5QE3FMTNtyHfHA1ei18CIDr5Yhvg28hGbDR4=";
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 944607955e..168b988b71 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.27.3";
+ version = "1.27.4";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- hash = "sha256-g/YRwhhGjeBhbSFS/6xJbljTTMiwJHE3WRySwJlzKys=";
+ hash = "sha256-Tb+T7kJHyZPXwUcEATj3jBr9qa7Sk6b+wL8HhqFOhYM=";
};
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 3aae9935ce..ab8c7463f0 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.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
- sha256 = "sha256-Tp43JDLzfOARF+1aEG5A5POdOe0rMcllWPuAdlT6tdI=";
+ sha256 = "sha256-Xtyn08rlBo17ouxSLQcVT8mQQ6nuDKPjE4OHBdze8/Q=";
};
- vendorHash = "sha256-JXWWdr5xmgXKwHx9h9X6Y0IZ4pEkBQxJSCR3CTjgJ5I=";
+ vendorHash = "sha256-MTueX4+cZIUdjE2BRLVGv7PJr3haV11woJmrkeKFpr0=";
subPackages = [ "cmd/kubeseal" ];
@@ -20,6 +20,7 @@ buildGoModule rec {
meta = with lib; {
description = "A Kubernetes controller and tool for one-way encrypted Secrets";
homepage = "https://github.com/bitnami-labs/sealed-secrets";
+ changelog = "https://github.com/bitnami-labs/sealed-secrets/blob/v${version}/RELEASE-NOTES.md";
license = licenses.asl20;
maintainers = with maintainers; [ groodt ];
};
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 a4eb88147f..76d8a0905a 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 = "41.3";
+ version = "41.6";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = version;
- sha256 = "sha256-8RAUFiQLXKYRcthkthoRLl73RKjJj6PVE6SxTvqWiiI=";
+ sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84=";
};
- vendorHash = "sha256-cINzo4G1Rn9T1HBGKOKo2boUpG2S2vnFL/uwEVXq2gU=";
+ vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk=";
ldflags = let t = "github.com/kubeshark/kubeshark"; in [
"-s" "-w"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix
new file mode 100644
index 0000000000..9bd4747d2d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubevpn";
+ version = "1.1.35";
+
+ src = fetchFromGitHub {
+ owner = "KubeNetworks";
+ repo = "kubevpn";
+ rev = "v${version}";
+ sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw=";
+ };
+
+ vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno=";
+
+ # TODO investigate why some config tests are failing
+ doCheck = false;
+
+ meta = with lib; {
+ changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}";
+ description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more";
+ homepage = "https://github.com/KubeNetworks/kubevpn";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mig4ng ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix
index 9ec9baa833..e89e63fca8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
- sha256 = "sha256-TmnWDCucZ4yQjl0+2hGGoopQ62h+AM1WogC5d+JUIO0=";
+ sha256 = "sha256-kk+NgupFLzbkh/jrbJj9E6H0v3QighKa7DQJoh/fZi8=";
};
ldflags = [
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 93079174bf..fdf85c4351 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.7.1";
- sha256 = "1lvangia0hllnlccxv0f9mlp3ym8l54wmqihicd44p9nyxbwbx3d";
- vendorSha256 = "sha256-1ir+IjyT9P+D3AbPo/7wWyZRFiKqZLJ/hoFUM1jtM0A=";
+ version = "23.7.2";
+ sha256 = "0wc829dzk0in0srq0vbcagrd5ylz2d758032anzlzkf4m3lr9hdw";
+ vendorSha256 = "sha256-16j5B96UDZITY1LEWZKtfAnww7ZcUjKh/cARLaYy9wk=";
}
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 fc53e14a41..26f0cc4e1a 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.30.1";
+ version = "1.31.1";
- vendorHash = "sha256-616T47H+8FdXU37MDvAHRyM59JXurU45uz8c/TNxkkc=";
+ vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8=";
doCheck = false;
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "sha256-dw+aFckp5Q9i6bNKPetw2WlslrpKAgEzXI+aGAwDurU=";
+ sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU=";
};
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 c7daafc971..401b5b156f 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.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
- hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo=";
+ hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts=";
};
- vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A=";
+ vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
index 46cbafff2a..abe2e6ee7f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix
@@ -77,9 +77,20 @@ rec {
nomad_1_5 = generic {
buildGoModule = buildGo120Module;
- version = "1.5.6";
- sha256 = "sha256-eFzGaTJ9BcK5F10lkTKB3sNaGZsmZ0BbPZI6kT5ZUpo=";
- vendorSha256 = "sha256-tOUQr44wUhhCccvj4dCI7fvLMrKaEX7xY7035Q3wU3M=";
+ version = "1.5.8";
+ sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho=";
+ vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno=";
+ passthru.tests.nomad = nixosTests.nomad;
+ preCheck = ''
+ export PATH="$PATH:/build/go/bin"
+ '';
+ };
+
+ nomad_1_6 = generic {
+ buildGoModule = buildGo120Module;
+ version = "1.6.1";
+ sha256 = "sha256-RsyGUaLteGiNf0PTkKLcjHTevhKb/mNx2JORpXhHJMw=";
+ vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY=";
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
export PATH="$PATH:/build/go/bin"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
index f77e8be550..2686b79c4b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nova";
- version = "3.6.4";
+ version = "3.7.0";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = pname;
- rev = version;
- hash = "sha256-6gTrBogMvM7X6PFthG+c8N9wXoNHwp0wHjGVKjiHJJY=";
+ rev = "v${version}";
+ hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA=";
};
- vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
+ vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA=";
ldflags = [ "-X main.version=${version}" "-s" "-w" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
index 705b10753c..8dbe03f3ba 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix
@@ -3,26 +3,27 @@
, fetchFromGitHub
, gpgme
, installShellFiles
+, pkg-config
, testers
, openshift
}:
buildGoModule rec {
pname = "openshift";
- version = "4.12.0";
- gitCommit = "854f807";
+ version = "4.13.0";
+ gitCommit = "e561d37";
src = fetchFromGitHub {
owner = "openshift";
repo = "oc";
- rev = "854f807d8a84dde710c062a5281bca5bc07cb562";
- hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg=";
+ rev = "e561d37285c8bde273ce00d086bea599a9cdd3be";
+ hash = "sha256-/ar96N+MSy0DPdza3UWiyolg1EZPBR6LCku4GV+HppM=";
};
vendorHash = null;
buildInputs = [ gpgme ];
- nativeBuildInputs = [ installShellFiles ];
+ nativeBuildInputs = [ installShellFiles pkg-config ];
ldflags = [
"-s"
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 589893a24e..93986c101b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pluto";
- version = "5.18.1";
+ version = "5.18.2";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
- sha256 = "sha256-E4DPJDBa/WX5JVsWgqdEv/O/XCvHDLyaL+nSMmw6Npg=";
+ sha256 = "sha256-PouKOIyKv7mxlBZJYCBppADdkf/XD28gavozCFFcO24=";
};
vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix
index ec373802b4..c3900c4faa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "pv-migrate";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "utkuozdemir";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE=";
+ sha256 = "sha256-mTzVMO0Msk5q8Wnpb0iQ8kifhNXlp4MfM+irMmOLDv8=";
};
subPackages = [ "cmd/pv-migrate" ];
- vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo=";
+ vendorHash = "sha256-SyORFCfX/4dhYLnsE/lc21/18TKpLkOxz+W9lsHjKNE=";
ldflags = [
"-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 ffcb846afd..6efdc1d5c4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rke";
- version = "1.4.6";
+ version = "1.4.7";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
- hash = "sha256-P/VvRoTcJuuRuoTT0zhebibBQrM6sz9Vv+qPrWY+B9Y=";
+ hash = "sha256-XiFXFd9pZBrZdYggVoHhxdu4cH+IyDtDNr7ztM+Zskk=";
};
vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix
index c9ce55b0b1..66b1324a6b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix
@@ -2,26 +2,38 @@
buildGoModule rec {
pname = "rke2";
- version = "1.27.2+rke2r1";
+ version = "1.27.3+rke2r1";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
- hash = "sha256-jzm2tYwsomLifAfmb0w1+/FpCgtOk+O8DRmy1OgzfmE=";
+ hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU=";
};
- vendorHash = "sha256-VVc1IgeR+LWEexTyIXtCcF6TtdDzsgP4U4kqArIKdU4=";
+ vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro=";
- subPackages = [ "." ];
+ postPatch = ''
+ # Patch the build scripts so they work in the Nix build environment.
+ patchShebangs ./scripts
- ldflags = [ "-s" "-w" "-X github.com/k3s-io/k3s/pkg/version.Version=v${version}" ];
+ # Disable the static build as it breaks.
+ sed -e 's/STATIC_FLAGS=.*/STATIC_FLAGS=/g' -i scripts/build-binary
+ '';
+
+ buildPhase = ''
+ DRONE_TAG="v${version}" ./scripts/build-binary
+ '';
+
+ installPhase = ''
+ install -D ./bin/rke2 $out/bin/rke2
+ '';
meta = with lib; {
homepage = "https://github.com/rancher/rke2";
description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution.";
changelog = "https://github.com/rancher/rke2/releases/tag/v${version}";
license = licenses.asl20;
- maintainers = with maintainers; [ zygot ];
+ maintainers = with maintainers; [ zimbatm zygot ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch
new file mode 100644
index 0000000000..b390d49246
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch
@@ -0,0 +1,20 @@
+--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
++++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+@@ -696,7 +696,7 @@ func init() {
+ // Load protocols
+ data, err := ioutil.ReadFile("/etc/protocols")
+ if err != nil {
+- if !os.IsNotExist(err) {
++ if !os.IsNotExist(err) && !os.IsPermission(err) {
+ panic(err)
+ }
+
+@@ -732,7 +732,7 @@ func init() {
+ // Load services
+ data, err = ioutil.ReadFile("/etc/services")
+ if err != nil {
+- if !os.IsNotExist(err) {
++ if !os.IsNotExist(err) && !os.IsPermission(err) {
+ panic(err)
+ }
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix
index 72622d25c3..c35cf14e06 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix
@@ -1,6 +1,20 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }:
let
+ metaCommon = with lib; {
+ description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
+ homepage = "https://docs.temporal.io/cli";
+ license = licenses.mit;
+ maintainers = with maintainers; [ aaronjheng ];
+ };
+
+ overrideModAttrs = old: {
+ # https://gitlab.com/cznic/libc/-/merge_requests/10
+ postBuild = ''
+ patch -p0 < ${./darwin-sandbox-fix.patch}
+ '';
+ };
+
tctl-next = buildGoModule rec {
pname = "tctl-next";
version = "0.9.0";
@@ -12,7 +26,9 @@ let
hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0=";
};
- vendorHash = "sha256-muTNwK2Sb2+0df/6DtAzT14gwyuqa13jkG6eQaqhSKg=";
+ vendorHash = "sha256-EX1T3AygarJn4Zae2I8CHQrZakmbNF1OwE4YZFF+nKc=";
+
+ inherit overrideModAttrs;
nativeBuildInputs = [ installShellFiles ];
@@ -33,6 +49,12 @@ let
--bash <($out/bin/temporal completion bash) \
--zsh <($out/bin/temporal completion zsh)
'';
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = metaCommon // {
+ mainProgram = "temporal";
+ };
};
tctl = buildGoModule rec {
@@ -46,7 +68,9 @@ let
hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig=";
};
- vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0=";
+ vendorHash = "sha256-5wCIY95mJ6+FCln4yBu+fM4ZcsxBGcXkCvxjGzt0+dM=";
+
+ inherit overrideModAttrs;
nativeBuildInputs = [ installShellFiles ];
@@ -63,6 +87,12 @@ let
--bash <($out/bin/tctl completion bash) \
--zsh <($out/bin/tctl completion zsh)
'';
+
+ __darwinAllowLocalNetworking = true;
+
+ meta = metaCommon // {
+ mainProgram = "tctl";
+ };
};
in
symlinkJoin rec {
@@ -75,11 +105,10 @@ symlinkJoin rec {
tctl
];
- meta = with lib; {
- description = "Temporal CLI";
- homepage = "https://temporal.io";
- license = licenses.mit;
- maintainers = with maintainers; [ aaronjheng ];
+ passthru = { inherit tctl tctl-next; };
+
+ meta = metaCommon // {
mainProgram = "temporal";
+ platforms = lib.unique (lib.concatMap (drv: drv.meta.platforms) paths);
};
}
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 72a8f8c23f..de33dd0626 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "temporal";
- version = "1.21.1";
+ version = "1.21.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
- hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU=";
+ hash = "sha256-4iosKxGjH2O2y2wkAs/tuCH+SXTj6FhrPqS9qgL+vTQ=";
};
vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
index 5fe6b263a6..09cc62352d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "terraform-backend-git";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "plumber-cd";
repo = "terraform-backend-git";
rev = "v${version}";
- hash = "sha256-nRh2eIVVBdb8jFfgmPoOk4y0TDoCeng50TRA+nphn58=";
+ hash = "sha256-ryHFuHIEJ4i1R3oBW3w3aAvtv+vIrO745qwx0+SqBF4=";
};
vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0=";
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 7eda46592e..d2744906bd 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
@@ -1,10 +1,10 @@
{
"aci": {
- "hash": "sha256-MF1YeTzKmua4C6Ay9QQGjVzjYCEZtyGW2wrMQH5Un/k=",
+ "hash": "sha256-iHWb9dytaXs7ywkxi5aPetBV1YSgYC1rTMn9+EXl42U=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
"owner": "CiscoDevNet",
"repo": "terraform-provider-aci",
- "rev": "v2.9.0",
+ "rev": "v2.10.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -37,20 +37,20 @@
"vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM="
},
"akamai": {
- "hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=",
+ "hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
- "rev": "v5.0.1",
+ "rev": "v5.1.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-xZ0pS7XxfYGbG2kEw5FAjABDQZmektaI7OhToiFMXKk="
+ "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM="
},
"alicloud": {
- "hash": "sha256-F69Otml1zH5TtD6dRPIXc2pOq2aM8NEsTsnmJDQEdxk=",
+ "hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
- "rev": "v1.207.2",
+ "rev": "v1.208.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -73,13 +73,13 @@
"vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4="
},
"argocd": {
- "hash": "sha256-S7Za9V18clq3Kb3pIQxUZpt8d51Dht76e+ypdAZB3VA=",
+ "hash": "sha256-t1WGa9pfsLn5uB7/LSYIcmb/kfQCHysIcUKHwn6y8GU=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili",
"repo": "terraform-provider-argocd",
- "rev": "v5.6.0",
+ "rev": "v6.0.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-4gVJ5j2pdrtZYmatsO5N+IwVbNCJfqMlizDI7UhgiOU="
+ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo="
},
"auth0": {
"hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=",
@@ -110,29 +110,29 @@
"vendorHash": null
},
"aws": {
- "hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=",
+ "hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
- "rev": "v5.8.0",
+ "rev": "v5.11.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU="
+ "vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM="
},
"azuread": {
- "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=",
+ "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
"owner": "hashicorp",
"repo": "terraform-provider-azuread",
- "rev": "v2.40.0",
+ "rev": "v2.41.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"azurerm": {
- "hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=",
+ "hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
- "rev": "v3.65.0",
+ "rev": "v3.68.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -182,22 +182,22 @@
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
},
"buildkite": {
- "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=",
+ "hash": "sha256-3rGuE47CYbl1B+DAYUBiuGTC1sn85c5aeay+irdhTe0=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
- "rev": "v0.20.0",
+ "rev": "v0.22.0",
"spdx": "MIT",
- "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I="
+ "vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="
},
"checkly": {
- "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",
+ "hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=",
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
"owner": "checkly",
"repo": "terraform-provider-checkly",
- "rev": "v1.6.7",
+ "rev": "v1.6.8",
"spdx": null,
- "vendorHash": "sha256-ATj1tGTS7FnEQDa6KuDQITGuVimP0A4sdlUNJ6RNIqI="
+ "vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y="
},
"ciscoasa": {
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
@@ -218,13 +218,13 @@
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
},
"cloudflare": {
- "hash": "sha256-Zj8CC+Xiej+gz9V/9IeIGaWP2cjIg6jboXN5jrBCosM=",
+ "hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
- "rev": "v4.10.0",
+ "rev": "v4.11.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-hxD+0OrCdyYn/9nvz5fd/54YiaZyZMOfsIa7lqZhCHE="
+ "vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE="
},
"cloudfoundry": {
"hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=",
@@ -264,13 +264,13 @@
"vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw="
},
"consul": {
- "hash": "sha256-UaTvFxwbLf9krUdsslFP6MXzpacnj/AKXiyUe7iSRCs=",
+ "hash": "sha256-2oujZd7tqvMnp48m3bs45p5dRC7U5a7hsiS5qBuPUHU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/consul",
"owner": "hashicorp",
"repo": "terraform-provider-consul",
- "rev": "v2.17.0",
+ "rev": "v2.18.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc="
+ "vendorHash": "sha256-0SRbKFKl1lfiiMDZW20ak9m09T3tSOH/fc+UwGeXmuk="
},
"ct": {
"hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=",
@@ -282,13 +282,22 @@
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
},
"datadog": {
- "hash": "sha256-2ahiJ4YL0BmrDwc9f9fp/ppStb51bZlzpwEfuTAlgko=",
+ "hash": "sha256-sytQJgrfgtJ761mGo0KUTxAukqvmPYyLM8+vsYGtoZc=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
- "rev": "v3.27.0",
+ "rev": "v3.28.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-yAOWcs+rFjjp21Xq1Ch/sE/6N0BSpOC167mxIOmR9nk="
+ "vendorHash": "sha256-foS7GyRUdhF/M8uTPf2I4WQo7qEg4Z/3FXjagoeSRkU="
+ },
+ "dexidp": {
+ "hash": "sha256-+Nt4bX6+4VB+mtJbsP166RObFbXaNyFrF+80x2/pRco=",
+ "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp",
+ "owner": "marcofranssen",
+ "repo": "terraform-provider-dexidp",
+ "rev": "v0.2.1",
+ "spdx": "MIT",
+ "vendorHash": "sha256-L8baV03p0V/xKi1O3YQxvoJXgP21qNhzznyvwrauVqI="
},
"dhall": {
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
@@ -300,11 +309,11 @@
"vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
},
"digitalocean": {
- "hash": "sha256-XKNQdsbh8+iq1N+pwlByFwdm6IlfEsgnT3q/l8SiHvU=",
+ "hash": "sha256-CnakqGO/adv44knzp3Q5nC17tD+ZpOEFqfQXPk20klg=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean",
"repo": "terraform-provider-digitalocean",
- "rev": "v2.28.1",
+ "rev": "v2.29.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -354,13 +363,13 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
- "hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=",
+ "hash": "sha256-nqKswIq7cOEvGuoRA9Fv5j84Ob/z2C+Ux5ecdhTW0RY=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
- "rev": "v1.14.3",
+ "rev": "v1.14.5",
"spdx": "MIT",
- "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM="
+ "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc="
},
"exoscale": {
"hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=",
@@ -390,11 +399,11 @@
"vendorHash": null
},
"flexibleengine": {
- "hash": "sha256-Y7rplfN7acrDWNO9Q4K3WaM5reFxi5ms012+wTm+EF0=",
+ "hash": "sha256-9qwGI7JBhX2WDX7u3SY2l9RJeiDffEpkE16f8/qqlI8=",
"homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine",
"owner": "FlexibleEngineCloud",
"repo": "terraform-provider-flexibleengine",
- "rev": "v1.39.0",
+ "rev": "v1.40.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck="
},
@@ -427,42 +436,42 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
- "hash": "sha256-xPxrHOuvOT8VO0D7M1TI39i0B1GIQ4Z2F1UckGsU/1A=",
+ "hash": "sha256-Y70HJEUArUCT1XM3F02bUNPwB1bW4N/Gg/M6aW7XcMM=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
- "rev": "v5.31.0",
+ "rev": "v5.32.0",
"spdx": "MIT",
"vendorHash": null
},
"gitlab": {
- "hash": "sha256-SHc1Mz1JsmNqTjfuJ4Ncll7fh5ruoRXNUAQRfFlibog=",
+ "hash": "sha256-uKImp0kcsLZL1SOAygd/ssJ7pxclUbAcDcEB3ko9Mio=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
- "rev": "v16.1.0",
+ "rev": "v16.2.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
+ "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0="
},
"google": {
- "hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=",
+ "hash": "sha256-6VLZW6RlBW7D4GS/JTvlpIcF3AhIEKbNFOqsQI58HyE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.73.1",
+ "rev": "v4.76.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
+ "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
},
"google-beta": {
- "hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=",
+ "hash": "sha256-ecmCr1AHpyYDmt1ofjFgJjirsNhpcdLggp9EXz3hT5E=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.73.1",
+ "rev": "v4.76.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
+ "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -474,31 +483,31 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
- "hash": "sha256-I0qfG916mbYYwjKmlUmCD2iG0CuJxTFOFdVS6VyEfHM=",
+ "hash": "sha256-pgyyOLkMu7W4llDb4oY72ujZ26SiQqvufVGWVv7y3Sk=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
- "rev": "v2.1.0",
+ "rev": "v2.2.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-gY15FJb1svy2AxXs6ZOmZX5o3oXIokzf5hXlFlx1cXU="
+ "vendorHash": "sha256-+I0nCbe/OK+9ax8PzLw+PCBHrNDTm96J1GITiNCQEfc="
},
"gridscale": {
- "hash": "sha256-u0NX1hoawEVbmj2Id6qvb8GYgH/u3cbgWZ/b+2nBYNM=",
+ "hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=",
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
"owner": "gridscale",
"repo": "terraform-provider-gridscale",
- "rev": "v1.21.0",
+ "rev": "v1.21.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
"hcloud": {
- "hash": "sha256-gb5Mp9LI0wb+oA+lfkEmrVEIJzCRoAhugFfJaOkvLVw=",
+ "hash": "sha256-TbEbqTgzp7pUXrhjxvs5hrFI5u//xIIniOvusZsseiE=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
- "rev": "v1.41.0",
+ "rev": "v1.42.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-jEzCvhfQTK/1MCODUN4tNrtnNE0yR23QI5Vnx1kYr4E="
+ "vendorHash": "sha256-wrgGxCNa5xLdBEy6RNNCz8ZVracyVsHzHtaQse6Ph+E="
},
"helm": {
"hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=",
@@ -510,11 +519,11 @@
"vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="
},
"heroku": {
- "hash": "sha256-zxX7cro1hAtgABlDsKQHxJJH9BrOlJHKFFwL5gGrmU0=",
+ "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
- "rev": "v5.2.4",
+ "rev": "v5.2.5",
"spdx": null,
"vendorHash": null
},
@@ -547,11 +556,11 @@
"vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4="
},
"huaweicloud": {
- "hash": "sha256-/KVQU0n91mltVE8UHDb6fpGn3CBPY1ubEP02DVg7eIY=",
+ "hash": "sha256-Uon1nXtoILFOQp9DsOubi31v6WJqWBa3zDZKHJdboHY=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.52.0",
+ "rev": "v1.53.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -655,13 +664,13 @@
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
"launchdarkly": {
- "hash": "sha256-lRkaRy4K43byP0r+wE3gne8pWmPB5il5oK4JMiPMZO4=",
+ "hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
- "rev": "v2.12.2",
+ "rev": "v2.13.4",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-Fb2k493XTePXgpCY9ZoMWaCZqq3fx3A2dBRsOp1MDBc="
+ "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
},
"libvirt": {
"hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=",
@@ -673,13 +682,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
- "hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=",
+ "hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
- "rev": "v2.5.1",
+ "rev": "v2.5.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0="
+ "vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@@ -736,22 +745,22 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"minio": {
- "hash": "sha256-Xszx9eWLufT0Jky+Z9/rky3SLJsRk2gMDjuTFbPTkS8=",
+ "hash": "sha256-BsOSImEMgxjldAQ014M25Y/JuxxaJLRdOOOHNAtm/Bg=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
- "rev": "v1.16.0",
+ "rev": "v1.17.1",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="
+ "vendorHash": "sha256-Pr5YNDMVNccjQRC5WXUY+0pMTMbuxKqkqtd/Z/z0cXc="
},
"mongodbatlas": {
- "hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",
+ "hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
- "rev": "v1.10.1",
+ "rev": "v1.10.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="
+ "vendorHash": "sha256-o8VrabFScEQyjfk4BLJGxq7LgZMWaQZ2cNAph37Grzo="
},
"namecheap": {
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
@@ -772,13 +781,13 @@
"vendorHash": null
},
"newrelic": {
- "hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=",
+ "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
- "rev": "v3.25.2",
+ "rev": "v3.26.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c="
+ "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw="
},
"nomad": {
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
@@ -790,13 +799,13 @@
"vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc="
},
"ns1": {
- "hash": "sha256-8m9uj6s7oSaqKUv2kwbPmk7R3MsydWKVLMvcbXg945k=",
+ "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
- "rev": "v2.0.4",
+ "rev": "v2.0.5",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-37mQ0/2a9nG3+WMvYgQofhhFw94OxSdnzez8RTgWSNU="
+ "vendorHash": "sha256-FLQhshuqIcMeqrW6h68pXzPaY0VqRXhfL0YMpHyKfkY="
},
"null": {
"hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
@@ -809,20 +818,20 @@
},
"nutanix": {
"deleteVendor": true,
- "hash": "sha256-c2+3nAwbFL3DWQW6OqAweTMmg8nZER4CaHGeGrh1/Tg=",
+ "hash": "sha256-p7ryvJEoMxfJWKNkUlpZL6lgJt5I93eHRh5qev5RGJ4=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
- "rev": "v1.9.1",
+ "rev": "v1.9.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
- "hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=",
+ "hash": "sha256-PLlgHUIQWxBCBmTRuQ6RSLuqkilqUb4svmklbSoYEtA=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
- "rev": "v5.4.0",
+ "rev": "v5.7.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -845,11 +854,11 @@
"vendorHash": null
},
"opennebula": {
- "hash": "sha256-bWmSXlNgPOhzNFodYAzLE1theDntCks3ywtruRbCcYc=",
+ "hash": "sha256-0XeGaHyN+u5QEU9RUr51FVi13HNmjBN6mnFwfilPw5s=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
- "rev": "v1.2.2",
+ "rev": "v1.3.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
},
@@ -863,38 +872,38 @@
"vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI="
},
"opentelekomcloud": {
- "hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=",
+ "hash": "sha256-+goODpTThegmo2cew5bKxGhtqAHd2ObeEzSG2vxWK4w=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
- "rev": "v1.35.3",
+ "rev": "v1.35.4",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo="
+ "vendorHash": "sha256-VPQml9PAb/41wwLHAFtHDSwGLwPYG9ePiPgKhtfdt9Y="
},
"opsgenie": {
- "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=",
+ "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=",
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
"owner": "opsgenie",
"repo": "terraform-provider-opsgenie",
- "rev": "v0.6.28",
+ "rev": "v0.6.29",
"spdx": "MPL-2.0",
"vendorHash": null
},
"ovh": {
- "hash": "sha256-DAixUxPk0ilbZ6T6Vf9YUKWt+6x7Ru77uYmmzUkPM0M=",
+ "hash": "sha256-CG7xyx3d9jPD+W0EmNVwdV2ShenfsnxykkERe/8ky3A=",
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
"owner": "ovh",
"repo": "terraform-provider-ovh",
- "rev": "v0.31.0",
+ "rev": "v0.32.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"pagerduty": {
- "hash": "sha256-6DYULlwIKC4zVeSuQDrulDxvZeC0cW5wRoS2LbUAFmw=",
+ "hash": "sha256-vMMxSmfNz9FZtFyOMo6e5OHX6GWNVAP/X/ewJ0sUHb0=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
- "rev": "v2.15.1",
+ "rev": "v2.15.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -935,13 +944,13 @@
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
},
"rancher2": {
- "hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=",
+ "hash": "sha256-thojEtfA8vn5fMTBuOClAKt3rlKs2XK7/RRMYSHAoMM=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher",
"repo": "terraform-provider-rancher2",
- "rev": "v3.0.2",
+ "rev": "v3.1.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc="
+ "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc="
},
"random": {
"hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",
@@ -971,13 +980,13 @@
"vendorHash": null
},
"scaleway": {
- "hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",
+ "hash": "sha256-xllc6uQN0Pjak/8eFNWCn639Kpf2UQPoDUPnX9YhoOc=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
- "rev": "v2.24.0",
+ "rev": "v2.26.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="
+ "vendorHash": "sha256-39MrDm4v7UIYDK/KNt9ES0SstkxEQ73CHvnxpZq1K5g="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@@ -1016,13 +1025,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"signalfx": {
- "hash": "sha256-mG3JUf7OASLvsfD7jk1p4CQRfrDj/TNnUKD1SzHQqEA=",
+ "hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
- "rev": "v7.0.0",
+ "rev": "v8.1.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-JE6gg32TmpEHxskJjFaqeg0tfR463fUUnwKzc0O08eo="
+ "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY="
},
"skytap": {
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
@@ -1034,11 +1043,11 @@
"vendorHash": null
},
"snowflake": {
- "hash": "sha256-Cou96AjZDi6GTz6i7+x/nJfwHkHrHB9E9g8RzX4/QKo=",
+ "hash": "sha256-gz41dRmJQm4cH7VhrEznir7IRA9+hGMjYzsOyQtNuG0=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
- "rev": "v0.68.1",
+ "rev": "v0.69.0",
"spdx": "MIT",
"vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
},
@@ -1052,13 +1061,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
- "hash": "sha256-YX0NTJ8T+HVrSiRC0WkA+SVakQ+ggVx/7JYvf3SkmPM=",
+ "hash": "sha256-8Pwy/jSzPWGXRCY+MszDPpbPWL6FFleoiu4VtSle0Kg=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
- "rev": "v1.125.1",
+ "rev": "v1.131.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-cT/85DbG5U/JPA+rgJ2BhxJA90KBKjg+X+glREiezAg="
+ "vendorHash": "sha256-NN4mnXzt1GJYGC0HBvYQBBZKENXfvVq7cTbE4XSPwto="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1106,20 +1115,20 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
- "hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=",
+ "hash": "sha256-Pk+x9/acer3YWBEMZYZWar8oDTFLPc0QydgAHrJZBNI=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.81.14",
+ "rev": "v1.81.18",
"spdx": "MPL-2.0",
"vendorHash": null
},
"tfe": {
- "hash": "sha256-UFTRqRlpS0q8go+dYIpLLmOR7zs4Zi97Q91AjV+LqI8=",
+ "hash": "sha256-wrqlEWM2id6NXfTGOM7iVbQkKP2CUwpCZdr9n3Lgvuk=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
- "rev": "v0.46.0",
+ "rev": "v0.47.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HdTx9f9ytE5/IG4yv1Xnqd/5ZA+ZaF6jjUmtI/q5yc0="
},
@@ -1161,11 +1170,11 @@
"vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
},
"turbot": {
- "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=",
+ "hash": "sha256-oG6Mme9Q4T/IgQF1jheL0SaV3NDCEGHvw5fbXIcgwPE=",
"homepage": "https://registry.terraform.io/providers/turbot/turbot",
"owner": "turbot",
"repo": "terraform-provider-turbot",
- "rev": "v1.9.1",
+ "rev": "v1.10.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1179,32 +1188,32 @@
"vendorHash": null
},
"utils": {
- "hash": "sha256-vxX8r6bbhp/lGeS2GciqAnwetjG3B5qzCLJnTQIWino=",
+ "hash": "sha256-3eEC0UN/VVockLstHhSNY9EH0bRv/LK3SkpSfMrMwSI=",
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
"owner": "cloudposse",
"repo": "terraform-provider-utils",
- "rev": "1.8.0",
+ "rev": "1.9.0",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
+ "vendorHash": "sha256-ZOJ4J+t8YIWAFZe9dnVHezdXdjz5y2ho53wmyS4dJEo="
},
"vault": {
- "hash": "sha256-XwM+WDfeWKwSz9pboaf5JfP2PrXevaRUw/YRnw8XXGw=",
+ "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-vault",
- "rev": "v3.18.0",
+ "rev": "v3.19.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0="
},
"vcd": {
- "hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=",
+ "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=",
"homepage": "https://registry.terraform.io/providers/vmware/vcd",
"owner": "vmware",
"repo": "terraform-provider-vcd",
- "rev": "v3.9.0",
+ "rev": "v3.10.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-dYFLohH/gU+cAiaLLNluxAjfj7giqnk+zQKGVSR1Kws="
+ "vendorHash": "sha256-p/wTnEr/+qe8S83x6EtfsnIMVUF1VWZVHOq0vLDbh60="
},
"venafi": {
"hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=",
@@ -1252,21 +1261,21 @@
"vendorHash": null
},
"wavefront": {
- "hash": "sha256-RZUjMAwXFKpWqec7869EMB/My5EVpy7If5ZoJx7IzIg=",
+ "hash": "sha256-DF9Q1cwzzLlF8+oJFF5HkOD0lfQhxsnIepl/fMCljcs=",
"homepage": "https://registry.terraform.io/providers/vmware/wavefront",
"owner": "vmware",
"repo": "terraform-provider-wavefront",
- "rev": "v3.6.0",
+ "rev": "v4.2.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
+ "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q="
},
"yandex": {
- "hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=",
+ "hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
- "rev": "v0.95.0",
+ "rev": "v0.96.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0="
+ "vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg="
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
index 8c6d0b07e8..4d380a141b 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
@@ -151,7 +151,7 @@ update_attr hash "${hash}"
old_vendor_hash="$(read_attr vendorHash)"
if [[ ${old_vendor_hash} != null ]]; then
echo_provider "calculating vendorHash"
- vendorHash=$(generate_hash go-modules)
+ vendorHash=$(generate_hash goModules)
update_attr vendorHash "${vendorHash}"
fi
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 1aff80d275..fe653013cf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
@@ -166,8 +166,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
- version = "1.5.3";
- hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo=";
+ version = "1.5.4";
+ hash = "sha256-MvN4gSJcPORD0wj6ixc3gUXPISGvAKSJPA6bS/SmDOY=";
vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
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 e38fbf36e1..274cd0ce36 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.48.1";
+ version = "0.48.4";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-zBjIUoH5s7Yo1qrzSY4LhxPBDcxxqZmvJt8z50FRro0=";
+ hash = "sha256-3hHCNiuff8CgnQ6hB4I8jODINKA6ZpNOkKwVcCqKDo4=";
};
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
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 12105f0b59..caf224ccc6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
buildGoModule rec {
pname = "tilt";
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.33.1";
+ version = "0.33.3";
src = fetchFromGitHub {
- owner = "tilt-dev";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8=";
+ owner = "tilt-dev";
+ repo = "tilt";
+ rev = "v${version}";
+ hash = "sha256-TNZE335tH50E96yJzD26U+JbVxjU746Wa/8YDGHFeto=";
};
+
vendorHash = null;
subPackages = [ "cmd/tilt" ];
ldflags = [ "-X main.version=${version}" ];
- meta = with lib; {
+ meta = {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
homepage = "https://tilt.dev/";
- license = licenses.asl20;
- maintainers = with maintainers; [ anton-dessiatov ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ anton-dessiatov ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix
new file mode 100644
index 0000000000..573e2cd78e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+ pname = "timoni";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "stefanprodan";
+ repo = "timoni";
+ rev = "v${version}";
+ hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o=";
+ };
+
+ vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE=";
+
+ subPackages = [ "cmd/timoni" ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ # Some tests require running Kubernetes instance
+ doCheck = false;
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.VERSION=${version}"
+ ];
+
+ postInstall = ''
+ installShellCompletion --cmd timoni \
+ --bash <($out/bin/timoni completion bash) \
+ --fish <($out/bin/timoni completion fish) \
+ --zsh <($out/bin/timoni completion zsh)
+ '';
+
+ meta = with lib; {
+ homepage = "https://timoni.sh";
+ changelog = "https://github.com/stefanprodan/timoni/releases/tag/${src.rev}";
+ description = "A package manager for Kubernetes, powered by CUE and inspired by Helm";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ votava ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix
index 3690464ceb..9092dfb307 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "velero";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "velero";
rev = "v${version}";
- sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw=";
+ sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4=";
};
ldflags = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
index 3107b31ac6..b9e5e023fe 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "weave-gitops";
- version = "0.26.0";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-sHk9ULh/792BEjPRcaeY3umx3pcLb41urrrouunm9nw=";
+ sha256 = "sha256-chL88vWUMN4kcuh8g2ckWOqYAs9JwE0vnm69zLd5KIM=";
};
ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
- vendorSha256 = "sha256-Q9LjKgaFUx4txJlPcrG/YIbHV4hh5oWHVXIBDDgKYRg=";
+ vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA=";
subPackages = [ "cmd/gitops" ];
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 63811d27b7..11165cbc8f 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.242";
+ version = "1.2.248";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8=";
+ hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA=";
};
- vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg=";
+ vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw=";
proxyVendor = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix
index 48cb8bd900..75db4554b0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "yor";
- version = "0.1.180";
+ version = "0.1.183";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- hash = "sha256-m6MEVPF+Jug655ictoUI3KjpMX5w3A3aDhFDZXTQfi4=";
+ hash = "sha256-OMwDqBZPzjeG47CKk/heRo0JxyN7E7qh/dnV8cAzUfo=";
};
vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix
index 3c6f1275a2..60c1c59c6a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zarf";
- version = "0.28.1";
+ version = "0.28.2";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
- hash = "sha256-TgrYDLlbaYQwRpG4Vy9sZGWawbN4iS9YFVEjlB3JVfY=";
+ hash = "sha256-4217HkmTridDkq0c0lqkcbwqxqAceNIVFl/TEDcuxCA=";
};
- vendorHash = "sha256-dIQ+6aWI47zI++4skMFnyDYpQPcHEHSwUS9aXatY43g=";
+ vendorHash = "sha256-sTI/fpT/5/2ulhCuhsKpY5epJup2TxF2jpRqBI0eOWA=";
proxyVendor = true;
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix
new file mode 100644
index 0000000000..2fb9664437
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, unzip
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "cyberduck";
+ version = "8.6.0.39818";
+
+ src = fetchurl {
+ url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip";
+ sha256 = "1iqq54n267lmmdlv8wmr9k461p49jindc1mn5wy742k08cqxc5ab";
+ };
+ dontUnpack = true;
+
+ nativeBuildInputs = [ unzip ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/Applications
+ unzip -d $out/Applications $src
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Libre file transfer client for Mac and Windows";
+ homepage = "https://cyberduck.io";
+ license = licenses.gpl3Plus;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ maintainers = with maintainers; [ emilytrau Enzime ];
+ platforms = platforms.darwin;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix
index 5f5283738c..3f6c52a4d4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix
@@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
+ mainProgram = "davmail";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix
index 1edf513868..fb4f102de0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix
@@ -1,15 +1,15 @@
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
let
- short_hash = "69aa892";
+ short_hash = "86497a5";
in buildGoModule rec {
pname = "deck";
- version = "1.23.0";
+ version = "1.25.0";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
rev = "v${version}";
- hash = "sha256-PrpiZBGNb8tWt2RiZ4iHKibN+2EQRm1/tBbDLng/lkA=";
+ hash = "sha256-dmzxCgZ0HLT9he8jS7lMtSFg5vbEbs8q368vE3lafhQ=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -21,7 +21,7 @@ in buildGoModule rec {
"-X github.com/kong/deck/cmd.COMMIT=${short_hash}"
];
- vendorHash = "sha256-brd+gtIHIarMv3l6O6JMDPRFlMwKSLZjBABAvByUC6o=";
+ vendorHash = "sha256-ucwJQSZSBvSJzNQYLeNyCnZETmrNgVPFLjjkr1zP6b4=";
postInstall = ''
installShellCompletion --cmd deck \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
index 9a0b718293..cf2edf7673 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
@@ -86,5 +86,6 @@ buildFHSEnv {
license = licenses.unfree;
maintainers = with maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ mainProgram = "dropbox";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
index fa88705ad2..5334fc01ff 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
@@ -11,8 +11,8 @@
let
pname = "expressvpn";
- clientVersion = "3.25.0";
- clientBuild = "13";
+ clientVersion = "3.52.0";
+ clientBuild = "2";
version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ];
expressvpnBase = stdenvNoCC.mkDerivation {
@@ -20,7 +20,7 @@ let
src = fetchurl {
url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb";
- hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA=";
+ hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew=";
};
nativeBuildInputs = [ dpkg autoPatchelfHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix
index 265e8236be..153cc791cb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix
@@ -12,7 +12,7 @@ let
hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc=";
};
- sourceRoot = "source/frontend";
+ sourceRoot = "${src.name}/frontend";
npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
index 424591f07e..5a7dc544bf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
@@ -99,6 +99,6 @@ stdenv.mkDerivation rec {
description = "Firewall daemon with D-Bus interface";
homepage = "https://github.com/firewalld/firewalld";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index 7b2c8c10f4..05f936d46f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
- version = "3.7.9";
+ version = "3.8.0";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-TD57tGLTYy8E7lx6hzH1/00oWFYqCQ325UNEhgv/AEA=";
+ hash = "sha256-sAA01/Hs8yGFJM+ttwhonrBqTpGsEoWrYDU8w/YmE6A=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix
index 8ce157c6d5..63c674c1a0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix
@@ -17,11 +17,16 @@
stdenv.mkDerivation rec {
pname = "freefilesync";
- version = "12.4";
+ version = "12.5";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
- hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo=";
+ # The URL only redirects to the file on the second attempt
+ postFetch = ''
+ rm -f $out
+ tryDownload "$url"
+ '';
+ hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM=";
};
sourceRoot = ".";
@@ -31,8 +36,12 @@ stdenv.mkDerivation rec {
# Disable loading of the missing Animal.dat
(fetchpatch {
url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch";
+ postFetch = ''
+ substituteInPlace $out \
+ --replace "-std=c++2b" "-std=c++23"
+ '';
excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ];
- hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74=";
+ hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo=";
})
# Fix build with GTK 3
(fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix
index 2b7987fa1e..36de704dbc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix
@@ -59,7 +59,7 @@ in
pname = "gephgui";
inherit version src;
- sourceRoot = "source/gephgui-wry/gephgui";
+ sourceRoot = "${src.name}/gephgui-wry/gephgui";
postPatch = "ln -s ${./package-lock.json} ./package-lock.json";
@@ -79,7 +79,7 @@ in
pname = "gephgui-wry";
inherit version src;
- sourceRoot = "source/gephgui-wry";
+ sourceRoot = "${src.name}/gephgui-wry";
cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix
new file mode 100644
index 0000000000..5f2eb54879
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+, buildPackages
+}:
+
+buildGoModule rec {
+ pname = "gnmic";
+ version = "0.31.3";
+
+ src = fetchFromGitHub {
+ owner = "openconfig";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-+TxOl+at/SQIC1x/LwCgk4JmvOPY2el7HE1reAkmVn8=";
+ };
+
+ vendorHash = "sha256-4cmFoDMgD9TKacZ2RD73kQKDrpN5xuSKZ4ikcWAd5Rw=";
+
+ ldflags = [
+ "-s" "-w"
+ "-X" "github.com/openconfig/gnmic/app.version=${version}"
+ "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}"
+ "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z"
+ ];
+ subPackages = [ "." ];
+
+ nativeBuildInputs = [ installShellFiles ];
+ postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
+ installShellCompletion --cmd gnmic \
+ --bash <(${emulator} $out/bin/gnmic completion bash) \
+ --fish <(${emulator} $out/bin/gnmic completion fish) \
+ --zsh <(${emulator} $out/bin/gnmic completion zsh)
+ '';
+
+ meta = with lib; {
+ description = "gNMI CLI client and collector";
+ homepage = "https://gnmic.openconfig.net/";
+ changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vincentbernat ];
+ };
+}
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 b5427384e9..9c0a5ea086 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
@@ -22,8 +22,7 @@
, luajit
, lz4
, nspr
-, nss
-, pcre
+, pcre2
, python
, zlib
, redisSupport ? true, redis, hiredis
@@ -34,11 +33,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
- version = "6.0.13";
+ version = "7.0.0";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
- hash = "sha256-4J8vgA0ODNL5fyHFBZUMzD27nOXP6AjflWe22EmjEFU=";
+ hash = "sha256-e80TExGDZkUUZdw/g4Wj9qrdCE/+RN0lfdqBBYY7t2k=";
};
nativeBuildInputs = [
@@ -67,8 +66,7 @@ stdenv.mkDerivation rec {
luajit
lz4
nspr
- nss
- pcre
+ pcre2
python
zlib
]
@@ -101,7 +99,6 @@ stdenv.mkDerivation rec {
"--enable-nflog"
"--enable-nfqueue"
"--enable-pie"
- "--disable-prelude"
"--enable-python"
"--enable-unix-socket"
"--localstatedir=/var"
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 e0d2cd3e0b..82da4dedc9 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.2.0";
+ version = "3.2.1";
src =
let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
- sha256 = "sha256-7lT69fU7tGujhbDTX0tYpkEquoswMCZOGAUhk2Nr+C0=";
+ sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
- sha256 = "sha256-a5qLK8WjrlmKF24U9SiEpY+SNWuHf6gHJBym5IM8HZ4=";
+ sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -136,5 +136,6 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
maintainers = with maintainers; [ wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
+ mainProgram = "armcord";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
index c6e020cdc2..501d8f7d16 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
@@ -1,7 +1,7 @@
{ lib, callPackage, stdenvNoCC }:
let
pname = "caprine";
- version = "2.55.5";
+ version = "2.58.0";
metaCommon = with lib; {
description = "An elegant Facebook Messenger desktop app";
homepage = "https://sindresorhus.com/caprine";
@@ -10,16 +10,17 @@ let
};
x86_64-appimage = callPackage ./build-from-appimage.nix {
inherit pname version metaCommon;
- sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo=";
+ sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
- sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk=";
+ sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg=";
};
in
(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; };
meta = oldAttrs.meta // {
platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms;
+ mainProgram = "caprine";
};
})
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 2bf96fcb46..8bc1c7cb59 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
@@ -1,7 +1,7 @@
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
let
versions = if stdenv.isLinux then {
- stable = "0.0.27";
+ stable = "0.0.28";
ptb = "0.0.44";
canary = "0.0.162";
development = "0.0.217";
@@ -16,7 +16,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U=";
+ sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
@@ -61,6 +61,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "discord";
};
package =
if stdenv.isLinux
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 236ceaa0a7..ce94764ed9 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
@@ -18,6 +18,7 @@ let
{
pythonInterpreter = "${python3.interpreter}";
configDirName = lib.toLower binaryName;
+ meta.mainProgram = "disable-breaking-updates.py";
} ''
mkdir -p $out/bin
cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 67e21bcd18..f3ec46f364 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
owner = "vector-im";
repo = "element-desktop";
rev = "v${finalAttrs.version}";
- sha256 = desktopSrcHash;
+ hash = desktopSrcHash;
};
offlineCache = fetchYarnDeps {
@@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
license = licenses.asl20;
maintainers = teams.matrix.members;
inherit (electron.meta) platforms;
+ mainProgram = "element-desktop";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
index e6b73d2983..4e80744a4c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
owner = "vector-im";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
- sha256 = webSrcHash;
+ hash = webSrcHash;
};
offlineCache = fetchYarnDeps {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
index 6e462ef24d..84196371be 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = "atom";
repo = "node-keytar";
rev = "v${version}";
- sha256 = pinData.srcHash;
+ hash = pinData.srcHash;
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json
index dc7420ab45..626f5a62ea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json
@@ -1,5 +1,5 @@
{
"version": "7.9.0",
- "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=",
+ "srcHash": "sha256-Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=",
"npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY="
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh
index 0ddfa02472..9b8d014f03 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps
+#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps nix-prefetch-github
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the keytar package."
@@ -25,7 +25,7 @@ wget "$SRC/package.json"
npm_hash=$(prefetch-npm-deps package-lock.json)
rm -rf node_modules package.json package-lock.json
-src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256)
+src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .hash)
cat > pin.json << EOF
{
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 280f8f6690..834bcb9235 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.35";
+ "version" = "1.11.37";
"hashes" = {
- "desktopSrcHash" = "8BP7PC0ZqE3d0K1AxmG05Xh3Ze1dAOcBVW9ADW4YAjY=";
- "desktopYarnHash" = "1k8ih7z9hxm38kbvnfimd0djwqlrs62s8i0hc6d6ii10l3binkzp";
- "webSrcHash" = "IM1M8iygeya8hw0uVjV4EK/jGG4UyQUTviYAvAjI7k4=";
- "webYarnHash" = "0lr5cgs8nhdjrv43pcyhq4ysrz8bncx0j969j82l0chq3nzdml5b";
+ "desktopSrcHash" = "sha256-6YiMAmOb0lSaLDE/ohVpZFbl4J1NxS9xNFFcebVW9MA=";
+ "desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly";
+ "webSrcHash" = "sha256-zFRoL/bnic6Waaiz7Vfama4qzlYKk0TTr5zPK6PNSpM=";
+ "webYarnHash" = "1lpd9mmg51jnhdr2zfisxdpc4i64kn4bpzkxqzip7dnn9iz432kw";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
index 915e3faa3e..b24b0d7b71 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
@@ -5,16 +5,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "seshat-node";
- inherit (pinData) version;
+ inherit (pinData) version cargoHash;
src = fetchFromGitHub {
owner = "matrix-org";
repo = "seshat";
rev = version;
- sha256 = pinData.srcHash;
+ hash = pinData.srcHash;
};
- sourceRoot = "source/seshat-node/native";
+ sourceRoot = "${src.name}/seshat-node/native";
nativeBuildInputs = [ nodejs python3 yarn ];
buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices;
@@ -53,6 +53,4 @@ in rustPlatform.buildRustPackage rec {
'';
disallowedReferences = [ stdenv.cc.cc ];
-
- cargoSha256 = pinData.cargoHash;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json
index 78d5156f54..f0648d11f2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json
@@ -1,6 +1,6 @@
{
"version": "2.3.3",
- "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=",
+ "srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=",
"yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp",
"cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU="
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh
index 1315715ac0..6e7e75e66b 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch
+#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch nix-prefetch-github
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the seshat package."
@@ -25,7 +25,7 @@ wget "$SRC/seshat-node/yarn.lock"
yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
-src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .sha256)
+src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .hash)
cat > pin.json << EOF
{
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh
index ca9f39c306..c68a347e68 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh
@@ -20,7 +20,7 @@ version="${version#v}"
# Element Web
web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version"
-web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256)
+web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash)
web_tmpdir=$(mktemp -d)
trap 'rm -rf "$web_tmpdir"' EXIT
@@ -32,7 +32,7 @@ popd
# Element Desktop
desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version"
-desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256)
+desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash)
desktop_tmpdir=$(mktemp -d)
trap 'rm -rf "$desktop_tmpdir"' EXIT
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
index 53c6e7345e..207ba682d2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
@@ -81,6 +81,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -92,9 +98,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.70"
+version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "arrayref"
@@ -220,6 +226,24 @@ dependencies = [
"event-listener",
]
+[[package]]
+name = "async-process"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "autocfg",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "signal-hook",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "async-recursion"
version = "1.0.4"
@@ -228,7 +252,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -271,7 +295,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -316,9 +340,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "base64ct"
@@ -352,7 +376,7 @@ dependencies = [
"cc",
"cfg-if",
"constant_time_eq",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -421,9 +445,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.12.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
@@ -485,9 +509,9 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-expr"
-version = "0.15.1"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
+checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a"
dependencies = [
"smallvec",
"target-lexicon",
@@ -526,12 +550,12 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
+ "android-tzdata",
"iana-time-zone",
- "num-integer",
"num-traits",
"serde",
"winapi",
@@ -566,16 +590,6 @@ dependencies = [
"cc",
]
-[[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"
@@ -674,16 +688,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "ctr"
version = "0.7.0"
@@ -715,50 +719,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "cxx"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.15",
-]
-
[[package]]
name = "derivative"
version = "2.2.0"
@@ -781,9 +741,9 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.4",
"crypto-common",
@@ -792,33 +752,34 @@ dependencies = [
[[package]]
name = "dirs"
-version = "5.0.0"
+version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
+ "option-ext",
"redox_users",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "displaydoc"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.18",
]
[[package]]
@@ -845,7 +806,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -922,11 +883,11 @@ dependencies = [
[[package]]
name = "field-offset"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
- "memoffset 0.8.0",
+ "memoffset 0.9.0",
"rustc_version",
]
@@ -938,7 +899,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flare"
-version = "0.8.0"
+version = "0.9.0"
dependencies = [
"ashpd",
"async-recursion",
@@ -973,12 +934,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
]
[[package]]
@@ -1083,7 +1044,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -1613,7 +1574,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -1731,12 +1692,11 @@ dependencies = [
[[package]]
name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
]
[[package]]
@@ -1794,9 +1754,9 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.1",
"libc",
@@ -1832,9 +1792,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
dependencies = [
"wasm-bindgen",
]
@@ -1894,15 +1854,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.142"
+version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "libm"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "libsignal-protocol"
@@ -1935,7 +1895,7 @@ dependencies = [
[[package]]
name = "libsignal-service"
version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535"
dependencies = [
"aes 0.7.5",
"aes-gcm",
@@ -1968,7 +1928,7 @@ dependencies = [
[[package]]
name = "libsignal-service-hyper"
version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535"
dependencies = [
"async-trait",
"async-tungstenite",
@@ -1991,15 +1951,6 @@ dependencies = [
"url",
]
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "linked-hash-map"
version = "0.5.6"
@@ -2008,9 +1959,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.3.3"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "locale_config"
@@ -2037,11 +1988,10 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
dependencies = [
- "cfg-if",
"value-bag",
]
@@ -2106,6 +2056,15 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "mime"
version = "0.3.17"
@@ -2128,15 +2087,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.7.1"
@@ -2149,14 +2099,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2366,9 +2315,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
[[package]]
name = "oncemutex"
@@ -2388,7 +2337,7 @@ dependencies = [
"byteorder",
"cbc",
"cipher 0.4.4",
- "digest 0.10.6",
+ "digest 0.10.7",
"dirs",
"futures-util",
"hkdf 0.12.3",
@@ -2416,6 +2365,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
[[package]]
name = "ordered-stream"
version = "0.2.0"
@@ -2500,7 +2455,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
"hmac 0.12.1",
"password-hash",
"sha2 0.10.6",
@@ -2512,7 +2467,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31"
dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
"hmac 0.12.1",
]
@@ -2566,9 +2521,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "png"
@@ -2580,7 +2535,7 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
]
[[package]]
@@ -2641,7 +2596,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "presage"
version = "0.6.0-dev"
-source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e"
+source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c"
dependencies = [
"base64 0.12.3",
"futures",
@@ -2660,7 +2615,7 @@ dependencies = [
[[package]]
name = "presage-store-sled"
version = "0.6.0-dev"
-source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e"
+source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c"
dependencies = [
"async-trait",
"base64 0.12.3",
@@ -2713,9 +2668,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
dependencies = [
"unicode-ident",
]
@@ -2856,9 +2811,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@@ -2965,13 +2920,13 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.8.1"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.7.1",
+ "regex-syntax 0.7.2",
]
[[package]]
@@ -2994,9 +2949,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "ring"
@@ -3024,9 +2979,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.13"
+version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
dependencies = [
"bitflags",
"errno",
@@ -3075,7 +3030,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
]
[[package]]
@@ -3105,12 +3060,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
[[package]]
name = "sct"
version = "0.7.0"
@@ -3123,9 +3072,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.8.2"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
"bitflags",
"core-foundation",
@@ -3136,9 +3085,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -3152,22 +3101,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
-version = "1.0.160"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -3189,14 +3138,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
@@ -3209,7 +3158,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -3220,7 +3169,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -3244,7 +3193,26 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "signal-hook"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
]
[[package]]
@@ -3325,9 +3293,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
"proc-macro2",
"quote",
@@ -3348,9 +3316,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.5"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
+checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2"
dependencies = [
"cfg-expr",
"heck 0.4.1",
@@ -3361,9 +3329,9 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.6"
+version = "0.12.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
+checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
[[package]]
name = "temp-dir"
@@ -3410,7 +3378,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -3430,9 +3398,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.27.0"
+version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"libc",
@@ -3441,7 +3409,7 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3456,13 +3424,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -3504,9 +3472,9 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
@@ -3545,20 +3513,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.18",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
]
@@ -3623,9 +3591,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-normalization"
@@ -3642,12 +3610,6 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
[[package]]
name = "unicode-xid"
version = "0.2.4"
@@ -3696,22 +3658,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
[[package]]
name = "uuid"
-version = "1.3.1"
+version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
dependencies = [
"serde",
]
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
[[package]]
name = "version-compare"
@@ -3755,9 +3713,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -3765,24 +3723,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.18",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
dependencies = [
"cfg-if",
"js-sys",
@@ -3792,9 +3750,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3802,28 +3760,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.18",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4069,15 +4027,16 @@ dependencies = [
[[package]]
name = "zbus"
-version = "3.12.0"
+version = "3.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3"
+checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs",
"async-io",
"async-lock",
+ "async-process",
"async-recursion",
"async-task",
"async-trait",
@@ -4108,23 +4067,24 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "3.12.0"
+version = "3.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a"
+checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"regex",
"syn 1.0.109",
+ "winnow",
"zvariant_utils",
]
[[package]]
name = "zbus_names"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3"
+checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a"
dependencies = [
"serde",
"static_assertions",
@@ -4148,7 +4108,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.18",
]
[[package]]
@@ -4170,9 +4130,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "3.12.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8"
+checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c"
dependencies = [
"byteorder",
"enumflags2",
@@ -4185,9 +4145,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "3.12.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a"
+checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -4198,9 +4158,9 @@ dependencies = [
[[package]]
name = "zvariant_utils"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b"
+checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
dependencies = [
"proc-macro2",
"quote",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
index f8559c57d6..ef8630b736 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
@@ -5,25 +5,28 @@
, meson
, ninja
, pkg-config
+, gst_all_1
, protobuf
, libsecret
, libadwaita
, rustPlatform
, rustc
+, appstream-glib
+, blueprint-compiler
, desktop-file-utils
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "flare";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "Schmiddiii";
repo = pname;
rev = version;
- hash = "sha256-w4WaWcUsjKiWfNe5StwRcPlcXqWz0427It96L1NsR0U=";
+ hash = "sha256-6p9uuK71fJvJs0U14jJEVb2mfpZWrCZZFE3eoZe9eVo=";
};
cargoDeps = rustPlatform.importCargoLock {
@@ -31,12 +34,14 @@ stdenv.mkDerivation rec {
outputHashes = {
"curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0=";
"libsignal-protocol-0.1.0" = "sha256-IBhmd3WzkICiADO24WLjDJ8pFILGwWNUHLXKpt+Y0IY=";
- "libsignal-service-0.1.0" = "sha256-art5O06X4lhp9PoAd23mi6F1wRWkUcyON7AK8uBDoK8=";
- "presage-0.6.0-dev" = "sha256-DVImXySYL0zlGkwss/5DnQ3skTaBa7l55VWIGCd6kQU=";
+ "libsignal-service-0.1.0" = "sha256-WSRqBNq9jbe6PSeExfmehNZwjlB70GLlHkrDlw59O5c=";
+ "presage-0.6.0-dev" = "sha256-oNDfFLir3XL2UOGrWR/IFO7XTeJKX+vjdrd3qbIomtw=";
};
};
nativeBuildInputs = [
+ appstream-glib # for appstream-util
+ blueprint-compiler
desktop-file-utils # for update-desktop-database
meson
ninja
@@ -51,6 +56,12 @@ stdenv.mkDerivation rec {
libadwaita
libsecret
protobuf
+
+ # To reproduce audio messages
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
];
meta = {
@@ -58,7 +69,7 @@ stdenv.mkDerivation rec {
description = "An unofficial Signal GTK client";
homepage = "https://gitlab.com/Schmiddiii/flare";
license = lib.licenses.agpl3Plus;
- maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ];
+ maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.linux;
};
}
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 09d2af372a..f58f62a7ae 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
@@ -7,8 +7,8 @@
}:
flutter.buildFlutterApplication rec {
+ pname = "fluffychat";
version = "1.12.1";
- name = "fluffychat";
src = fetchFromGitLab {
owner = "famedly";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index ffe82e6708..fdfbbc5b27 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -1,43 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchurl
, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool
, libunwind, ncurses, curl, jansson, texinfo
-, automake, autoconf }:
+, argp-standalone }:
stdenv.mkDerivation rec {
pname = "freetalk";
- version = "4.1";
+ version = "4.2";
- src = fetchFromGitHub {
- owner = "GNUFreetalk";
- repo = "freetalk";
- rev = "v${version}";
- sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
+ src = fetchurl {
+ url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz";
+ hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA=";
};
- patches = [
- # Pull pending patch for -fno-common tuulchain support:
- # https://github.com/GNUFreetalk/freetalk/pull/39
- (fetchpatch {
- name = "fno-common.patch";
- url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch";
- sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf";
- })
- ];
-
- preConfigure = ''
- ./autogen.sh
- '';
-
- nativeBuildInputs = [ pkg-config texinfo autoconf automake ];
+ nativeBuildInputs = [ pkg-config texinfo ];
buildInputs = [
guile glib loudmouth gmp libidn readline libtool
libunwind ncurses curl jansson
+ ] ++ lib.optionals stdenv.isDarwin [
+ argp-standalone
];
+ env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp";
+
meta = with lib; {
description = "Console XMPP client";
license = licenses.gpl3Plus ;
maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
downloadPage = "https://www.gnu.org/software/freetalk/";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
new file mode 100644
index 0000000000..2308a4b616
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
@@ -0,0 +1,65 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchYarnDeps
+, yarn
+, fixup_yarn_lock
+, nodejs
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "hydrogen-web";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "vector-im";
+ repo = finalAttrs.pname;
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0=";
+ };
+
+ offlineCache = fetchYarnDeps {
+ yarnLock = finalAttrs.src + "/yarn.lock";
+ hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w=";
+ };
+
+ nativeBuildInputs = [ yarn fixup_yarn_lock nodejs ];
+
+ configurePhase = ''
+ runHook preConfigure
+
+ export HOME=$PWD/tmp
+ mkdir -p $HOME
+
+ fixup_yarn_lock yarn.lock
+ yarn config --offline set yarn-offline-mirror $offlineCache
+ yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
+ patchShebangs node_modules
+
+ runHook postConfigure
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ yarn build --offline
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ cp -R target $out
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Lightweight matrix client with legacy and mobile browser support";
+ homepage = "https://github.com/vector-im/hydrogen-web";
+ maintainers = lib.teams.matrix.members;
+ license = lib.licenses.asl20;
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix
new file mode 100644
index 0000000000..9ea22e864f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, jq
+, hydrogen-web-unwrapped
+, conf ? { }
+}:
+
+if (conf == { }) then hydrogen-web-unwrapped else
+stdenv.mkDerivation {
+ pname = "${hydrogen-web-unwrapped.pname}-wrapped";
+ inherit (hydrogen-web-unwrapped) version meta;
+
+ dontUnpack = true;
+
+ nativeBuildInputs = [ jq ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ ln -s ${hydrogen-web-unwrapped}/* $out
+ rm $out/config.json
+ jq -s '.[0] * $conf' "${hydrogen-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json"
+
+ runHook postInstall
+ '';
+}
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
deleted file mode 100644
index 5420b77c89..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 ee14657bed..87f65e6d05 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
@@ -4,7 +4,7 @@
, fetchFromGitLab
, fetchpatch
, gitUpdater
-, ffmpeg_5
+, ffmpeg_6
# for daemon
, autoreconfHook
@@ -12,7 +12,7 @@
, alsa-lib
, asio
, dbus
-, dbus_cplusplus
+, sdbus-cpp
, fmt
, gmp
, gnutls
@@ -66,14 +66,14 @@ let
in
stdenv.mkDerivation rec {
pname = "jami";
- version = "20230323.0";
+ version = "20230619.1";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "jami-client-qt";
rev = "stable/${version}";
- hash = "sha256-X8iIT8UtI2Vq0Ne5e2ahSPN4g7QLZGnq3SZV/NY+1pY=";
+ hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0=";
fetchSubmodules = true;
};
@@ -82,16 +82,24 @@ stdenv.mkDerivation rec {
patch-src = src + "/daemon/contrib/src/pjproject/";
in
rec {
- version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f";
+ version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "pjproject";
rev = version;
- hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ=";
+ hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4=";
};
- patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
+ patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [
+ (fetchpatch {
+ name = "CVE-2023-27585.patch";
+ url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch";
+ hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg=";
+ })
+ ];
+
+ patchFlags = [ "-p1" "-l" ];
configureFlags = (readLinesToList ./config/pjsip_args_common)
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
@@ -105,15 +113,7 @@ stdenv.mkDerivation rec {
daemon = stdenv.mkDerivation {
pname = "jami-daemon";
inherit src version meta;
- sourceRoot = "source/daemon";
-
- patches = [
- ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch
- (fetchpatch {
- url = "https://git.jami.net/savoirfairelinux/jami-daemon/-/commit/315b5fbf546712f22a7b03ca750257bc92263a91.patch";
- hash = "sha256-GNUhFWvYpihAVe1gkVkZARpQmN+Cgv97hRQ4VFiEoKI=";
- })
- ];
+ sourceRoot = "${src.name}/daemon";
nativeBuildInputs = [
autoreconfHook
@@ -125,9 +125,9 @@ stdenv.mkDerivation rec {
alsa-lib
asio
dbus
- dbus_cplusplus
+ sdbus-cpp
fmt
- ffmpeg_5
+ ffmpeg_6
gmp
gnutls
http-parser
@@ -154,6 +154,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
};
+ postPatch = ''
+ substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \
+ --replace 'required property string placeholderText' 'property string placeholderText: ""'
+ '';
+
preConfigure = ''
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
'';
@@ -168,7 +173,7 @@ stdenv.mkDerivation rec {
buildInputs = [
daemon
- ffmpeg_5
+ ffmpeg_6
libnotify
networkmanager
qtbase
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index d3700a66be..1314853ad6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -1,99 +1,149 @@
-{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell
-, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss
-, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn
-, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl
-, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true
+{ stdenv
+, callPackage
+, fetchurl
+, makeWrapper
+, aspell
+, avahi
+, cacert
+, dbus
+, dbus-glib
+, farstream
+, gettext
+, gst_all_1
+, gtk2
+, gtk2-x11
+, gtkspell2
+, intltool
+, lib
+, libICE
+, libSM
+, libXScrnSaver
+, libXext
+, libgcrypt
+, libgnt
+, libidn
+, libstartup_notification
+, libxml2
+, ncurses
+, nspr
+, nss
+, perlPackages
+, pkg-config
+, python3
+, pidgin
+, plugins ? []
+, withOpenssl ? false, openssl
+, withGnutls ? false , gnutls
+, withCyrus_sasl ? true, cyrus_sasl
+, pidginPackages
}:
# FIXME: clean the mess around choosing the SSL library (nss by default)
-let unwrapped = stdenv.mkDerivation rec {
- pname = "pidgin";
- version = "2.14.12";
+let
+ unwrapped = stdenv.mkDerivation rec {
+ pname = "pidgin";
+ version = "2.14.12";
- src = fetchurl {
- url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
- sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc=";
- };
+ src = fetchurl {
+ url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
+ sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc=";
+ };
- nativeBuildInputs = [ makeWrapper intltool ];
+ nativeBuildInputs = [ makeWrapper intltool ];
- env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
+ env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
- buildInputs = let
- python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
- in [
- aspell libstartup_notification
- gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
- libxml2 nss nspr
- libXScrnSaver python-with-dbus
- avahi dbus dbus-glib libidn
- libICE libXext libSM cyrus_sasl
- libgnt ncurses # optional: build finch - the console UI
- ]
- ++ lib.optional withOpenssl openssl
- ++ lib.optionals withGnutls [ gnutls libgcrypt ]
- ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ]
- ++ lib.optional stdenv.isDarwin gtk2-x11;
-
-
- propagatedBuildInputs = [ pkg-config gettext ]
- ++ (with perlPackages; [ perl XMLParser ])
- ++ lib.optional stdenv.isLinux gtk2
+ buildInputs = let
+ python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
+ in [
+ aspell
+ avahi
+ cyrus_sasl
+ dbus
+ dbus-glib
+ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ gst_all_1.gstreamer
+ libICE
+ libSM
+ libXScrnSaver
+ libXext
+ libgnt
+ libidn
+ libstartup_notification
+ libxml2
+ ncurses # optional: build finch - the console UI
+ nspr
+ nss
+ python-with-dbus
+ ]
+ ++ lib.optional withOpenssl openssl
+ ++ lib.optionals withGnutls [ gnutls libgcrypt ]
+ ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ]
++ lib.optional stdenv.isDarwin gtk2-x11;
- patches = [ ./pidgin-makefile.patch ./add-search-path.patch ];
- configureFlags = [
- "--with-nspr-includes=${nspr.dev}/include/nspr"
- "--with-nspr-libs=${nspr.out}/lib"
- "--with-nss-includes=${nss.dev}/include/nss"
- "--with-nss-libs=${nss.out}/lib"
- "--with-ncurses-headers=${ncurses.dev}/include"
- "--with-system-ssl-certs=${cacert}/etc/ssl/certs"
- "--disable-meanwhile"
- "--disable-nm"
- "--disable-tcl"
- "--disable-gevolution"
- ]
- ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
- ++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"]
- ++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"];
+ propagatedBuildInputs = [ pkg-config gettext ]
+ ++ (with perlPackages; [ perl XMLParser ])
+ ++ lib.optional stdenv.isLinux gtk2
+ ++ lib.optional stdenv.isDarwin gtk2-x11;
- enableParallelBuilding = true;
+ patches = [
+ ./add-search-path.patch
+ ./pidgin-makefile.patch
+ ];
- postInstall = ''
- wrapProgram $out/bin/pidgin \
- --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
- '';
+ configureFlags = [
+ "--with-nspr-includes=${nspr.dev}/include/nspr"
+ "--with-nspr-libs=${nspr.out}/lib"
+ "--with-nss-includes=${nss.dev}/include/nss"
+ "--with-nss-libs=${nss.out}/lib"
+ "--with-ncurses-headers=${ncurses.dev}/include"
+ "--with-system-ssl-certs=${cacert}/etc/ssl/certs"
+ "--disable-meanwhile"
+ "--disable-nm"
+ "--disable-tcl"
+ "--disable-gevolution"
+ ]
+ ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ]
+ ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ]
+ ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ];
- doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
- # In particular, this detects missing python imports in some of the tools.
- postFixup = let
- # TODO: python is a script, so it doesn't work as interpreter on darwin
- binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch";
- in lib.optionalString doInstallCheck ''
- for f in "''${!outputBin}"/bin/{${binsToTest}}; do
- echo "Testing: $f --help"
- "$f" --help
- done
- '';
+ enableParallelBuilding = true;
- passthru = {
- makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}";
+ postInstall = ''
+ wrapProgram $out/bin/pidgin \
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+ '';
+
+ doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+ # In particular, this detects missing python imports in some of the tools.
+ postFixup = let
+ # TODO: python is a script, so it doesn't work as interpreter on darwin
+ binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch";
+ in lib.optionalString doInstallCheck ''
+ for f in "''${!outputBin}"/bin/{${binsToTest}}; do
+ echo "Testing: $f --help"
+ "$f" --help
+ done
+ '';
+
+ passthru = {
+ makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}";
+ withPlugins = pluginfn: callPackage ./wrapper.nix {
+ plugins = pluginfn pidginPackages;
+ pidgin = unwrapped;
+ };
+ };
+
+ meta = {
+ description = "Multi-protocol instant messaging client";
+ homepage = "https://pidgin.im/";
+ license = lib.licenses.gpl2Plus;
+ platforms = lib.platforms.unix;
+ maintainers = [ lib.maintainers.lucasew ];
+ };
};
- meta = with lib; {
- description = "Multi-protocol instant messaging client";
- homepage = "https://pidgin.im/";
- license = licenses.gpl2Plus;
- platforms = platforms.unix;
- maintainers = [ ];
- };
-};
-
in if plugins == [] then unwrapped
- else callPackage ./wrapper.nix {
- inherit plugins;
- pidgin = unwrapped;
- }
+ else unwrapped.withPlugins (_: plugins)
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
new file mode 100644
index 0000000000..b666df3096
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, newScope
+, pidgin
+, texlive
+, config
+}:
+
+lib.makeScope newScope (self:
+ let callPackage = self.callPackage;
+ in {
+ pidgin = callPackage ../. {
+ withOpenssl = config.pidgin.openssl or true;
+ withGnutls = config.pidgin.gnutls or false;
+ plugins = [];
+ };
+
+ pidginPackages = self;
+
+ pidgin-indicator = callPackage ./pidgin-indicator { };
+
+ pidgin-latex = callPackage ./pidgin-latex {
+ texLive = texlive.combined.scheme-basic;
+ };
+
+ pidgin-msn-pecan = callPackage ./msn-pecan { };
+
+ pidgin-mra = callPackage ./pidgin-mra { };
+
+ pidgin-skypeweb = callPackage ./pidgin-skypeweb { };
+
+ pidgin-carbons = callPackage ./carbons { };
+
+ pidgin-xmpp-receipts = callPackage ./pidgin-xmpp-receipts { };
+
+ pidgin-otr = callPackage ./otr { };
+
+ pidgin-osd = callPackage ./pidgin-osd { };
+
+ pidgin-sipe = callPackage ./sipe { };
+
+ pidgin-window-merge = callPackage ./window-merge { };
+
+ purple-discord = callPackage ./purple-discord { };
+
+ purple-googlechat = callPackage ./purple-googlechat { };
+
+ purple-hangouts = callPackage ./purple-hangouts { };
+
+ purple-lurch = callPackage ./purple-lurch { };
+
+ purple-matrix = callPackage ./purple-matrix { };
+
+ purple-mm-sms = callPackage ./purple-mm-sms { };
+
+ purple-plugin-pack = callPackage ./purple-plugin-pack { };
+
+ purple-signald = callPackage ./purple-signald { };
+
+ purple-slack = callPackage ./purple-slack { };
+
+ purple-vk-plugin = callPackage ./purple-vk-plugin { };
+
+ purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { };
+
+ tdlib-purple = callPackage ./tdlib-purple { };
+
+ pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { };
+
+ purple-facebook = callPackage ./purple-facebook { };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
similarity index 95%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
index a396e9acc0..ceeac0acd0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU=";
};
- sourceRoot = "source/steam-mobile";
+ sourceRoot = "${src.name}/steam-mobile";
installFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
index 3bdecf504c..121ef0231a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A libpurple plugin for sending and receiving SMS via Modemmanager";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ tomfitzhenry ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix
rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
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 6307782736..5a72c1bd1e 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
@@ -19,6 +19,7 @@
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
+, makeWrapper
}:
let
@@ -42,7 +43,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
- wrapGAppsHook
+ # makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`.
+ (wrapGAppsHook.override { inherit makeWrapper; })
dpkg
];
@@ -87,7 +89,10 @@ stdenv.mkDerivation {
'';
preFixup = ''
- gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gjs ]}")
+ gappsWrapperArgs+=(
+ --prefix PATH : "${lib.makeBinPath [ gjs ]}"
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+ )
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
index e80d5955b3..4062911bd7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -2,11 +2,11 @@
let
pname = "rambox";
- version = "2.1.3";
+ version = "2.1.5";
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
- sha256 = "sha256-wvjCr1U+/1/GtebMNWJjizzegqZ+wWXUrmOshYtMq6o=";
+ sha256 = "sha256-+9caiyh5o537cwjF0/bGdaJGQNd2Navn/nLYaYjnRN8=";
};
desktopItem = (makeDesktopItem {
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 464fc65cfb..647b2e662a 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.8";
+ version = "1.11.0";
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-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8=";
+ sha256 = "sha256-QartWtp5/OtJqQq5GXRoIQ/ytK9/YCW1ixXTUrnGwqw=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
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 b150c2f9fb..ea1ab235fc 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,8 +1,8 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
- version = "6.23.0";
- hash = "sha256-WZe1fJ6H+h7QcXn+gR7OJ+KSOgd9NxTDLMs7UOFeq70=";
+ version = "6.27.1";
+ hash = "sha256-nEOt6bep6SqhAab8yD9NlRrDGU2IvZeOxSqPj2u1bio=";
};
signal-desktop-beta = {
dir = "Signal Beta";
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 0122426786..49035e9bd5 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.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
- version = "20230707";
+ version = "20230730";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
- hash = "sha256-kVXkcAhDpwc6/d5iXMJ3Z31p9REqWUvSimE8p+OD8aU=";
+ hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index e2135734bd..99b8b4563d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -17,5 +17,6 @@ buildGoModule rec {
homepage = "https://github.com/erroneousboat/slack-term";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
+ mainProgram = "slack-term";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 4d8c1d4aee..3a03a5fce8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -45,14 +45,14 @@ let
pname = "slack";
- x86_64-darwin-version = "4.32.122";
- x86_64-darwin-sha256 = "sha256-aKvMtuo3cNJsw42RNezmETsLAtl6G2yqYGOGp2Pt32U=3";
+ x86_64-darwin-version = "4.33.73";
+ x86_64-darwin-sha256 = "0y8plkl3pm8250xpavc91kn5b9gcdwr7bqzd3i79n48395lx11ka";
- x86_64-linux-version = "4.32.122";
- x86_64-linux-sha256 = "sha256-ViJHG7s7xqnatNOss5mfa7GqqlHbBrLGHBzTqqo7W/w=";
+ x86_64-linux-version = "4.33.73";
+ x86_64-linux-sha256 = "007i8sjnm1ikjxvgw6nisj4nmv99bwk0r4sfpvc2j4w4wk68sx3m";
- aarch64-darwin-version = "4.32.122";
- aarch64-darwin-sha256 = "sha256-j3PbH/5cKN5+vUiLvXaxyPYilt6GX6FsGo+1hlJKrls=";
+ aarch64-darwin-version = "4.33.73";
+ aarch64-darwin-sha256 = "15s3ss15yawb04dyzn82xmk1gs70sg2i3agsj2aw0xdx73yjl34p";
version = {
x86_64-darwin = x86_64-darwin-version;
@@ -85,6 +85,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ mmahut maxeaubrey ];
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
+ mainProgram = "slack";
};
linux = stdenv.mkDerivation rec {
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 8a9fc9d88b..792572e5c1 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
@@ -17,18 +17,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
- version = "1.1.11";
+ version = "1.2.8";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
- hash = "sha256-D0qZvKGfLE6VreCYn4Io2KmHcAHCVegG8xZwmxsQH5c=";
+ hash = "sha256-5OocTsQjmNZCnzAY1RfrxD6Ad/kZTIkFl/3OmeJl1oI=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
- hash = "sha256-Zk3TAoGAPeki/ogfNl/XqeBBn6N/kbNcktRHEyqPOAA=";
+ hash = "sha256-XUASMWrH8wWeYsr6gCdQGgV/7E6hLDWkJ0BXHZCepKQ=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
index 1f21891c79..be4334438c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -39,6 +39,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ liff tricktron ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "teams";
};
linux = stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 5a0a9006e0..540555b412 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config
-, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin
+, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages
}:
let
- arch = if stdenv.is64bit then "amd64" else "x86";
+ arch = "amd64";
- libDir = if stdenv.is64bit then "lib64" else "lib";
+ libDir = "lib64";
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg
- qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395
+ qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi
];
desktopItem = makeDesktopItem {
@@ -25,21 +25,16 @@ let
genericName = "TeamSpeak";
categories = [ "Network" ];
};
-
- fakeLess = writeShellScriptBin "less" "cat";
-
in
stdenv.mkDerivation rec {
pname = "teamspeak-client";
- version = "3.5.6";
+ version = "3.6.1";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
- sha256 = if stdenv.is64bit
- then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg"
- else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija";
+ hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4=";
};
# grab the plugin sdk for the desktop icon
@@ -48,11 +43,20 @@ stdenv.mkDerivation rec {
sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f";
};
- nativeBuildInputs = [ makeWrapper fakeLess which unzip ];
+ nativeBuildInputs = [
+ makeWrapper
+ which
+ unzip
+ perl # Installer script needs `shasum`
+ ];
+ # This just runs the installer script. If it gets stuck at something like
+ # ++ exec
+ # + PAGER_PATH=
+ # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs.
unpackPhase =
''
- echo -e '\ny' | sh -xe $src
+ echo -e '\ny' | PAGER=cat sh -xe $src
cd TeamSpeak*
'';
@@ -110,8 +114,9 @@ stdenv.mkDerivation rec {
url = "https://www.teamspeak.com/en/privacy-and-terms/";
free = false;
};
- maintainers = with maintainers; [ lhvwb lukegb ];
- platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = with maintainers; [ lhvwb lukegb atemu ];
+ mainProgram = "ts3client";
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
deleted file mode 100644
index c8e8598c14..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages
-, makeWrapper, openssl, pkg-config, python3, readline, zlib
-}:
-
-stdenv.mkDerivation rec {
- pname = "telegram-cli";
- version = "20200106";
-
- src = fetchFromGitHub {
- owner = "kenorb-contrib";
- repo = "tg";
- rev = "refs/tags/${version}";
- sha256 = "sha256-wYBPr2b8IOycO9y/CNyGjnRsyGyYl3oiXYtTzwTurVA=";
- fetchSubmodules = true;
- };
-
- patches = [
- # Pull patch pending upstream upstream inclusion for -fno-common toolchains:
- # https://github.com/kenorb-contrib/tg/pull/61
- (fetchpatch {
- name = "fno-common.patch";
- url = "https://github.com/kenorb-contrib/tg/commit/aad2e644fffa16066b227741d54de31bddb04ff8.patch";
- sha256 = "sha256-LAa5J4BVj3QCiDSs+p2bynDroMSIqCeexQvrgaDl6OE=";
- })
- ];
-
- buildInputs = [
- jansson
- libconfig
- libevent
- libgcrypt
- lua
- lua53Packages.lgi
- openssl
- python3
- readline
- zlib
- ];
- nativeBuildInputs = [
- pkg-config
- makeWrapper
- ];
-
- installPhase = ''
- runHook preInstall
- install -Dm755 ./bin/telegram-cli $out/bin/telegram-cli-keyless
- install -Dm644 ./tg-server.pub -t $out/share/telegram-cli
- makeWrapper $out/bin/telegram-cli-keyless $out/bin/telegram-cli \
- --add-flags "-k $out/share/telegram-cli/tg-server.pub"
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library";
- downloadPage = "https://github.com/kenorb-contrib/tg";
- license = licenses.gpl2Only;
- maintainers = with maintainers; [ ];
- };
-}
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 4de6ce1bce..7a7835ede4 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
@@ -209,5 +209,6 @@ stdenv.mkDerivation rec {
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ nickcao ];
+ mainProgram = "telegram-desktop";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
index 347fa9d2e6..0cb8cc4ff2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "threema-desktop";
- version = "1.2.27";
+ version = "1.2.31";
src = fetchurl {
# As Threema only offers a Latest Release url, the plan is to upload each
# new release url to web.archive.org until their Github releases page gets populated.
- url = "https://web.archive.org/web/20230302151220/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
- sha256 = "0jx271zwqja7i7qdvhiyq5m6g19a12falfvxbkxrw7ab3ycds2px";
+ url = "https://web.archive.org/web/20230731230034if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
+ hash = "sha256-eZ/bjcSnrnzub1G4sbwPn3GCTwhDfFuYv9Plf5SJL90=";
};
nativeBuildInputs = [
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 8834ba2a15..b7f46e13ed 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.15.3.20121";
- versions.x86_64-darwin = "5.15.3.20121";
- versions.x86_64-linux = "5.15.3.4839";
+ versions.aarch64-darwin = "5.15.5.20753";
+ versions.x86_64-darwin = "5.15.5.20753";
+ versions.x86_64-linux = "5.15.5.5603";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
- hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw=";
+ hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
- hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w=";
+ hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
- hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0=";
+ hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
index 0ccca903f1..eff1458e07 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "thelounge";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchFromGitHub {
owner = "thelounge";
repo = "thelounge";
rev = "v${finalAttrs.version}";
- hash = "sha256-2MHq71lKkFe1uHEENgUiYsO99bPyLmEZZIdcdgsZfSM=";
+ hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA=";
};
# Allow setting package path for the NixOS module.
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
- hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk=";
+ hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
};
nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
@@ -88,5 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ winter raitobezarius ];
license = licenses.mit;
inherit (nodejs.meta) platforms;
+ mainProgram = "thelounge";
};
})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch
new file mode 100644
index 0000000000..775a7b7178
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+ [[package]]
+ name = "tiny"
+-version = "0.10.0"
++version = "0.11.0"
+ dependencies = [
+ "clap",
+ "dirs",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
index 4d7f5b0ca3..519d1dad76 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
@@ -12,16 +12,18 @@
rustPlatform.buildRustPackage rec {
pname = "tiny";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "osa1";
repo = pname;
rev = "v${version}";
- sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1";
+ hash = "sha256-oOaLQh9gJlurHi9awoRh4wQnXwkuOGJLnGQA6di6k1Q=";
};
- cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
+ cargoPatches = [ ./Cargo.lock.patch ];
+
+ cargoHash = "sha256-wUBScLNRNAdDZ+HpQjYiExgPJnE9cxviooHePbJI13Q=";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals dbusSupport [ dbus ]
@@ -30,6 +32,11 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional notificationSupport "desktop-notifications";
+ checkFlags = [
+ # flaky test
+ "--skip=tests::config::parsing_tab_configs"
+ ];
+
meta = with lib; {
description = "A console IRC client";
homepage = "https://github.com/osa1/tiny";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
index d9a2ed5789..46d5d97e43 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
@@ -95,6 +95,7 @@ let
'';
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ncfavier ];
+ mainProgram = "weechat";
platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix
index ecfddcf649..39a9f141c7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix
@@ -13,7 +13,7 @@ let
fs-repo-common = pname: version: buildGoModule {
inherit pname version;
inherit (kubo-migrator-unwrapped) src;
- sourceRoot = "source/${pname}";
+ sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}";
vendorSha256 = null;
# Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match
# See https://github.com/ipfs/fs-repo-migrations/pull/163
diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix
index b553185164..d5dc1421a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4=";
};
- sourceRoot = "source/fs-repo-migrations";
+ sourceRoot = "${src.name}/fs-repo-migrations";
vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix
new file mode 100644
index 0000000000..ed2817ed10
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, openssl
+, protobuf3_19
+, catch2
+, boost181
+, icu
+}:
+let
+ boost = boost181.override { enableStatic = true; };
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "localproxy";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "aws-samples";
+ repo = "aws-iot-securetunneling-localproxy";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ openssl protobuf3_19 catch2 boost icu ];
+
+ # causes redefinition of _FORTIFY_SOURCE
+ hardeningDisable = [ "fortify3" ];
+
+ meta = with lib; {
+ description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++";
+ homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy";
+ license = licenses.asl20;
+ maintainers = with maintainers; [spalf];
+ platforms = platforms.unix;
+ };
+ })
diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
index 33afc84509..6ce0abb6c0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
- version = "1.7.3";
+ version = "1.8.0";
disabled = python3.pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "refs/tags/v${version}";
- hash = "sha256-IzE+rCudMskJuPIWsz+u2D5KC8mc1JhNDVSHXixUEZA=";
+ hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw=";
};
format = "pyproject";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
index eb517e76c9..197fe15861 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
- version = "0.8.1";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
- hash = "sha256-N/g5//yIVot2vHPD/staVneO9eWPx0jT5dnYpcs1SZU=";
+ hash = "sha256-AImLYRRCL6IvoSeMFH2mbkNOvUmLwIvhWB3cOoqDljk=";
};
- cargoSha256 = "hjkCvyzsBzfP4FGSli0acrVCfbRC0V7uBecV5VSiClI=";
+ cargoSha256 = "deJZPaZW6rb7A6wOL3vcphBXu0F7EXc1xRwSDY/v8l4=";
nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix
index 6e694d01b4..9b5adb3a97 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "mailspring";
- version = "1.10.8";
+ version = "1.11.0";
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
- sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs=";
+ hash = "sha256-aAqkltVxIlGwRVGM+1QkrVgfnitl+D3Xb0qi0o8ow+Q=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 3c21b64933..c1db119080 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ notmuch openssl sqlite xapian zlib ];
+ XAPIAN_CONFIG = "${xapian}/bin/xapian-config";
meta = {
description = "Synchronize maildirs and notmuch databases";
homepage = "http://www.muchsync.org/";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 3a13620a85..a4069e332c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -42,13 +42,13 @@ rec {
thunderbird-115 = (buildMozillaMach rec {
pname = "thunderbird";
- version = "115.0";
+ version = "115.0.1";
application = "comm/mail";
applicationName = "Mozilla Thunderbird";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "2370a8e0b5ad2bc71bcb787cc93d31e5bf91bee9a4126c8677210e05936a726938b5fcff9b83c2ef1f509c1cadaa58638ba2399682308f32326a054496ea7a23";
+ sha512 = "9a53024790a537fb012d66e683248e82a9b2c2a4db6fc90d1e1d3c785c28e9d65f1d110c33dcbdad63f8f6ecb3e5c6a526c0028c3970125022ebe384506d4ba3";
};
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
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 6bb9e653ab..f5a2139b53 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.113.3";
+ version = "3.115.2";
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-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k=";
+ sha256 = "sha256-PdVvrb+sC8LF4tZXAHt2CevyoXhxTXJB01Fe64YI6BI=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json
index fe202a7753..f7b7280b46 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json
@@ -2,7 +2,7 @@
"owner": "zammad",
"repo": "zammad",
"rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678",
- "sha256": "vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=",
+ "hash": "sha256-vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=",
"fetchSubmodules": true
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix
index de08620cf8..fa734e7dea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix
@@ -13,6 +13,7 @@
, opusTools
, gst_all_1
, enableSonos ? true
+, qtwayland
}:
let packages = [
vorbis-tools
@@ -27,17 +28,18 @@ let packages = [
] ++ lib.optionals stdenv.isLinux [ pulseaudio ];
in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "mkchromecast-unstable";
version = "2022-10-31";
- src = fetchFromGitHub rec {
+ src = fetchFromGitHub {
owner = "muammar";
repo = "mkchromecast";
rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc";
sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y=";
};
+ buildInputs = lib.optional stdenv.isLinux qtwayland;
propagatedBuildInputs = with python3Packages; ([
pychromecast
psutil
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix
index 287797fd8e..0ed9599963 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix
@@ -11,7 +11,7 @@ buildGoModule {
src
;
- sourceRoot = "source/wireguard/libwg";
+ sourceRoot = "${mullvad.src.name}/wireguard/libwg";
vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix
index b191c31d39..ad33172801 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix
@@ -1,14 +1,17 @@
{ lib
+, stdenv
, openvpn
, fetchpatch
, fetchurl
, iproute2
-, autoconf
-, automake
+, libnl
+, autoreconfHook
+, pkg-config
}:
openvpn.overrideAttrs (oldAttrs:
let
+ inherit (lib) optional;
fetchMullvadPatch = { commit, sha256 }: fetchpatch {
url = "https://github.com/mullvad/openvpn/commit/${commit}.patch";
inherit sha256;
@@ -16,68 +19,90 @@ openvpn.overrideAttrs (oldAttrs:
in
rec {
pname = "openvpn-mullvad";
- version = "2.5.3";
+ version = "2.6.0";
src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/openvpn-${version}.tar.gz";
- sha256 = "sha256-dfAETfRJQwVVynuZWit3qyTylG/cNmgwG47cI5hqX34=";
+ sha256 = "sha256-6+yTMmPJhQ72984SXi8iIUvmCxy7jM/xiJJkP+CDro8=";
};
- buildInputs = oldAttrs.buildInputs or [ ] ++ [
- iproute2
- ];
-
- configureFlags = oldAttrs.configureFlags or [ ] ++ [
- "--enable-iproute2"
- "IPROUTE=${iproute2}/sbin/ip"
- ];
-
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
- autoconf
- automake
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = oldAttrs.buildInputs or [ ]
+ ++ optional stdenv.isLinux [ libnl.dev ];
+
+ configureFlags = [
+ # Assignement instead of appending to make sure to use exactly the flags required by mullvad
+
+ # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17
+ "--enable-static"
+ "--disable-shared"
+ "--disable-debug"
+ "--disable-plugin-down-root"
+ "--disable-management"
+ "--disable-port-share"
+ "--disable-systemd"
+ "--disable-dependency-tracking"
+ "--disable-pkcs11"
+ "--disable-plugin-auth-pam"
+ "--enable-plugins"
+ "--disable-lzo"
+ "--disable-lz4"
+ "--enable-comp-stub"
+ ]
+ ++ optional stdenv.isLinux [
+ # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35
+ "--enable-dco" # requires libnl
+ "--disable-iproute2"
];
patches = oldAttrs.patches or [ ] ++ [
# look at compare to find the relevant commits
- # https://github.com/OpenVPN/openvpn/compare/release/2.5...mullvad:mullvad-patches
+ # https://github.com/OpenVPN/openvpn/compare/release/2.6...mullvad:mullvad-patches
# used openvpn version is the latest tag ending with -mullvad
# https://github.com/mullvad/openvpn/tags
(fetchMullvadPatch {
# "Reduce PUSH_REQUEST_INTERVAL to one second"
- commit = "41e44158fc71bb6cc8cc6edb6ada3307765a12e8";
- sha256 = "sha256-UoH0V6gTPdEuybFkWxdaB4zomt7rZeEUyXs9hVPbLb4=";
- })
- (fetchMullvadPatch {
- # "Allow auth plugins to set a failure reason"
- commit = "f51781c601e8c72ae107deaf25bf66f7c193e9cd";
- sha256 = "sha256-+kwG0YElL16T0e+avHlI8gNQdAxneRS6fylv7QXvC1s=";
+ commit = "4084b49de84e64c56584a378e85faf37973b6d6d";
+ sha256 = "sha256-MmYeFSw6c/QJh0LqLgkx+UxrbtTVv6zEFcnYEqznR1c=";
})
(fetchMullvadPatch {
# "Send an event to any plugins when authentication fails"
- commit = "c2f810f966f2ffd68564d940b5b8946ea6007d5a";
- sha256 = "sha256-PsKIxYwpLD66YaIpntXJM8OGcObyWBSAJsQ60ojvj30=";
+ commit = "f24de7922d70c6e1ae06acf18bce1f62d9fa6b07";
+ sha256 = "sha256-RvlQbR6/s4NorYeA6FL7tE6geg6MIoZJtHeYxkVbdwA=";
})
(fetchMullvadPatch {
# "Shutdown when STDIN is closed"
- commit = "879d6a3c0288b5443bbe1b94261655c329fc2e0e";
- sha256 = "sha256-pRFY4r+b91/xAKXx6u5GLzouQySXuO5gH0kMGm77a3c=";
- })
- (fetchMullvadPatch {
- # "Update TAP hardware ID"
- commit = "7f71b37a3b25bec0b33a0e29780c222aef869e9d";
- sha256 = "sha256-RF/GvD/ZvhLdt34wDdUT/yxa+IVWx0eY6WRdNWXxXeQ=";
+ commit = "81ae84271c044359b67991b15ebfb0cf9a32b3ad";
+ sha256 = "sha256-ilKMyU97ha2m0p1FD64aNQncnKo4Tyi/nATuD5yPmVw=";
})
(fetchMullvadPatch {
# "Undo dependency on Python docutils"
- commit = "abd3c6214529d9f4143cc92dd874d8743abea17c";
- sha256 = "sha256-SC2RlpWHUDMAEKap1t60dC4hmalk3vok6xY+/xhC2U0=";
+ commit = "a5064b4b6c598b68d8cabc3f4006e5addef1ec1e";
+ sha256 = "sha256-+B6jxL0M+W5LzeukXkir26hn1OaYnycVNBwMYFq6gsE=";
})
(fetchMullvadPatch {
# "Prevent signal when stdin is closed from being cleared (#10)"
- commit = "b45b090c81e7b4f2dc938642af7a1e12f699f5c5";
- sha256 = "sha256-KPTFmbuJhMI+AvaRuu30CPPLQAXiE/VApxlUCqbZFls=";
+ commit = "abe529e6d7f71228a036007c6c02624ec98ad6c1";
+ sha256 = "sha256-qJQeEtZO/+8kenXTKv4Bx6NltUYe8AwzXQtJcyhrjfc=";
+ })
+ (fetchMullvadPatch {
+ # "Disable libcap-ng"
+ commit = "598014de7c063fa4e8ba1fffa01434229faafd04";
+ sha256 = "sha256-+cFX5gmMuG6XFkTs6IV7utiKRF9E47F5Pgo93c+zBXo=";
+ })
+ (fetchMullvadPatch {
+ # "Remove libnsl dep"
+ commit = "845727e01ab3ec9bd58fcedb31b3cf2ebe2d5226";
+ sha256 = "sha256-Via62wKVfMWHTmO7xIXXO7b5k0KYHs1D0JVg3qnXkeM=";
})
];
+ postPatch = oldAttrs.postPatch or "" + ''
+ rm ./configure
+ '';
meta = oldAttrs.meta or { } // {
description = "OpenVPN with Mullvad-specific patches applied";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix
index 2bc25913e0..a673f1b381 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.20.3";
+ version = "0.20.4";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
- hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc=";
+ hash = "sha256-4njC4hQoiAWlkwyvP14wWK+PxQ6bGR5QzteurHcuo4o=";
};
- vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns=";
+ vendorHash = "sha256-f6foYD/2b9iLzQbPTXeiKCdrm7gz5E8ulWHZaj+KB/M=";
inherit subPackages;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
index 854f1c3484..839766e2ac 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,11 +1,12 @@
{ spellChecking ? true
, lib
, stdenv
-, fetchurl
+, fetchFromGitLab
+, autoreconfHook
, pkg-config
, gtk3
, gtkspell3
-, gmime2
+, gmime3
, gettext
, intltool
, itstool
@@ -21,21 +22,19 @@
stdenv.mkDerivation rec {
pname = "pan";
- version = "0.146";
+ version = "0.154";
- src = fetchurl {
- url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
- sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "GNOME";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ=";
};
- patches = [
- # Take , , "gtk-compat.h" out of extern "C"
- ./move-out-of-extern-c.diff
- ];
+ nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];
- nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ];
-
- buildInputs = [ gtk3 gmime2 libnotify gnutls ]
+ buildInputs = [ gtk3 gmime3 libnotify gnutls ]
++ lib.optional spellChecking gtkspell3
++ lib.optionals gnomeSupport [ libsecret gcr ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff
deleted file mode 100644
index 02b19b58ee..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff
+++ /dev/null
@@ -1,1113 +0,0 @@
-diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc
-index b06d0c2..f424738 100644
---- a/pan/data-impl/article-filter.cc
-+++ b/pan/data-impl/article-filter.cc
-@@ -25,10 +25,7 @@
- #include
-
- //#include
--extern "C"
--{
-- #include
--}
-+#include
-
- #include "article-filter.h"
-
-diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
-index 88012cc..4465966 100644
---- a/pan/data-impl/data-impl.cc
-+++ b/pan/data-impl/data-impl.cc
-@@ -22,10 +22,8 @@
- **************/
-
- #include
--extern "C" {
-- #include
-- #include // for g_build_filename
--}
-+#include
-+#include // for g_build_filename
- #include
- #include
- #include
-diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc
-index bea1a90..d938634 100644
---- a/pan/data-impl/data-io.cc
-+++ b/pan/data-impl/data-io.cc
-@@ -27,9 +27,9 @@ extern "C" {
- #include // for chmod
- #include // for chmod
- #include
-- #include
-- #include
- }
-+#include
-+#include
- #include
- #include
- #include
-diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc
-index 244feb9..da0183a 100644
---- a/pan/data-impl/groups.cc
-+++ b/pan/data-impl/groups.cc
-@@ -29,9 +29,9 @@
- #include
-
- #include
-+#include
- extern "C" {
- #include
-- #include
- }
-
- #include
-diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
-index f8c4466..16d5672 100644
---- a/pan/data-impl/headers.cc
-+++ b/pan/data-impl/headers.cc
-@@ -25,10 +25,10 @@
- #include
- #include
- #include
-+#include
- extern "C" {
- #include // for chmod
- #include // for chmod
-- #include
- }
- #include
- #include
-diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
-index e999fda..a6e6bb5 100644
---- a/pan/data-impl/profiles.cc
-+++ b/pan/data-impl/profiles.cc
-@@ -26,9 +26,9 @@
- extern "C" {
- #include // for chmod
- #include // for chmod
-- #include
-- #include
- }
-+#include
-+#include
- #include
- #include
- #include
-diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
-index 9ea55d4..b23782f 100644
---- a/pan/data-impl/server.cc
-+++ b/pan/data-impl/server.cc
-@@ -25,10 +25,8 @@
- #include