git.iko.soy/typeable/nixpkgs

on e412163 help sign in

from76b29a4

swap

to0 ahead, 1197 behind

compare

.editorconfig−5

@@ -55,11 +55,6 @@ trim_trailing_whitespace = unset

5555[*.lock]

5656indent_size = unset

5757

58−# trailing whitespace is an actual syntax element of classic Markdown/

59−# CommonMark to enforce a line break

60−[*.md]

61−trim_trailing_whitespace = unset

62−

6358[eggs.nix]

6459trim_trailing_whitespace = unset

6560

doc/builders/fetchers.chapter.md+11−11

@@ -10,7 +10,7 @@ For those who develop and maintain fetchers, a similar problem arises with chang

1010

1111## `fetchurl` and `fetchzip` {#fetchurl}

1212

13−Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of `fetchurl` is provided below.

13+Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.

1414

1515```nix

1616{ stdenv, fetchurl }:

@@ -24,9 +24,9 @@ stdenv.mkDerivation {

2424}

2525```

2626

27−The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand, will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.

27+The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.

2828

29−`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example, it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.

29+`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.

3030

3131Most other fetchers return a directory rather than a single file.

3232

@@ -38,9 +38,9 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha25

3838

3939Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`.

4040

41−Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.

41+Additionally the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.

4242

43−If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information:

43+If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more infomation:

4444

4545```nix

4646{ stdenv, fetchgit }:

@@ -78,17 +78,17 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m

7878

7979## `fetchFromGitHub` {#fetchfromgithub}

8080

81−`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `sha256` is currently preferred.

81+`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred.

8282

8383`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.

8484

8585## `fetchFromGitLab` {#fetchfromgitlab}

8686

87−This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.

87+This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.

8888

8989## `fetchFromGitiles` {#fetchfromgitiles}

9090

91−This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.

91+This is used with Gitiles repositories. The arguments expected are similar to fetchgit.

9292

9393## `fetchFromBitbucket` {#fetchfrombitbucket}

9494

@@ -96,11 +96,11 @@ This is used with BitBucket repositories. The arguments expected are very simila

9696

9797## `fetchFromSavannah` {#fetchfromsavannah}

9898

99−This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.

99+This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.

100100

101101## `fetchFromRepoOrCz` {#fetchfromrepoorcz}

102102

103−This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.

103+This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.

104104

105105## `fetchFromSourcehut` {#fetchfromsourcehut}

106106

@@ -111,4 +111,4 @@ or "hg"), `domain` and `fetchSubmodules`.

111111

112112If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`

113113or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,

114−respectively. Otherwise, the fetcher uses `fetchzip`.

114+respectively. Otherwise the fetcher uses `fetchzip`.

doc/builders/images/dockertools.section.md+8−8

@@ -58,7 +58,7 @@ After the new layer has been created, its closure (to which `contents`, `config`

5858

5959At the end of the process, only one new single layer will be produced and added to the resulting image.

6060

61−The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage), it would be `redis/latest`.

61+The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage) it would be `redis/latest`.

6262

6363It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute.

6464

@@ -87,7 +87,7 @@ pkgs.dockerTools.buildImage {

8787}

8888```

8989

90−Now the Docker CLI will display a reasonable date and sort the images as expected:

90+and now the Docker CLI will display a reasonable date and sort the images as expected:

9191

9292```ShellSession

9393$ docker images

@@ -95,7 +95,7 @@ REPOSITORY TAG IMAGE ID CREATED SIZE

9595hello latest de2bf4786de6 About a minute ago 25.2MB

9696```

9797

98−However, the produced images will not be binary reproducible.

98+however, the produced images will not be binary reproducible.

9999

100100## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage}

101101

@@ -119,13 +119,13 @@ Create a Docker image with many of the store paths being on their own layer to i

119119

120120`contents` _optional_

121121

122−: Top-level paths in the container. Either a single derivation, or a list of derivations.

122+: Top level paths in the container. Either a single derivation, or a list of derivations.

123123

124124 *Default:* `[]`

125125

126126`config` _optional_

127127

128−: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).

128+: Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).

129129

130130 *Default:* `{}`

131131

@@ -195,9 +195,9 @@ pkgs.dockerTools.buildLayeredImage {

195195

196196Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.

197197

198−Modern Docker installations support up to 128 layers, but older versions support as few as 42.

198+Modern Docker installations support up to 128 layers, however older versions support as few as 42.

199199

200−If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However, it will be impossible to extend the image further.

200+If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further.

201201

202202The first (`maxLayers-2`) most "popular" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining "unpopular" paths, and finally layer \#`maxLayers` will contain the Image configuration.

203203

@@ -213,7 +213,7 @@ The image produced by running the output script can be piped directly into `dock

213213$(nix-build) | docker load

214214```

215215

216−Alternatively, the image be piped via `gzip` into `skopeo`, e.g., to copy it into a registry:

216+Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry:

217217

218218```ShellSession

219219$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag

doc/builders/images/ocitools.section.md+3−3

@@ -1,10 +1,10 @@

11# pkgs.ociTools {#sec-pkgs-ociTools}

22

3−`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container.

3+`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container.

44

55## buildContainer {#ssec-pkgs-ociTools-buildContainer}

66

7−This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command.

7+This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command.

88

99The parameters of `buildContainer` with an example value are described below:

1010

@@ -30,7 +30,7 @@ buildContainer {

3030}

3131```

3232

33−- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container.

33+- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container

3434

3535- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)

3636

doc/builders/images/snaptools.section.md+1−1

@@ -33,7 +33,7 @@ in snapTools.makeSnap {

3333

3434## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}

3535

36−Graphical programs require many more integrations with the host. This example uses Firefox as an example because it is one of the most complicated programs we could package.

36+Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.

3737

3838``` {#ex-snapTools-buildSnap-firefox .nix}

3939let

doc/builders/packages/citrix.section.md+5−5

@@ -4,13 +4,13 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a

44

55## Basic usage {#sec-citrix-base}

66

7−The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix.

7+The tarball archive needs to be downloaded manually as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store the package can be built and installed with Nix.

88

9−## Citrix Self-service {#sec-citrix-selfservice}

9+## Citrix Selfservice {#sec-citrix-selfservice}

1010

11−The [self-service](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.

11+The [selfservice](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.

1212

13−In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that, you can configure the `selfservice` like this:

13+In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that you can configure the `selfservice` like this:

1414

1515```ShellSession

1616$ storebrowse -C ~/Downloads/receiverconfig.cr

@@ -19,7 +19,7 @@ $ selfservice

1919

2020## Custom certificates {#sec-citrix-custom-certs}

2121

22−The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:

22+The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:

2323

2424```nix

2525with import <nixpkgs> { config.allowUnfree = true; };

doc/builders/packages/eclipse.section.md+5−5

@@ -8,9 +8,9 @@ Nixpkgs provides a number of packages that will install Eclipse in its various f

88$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description

99```

1010

11−Once an Eclipse variant is installed, it can be run using the `eclipse` command, as expected. From within Eclipse, it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.

11+Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.

1212

13−If you prefer to install plugins in a more declarative manner, then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add:

13+If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add

1414

1515```nix

1616packageOverrides = pkgs: {

@@ -22,15 +22,15 @@ packageOverrides = pkgs: {

2222}

2323```

2424

25−to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running:

25+to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running

2626

2727```ShellSession

2828$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description

2929```

3030

31−If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.

31+If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.

3232

33−Expanding the previous example with two plugins using the above functions, we have:

33+Expanding the previous example with two plugins using the above functions we have

3434

3535```nix

3636packageOverrides = pkgs: {

doc/builders/packages/elm.section.md+1−1

@@ -1,6 +1,6 @@

11# Elm {#sec-elm}

22

3−To start a development environment, run:

3+To start a development environment do

44

55```ShellSession

66nix-shell -p elmPackages.elm elmPackages.elm-format

doc/builders/packages/emacs.section.md+3−3

@@ -20,7 +20,7 @@ The Emacs package comes with some extra helpers to make it easier to configure.

2020}

2121```

2222

23−You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provides a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.

23+You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.

2424

2525```nix

2626{

@@ -101,9 +101,9 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t

101101}

102102```

103103

104−This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.

104+This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command.

105105

106−Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope'`.

106+Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.

107107

108108```nix

109109overrides = self: super: rec {

doc/builders/packages/etc-files.section.md+4−4

@@ -1,10 +1,10 @@

11# /etc files {#etc}

22

3−Certain calls in glibc require access to runtime files found in `/etc` such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.

3+Certain calls in glibc require access to runtime files found in /etc such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.

44

5−On non-NixOS distributions these files are typically provided by packages (i.e., [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.

5+On non-NixOS distributions these files are typically provided by packages (i.e. [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.

66

7−If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your `buildInputs`, then it will set the environment variables `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a setup hook.

7+If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your _buildInputs_ then it will set the environment varaibles `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a _setup-hook_.

88

99

1010```bash

@@ -15,4 +15,4 @@ NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/e

1515NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols

1616```

1717

18−Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variables are *not* set, then it will attempt to find the files at the default location within `/etc`.

18+Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variable are *not set*, then it will attempt to find the files at the default location within _/etc_.

doc/builders/packages/firefox.section.md+8−7

@@ -2,7 +2,7 @@

22

33## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies}

44

5−The `wrapFirefox` function allows to pass policies, preferences and extensions that are available to Firefox. With the help of `fetchFirefoxAddon` this allows to build a Firefox version that already comes with add-ons pre-installed:

5+The `wrapFirefox` function allows to pass policies, preferences and extension that are available to Firefox. With the help of `fetchFirefoxAddon` this allows build a Firefox version that already comes with addons pre-installed:

66

77```nix

88{

@@ -40,12 +40,13 @@ The `wrapFirefox` function allows to pass policies, preferences and extensions t

4040}

4141```

4242

43−If `nixExtensions != null`, then all manually installed add-ons will be uninstalled from your browser profile.

44−To view available enterprise policies, visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)

45−or type into the Firefox URL bar: `about:policies#documentation`.

46−Nix installed add-ons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded add-ons are checksummed and manual add-ons can't be installed. Also, make sure that the `name` field of `fetchFirefoxAddon` is unique. If you remove an add-on from the `nixExtensions` array, rebuild and start Firefox: the removed add-on will be completely removed with all of its settings.

43+If `nixExtensions != null` then all manually installed addons will be uninstalled from your browser profile.

44+To view available enterprise policies visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)

45+or type into the Firefox url bar: `about:policies#documentation`.

46+Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings.

4747

4848## Troubleshooting {#sec-firefox-troubleshooting}

49−If add-ons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for add-ons thus nix add-ons get disabled by the normal Firefox binary.

49+If addons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for addons thus nix addons get disabled by the normal Firefox binary.

50+

51+If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode.

5052

51−If add-ons do not appear installed despite being defined in your nix configuration file, reset the local add-on state of your Firefox profile by clicking `Help -> More Troubleshooting Information -> Refresh Firefox`. This can happen if you switch from manual add-on mode to nix add-on mode and then back to manual mode and then again to nix add-on mode.

doc/builders/packages/fish.section.md+1−1

@@ -36,7 +36,7 @@ using `buildFishPlugin` and running unit tests with the `fishtape` test runner.

3636## Fish wrapper {#sec-fish-wrapper}

3737

3838The `wrapFish` package is a wrapper around Fish which can be used to create

39−Fish shells initialized with some plugins as well as completions, configuration

39+Fish shells initialised with some plugins as well as completions, configuration

4040snippets and functions sourced from the given paths. This provides a convenient

4141way to test Fish plugins and scripts without having to alter the environment.

4242

doc/builders/packages/fuse.section.md+2−2

@@ -24,10 +24,10 @@ packages on macOS:

2424 checking for fuse.h... no

2525 configure: error: No fuse.h found.

2626

27−This happens on autoconf based projects that use `AC_CHECK_HEADERS` or

27+This happens on autoconf based projects that uses `AC_CHECK_HEADERS` or

2828`AC_CHECK_LIBS` to detect libfuse, and will occur even when the `fuse` package

2929is included in `buildInputs`. It happens because libfuse headers throw an error

30−on macOS if the `FUSE_USE_VERSION` macro is undefined. Many projects do define

30+on macOS if the `FUSE_USE_VERSION` macro is undefined. Many proejcts do define

3131`FUSE_USE_VERSION`, but only inside C source files. This results in the above

3232error at configure time because the configure script would attempt to compile

3333sample FUSE programs without defining `FUSE_USE_VERSION`.

doc/builders/packages/ibus.section.md+3−3

@@ -6,7 +6,7 @@ This package is an ibus-based completion method to speed up typing.

66

77IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).

88

9−On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:

9+On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:

1010

1111```nix

1212{ pkgs, ... }: {

@@ -19,7 +19,7 @@ On NixOS, you need to explicitly enable `ibus` with given engines before customi

1919

2020## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}

2121

22−The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:

22+The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:

2323

2424```nix

2525ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }

@@ -31,7 +31,7 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe

3131

3232The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:

3333

34−On NixOS, it can be installed using the following expression:

34+On NixOS it can be installed using the following expression:

3535

3636```nix

3737{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }

doc/builders/packages/linux.section.md+7−7

@@ -4,7 +4,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke

44

55The function that builds the kernel has an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).

66

7−The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e., has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:

7+The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:

88

99```nix

1010modulesTree = [kernel]

@@ -14,19 +14,19 @@ modulesTree = [kernel]

1414

1515How to add a new (major) version of the Linux kernel to Nixpkgs:

1616

17−1. Copy the old Nix expression (e.g., `linux-2.6.21.nix`) to the new one (e.g., `linux-2.6.22.nix`) and update it.

17+1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it.

1818

19192. Add the new kernel to the `kernels` attribute set in `linux-kernels.nix` (e.g., create an attribute `kernel_2_6_22`).

2020

21213. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following:

2222

23− 1. Make a copy from the old config (e.g., `config-2.6.21-i686-smp`) to the new one (e.g., `config-2.6.22-i686-smp`).

23+ 1. Make an copy from the old config (e.g. `config-2.6.21-i686-smp`) to the new one (e.g. `config-2.6.22-i686-smp`).

2424

25− 2. Copy the config file for this platform (e.g., `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.

25+ 2. Copy the config file for this platform (e.g. `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.

2626

27− 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e., don’t enable some feature on `i686` and disable it on `x86_64`).

27+ 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on `i686` and disable it on `x86_64`).

2828

29− 4. If needed, you can also run `make menuconfig`:

29+ 4. If needed you can also run `make menuconfig`:

3030

3131 ```ShellSession

3232 $ nix-env -f "<nixpkgs>" -iA ncurses

@@ -34,7 +34,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs:

3434 $ make menuconfig ARCH=arch

3535 ```

3636

37− 5. Copy `.config` over the new config file (e.g., `config-2.6.22-i686-smp`).

37+ 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`).

3838

39394. Test building the kernel: `nix-build -A linuxKernel.kernels.kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it.

4040

doc/builders/packages/locales.section.md+2−2

@@ -1,5 +1,5 @@

11# Locales {#locales}

22

3−To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats, Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.

3+To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.

44

5−On non-NixOS distributions, this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.

5+On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.

doc/builders/packages/nginx.section.md+2−2

@@ -4,8 +4,8 @@

44

55## ETags on static files served from the Nix store {#sec-nginx-etag}

66

7−HTTP has a couple of different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store because all file timestamps are set to 0 (for reasons related to build reproducibility).

7+HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility).

88

9−Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g., a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.

9+Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.

1010

1111As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior.

doc/builders/packages/opengl.section.md+1−1

@@ -12,4 +12,4 @@ The NixOS desktop or other non-headless configurations are the primary target fo

1212

1313If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.

1414

15−For proprietary video drivers, you might have luck with also adding the corresponding video driver package.

15+For proprietary video drivers you might have luck with also adding the corresponding video driver package.

doc/builders/packages/shell-helpers.section.md+1−1

@@ -4,7 +4,7 @@ Some packages provide the shell integration to be more useful. But unlike other

44

55- `fzf` : `fzf-share`

66

7−E.g. `fzf` can then be used in the `.bashrc` like this:

7+E.g. `fzf` can then used in the `.bashrc` like this:

88

99```bash

1010source "$(fzf-share)/completion.bash"

doc/builders/packages/steam.section.md+8−8

@@ -2,20 +2,20 @@

22

33## Steam in Nix {#sec-steam-nix}

44

5−Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in `$HOME`.

5+Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME.

66

77Nix problems and constraints:

88

9−- We don't have `/bin/bash` and many scripts point there. Same thing for `/usr/bin/python`.

9+- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.

1010- We don't have the dynamic loader in `/lib`.

11−- The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam.

11+- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.

1212- The steam binary cannot be patched, it's also checked.

1313

1414The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.

1515

1616## How to play {#sec-steam-play}

1717

18−Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` and also enable a few workarounds as well as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro Controller.

18+Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.

1919

2020## Troubleshooting {#sec-steam-troub}

2121

@@ -32,7 +32,7 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`

3232- **Using the FOSS Radeon or nouveau (nvidia) drivers**

3333

3434 - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore.

35− - Steam ships statically linked with a version of `libcrypto` that conflicts with the one dynamically loaded by radeonsi_dri.so. If you get the error:

35+ - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error

3636

3737 ```

3838 steam.sh: line 713: 7842 Segmentation fault (core dumped)

@@ -42,13 +42,13 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`

4242

4343- **Java**

4444

45− 1. There is no java in steam chrootenv by default. If you get a message like:

45+ 1. There is no java in steam chrootenv by default. If you get a message like

4646

4747 ```

4848 /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found

4949 ```

5050

51− you need to add:

51+ you need to add

5252

5353 ```nix

5454 steam.override { withJava = true; };

@@ -56,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`

5656

5757## steam-run {#sec-steam-run}

5858

59−The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with:

59+The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with

6060

6161```

6262steam-run ./foo

doc/builders/packages/urxvt.section.md+4−4

@@ -4,7 +4,7 @@ Urxvt, also known as rxvt-unicode, is a highly customizable terminal emulator.

44

55## Configuring urxvt {#sec-urxvt-conf}

66

7−In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as:

7+In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as

88

99```nix

1010rxvt-unicode.override {

@@ -58,14 +58,14 @@ rxvt-unicode.override {

5858

5959## Packaging urxvt plugins {#sec-urxvt-pkg}

6060

61−Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin, create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.

61+Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.

6262

6363A plugin can be any kind of derivation, the only requirement is that it should always install perl scripts in `$out/lib/urxvt/perl`. Look for existing plugins for examples.

6464

65−If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:

65+If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough:

6666

6767```nix

6868passthru.perlPackages = [ "self" ];

6969```

7070

71−This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.

71+This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly.

doc/builders/packages/weechat.section.md+5−5

@@ -1,6 +1,6 @@

1−# WeeChat {#sec-weechat}

1+# Weechat {#sec-weechat}

22

3−WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as:

3+Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as

44

55```nix

66weechat.override {configure = {availablePlugins, ...}: {

@@ -13,7 +13,7 @@ If the `configure` function returns an attrset without the `plugins` attribute,

1313

1414The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and `lua`.

1515

16−The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:

16+The python and perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:

1717

1818```nix

1919weechat.override { configure = {availablePlugins, ...}: {

@@ -49,7 +49,7 @@ weechat.override {

4949

5050Further values can be added to the list of commands when running `weechat --run-command "your-commands"`.

5151

52−Additionally, it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:

52+Additionally it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:

5353

5454```nix

5555weechat.override {

@@ -64,7 +64,7 @@ weechat.override {

6464}

6565```

6666

67−In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute, which contains a list of all scripts inside the store path. Furthermore, all scripts have to live in `$out/share`. An exemplary derivation looks like this:

67+In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in `$out/share`. An exemplary derivation looks like this:

6868

6969```nix

7070{ stdenv, fetchurl }:

doc/builders/trivial-builders.chapter.md+3−3

@@ -35,10 +35,10 @@ This works just like `runCommand`. The only difference is that it also provides

3535

3636## `runCommandLocal` {#trivial-builder-runCommandLocal}

3737

38−Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network round-trip and can speed up a build.

38+Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.

3939

4040::: {.note}

41−This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g., just copying some files to a different location or adding symlinks) because there the `system` is usually the same as `builtins.currentSystem`.

41+This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.

4242:::

4343

4444## `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin` {#trivial-builder-writeText}

@@ -219,5 +219,5 @@ produces an output path `/nix/store/<hash>-runtime-references` containing

219219/nix/store/<hash>-hello-2.10

220220```

221221

222−but none of `hello`'s dependencies because those are not referenced directly

222+but none of `hello`'s dependencies, because those are not referenced directly

223223by `hi`'s output.

doc/contributing/submitting-changes.chapter.md+1−1

@@ -96,7 +96,7 @@ We use jbidwatcher as an example for a discontinued project here.

9696

97971. Have Nixpkgs checked out locally and up to date.

98981. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`

99−1. Remove the actual package including its directory, e.g. `git rm -rf pkgs/applications/misc/jbidwatcher`

99+1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`

1001001. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).

1011011. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)

102102

doc/stdenv/meta.chapter.md−34

@@ -175,40 +175,6 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For

175175

176176NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).

177177

178−Alternatively, you can specify other derivations as tests. You can make use of

179−the optional parameter to inject the correct package without

180−relying on non-local definitions, even in the presence of `overrideAttrs`.

181−Here that's `finalAttrs.finalPackage`, but you could choose a different name if

182−`finalAttrs` already exists in your scope.

183−

184−`(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the

185−definition of `tests` does not rely on the original `mypkg` or overrides it in

186−all places.

187−

188−```nix

189−# my-package/default.nix

190−{ stdenv, callPackage }:

191−stdenv.mkDerivation (finalAttrs: {

192− # ...

193− passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; };

194−})

195−```

196−

197−```nix

198−# my-package/example.nix

199−{ runCommand, lib, my-package, ... }:

200−runCommand "my-package-test" {

201− nativeBuildInputs = [ my-package ];

202− src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];

203−} ''

204− my-package --help

205− my-package <example.in >example.actual

206− diff -U3 --color=auto example.expected example.actual

207− mkdir $out

208−''

209−```

210−

211−

212178### `timeout` {#var-meta-timeout}

213179

214180A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`.

doc/stdenv/stdenv.chapter.md−54

@@ -317,60 +317,6 @@ The script will be usually run from the root of the Nixpkgs repository but you s

317317

318318For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.

319319

320−### Recursive attributes in `mkDerivation`

321−

322−If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example:

323−

324−```nix

325−mkDerivation (finalAttrs: {

326− pname = "hello";

327− withFeature = true;

328− configureFlags =

329− lib.optionals finalAttrs.withFeature ["--with-feature"];

330−})

331−```

332−

333−Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`.

334−The `rec` keyword works at the syntax level and is unaware of overriding.

335−

336−Instead, the definition references `finalAttrs`, allowing users to change `withFeature`

337−consistently with `overrideAttrs`.

338−

339−`finalAttrs` also contains the attribute `finalPackage`, which includes the output paths, etc.

340−

341−Let's look at a more elaborate example to understand the differences between

342−various bindings:

343−

344−```nix

345−# `pkg` is the _original_ definition (for illustration purposes)

346−let pkg =

347− mkDerivation (finalAttrs: {

348− # ...

349−

350− # An example attribute

351− packages = [];

352−

353− # `passthru.tests` is a commonly defined attribute.

354− passthru.tests.simple = f finalAttrs.finalPackage;

355−

356− # An example of an attribute containing a function

357− passthru.appendPackages = packages':

358− finalAttrs.finalPackage.overrideAttrs (newSelf: super: {

359− packages = super.packages ++ packages';

360− });

361−

362− # For illustration purposes; referenced as

363− # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.

364− passthru.finalAttrs = finalAttrs;

365− passthru.original = pkg;

366− });

367−in pkg

368−```

369−

370−Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`.

371−

372−See also the section about [`passthru.tests`](#var-meta-tests).

373−

374320## Phases {#sec-stdenv-phases}

375321

376322`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder.

doc/using/overrides.chapter.md+2−6

@@ -39,18 +39,14 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st

3939Example usage:

4040

4141```nix

42−helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {

42+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {

4343 separateDebugInfo = true;

4444});

4545```

4646

4747In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.

4848

49−The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

50−

51−The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `finalPackage` attribute which is equal to the result of `mkDerivation` or subsequent `overrideAttrs` calls.

52−

53−If only a one-argument function is written, the argument has the meaning of `previousAttrs`.

49+The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

5450

5551::: {.note}

5652Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).

lib/default.nix−4

@@ -11,9 +11,6 @@ let

1111 callLibs = file: import file { lib = self; };

1212 in {

1313

14− # interacting with flakes

15− flakes = callLibs ./flakes.nix;

16−

1714 # often used, or depending on very little

1815 trivial = callLibs ./trivial.nix;

1916 fixedPoints = callLibs ./fixed-points.nix;

@@ -62,7 +59,6 @@ let

6259 # linux kernel configuration

6360 kernel = callLibs ./kernel.nix;

6461

65− inherit (self.flakes) callLocklessFlake;

6662 inherit (builtins) add addErrorContext attrNames concatLists

6763 deepSeq elem elemAt filter genericClosure genList getAttr

6864 hasAttr head isAttrs isBool isInt isList isString length

lib/flakes.nixdeleted−22

@@ -1,22 +0,0 @@

1−{ lib }:

2−

3−rec {

4−

5− /* imports a flake.nix without acknowledging its lock file, useful for

6− referencing subflakes from a parent flake. The second argument allows

7− specifying the inputs of this flake.

8−

9− Example:

10− callLocklessFlake {

11− path = ./directoryContainingFlake;

12− inputs = { inherit nixpkgs; };

13− }

14− */

15− callLocklessFlake = { path, inputs ? { } }:

16− let

17− self = { outPath = path; } //

18− ((import (path + "/flake.nix")).outputs (inputs // { self = self; }));

19− in

20− self;

21−

22−}

lib/strings.nix+1−1

@@ -254,7 +254,7 @@ rec {

254254 => false

255255 */

256256 hasInfix = infix: content:

257− builtins.match ".*${escapeRegex infix}.*" "${content}" != null;

257+ builtins.match ".*${escapeRegex infix}.*" content != null;

258258

259259 /* Convert a string to a list of characters (i.e. singleton strings).

260260 This allows you to, e.g., map a function over each character. However,

lib/systems/platforms.nix+2−2

@@ -3,7 +3,7 @@

33# targetPlatform, etc) containing at least the minimal set of attrs

44# required (see types.parsedPlatform in lib/systems/parse.nix). This

55# file takes an already-valid platform and further elaborates it with

6−# optional fields; currently these are: linux-kernel, gcc, and rustc.

6+# optional fields such as linux-kernel, gcc, etc.

77

88{ lib }:

99rec {

@@ -568,5 +568,5 @@ rec {

568568

569569 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv

570570

571− else { };

571+ else pc;

572572}

lib/tests/flakes/subflakeTest/flake.nixdeleted−8

@@ -1,8 +0,0 @@

1−{

2− outputs = { self, subflake, callLocklessFlake }: rec {

3− x = (callLocklessFlake {

4− path = subflake;

5− inputs = {};

6− }).subflakeOutput;

7− };

8−}

lib/tests/flakes/subflakeTest/subflake/flake.nixdeleted−5

@@ -1,5 +0,0 @@

1−{

2− outputs = { self }: {

3− subflakeOutput = 1;

4− };

5−}

lib/tests/misc.nix−39

@@ -22,15 +22,6 @@ in

2222

2323runTests {

2424

25−# FLAKES

26−

27− testCallLocklessFlake = {

28− expr = callLocklessFlake {

29− path = ./flakes/subflakeTest;

30− inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };

31− };

32− expected = { x = 1; outPath = ./flakes/subflakeTest; };

33− };

3425

3526# TRIVIAL

3627

@@ -280,36 +271,6 @@ runTests {

280271 '';

281272 };

282273

283− testHasInfixFalse = {

284− expr = hasInfix "c" "abde";

285− expected = false;

286− };

287−

288− testHasInfixTrue = {

289− expr = hasInfix "c" "abcde";

290− expected = true;

291− };

292−

293− testHasInfixDerivation = {

294− expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;

295− expected = true;

296− };

297−

298− testHasInfixPath = {

299− expr = hasInfix "tests" ./.;

300− expected = true;

301− };

302−

303− testHasInfixPathStoreDir = {

304− expr = hasInfix builtins.storeDir ./.;

305− expected = true;

306− };

307−

308− testHasInfixToString = {

309− expr = hasInfix "a" { __toString = _: "a"; };

310− expected = true;

311− };

312−

313274# LISTS

314275

315276 testFilter = {

maintainers/maintainer-list.nix−38

@@ -687,12 +687,6 @@

687687 github = "an-empty-string";

688688 githubId = 681716;

689689 };

690− AnatolyPopov = {

691− email = "aipopov@live.ru";

692− github = "AnatolyPopov";

693− githubId = 2312534;

694− name = "Anatolii Popov";

695− };

696690 andehen = {

697691 email = "git@andehen.net";

698692 github = "andehen";

@@ -841,13 +835,6 @@

841835 githubId = 5327697;

842836 name = "Anatolii Prylutskyi";

843837 };

844− anselmschueler = {

845− email = "mail@anselmschueler.com";

846− github = "schuelermine";

847− githubId = 48802534;

848− name = "Anselm Schüler";

849− matrix = "@schuelermine:matrix.org";

850− };

851838 antoinerg = {

852839 email = "roygobeil.antoine@gmail.com";

853840 github = "antoinerg";

@@ -1409,12 +1396,6 @@

14091396 githubId = 164148;

14101397 name = "Ben Darwin";

14111398 };

1412− bdd = {

1413− email = "bdd@mindcast.org";

1414− github = "bdd";

1415− githubId = 11135;

1416− name = "Berk D. Demir";

1417− };

14181399 bdesham = {

14191400 email = "benjamin@esham.io";

14201401 github = "bdesham";

@@ -7218,13 +7199,6 @@

72187199 githubId = 1769386;

72197200 name = "Liam Diprose";

72207201 };

7221− libjared = {

7222− email = "jared@perrycode.com";

7223− github = "libjared";

7224− githubId = 3746656;

7225− matrix = "@libjared:matrix.org";

7226− name = "Jared Perry";

7227− };

72287202 liff = {

72297203 email = "liff@iki.fi";

72307204 github = "liff";

@@ -13294,12 +13268,6 @@

1329413268 githubId = 1771332;

1329513269 name = "László Vaskó";

1329613270 };

13297− vlinkz = {

13298− email = "vmfuentes64@gmail.com";

13299− github = "vlinkz";

13300− githubId = 20145996;

13301− name = "Victor Fuentes";

13302− };

1330313271 vlstill = {

1330413272 email = "xstill@fi.muni.cz";

1330513273 github = "vlstill";

@@ -14211,12 +14179,6 @@

1421114179 github = "deifactor";

1421214180 githubId = 30192992;

1421314181 };

14214− deinferno = {

14215− name = "deinferno";

14216− email = "14363193+deinferno@users.noreply.github.com";

14217− github = "deinferno";

14218− githubId = 14363193;

14219− };

1422014182 fzakaria = {

1422114183 name = "Farid Zakaria";

1422214184 email = "farid.m.zakaria@gmail.com";

maintainers/scripts/luarocks-packages.csv+1−2

@@ -52,7 +52,7 @@ luadbi-postgresql,,,,,,

5252luadbi-sqlite3,,,,,,

5353luaepnf,,,,,,

5454luaevent,,,,,,

55−luaexpat,,,,1.4.1-1,,arobyn flosse

55+luaexpat,,,,1.3.0-1,,arobyn flosse

5656luaffi,,,http://luarocks.org/dev,,,

5757luafilesystem,,,,1.7.0-2,,flosse

5858lualogging,,,,,,

@@ -64,7 +64,6 @@ luasocket,,,,,,

6464luasql-sqlite3,,,,,,vyp

6565luassert,,,,,,

6666luasystem,,,,,,

67−luaunbound,,,,,

6867luautf8,,,,,,pstn

6968luazip,,,,,,

7069lua-yajl,,,,,,pstn

maintainers/scripts/pluginupdate.py+37−43

@@ -87,8 +87,7 @@ def make_request(url: str, token=None) -> urllib.request.Request:

8787 return urllib.request.Request(url, headers=headers)

8888

8989

90−# a dictionary of plugins and their new repositories

91−Redirects = Dict['PluginDesc', 'Repo']

90+Redirects = Dict['Repo', 'Repo']

9291

9392class Repo:

9493 def __init__(

@@ -97,8 +96,8 @@ class Repo:

9796 self.uri = uri

9897 '''Url to the repo'''

9998 self._branch = branch

100− # Redirect is the new Repo to use

101− self.redirect: Optional['Repo'] = None

99+ # {old_uri: new_uri}

100+ self.redirect: Redirects = {}

102101 self.token = "dummy_token"

103102

104103 @property

@@ -208,7 +207,7 @@ class RepoGitHub(Repo):

208207 )

209208

210209 new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)

211− self.redirect = new_repo

210+ self.redirect[self] = new_repo

212211

213212

214213 def prefetch(self, commit: str) -> str:

@@ -238,7 +237,7 @@ class RepoGitHub(Repo):

238237 }}'''

239238

240239

241−@dataclass(frozen=True)

240+@dataclass

242241class PluginDesc:

243242 repo: Repo

244243 branch: str

@@ -311,16 +310,6 @@ def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[Plugin

311310

312311 return plugins

313312

314−def run_nix_expr(expr):

315− with CleanEnvironment():

316− cmd = ["nix", "eval", "--extra-experimental-features",

317− "nix-command", "--impure", "--json", "--expr", expr]

318− log.debug("Running command %s", cmd)

319− out = subprocess.check_output(cmd)

320− data = json.loads(out)

321− return data

322−

323−

324313class Editor:

325314 """The configuration of the update script."""

326315

@@ -343,15 +332,9 @@ class Editor:

343332 self.deprecated = deprecated or root.joinpath("deprecated.json")

344333 self.cache_file = cache_file or f"{name}-plugin-cache.json"

345334

346− def get_current_plugins(self) -> List[Plugin]:

335+ def get_current_plugins(self):

347336 """To fill the cache"""

348− data = run_nix_expr(self.get_plugins)

349− plugins = []

350− for name, attr in data.items():

351− print("get_current_plugins: name %s" % name)

352− p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])

353− plugins.append(p)

354− return plugins

337+ return get_current_plugins(self)

355338

356339 def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:

357340 '''CSV spec'''

@@ -465,10 +448,24 @@ class CleanEnvironment(object):

465448 self.empty_config.close()

466449

467450

451+def get_current_plugins(editor: Editor) -> List[Plugin]:

452+ with CleanEnvironment():

453+ cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins]

454+ log.debug("Running command %s", cmd)

455+ out = subprocess.check_output(cmd)

456+ data = json.loads(out)

457+ plugins = []

458+ for name, attr in data.items():

459+ print("get_current_plugins: name %s" % name)

460+ p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])

461+ plugins.append(p)

462+ return plugins

463+

464+

468465def prefetch_plugin(

469466 p: PluginDesc,

470467 cache: "Optional[Cache]" = None,

471−) -> Tuple[Plugin, Optional[Repo]]:

468+) -> Tuple[Plugin, Redirects]:

472469 repo, branch, alias = p.repo, p.branch, p.alias

473470 name = alias or p.repo.name

474471 commit = None

@@ -482,7 +479,7 @@ def prefetch_plugin(

482479 return cached_plugin, repo.redirect

483480

484481 has_submodules = repo.has_submodules()

485− log.debug(f"prefetch {name}")

482+ print(f"prefetch {name}")

486483 sha256 = repo.prefetch(commit)

487484

488485 return (

@@ -491,7 +488,7 @@ def prefetch_plugin(

491488 )

492489

493490

494−def print_download_error(plugin: PluginDesc, ex: Exception):

491+def print_download_error(plugin: str, ex: Exception):

495492 print(f"{plugin}: {ex}", file=sys.stderr)

496493 ex_traceback = ex.__traceback__

497494 tb_lines = [

@@ -501,21 +498,19 @@ def print_download_error(plugin: PluginDesc, ex: Exception):

501498 print("\n".join(tb_lines))

502499

503500def check_results(

504− results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]

501+ results: List[Tuple[PluginDesc, Union[Exception, Plugin], Redirects]]

505502) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:

506503 ''' '''

507− failures: List[Tuple[PluginDesc, Exception]] = []

504+ failures: List[Tuple[str, Exception]] = []

508505 plugins = []

509− redirects: Redirects = {}

506+ # {old: new} plugindesc

507+ redirects: Dict[Repo, Repo] = {}

510508 for (pdesc, result, redirect) in results:

511509 if isinstance(result, Exception):

512− failures.append((pdesc, result))

510+ failures.append((pdesc.name, result))

513511 else:

514− new_pdesc = pdesc

515− if redirect is not None:

516− redirects.update({pdesc: redirect})

517− new_pdesc = PluginDesc(redirect, pdesc.branch, pdesc.alias)

518− plugins.append((new_pdesc, result))

512+ plugins.append((pdesc, result))

513+ redirects.update(redirect)

519514

520515 print(f"{len(results) - len(failures)} plugins were checked", end="")

521516 if len(failures) == 0:

@@ -596,13 +591,13 @@ class Cache:

596591

597592def prefetch(

598593 pluginDesc: PluginDesc, cache: Cache

599−) -> Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]:

594+) -> Tuple[PluginDesc, Union[Exception, Plugin], dict]:

600595 try:

601596 plugin, redirect = prefetch_plugin(pluginDesc, cache)

602597 cache[plugin.commit] = plugin

603598 return (pluginDesc, plugin, redirect)

604599 except Exception as e:

605− return (pluginDesc, e, None)

600+ return (pluginDesc, e, {})

606601

607602

608603

@@ -611,7 +606,7 @@ def rewrite_input(

611606 input_file: Path,

612607 deprecated: Path,

613608 # old pluginDesc and the new

614− redirects: Redirects = {},

609+ redirects: Dict[PluginDesc, PluginDesc] = {},

615610 append: List[PluginDesc] = [],

616611):

617612 plugins = load_plugins_from_csv(config, input_file,)

@@ -623,10 +618,9 @@ def rewrite_input(

623618 cur_date_iso = datetime.now().strftime("%Y-%m-%d")

624619 with open(deprecated, "r") as f:

625620 deprecations = json.load(f)

626− for pdesc, new_repo in redirects.items():

627− new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)

628− old_plugin, _ = prefetch_plugin(pdesc)

629− new_plugin, _ = prefetch_plugin(new_pdesc)

621+ for old, new in redirects.items():

622+ old_plugin, _ = prefetch_plugin(old)

623+ new_plugin, _ = prefetch_plugin(new)

630624 if old_plugin.normalized_name != new_plugin.normalized_name:

631625 deprecations[old_plugin.normalized_name] = {

632626 "new": new_plugin.normalized_name,

maintainers/team-list.nix−36

@@ -198,18 +198,6 @@ with lib.maintainers; {

198198 enableFeatureFreezePing = true;

199199 };

200200

201− enlightenment = {

202− members = [

203− romildo

204− ];

205− githubTeams = [

206− "enlightenment"

207− ];

208− scope = "Maintain Enlightenment desktop environment and related packages.";

209− shortName = "Enlightenment";

210− enableFeatureFreezePing = true;

211− };

212−

213201 # Dummy group for the "everyone else" section

214202 feature-freeze-everyone-else = {

215203 members = [ ];

@@ -355,30 +343,6 @@ with lib.maintainers; {

355343 shortName = "Linux Kernel";

356344 };

357345

358− lumina = {

359− members = [

360− romildo

361− ];

362− githubTeams = [

363− "lumina"

364− ];

365− scope = "Maintain lumina desktop environment and related packages.";

366− shortName = "Lumina";

367− enableFeatureFreezePing = true;

368− };

369−

370− lxqt = {

371− members = [

372− romildo

373− ];

374− githubTeams = [

375− "lxqt"

376− ];

377− scope = "Maintain LXQt desktop environment and related packages.";

378− shortName = "LXQt";

379− enableFeatureFreezePing = true;

380− };

381−

382346 marketing = {

383347 members = [

384348 garbas

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml−79

@@ -43,33 +43,6 @@

4343 Shell.

4444 </para>

4545 </listitem>

46− <listitem>

47− <para>

48− <literal>stdenv.mkDerivation</literal> now supports a

49− self-referencing <literal>finalAttrs:</literal> parameter

50− containing the final <literal>mkDerivation</literal> arguments

51− including overrides. <literal>drv.overrideAttrs</literal> now

52− supports two parameters

53− <literal>finalAttrs: previousAttrs:</literal>. This allows

54− packaging configuration to be overridden in a consistent

55− manner by providing an alternative to

56− <literal>rec {}</literal> syntax.

57− </para>

58− <para>

59− Additionally, <literal>passthru</literal> can now reference

60− <literal>finalAttrs.finalPackage</literal> containing the

61− final package, including attributes such as the output paths

62− and <literal>overrideAttrs</literal>.

63− </para>

64− <para>

65− New language integrations can be simplified by overriding a

66− <quote>prototype</quote> package containing the

67− language-specific logic. This removes the need for a extra

68− layer of overriding for the <quote>generic builder</quote>

69− arguments, thus removing a usability problem and source of

70− error.

71− </para>

72− </listitem>

7346 <listitem>

7447 <para>

7548 PHP 8.1 is now available

@@ -100,22 +73,6 @@

10073 Systemd has been upgraded to the version 250.

10174 </para>

10275 </listitem>

103− <listitem>

104− <para>

105− Pulseaudio has been upgraded to version 15.0 and now

106− optionally

107− <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports

108− additional Bluetooth audio codecs</link> like aptX or LDAC,

109− with codec switching support being available in

110− <literal>pavucontrol</literal>. This feature is disabled by

111− default but can be enabled by using

112− <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>.

113− Existing 3rd party modules that provided similar

114− functionality, like <literal>pulseaudio-modules-bt</literal>

115− or <literal>pulseaudio-hsphfpd</literal> are deprecated and

116− have been removed.

117− </para>

118− </listitem>

11976 <listitem>

12077 <para>

12178 The new

@@ -151,14 +108,6 @@

151108 default.

152109 </para>

153110 </listitem>

154− <listitem>

155− <para>

156− The GNOME and Plasma installation CDs now use

157− <literal>pkgs.calamares</literal> and

158− <literal>pkgs.calamares-nixos-extensions</literal> to allow

159− users to easily install and set up NixOS with a GUI.

160− </para>

161− </listitem>

162111 </itemizedlist>

163112 </section>

164113 <section xml:id="sec-release-22.05-new-services">

@@ -544,19 +493,6 @@

544493 <literal>/etc/containers</literal>.

545494 </para>

546495 </listitem>

547− <listitem>

548− <para>

549− For new installations

550− <literal>virtualisation.oci-containers.backend</literal> is

551− now set to <literal>podman</literal> by default. If you still

552− want to use Docker on systems where

553− <literal>system.stateVersion</literal> is set to to

554− <literal>&quot;22.05&quot;</literal> set

555− <literal>virtualisation.oci-containers.backend = &quot;docker&quot;;</literal>.Old

556− systems with older <literal>stateVersion</literal>s stay with

557− <quote>docker</quote>.

558− </para>

559− </listitem>

560496 <listitem>

561497 <para>

562498 <literal>security.klogd</literal> was removed. Logging of

@@ -877,11 +813,6 @@

877813 to the new location if the <literal>stateVersion</literal> is

878814 updated.

879815 </para>

880− <para>

881− As of Synapse 1.58.0, the old groups/communities feature has

882− been disabled by default. It will be completely removed with

883− Synapse 1.61.0.

884− </para>

885816 </listitem>

886817 <listitem>

887818 <para>

@@ -1423,16 +1354,6 @@

14231354 <literal>otelcorecol</literal> and enjoy a 7x smaller binary.

14241355 </para>

14251356 </listitem>

1426− <listitem>

1427− <para>

1428− <literal>services.zookeeper</literal> has a new option

1429− <literal>jre</literal> for specifying the JRE to start

1430− zookeeper with. It defaults to the JRE that

1431− <literal>pkgs.zookeeper</literal> was wrapped with, instead of

1432− <literal>pkgs.jre</literal>. This changes the JRE to

1433− <literal>pkgs.jdk11_headless</literal> by default.

1434− </para>

1435− </listitem>

14361357 <listitem>

14371358 <para>

14381359 <literal>pkgs.pgadmin</literal> now refers to

nixos/doc/manual/release-notes/rl-2205.section.md−29

@@ -17,21 +17,6 @@ In addition to numerous new and upgraded packages, this release has the followin

1717

1818- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell.

1919

20−- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter

21− containing the final `mkDerivation` arguments including overrides.

22− `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`.

23− This allows packaging configuration to be overridden in a consistent manner by

24− providing an alternative to `rec {}` syntax.

25−

26− Additionally, `passthru` can now reference `finalAttrs.finalPackage` containing

27− the final package, including attributes such as the output paths and

28− `overrideAttrs`.

29−

30− New language integrations can be simplified by overriding a "prototype"

31− package containing the language-specific logic. This removes the need for a

32− extra layer of overriding for the "generic builder" arguments, thus removing a

33− usability problem and source of error.

34−

3520- PHP 8.1 is now available

3621

3722- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).

@@ -42,9 +27,6 @@ In addition to numerous new and upgraded packages, this release has the followin

4227

4328- Systemd has been upgraded to the version 250.

4429

45−- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`.

46− Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed.

47−

4830- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.

4931

5032- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details.

@@ -53,8 +35,6 @@ In addition to numerous new and upgraded packages, this release has the followin

5335

5436- The default GHC version has been updated from 8.10.7 to 9.0.2. `pkgs.haskellPackages` and `pkgs.ghc` will now use this version by default.

5537

56−- The GNOME and Plasma installation CDs now use `pkgs.calamares` and `pkgs.calamares-nixos-extensions` to allow users to easily install and set up NixOS with a GUI.

57−

5838## New Services {#sec-release-22.05-new-services}

5939

6040- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).

@@ -181,9 +161,6 @@ In addition to numerous new and upgraded packages, this release has the followin

181161 This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo

182162 which assumes they have ownership over `/etc/containers`.

183163

184−- For new installations `virtualisation.oci-containers.backend` is now set to `podman` by default.

185− If you still want to use Docker on systems where `system.stateVersion` is set to to `"22.05"` set `virtualisation.oci-containers.backend = "docker";`.Old systems with older `stateVersion`s stay with "docker".

186−

187164- `security.klogd` was removed. Logging of kernel messages is handled

188165 by systemd since Linux 3.5.

189166

@@ -362,8 +339,6 @@ In addition to numerous new and upgraded packages, this release has the followin

362339 `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new

363340 location if the `stateVersion` is updated.

364341

365− As of Synapse 1.58.0, the old groups/communities feature has been disabled by default. It will be completely removed with Synapse 1.61.0.

366−

367342- The Keycloak package (`pkgs.keycloak`) has been switched from the

368343 Wildfly version, which will soon be deprecated, to the Quarkus based

369344 version. The Keycloak service (`services.keycloak`) has been updated

@@ -563,10 +538,6 @@ In addition to numerous new and upgraded packages, this release has the followin

563538 you should change the package you refer to. If you don't need them update your

564539 commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.

565540

566−- `services.zookeeper` has a new option `jre` for specifying the JRE to start

567− zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with,

568− instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default.

569−

570541- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.

571542

572543- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`

nixos/maintainers/scripts/lxd/lxd-image.nix+1−1

@@ -27,7 +27,7 @@ with lib;

2727 networking.useDHCP = false;

2828 networking.interfaces.eth0.useDHCP = true;

2929

30− # As this is intended as a standalone image, undo some of the minimal profile stuff

30+ # As this is intended as a stadalone image, undo some of the minimal profile stuff

3131 documentation.enable = true;

3232 documentation.nixos.enable = true;

3333 environment.noXlibs = false;

nixos/modules/hardware/all-firmware.nix+1−1

@@ -72,7 +72,7 @@ in {

7272 })

7373 (mkIf cfg.enableAllFirmware {

7474 assertions = [{

75− assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree;

75+ assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);

7676 message = ''

7777 the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.

7878 This requires nixpkgs.config.allowUnfree to be true.

nixos/modules/i18n/input-method/fcitx5.nix+6−21

@@ -5,9 +5,7 @@ with lib;

55let

66 im = config.i18n.inputMethod;

77 cfg = im.fcitx5;

8− addons = cfg.addons ++ optional cfg.enableRimeData pkgs.rime-data;

9− fcitx5Package = pkgs.fcitx5-with-addons.override { inherit addons; };

10− whetherRimeDataDir = any (p: p.pname == "fcitx5-rime") cfg.addons;

8+ fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };

119in {

1210 options = {

1311 i18n.inputMethod.fcitx5 = {

@@ -19,29 +17,16 @@ in {

1917 Enabled Fcitx5 addons.

2018 '';

2119 };

22−

23− enableRimeData = mkEnableOption "default rime-data with fcitx5-rime";

2420 };

2521 };

2622

2723 config = mkIf (im.enabled == "fcitx5") {

2824 i18n.inputMethod.package = fcitx5Package;

2925

30− environment = mkMerge [{

31− variables = {

32− GTK_IM_MODULE = "fcitx";

33− QT_IM_MODULE = "fcitx";

34− XMODIFIERS = "@im=fcitx";

35− };

36− }

37− (mkIf whetherRimeDataDir {

38− pathsToLink = [

39− "/share/rime-data"

40− ];

41−

42− variables = {

43− NIX_RIME_DATA_DIR = "/run/current-system/sw/share/rime-data";

44− };

45− })];

26+ environment.variables = {

27+ GTK_IM_MODULE = "fcitx";

28+ QT_IM_MODULE = "fcitx";

29+ XMODIFIERS = "@im=fcitx";

30+ };

4631 };

4732}

nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+8−14

@@ -35,28 +35,22 @@ with lib;

3535 # Enable sound in graphical iso's.

3636 hardware.pulseaudio.enable = true;

3737

38− # Spice guest additions

39− services.spice-vdagentd.enable = true;

40−

41− # Enable plymouth

42− boot.plymouth.enable = true;

43−

44− environment.defaultPackages = with pkgs; [

38+ environment.systemPackages = [

4539 # Include gparted for partitioning disks.

46− gparted

40+ pkgs.gparted

4741

4842 # Include some editors.

49− vim

50− nano

43+ pkgs.vim

44+ pkgs.bvi # binary editor

45+ pkgs.joe

5146

5247 # Include some version control tools.

53− git

54− rsync

48+ pkgs.git

5549

5650 # Firefox for reading the manual.

57− firefox

51+ pkgs.firefox

5852

59− glxinfo

53+ pkgs.glxinfo

6054 ];

6155

6256}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nixdeleted−59

@@ -1,59 +0,0 @@

1−# This module defines a NixOS installation CD that contains GNOME.

2−

3−{ pkgs, ... }:

4−

5−{

6− imports = [ ./installation-cd-graphical-calamares.nix ];

7−

8− isoImage.edition = "gnome";

9−

10− services.xserver.desktopManager.gnome = {

11− # Add Firefox and other tools useful for installation to the launcher

12− favoriteAppsOverride = ''

13− [org.gnome.shell]

14− favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]

15− '';

16−

17− # Override GNOME defaults to disable GNOME tour and disable suspend

18− extraGSettingsOverrides = ''

19− [org.gnome.shell]

20− welcome-dialog-last-shown-version='9999999999'

21−

22− [org.gnome.settings-daemon.plugins.power]

23− sleep-inactive-ac-type='nothing'

24− sleep-inactive-battery-type='nothing'

25− '';

26−

27− extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];

28−

29− enable = true;

30− };

31−

32− # Theme calamares with GNOME theme

33− qt5 = {

34− enable = true;

35− platformTheme = "gnome";

36− };

37−

38− # Fix scaling for calamares on wayland

39− environment.variables = {

40− QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";

41− };

42−

43− services.xserver.displayManager = {

44− gdm = {

45− enable = true;

46− # autoSuspend makes the machine automatically suspend after inactivity.

47− # It's possible someone could/try to ssh'd into the machine and obviously

48− # have issues because it's inactive.

49− # See:

50− # * https://github.com/NixOS/nixpkgs/pull/63790

51− # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22

52− autoSuspend = false;

53− };

54− autoLogin = {

55− enable = true;

56− user = "nixos";

57− };

58− };

59−}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nixdeleted−49

@@ -1,49 +0,0 @@

1−# This module defines a NixOS installation CD that contains X11 and

2−# Plasma 5.

3−

4−{ pkgs, ... }:

5−

6−{

7− imports = [ ./installation-cd-graphical-calamares.nix ];

8−

9− isoImage.edition = "plasma5";

10−

11− services.xserver = {

12− desktopManager.plasma5 = {

13− enable = true;

14− };

15−

16− # Automatically login as nixos.

17− displayManager = {

18− sddm.enable = true;

19− autoLogin = {

20− enable = true;

21− user = "nixos";

22− };

23− };

24− };

25−

26− environment.systemPackages = with pkgs; [

27− # Graphical text editor

28− kate

29− ];

30−

31− system.activationScripts.installerDesktop = let

32−

33− # Comes from documentation.nix when xserver and nixos.enable are true.

34− manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";

35−

36− homeDir = "/home/nixos/";

37− desktopDir = homeDir + "Desktop/";

38−

39− in ''

40− mkdir -p ${desktopDir}

41− chown nixos ${homeDir} ${desktopDir}

42−

43− ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}

44− ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}

45− ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}

46− ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}

47− '';

48−

49−}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nixdeleted−20

@@ -1,20 +0,0 @@

1−# This module adds the calamares installer to the basic graphical NixOS

2−# installation CD.

3−

4−{ pkgs, ... }:

5−let

6− calamares-nixos-autostart = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };

7−in

8−{

9− imports = [ ./installation-cd-graphical-base.nix ];

10−

11− environment.systemPackages = with pkgs; [

12− # Calamares for graphical installation

13− libsForQt5.kpmcore

14− calamares-nixos

15− calamares-nixos-autostart

16− calamares-nixos-extensions

17− # Needed for calamares QML module packagechooserq

18− libsForQt5.full

19− ];

20−}

nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+3−1

@@ -1,6 +1,8 @@

11# This module defines a NixOS installation CD that contains GNOME.

22

3−{ ... }:

3+{ lib, ... }:

4+

5+with lib;

46

57{

68 imports = [ ./installation-cd-graphical-base.nix ];

nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+3−1

@@ -1,7 +1,9 @@

11# This module defines a NixOS installation CD that contains X11 and

22# Plasma 5.

33

4−{ pkgs, ... }:

4+{ config, lib, pkgs, ... }:

5+

6+with lib;

57

68{

79 imports = [ ./installation-cd-graphical-base.nix ];

nixos/modules/module-list.nix−2

@@ -737,7 +737,6 @@

737737 ./services/networking/blocky.nix

738738 ./services/networking/charybdis.nix

739739 ./services/networking/cjdns.nix

740− ./services/networking/cloudflare-dyndns.nix

741740 ./services/networking/cntlm.nix

742741 ./services/networking/connman.nix

743742 ./services/networking/consul.nix

@@ -1256,7 +1255,6 @@

12561255 ./virtualisation/virtualbox-guest.nix

12571256 ./virtualisation/virtualbox-host.nix

12581257 ./virtualisation/vmware-guest.nix

1259− ./virtualisation/vmware-host.nix

12601258 ./virtualisation/waydroid.nix

12611259 ./virtualisation/xen-dom0.nix

12621260 ./virtualisation/xe-guest-utilities.nix

nixos/modules/programs/thefuck.nix+6−7

@@ -6,12 +6,9 @@ let

66 prg = config.programs;

77 cfg = prg.thefuck;

88

9− bashAndZshInitScript = ''

9+ initScript = ''

1010 eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})

1111 '';

12− fishInitScript = ''

13− ${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source

14− '';

1512in

1613 {

1714 options = {

@@ -33,8 +30,10 @@ in

3330 config = mkIf cfg.enable {

3431 environment.systemPackages = with pkgs; [ thefuck ];

3532

36− programs.bash.interactiveShellInit = bashAndZshInitScript;

37− programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;

38− programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;

33+ programs.bash.interactiveShellInit = initScript;

34+ programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;

35+ programs.fish.interactiveShellInit = mkIf prg.fish.enable ''

36+ ${pkgs.thefuck}/bin/thefuck --alias | source

37+ '';

3938 };

4039 }

nixos/modules/security/pam.nix+3−3

@@ -492,7 +492,7 @@ let

492492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}

493493 '') +

494494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''

495− auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

495+ auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

496496 '') +

497497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''

498498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}

@@ -1131,7 +1131,7 @@ in

11311131 ++ optional config.services.sssd.enable pkgs.sssd

11321132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]

11331133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]

1134− ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]

1134+ ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]

11351135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]

11361136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];

11371137

@@ -1221,7 +1221,7 @@ in

12211221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,

12221222 '' +

12231223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''

1224− "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,

1224+ "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,

12251225 '' +

12261226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''

12271227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,

nixos/modules/services/hardware/udev.nix+7−32

@@ -8,24 +8,6 @@ let

88

99 cfg = config.services.udev;

1010

11− initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} ''

12− mkdir -p $out/etc/udev/rules.d

13− for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do

14− ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d

15− done

16− '';

17−

18−

19− # networkd link files are used early by udev to set up interfaces early.

20− # This must be done in stage 1 to avoid race conditions between udev and

21− # network daemons.

22− # TODO move this into the initrd-network module when it exists

23− initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''

24− mkdir -p $out

25− ln -s ${udev}/lib/systemd/network/*.link $out/

26− ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}

27− '';

28−

2911 extraUdevRules = pkgs.writeTextFile {

3012 name = "extra-udev-rules";

3113 text = cfg.extraRules;

@@ -368,10 +350,7 @@ in

368350 ];

369351 boot.initrd.systemd.storePaths = [

370352 "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"

371− "${config.boot.initrd.systemd.package}/lib/udev/ata_id"

372− "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"

373− "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"

374− "${config.boot.initrd.systemd.package}/lib/udev/rules.d"

353+ "${config.boot.initrd.systemd.package}/lib/udev"

375354 ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;

376355

377356 # Generate the udev rules for the initrd

@@ -385,17 +364,13 @@ in

385364 systemd = config.boot.initrd.systemd.package;

386365 binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];

387366 };

388− "/etc/systemd/network".source = initrdLinkUnits;

389367 };

390− # Insert initrd rules

391− boot.initrd.services.udev.packages = [

392− initrdUdevRules

393− (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {

394− name = "initrd-udev-rules";

395− destination = "/etc/udev/rules.d/99-local.rules";

396− text = config.boot.initrd.services.udev.rules;

397− }))

398− ];

368+ # Insert custom rules

369+ boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {

370+ name = "initrd-udev-rules";

371+ destination = "/etc/udev/rules.d/99-local.rules";

372+ text = config.boot.initrd.services.udev.rules;

373+ });

399374

400375 environment.etc =

401376 {

nixos/modules/services/misc/zookeeper.nix+1−8

@@ -114,13 +114,6 @@ in {

114114 type = types.package;

115115 };

116116

117− jre = mkOption {

118− description = "The JRE with which to run Zookeeper";

119− default = cfg.package.jre;

120− defaultText = literalExpression "pkgs.zookeeper.jre";

121− example = literalExpression "pkgs.jre";

122− type = types.package;

123− };

124117 };

125118

126119

@@ -138,7 +131,7 @@ in {

138131 after = [ "network.target" ];

139132 serviceConfig = {

140133 ExecStart = ''

141− ${cfg.jre}/bin/java \

134+ ${pkgs.jre}/bin/java \

142135 -cp "${cfg.package}/lib/*:${configDir}" \

143136 ${escapeShellArgs cfg.extraCmdLineOptions} \

144137 -Dzookeeper.datadir.autocreate=false \

nixos/modules/services/networking/asterisk.nix+43−11

@@ -14,9 +14,28 @@ let

1414

1515 # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override

1616 defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;

17− allConfFiles = {

17+ allConfFiles =

18+ cfg.confFiles //

19+ builtins.listToAttrs (map (x: { name = x;

20+ value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })

21+ defaultConfFiles);

22+

23+ asteriskEtc = pkgs.stdenv.mkDerivation

24+ ((mapAttrs' (name: value: nameValuePair

25+ # Fudge the names to make bash happy

26+ ((replaceChars ["."] ["_"] name) + "_")

27+ (value)

28+ ) allConfFiles) //

29+ {

30+ confFilesString = concatStringsSep " " (

31+ attrNames allConfFiles

32+ );

33+

34+ name = "asterisk-etc";

35+

1836 # Default asterisk.conf file

19− "asterisk.conf".text = ''

37+ # (Notice that astetcdir will be set to the path of this derivation)

38+ asteriskConf = ''

2039 [directories]

2140 astetcdir => /etc/asterisk

2241 astmoddir => ${cfg.package}/lib/asterisk/modules

@@ -29,28 +48,43 @@ let

2948 astrundir => /run/asterisk

3049 astlogdir => /var/log/asterisk

3150 astsbindir => ${cfg.package}/sbin

32− ${cfg.extraConfig}

3351 '';

52+ extraConf = cfg.extraConfig;

3453

3554 # Loading all modules by default is considered sensible by the authors of

3655 # "Asterisk: The Definitive Guide". Secure sites will likely want to

3756 # specify their own "modules.conf" in the confFiles option.

38− "modules.conf".text = ''

57+ modulesConf = ''

3958 [modules]

4059 autoload=yes

4160 '';

4261

4362 # Use syslog for logging so logs can be viewed with journalctl

44− "logger.conf".text = ''

63+ loggerConf = ''

4564 [general]

4665

4766 [logfiles]

4867 syslog.local0 => notice,warning,error

4968 '';

50− } //

51− mapAttrs (name: text: { inherit text; }) cfg.confFiles //

52− listToAttrs (map (x: nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles);

5369

70+ buildCommand = ''

71+ mkdir -p "$out"

72+

73+ # Create asterisk.conf, pointing astetcdir to the path of this derivation

74+ echo "$asteriskConf" | sed "s|@out@|$out|g" > "$out"/asterisk.conf

75+ echo "$extraConf" >> "$out"/asterisk.conf

76+

77+ echo "$modulesConf" > "$out"/modules.conf

78+

79+ echo "$loggerConf" > "$out"/logger.conf

80+

81+ # Config files specified in confFiles option override all other files

82+ for i in $confFilesString; do

83+ conf=$(echo "$i"_ | sed 's/\./_/g')

84+ echo "''${!conf}" > "$out"/"$i"

85+ done

86+ '';

87+ });

5488in

5589

5690{

@@ -175,9 +209,7 @@ in

175209 config = mkIf cfg.enable {

176210 environment.systemPackages = [ cfg.package ];

177211

178− environment.etc = mapAttrs' (name: value:

179− nameValuePair "asterisk/${name}" value

180− ) allConfFiles;

212+ environment.etc.asterisk.source = asteriskEtc;

181213

182214 users.users.asterisk =

183215 { name = asteriskUser;

nixos/modules/services/networking/cloudflare-dyndns.nixdeleted−93

@@ -1,93 +0,0 @@

1−{ config, pkgs, lib, ... }:

2−

3−with lib;

4−

5−let

6− cfg = config.services.cloudflare-dyndns;

7−in

8−{

9− options = {

10− services.cloudflare-dyndns = {

11− enable = mkEnableOption "Cloudflare Dynamic DNS Client";

12−

13− apiTokenFile = mkOption {

14− type = types.nullOr types.str;

15− default = null;

16− description = ''

17− The path to a file containing the CloudFlare API token.

18−

19− The file must have the form `CLOUDFLARE_API_TOKEN=...`

20− '';

21− };

22−

23− domains = mkOption {

24− type = types.listOf types.str;

25− default = [ ];

26− description = ''

27− List of domain names to update records for.

28− '';

29− };

30−

31− proxied = mkOption {

32− type = types.bool;

33− default = false;

34− description = ''

35− Whether this is a DNS-only record, or also being proxied through CloudFlare.

36− '';

37− };

38−

39− ipv4 = mkOption {

40− type = types.bool;

41− default = true;

42− description = ''

43− Whether to enable setting IPv4 A records.

44− '';

45− };

46−

47− ipv6 = mkOption {

48− type = types.bool;

49− default = false;

50− description = ''

51− Whether to enable setting IPv6 AAAA records.

52− '';

53− };

54−

55− deleteMissing = mkOption {

56− type = types.bool;

57− default = false;

58− description = ''

59− Whether to delete the record when no IP address is found.

60− '';

61− };

62− };

63− };

64−

65− config = mkIf cfg.enable {

66− systemd.services.cloudflare-dyndns = {

67− description = "CloudFlare Dynamic DNS Client";

68− after = [ "network.target" ];

69− wantedBy = [ "multi-user.target" ];

70− startAt = "*:0/5";

71−

72− environment = {

73− CLOUDFLARE_DOMAINS = toString cfg.domains;

74− };

75−

76− serviceConfig = {

77− Type = "simple";

78− DynamicUser = true;

79− StateDirectory = "cloudflare-dyndns";

80− EnvironmentFile = cfg.apiTokenFile;

81− ExecStart =

82− let

83− args = [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]

84− ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])

85− ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])

86− ++ optional cfg.deleteMissing "--delete-missing"

87− ++ optional cfg.proxied "--proxied";

88− in

89− "${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}";

90− };

91− };

92− };

93−}

nixos/modules/services/networking/prosody.nix−1

@@ -820,7 +820,6 @@ in

820820 '') cfg.muc}

821821

822822 ${ lib.optionalString (cfg.uploadHttp != null) ''

823− -- TODO: think about migrating this to mod-http_file_share instead.

824823 Component ${toLua cfg.uploadHttp.domain} "http_upload"

825824 http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit}

826825 http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter}

nixos/modules/services/networking/ssh/sshd.nix−1

@@ -441,7 +441,6 @@ in

441441

442442 ${flip concatMapStrings cfg.hostKeys (k: ''

443443 if ! [ -s "${k.path}" ]; then

444− rm -f "${k.path}"

445444 ssh-keygen \

446445 -t "${k.type}" \

447446 ${if k ? bits then "-b ${toString k.bits}" else ""} \

nixos/modules/services/system/nscd.nix+1−1

@@ -38,7 +38,7 @@ in

3838 default = if pkgs.stdenv.hostPlatform.libc == "glibc"

3939 then pkgs.stdenv.cc.libc.bin

4040 else pkgs.glibc.bin;

41− defaultText = lib.literalExpression ''

41+ defaultText = literalExample ''

4242 if pkgs.stdenv.hostPlatform.libc == "glibc"

4343 then pkgs.stdenv.cc.libc.bin

4444 else pkgs.glibc.bin;

nixos/modules/services/web-apps/keycloak.nix+1−2

@@ -540,8 +540,7 @@ in

540540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;

541541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

542542 db-password._secret = cfg.database.passwordFile;

543− db-url-host = cfg.database.host;

544− db-url-port = toString cfg.database.port;

543+ db-url-host = "${cfg.database.host}:${toString cfg.database.port}";

545544 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;

546545 db-url-properties = prefixUnlessEmpty "?" dbProps;

547546 db-url = null;

nixos/modules/services/x11/desktop-managers/enlightenment.nix−4

@@ -16,10 +16,6 @@ let

1616in

1717

1818{

19− meta = {

20− maintainers = teams.enlightenment.members;

21− };

22−

2319 imports = [

2420 (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])

2521 ];

nixos/modules/services/x11/desktop-managers/lumina.nix−4

@@ -10,10 +10,6 @@ let

1010in

1111

1212{

13− meta = {

14− maintainers = teams.lumina.members;

15− };

16−

1713 options = {

1814

1915 services.xserver.desktopManager.lumina.enable = mkOption {

nixos/modules/services/x11/desktop-managers/lxqt.nix−6

@@ -9,10 +9,6 @@ let

99in

1010

1111{

12− meta = {

13− maintainers = teams.lxqt.members;

14− };

15−

1612 options = {

1713

1814 services.xserver.desktopManager.lxqt.enable = mkOption {

@@ -67,8 +63,6 @@ in

6763

6864 services.upower.enable = config.powerManagement.enable;

6965

70− services.xserver.libinput.enable = mkDefault true;

71−

7266 xdg.portal.enable = true;

7367 xdg.portal.extraPortals = [ pkgs.lxqt.xdg-desktop-portal-lxqt ];

7468 };

nixos/modules/services/x11/desktop-managers/mate.nix−1

@@ -73,7 +73,6 @@ in

7373 services.udev.packages = [ pkgs.mate.mate-settings-daemon ];

7474 services.gvfs.enable = true;

7575 services.upower.enable = config.powerManagement.enable;

76− services.xserver.libinput.enable = mkDefault true;

7776

7877 security.pam.services.mate-screensaver.unixAuth = true;

7978

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1

@@ -33,7 +33,7 @@ let

3333 netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else "";

3434

3535 copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''

36− empty_file=$(${pkgs.coreutils}/bin/mktemp)

36+ empty_file=$(mktemp)

3737

3838 ${concatStrings (mapAttrsToList (n: v: ''

3939 ${pkgs.coreutils}/bin/install -Dp "${v}" "${efi.efiSysMountPoint}/"${escapeShellArg n}

nixos/modules/system/boot/stage-1-init.sh+5−1

@@ -318,7 +318,11 @@ checkFS() {

318318

319319 echo "checking $device..."

320320

321− fsck -V -a "$device"

321+ fsckFlags=

322+ if test "$fsType" != "btrfs"; then

323+ fsckFlags="-V -a"

324+ fi

325+ fsck $fsckFlags "$device"

322326 fsckResult=$?

323327

324328 if test $(($fsckResult | 2)) = $fsckResult; then

nixos/modules/system/boot/systemd/initrd.nix−1

@@ -342,7 +342,6 @@ in {

342342 "/etc/fstab".source = fstab;

343343

344344 "/lib/modules".source = "${modulesClosure}/lib/modules";

345− "/lib/firmware".source = "${modulesClosure}/lib/firmware";

346345

347346 "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;

348347

nixos/modules/system/boot/systemd/shutdown.nix+1−1

@@ -44,7 +44,7 @@ in {

4444 ];

4545 };

4646

47− path = [pkgs.util-linux pkgs.makeInitrdNGTool];

47+ path = [pkgs.util-linux pkgs.makeInitrdNGTool pkgs.glibc pkgs.patchelf];

4848 serviceConfig.Type = "oneshot";

4949 script = ''

5050 mkdir -p /run/initramfs

nixos/modules/virtualisation/oci-containers.nix+5−1

@@ -338,7 +338,11 @@ in {

338338

339339 backend = mkOption {

340340 type = types.enum [ "podman" "docker" ];

341− default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker";

341+ default =

342+ # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman

343+ # if versionAtLeast config.system.stateVersion "20.09" then "podman"

344+ # else "docker";

345+ "docker";

342346 description = "The underlying Docker implementation to use.";

343347 };

344348

nixos/modules/virtualisation/vmware-host.nixdeleted−166

@@ -1,166 +0,0 @@

1−{ config, pkgs, lib, ... }:

2−

3−let

4− cfg = config.virtualisation.vmware.host;

5− wrapperDir = "/run/vmware/bin"; # Perfectly fits as /usr/local/bin

6− parentWrapperDir = dirOf wrapperDir;

7− vmwareWrappers = # Needed as hardcoded paths workaround

8− let mkVmwareSymlink =

9− program:

10− ''

11− ln -s "${config.security.wrapperDir}/${program}" $wrapperDir/${program}

12− '';

13− in

14− [

15− (mkVmwareSymlink "pkexec")

16− (mkVmwareSymlink "mount")

17− (mkVmwareSymlink "umount")

18− ];

19−in

20−{

21− options = with lib; {

22− virtualisation.vmware.host = {

23− enable = mkEnableOption "VMware" // {

24− description = ''

25− This enables VMware host virtualisation for running VMs.

26−

27− <important><para>

28− <literal>vmware-vmx</literal> will cause kcompactd0 due to

29− <literal>Transparent Hugepages</literal> feature in kernel.

30− Apply <literal>[ "transparent_hugepage=never" ]</literal> in

31− option <option>boot.kernelParams</option> to disable them.

32− </para></important>

33−

34− <note><para>

35− If that didn't work disable <literal>TRANSPARENT_HUGEPAGE</literal>,

36− <literal>COMPACTION</literal> configs and recompile kernel.

37− </para></note>

38− '';

39− };

40− package = mkOption {

41− type = types.package;

42− default = pkgs.vmware-workstation;

43− defaultText = literalExpression "pkgs.vmware-workstation";

44− description = "VMware host virtualisation package to use";

45− };

46− extraPackages = mkOption {

47− type = with types; listOf package;

48− default = with pkgs; [ ];

49− description = "Extra packages to be used with VMware host.";

50− example = "with pkgs; [ ntfs3g ]";

51− };

52− extraConfig = mkOption {

53− type = types.lines;

54− default = "";

55− description = "Add extra config to /etc/vmware/config";

56− example = ''

57− # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU

58− mks.gl.allowUnsupportedDrivers = "TRUE"

59− mks.vk.allowUnsupportedDevices = "TRUE"

60− '';

61− };

62− };

63− };

64−

65− config = lib.mkIf cfg.enable {

66− boot.extraModulePackages = [ config.boot.kernelPackages.vmware ];

67− boot.extraModprobeConfig = "alias char-major-10-229 fuse";

68− boot.kernelModules = [ "vmw_pvscsi" "vmw_vmci" "vmmon" "vmnet" "fuse" ];

69−

70− environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;

71− services.printing.drivers = [ cfg.package ];

72−

73− environment.etc."vmware/config".text = ''

74− ${builtins.readFile "${cfg.package}/etc/vmware/config"}

75− ${cfg.extraConfig}

76− '';

77−

78− environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap";

79− environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu";

80− environment.etc."vmware-installer".source = "${cfg.package}/etc/vmware-installer";

81−

82− # SUID wrappers

83−

84− security.wrappers = {

85− vmware-vmx = {

86− setuid = true;

87− owner = "root";

88− group = "root";

89− source = "${cfg.package}/lib/vmware/bin/.vmware-vmx-wrapped";

90− };

91− };

92−

93− ###### wrappers activation script

94−

95− system.activationScripts.vmwareWrappers =

96− lib.stringAfter [ "specialfs" "users" ]

97− ''

98− mkdir -p "${parentWrapperDir}"

99− chmod 755 "${parentWrapperDir}"

100− # We want to place the tmpdirs for the wrappers to the parent dir.

101− wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)

102− chmod a+rx "$wrapperDir"

103− ${lib.concatStringsSep "\n" (vmwareWrappers)}

104− if [ -L ${wrapperDir} ]; then

105− # Atomically replace the symlink

106− # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/

107− old=$(readlink -f ${wrapperDir})

108− if [ -e "${wrapperDir}-tmp" ]; then

109− rm --force --recursive "${wrapperDir}-tmp"

110− fi

111− ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"

112− mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"

113− rm --force --recursive "$old"

114− else

115− # For initial setup

116− ln --symbolic "$wrapperDir" "${wrapperDir}"

117− fi

118− '';

119−

120− # Services

121−

122− systemd.services."vmware-authdlauncher" = {

123− description = "VMware Authentification Daemon";

124− serviceConfig = {

125− Type = "forking";

126− ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ];

127− };

128− wantedBy = [ "multi-user.target" ];

129− };

130−

131− systemd.services."vmware-networks-configuration" = {

132− description = "VMware Networks Configuration Generation";

133− unitConfig.ConditionPathExists = "!/etc/vmware/networking";

134− serviceConfig = {

135− UMask = "0077";

136− ExecStart = [

137− "${cfg.package}/bin/vmware-networks --postinstall vmware-player,0,1"

138− ];

139− Type = "oneshot";

140− RemainAfterExit = "yes";

141− };

142− wantedBy = [ "multi-user.target" ];

143− };

144−

145− systemd.services."vmware-networks" = {

146− description = "VMware Networks";

147− after = [ "vmware-networks-configuration.service" ];

148− requires = [ "vmware-networks-configuration.service" ];

149− serviceConfig = {

150− Type = "forking";

151− ExecCondition = [ "${pkgs.kmod}/bin/modprobe vmnet" ];

152− ExecStart = [ "${cfg.package}/bin/vmware-networks --start" ];

153− ExecStop = [ "${cfg.package}/bin/vmware-networks --stop" ];

154− };

155− wantedBy = [ "multi-user.target" ];

156− };

157−

158− systemd.services."vmware-usbarbitrator" = {

159− description = "VMware USB Arbitrator";

160− serviceConfig = {

161− ExecStart = [ "${cfg.package}/bin/vmware-usbarbitrator -f" ];

162− };

163− wantedBy = [ "multi-user.target" ];

164− };

165− };

166−}

nixos/release-combined.nix−2

@@ -132,14 +132,12 @@ in rec {

132132 # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314

133133 #(onFullSupported "nixos.tests.nfs3.simple")

134134 (onFullSupported "nixos.tests.nfs4.simple")

135− (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman")

136135 (onFullSupported "nixos.tests.openssh")

137136 (onFullSupported "nixos.tests.pantheon")

138137 (onFullSupported "nixos.tests.php.fpm")

139138 (onFullSupported "nixos.tests.php.httpd")

140139 (onFullSupported "nixos.tests.php.pcre")

141140 (onFullSupported "nixos.tests.plasma5")

142− (onSystems ["x86_64-linux"] "nixos.tests.podman")

143141 (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")

144142 (onFullSupported "nixos.tests.predictable-interface-names.predictable")

145143 (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")

nixos/release.nix+2−2

@@ -150,13 +150,13 @@ in rec {

150150 });

151151

152152 iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

153− module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix;

153+ module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;

154154 type = "plasma5";

155155 inherit system;

156156 });

157157

158158 iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

159− module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;

159+ module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;

160160 type = "gnome";

161161 inherit system;

162162 });

nixos/tests/all-tests.nix+1

@@ -284,6 +284,7 @@ in

284284 loki = handleTest ./loki.nix {};

285285 lvm2 = handleTest ./lvm2 {};

286286 lxd = handleTest ./lxd.nix {};

287+ lxd-image = handleTest ./lxd-image.nix {};

287288 lxd-nftables = handleTest ./lxd-nftables.nix {};

288289 lxd-image-server = handleTest ./lxd-image-server.nix {};

289290 #logstash = handleTest ./logstash.nix {};

nixos/tests/common/lxd/config.yamldeleted−24

@@ -1,24 +0,0 @@

1−storage_pools:

2− - name: default

3− driver: dir

4− config:

5− source: /var/lxd-pool

6−

7−networks:

8− - name: lxdbr0

9− type: bridge

10− config:

11− ipv4.address: auto

12− ipv6.address: none

13−

14−profiles:

15− - name: default

16− devices:

17− eth0:

18− name: eth0

19− network: lxdbr0

20− type: nic

21− root:

22− path: /

23− pool: default

24− type: disk

nixos/tests/gitlab.nix+25−298

@@ -1,31 +1,9 @@

1−# This test runs gitlab and performs the following tests:

2−# - Creating users

3−# - Pushing commits

4−# - over the API

5−# - over SSH

6−# - Creating Merge Requests and merging them

7−# - Opening and closing issues.

8−# - Downloading repository archives as tar.gz and tar.bz2

9−import ./make-test-python.nix ({ pkgs, lib, ... }:

10−

11−with lib;

1+# This test runs gitlab and checks if it works

122

133let

14− inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;

154 initialRootPassword = "notproduction";

16− rootProjectId = "2";

17−

18− aliceUsername = "alice";

19− aliceUserId = "2";

20− alicePassword = "alicepassword";

21− aliceProjectId = "2";

22− aliceProjectName = "test-alice";

23−

24− bobUsername = "bob";

25− bobUserId = "3";

26− bobPassword = "bobpassword";

27− bobProjectId = "3";

28−in {

5+in

6+import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {

297 name = "gitlab";

308 meta = with pkgs.lib.maintainers; {

319 maintainers = [ globin yayayayaka ];

@@ -53,8 +31,6 @@ in {

5331 };

5432 };

5533

56− services.openssh.enable = true;

57−

5834 services.dovecot2 = {

5935 enable = true;

6036 enableImap = true;

@@ -101,43 +77,8 @@ in {

10177 password = initialRootPassword;

10278 });

10379

104− createUserAlice = pkgs.writeText "create-user-alice.json" (builtins.toJSON rec {

105− username = aliceUsername;

106− name = username;

107− email = "alice@localhost";

108− password = alicePassword;

109− skip_confirmation = true;

110− });

111−

112− createUserBob = pkgs.writeText "create-user-bob.json" (builtins.toJSON rec {

113− username = bobUsername;

114− name = username;

115− email = "bob@localhost";

116− password = bobPassword;

117− skip_confirmation = true;

118− });

119−

120− aliceAuth = pkgs.writeText "alice-auth.json" (builtins.toJSON {

121− grant_type = "password";

122− username = aliceUsername;

123− password = alicePassword;

124− });

125−

126− bobAuth = pkgs.writeText "bob-auth.json" (builtins.toJSON {

127− grant_type = "password";

128− username = bobUsername;

129− password = bobPassword;

130− });

131−

132− aliceAddSSHKey = pkgs.writeText "alice-add-ssh-key.json" (builtins.toJSON {

133− id = aliceUserId;

134− title = "snakeoil@nixos";

135− key = snakeOilPublicKey;

136− });

137−

138− createProjectAlice = pkgs.writeText "create-project-alice.json" (builtins.toJSON {

139− name = aliceProjectName;

140− visibility = "public";

80+ createProject = pkgs.writeText "create-project.json" (builtins.toJSON {

81+ name = "test";

14182 });

14283

14384 putFile = pkgs.writeText "put-file.json" (builtins.toJSON {

@@ -148,23 +89,6 @@ in {

14889 commit_message = "create a new file";

14990 });

15091

151− mergeRequest = pkgs.writeText "merge-request.json" (builtins.toJSON {

152− id = bobProjectId;

153− target_project_id = aliceProjectId;

154− source_branch = "master";

155− target_branch = "master";

156− title = "Add some other file";

157− });

158−

159− newIssue = pkgs.writeText "new-issue.json" (builtins.toJSON {

160− title = "useful issue title";

161− });

162−

163− closeIssue = pkgs.writeText "close-issue.json" (builtins.toJSON {

164− issue_iid = 1;

165− state_event = "close";

166− });

167−

16892 # Wait for all GitLab services to be fully started.

16993 waitForServices = ''

17094 gitlab.wait_for_unit("gitaly.service")

@@ -181,8 +105,6 @@ in {

181105 # The actual test of GitLab. Only push data to GitLab if

182106 # `doSetup` is is true.

183107 test = doSetup: ''

184− GIT_SSH_COMMAND = "ssh -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null"

185−

186108 gitlab.succeed(

187109 "curl -isSf http://gitlab | grep -i location | grep http://gitlab/users/sign_in"

188110 )

@@ -193,222 +115,27 @@ in {

193115 "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"

194116 )

195117 '' + optionalString doSetup ''

196− with subtest("Create user Alice"):

197− gitlab.succeed(

198− """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserAlice} http://gitlab/api/v4/users)" = "201" ]"""

199− )

200− gitlab.succeed(

201− "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${aliceAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-alice"

202− )

203−

204− with subtest("Create user Bob"):

205− gitlab.succeed(

206− """ [ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserBob} http://gitlab/api/v4/users)" = "201" ]"""

207− )

208− gitlab.succeed(

209− "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${bobAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-bob"

210− )

211−

212− with subtest("Setup Git and SSH for Alice"):

213− gitlab.succeed("git config --global user.name Alice")

214− gitlab.succeed("git config --global user.email alice@nixos.invalid")

215− gitlab.succeed("mkdir -m 700 /root/.ssh")

216− gitlab.succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa")

217− gitlab.succeed("chmod 600 /root/.ssh/id_ecdsa")

218− gitlab.succeed(

219− """

220− [ "$(curl \

221− -o /dev/null \

222− -w '%{http_code}' \

223− -X POST \

224− -H 'Content-Type: application/json' \

225− -H @/tmp/headers-alice -d @${aliceAddSSHKey} \

226− http://gitlab/api/v4/user/keys)" = "201" ]

227− """

228− )

229−

230− with subtest("Create a new repository"):

231− # Alice creates a new repository

232− gitlab.succeed(

233− """

234− [ "$(curl \

235− -o /dev/null \

236− -w '%{http_code}' \

237− -X POST \

238− -H 'Content-Type: application/json' \

239− -H @/tmp/headers-alice \

240− -d @${createProjectAlice} \

241− http://gitlab/api/v4/projects)" = "201" ]

242− """

243− )

244−

245− # Alice commits an initial commit

246− gitlab.succeed(

247− """

248− [ "$(curl \

249− -o /dev/null \

250− -w '%{http_code}' \

251− -X POST \

252− -H 'Content-Type: application/json' \

253− -H @/tmp/headers-alice \

254− -d @${putFile} \

255− http://gitlab/api/v4/projects/${aliceProjectId}/repository/files/some-file.txt)" = "201" ]"""

256− )

257−

258− with subtest("git clone over HTTP"):

259− gitlab.succeed(

260− """git clone http://gitlab/alice/${aliceProjectName}.git clone-via-http""",

261− timeout=15

262− )

263−

264− with subtest("Push a commit via SSH"):

265− gitlab.succeed(

266− f"""GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git clone gitlab@gitlab:alice/${aliceProjectName}.git""",

267− timeout=15

268− )

269− gitlab.succeed(

270− """echo "a commit sent over ssh" > ${aliceProjectName}/ssh.txt"""

271− )

272− gitlab.succeed(

273− """

274− cd ${aliceProjectName} || exit 1

275− git add .

276− """

277− )

278− gitlab.succeed(

279− """

280− cd ${aliceProjectName} || exit 1

281− git commit -m "Add a commit to be sent over ssh"

282− """

283− )

284− gitlab.succeed(

285− f"""

286− cd ${aliceProjectName} || exit 1

287− GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git push --set-upstream origin master

288− """,

289− timeout=15

290− )

291−

292− with subtest("Fork a project"):

293− # Bob forks Alice's project

294− gitlab.succeed(

295− """

296− [ "$(curl \

297− -o /dev/null \

298− -w '%{http_code}' \

299− -X POST \

300− -H 'Content-Type: application/json' \

301− -H @/tmp/headers-bob \

302− http://gitlab/api/v4/projects/${aliceProjectId}/fork)" = "201" ]

303− """

304− )

305−

306− # Bob creates a commit

307− gitlab.wait_until_succeeds(

308− """

309− [ "$(curl \

310− -o /dev/null \

311− -w '%{http_code}' \

312− -X POST \

313− -H 'Content-Type: application/json' \

314− -H @/tmp/headers-bob \

315− -d @${putFile} \

316− http://gitlab/api/v4/projects/${bobProjectId}/repository/files/some-other-file.txt)" = "201" ]

317− """

318− )

319−

320− with subtest("Create a Merge Request"):

321− # Bob opens a merge request against Alice's repository

322− gitlab.wait_until_succeeds(

323− """

324− [ "$(curl \

325− -o /dev/null \

326− -w '%{http_code}' \

327− -X POST \

328− -H 'Content-Type: application/json' \

329− -H @/tmp/headers-bob \

330− -d @${mergeRequest} \

331− http://gitlab/api/v4/projects/${bobProjectId}/merge_requests)" = "201" ]

332− """

333− )

334−

335− # Alice merges the MR

336− gitlab.wait_until_succeeds(

337− """

338− [ "$(curl \

339− -o /dev/null \

340− -w '%{http_code}' \

341− -X PUT \

342− -H 'Content-Type: application/json' \

343− -H @/tmp/headers-alice \

344− -d @${mergeRequest} \

345− http://gitlab/api/v4/projects/${aliceProjectId}/merge_requests/1/merge)" = "200" ]

346− """

347− )

348−

349− with subtest("Create an Issue"):

350− # Bob opens an issue on Alice's repository

351− gitlab.succeed(

352− """[ "$(curl \

353− -o /dev/null \

354− -w '%{http_code}' \

355− -X POST \

356− -H 'Content-Type: application/json' \

357− -H @/tmp/headers-bob \

358− -d @${newIssue} \

359− http://gitlab/api/v4/projects/${aliceProjectId}/issues)" = "201" ]

360− """

361− )

362−

363− # Alice closes the issue

364− gitlab.wait_until_succeeds(

365− """

366− [ "$(curl \

367− -o /dev/null \

368− -w '%{http_code}' \

369− -X PUT \

370− -H 'Content-Type: application/json' \

371− -H @/tmp/headers-alice -d @${closeIssue} http://gitlab/api/v4/projects/${aliceProjectId}/issues/1)" = "200" ]

372− """

373− )

118+ gitlab.succeed(

119+ """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects)" = "201" ]"""

120+ )

121+ gitlab.succeed(

122+ """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/2/repository/files/some-file.txt)" = "201" ]"""

123+ )

374124 '' + ''

375− with subtest("Download archive.tar.gz"):

376− gitlab.succeed(

377− """

378− [ "$(curl \

379− -o /dev/null \

380− -w '%{http_code}' \

381− -H @/tmp/headers-alice \

382− http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz)" = "200" ]

383− """

384− )

385− gitlab.succeed(

386− """

387− curl \

388− -H @/tmp/headers-alice \

389− http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz > /tmp/archive.tar.gz

390− """

391− )

392− gitlab.succeed("test -s /tmp/archive.tar.gz")

393−

394− with subtest("Download archive.tar.bz2"):

395− gitlab.succeed(

396− """

397− [ "$(curl \

398− -o /dev/null \

399− -w '%{http_code}' \

400− -H @/tmp/headers-alice \

401− http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2)" = "200" ]

402− """

403− )

404− gitlab.succeed(

405− """

406− curl \

407− -H @/tmp/headers-alice \

408− http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2 > /tmp/archive.tar.bz2

409− """

410− )

411− gitlab.succeed("test -s /tmp/archive.tar.bz2")

125+ gitlab.succeed(

126+ """[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz)" = "200" ]"""

127+ )

128+ gitlab.succeed(

129+ """curl -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz > /tmp/archive.tar.gz"""

130+ )

131+ gitlab.succeed(

132+ """[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2)" = "200" ]"""

133+ )

134+ gitlab.succeed(

135+ """curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"""

136+ )

137+ gitlab.succeed("test -s /tmp/archive.tar.gz")

138+ gitlab.succeed("test -s /tmp/archive.tar.bz2")

412139 '';

413140

414141 in ''

nixos/tests/lxd-image-server.nix+48−15

@@ -1,21 +1,54 @@

1−import ./make-test-python.nix ({ pkgs, lib, ... } :

1+import ./make-test-python.nix ({ pkgs, ...} :

22

33let

4− lxd-image = import ../release.nix {

5− configuration = {

6− # Building documentation makes the test unnecessarily take a longer time:

7− documentation.enable = lib.mkForce false;

8− };

4+ # Since we don't have access to the internet during the tests, we have to

5+ # pre-fetch lxd containers beforehand.

6+ #

7+ # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8+ # generally, sufficient for our tests.

9+ alpine-meta = pkgs.fetchurl {

10+ url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11+ hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12+ };

13+

14+ alpine-rootfs = pkgs.fetchurl {

15+ url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

16+ hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

917 };

1018

11− lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

12− lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

19+ lxd-config = pkgs.writeText "config.yaml" ''

20+ storage_pools:

21+ - name: default

22+ driver: dir

23+ config:

24+ source: /var/lxd-pool

25+

26+ networks:

27+ - name: lxdbr0

28+ type: bridge

29+ config:

30+ ipv4.address: auto

31+ ipv6.address: none

32+

33+ profiles:

34+ - name: default

35+ devices:

36+ eth0:

37+ name: eth0

38+ network: lxdbr0

39+ type: nic

40+ root:

41+ path: /

42+ pool: default

43+ type: disk

44+ '';

45+

1346

1447in {

1548 name = "lxd-image-server";

1649

1750 meta = with pkgs.lib.maintainers; {

18− maintainers = [ mkg20001 patryk27 ];

51+ maintainers = [ mkg20001 ];

1952 };

2053

2154 nodes.machine = { lib, ... }: {

@@ -67,20 +100,20 @@ in {

67100 # lxd expects the pool's directory to already exist

68101 machine.succeed("mkdir /var/lxd-pool")

69102

103+

70104 machine.succeed(

71− "cat ${./common/lxd/config.yaml} | lxd init --preseed"

105+ "cat ${lxd-config} | lxd init --preseed"

72106 )

73107

74108 machine.succeed(

75− "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

109+ "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

76110 )

77111

78− loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"

112+ loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"

79113

80114 with subtest("push image to server"):

81− machine.succeed("lxc launch nixos test")

82− machine.sleep(5)

83− machine.succeed("lxc stop -f test")

115+ machine.succeed("lxc launch alpine test")

116+ machine.succeed("lxc stop test")

84117 machine.succeed("lxc publish --public test --alias=testimg")

85118 machine.succeed("lxc image export testimg")

86119 machine.succeed("ls >&2")

nixos/tests/lxd-image.nixnew file+89

@@ -0,0 +1,89 @@

1+# This test ensures that the nixOS lxd images builds and functions properly

2+# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software

3+

4+import ./make-test-python.nix ({ pkgs, ...} : let

5+ release = import ../release.nix {

6+ /* configuration = {

7+ environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works

8+ }; */

9+ };

10+

11+ metadata = release.lxdMeta.${pkgs.system};

12+ image = release.lxdImage.${pkgs.system};

13+

14+ lxd-config = pkgs.writeText "config.yaml" ''

15+ storage_pools:

16+ - name: default

17+ driver: dir

18+ config:

19+ source: /var/lxd-pool

20+

21+ networks:

22+ - name: lxdbr0

23+ type: bridge

24+ config:

25+ ipv4.address: auto

26+ ipv6.address: none

27+

28+ profiles:

29+ - name: default

30+ devices:

31+ eth0:

32+ name: eth0

33+ network: lxdbr0

34+ type: nic

35+ root:

36+ path: /

37+ pool: default

38+ type: disk

39+ '';

40+in {

41+ name = "lxd-image";

42+

43+ meta = with pkgs.lib.maintainers; {

44+ maintainers = [ mkg20001 ];

45+ };

46+

47+ nodes.machine = { lib, ... }: {

48+ virtualisation = {

49+ # disk full otherwise

50+ diskSize = 2048;

51+

52+ lxc.lxcfs.enable = true;

53+ lxd.enable = true;

54+ };

55+ };

56+

57+ testScript = ''

58+ machine.wait_for_unit("sockets.target")

59+ machine.wait_for_unit("lxd.service")

60+ machine.wait_for_file("/var/lib/lxd/unix.socket")

61+

62+ # It takes additional second for lxd to settle

63+ machine.sleep(1)

64+

65+ # lxd expects the pool's directory to already exist

66+ machine.succeed("mkdir /var/lxd-pool")

67+

68+ machine.succeed(

69+ "cat ${lxd-config} | lxd init --preseed"

70+ )

71+

72+ # TODO: test custom built container aswell

73+

74+ with subtest("importing container works"):

75+ machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")

76+

77+ with subtest("launching container works"):

78+ machine.succeed("lxc launch nixos machine -c security.nesting=true")

79+ # make sure machine boots up properly

80+ machine.sleep(5)

81+

82+ with subtest("container shell works"):

83+ machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")

84+ machine.succeed("lxc exec machine /run/current-system/sw/bin/true")

85+

86+ # with subtest("rebuilding works"):

87+ # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")

88+ '';

89+})

nixos/tests/lxd.nix+63−40

@@ -1,18 +1,48 @@

1−import ./make-test-python.nix ({ pkgs, lib, ... } :

1+import ./make-test-python.nix ({ pkgs, ...} :

22

33let

4− lxd-image = import ../release.nix {

5− configuration = {

6− # Building documentation makes the test unnecessarily take a longer time:

7− documentation.enable = lib.mkForce false;

4+ # Since we don't have access to the internet during the tests, we have to

5+ # pre-fetch lxd containers beforehand.

6+ #

7+ # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8+ # generally, sufficient for our tests.

9+ alpine-meta = pkgs.fetchurl {

10+ url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11+ hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12+ };

813

9− # Our tests require `grep` & friends:

10− environment.systemPackages = with pkgs; [ busybox ];

11− };

14+ alpine-rootfs = pkgs.fetchurl {

15+ url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

16+ hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

1217 };

1318

14− lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

15− lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

19+ lxd-config = pkgs.writeText "config.yaml" ''

20+ storage_pools:

21+ - name: default

22+ driver: dir

23+ config:

24+ source: /var/lxd-pool

25+

26+ networks:

27+ - name: lxdbr0

28+ type: bridge

29+ config:

30+ ipv4.address: auto

31+ ipv6.address: none

32+

33+ profiles:

34+ - name: default

35+ devices:

36+ eth0:

37+ name: eth0

38+ network: lxdbr0

39+ type: nic

40+ root:

41+ path: /

42+ pool: default

43+ type: disk

44+ '';

45+

1646

1747in {

1848 name = "lxd";

@@ -23,8 +53,6 @@ in {

2353

2454 nodes.machine = { lib, ... }: {

2555 virtualisation = {

26− diskSize = 2048;

27−

2856 # Since we're testing `limits.cpu`, we've gotta have a known number of

2957 # cores to lean on

3058 cores = 2;

@@ -49,66 +77,61 @@ in {

4977 machine.succeed("mkdir /var/lxd-pool")

5078

5179 machine.succeed(

52− "cat ${./common/lxd/config.yaml} | lxd init --preseed"

80+ "cat ${lxd-config} | lxd init --preseed"

5381 )

5482

5583 machine.succeed(

56− "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

84+ "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

5785 )

5886

59− with subtest("Container can be managed"):

60− machine.succeed("lxc launch nixos container")

61− machine.sleep(5)

62− machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

63− machine.succeed("lxc exec container true")

64− machine.succeed("lxc delete -f container")

87+ with subtest("Containers can be launched and destroyed"):

88+ machine.succeed("lxc launch alpine test")

89+ machine.succeed("lxc exec test true")

90+ machine.succeed("lxc delete -f test")

6591

66− with subtest("Container is mounted with lxcfs inside"):

67− machine.succeed("lxc launch nixos container")

68− machine.sleep(5)

92+ with subtest("Containers are being mounted with lxcfs inside"):

93+ machine.succeed("lxc launch alpine test")

6994

7095 ## ---------- ##

7196 ## limits.cpu ##

7297

73− machine.succeed("lxc config set container limits.cpu 1")

74− machine.succeed("lxc restart container")

75− machine.sleep(5)

98+ machine.succeed("lxc config set test limits.cpu 1")

99+ machine.succeed("lxc restart test")

76100

101+ # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort

102+ # to the primal methods

77103 assert (

78104 "1"

79− == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

105+ == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

80106 )

81107

82− machine.succeed("lxc config set container limits.cpu 2")

83− machine.succeed("lxc restart container")

84− machine.sleep(5)

108+ machine.succeed("lxc config set test limits.cpu 2")

109+ machine.succeed("lxc restart test")

85110

86111 assert (

87112 "2"

88− == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

113+ == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

89114 )

90115

91116 ## ------------- ##

92117 ## limits.memory ##

93118

94− machine.succeed("lxc config set container limits.memory 64MB")

95− machine.succeed("lxc restart container")

96− machine.sleep(5)

119+ machine.succeed("lxc config set test limits.memory 64MB")

120+ machine.succeed("lxc restart test")

97121

98122 assert (

99123 "MemTotal: 62500 kB"

100− == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

124+ == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

101125 )

102126

103− machine.succeed("lxc config set container limits.memory 128MB")

104− machine.succeed("lxc restart container")

105− machine.sleep(5)

127+ machine.succeed("lxc config set test limits.memory 128MB")

128+ machine.succeed("lxc restart test")

106129

107130 assert (

108131 "MemTotal: 125000 kB"

109− == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

132+ == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

110133 )

111134

112− machine.succeed("lxc delete -f container")

135+ machine.succeed("lxc delete -f test")

113136 '';

114137})

nixos/tests/matrix-appservice-irc.nix−3

@@ -20,9 +20,6 @@ import ./make-test-python.nix ({ pkgs, ... }:

2020

2121 enable_registration = true;

2222

23− # don't use this in production, always use some form of verification

24− enable_registration_without_verification = true;

25−

2623 listeners = [ {

2724 # The default but tls=false

2825 bind_addresses = [

nixos/tests/openssh.nix+6−12

@@ -80,21 +80,17 @@ in {

8080

8181 client.wait_for_unit("network.target")

8282 client.succeed(

83− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",

84− timeout=30

83+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"

8584 )

8685 client.succeed(

87− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",

88− timeout=30

86+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"

8987 )

9088

9189 client.succeed(

92− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",

93− timeout=30

90+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"

9491 )

9592 client.succeed(

96− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",

97− timeout=30

93+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"

9894 )

9995

10096 with subtest("configured-authkey"):

@@ -103,12 +99,10 @@ in {

10399 )

104100 client.succeed("chmod 600 privkey.snakeoil")

105101 client.succeed(

106− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",

107− timeout=30

102+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"

108103 )

109104 client.succeed(

110− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",

111− timeout=30

105+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"

112106 )

113107

114108 with subtest("localhost-only"):

nixos/tests/pam/pam-oath-login.nix+1−1

@@ -7,7 +7,7 @@ let

77 # how many passwords have been made. In this env, we'll always be on

88 # the 0th counter, so the password is static.

99 #

10− # Generated in nix-shell -p oath-toolkit

10+ # Generated in nix-shell -p oathToolkit

1111 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3

1212 # and picking a the first 4:

1313 oathSnakeOilPassword1 = "143349";

nixos/tests/pgadmin4.nix+48−37

@@ -1,27 +1,53 @@

1−import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:

2−

3− /*

4− This test suite replaces the typical pytestCheckHook function in python

5− packages. Pgadmin4 test suite needs a running and configured postgresql

6− server. This is why this test exists.

7−

8− To not repeat all the python dependencies needed, this test is called directly

9− from the pgadmin4 derivation, which also passes the currently

10− used propagatedBuildInputs and any python overrides.

11−

12− Unfortunately, there doesn't seem to be an easy way to otherwise include

13− the needed packages here.

14−

15− Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails

16− and needs to be called as "pgadmin4.tests"

17−

18− */

1+import ./make-test-python.nix ({ pkgs, lib, ... }:

192

203 let

214 pgadmin4SrcDir = "/pgadmin";

225 pgadmin4Dir = "/var/lib/pgadmin";

236 pgadmin4LogDir = "/var/log/pgadmin";

247

8+ python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [

9+ selenium

10+ testtools

11+ testscenarios

12+ flask

13+ flask-babelex

14+ flask-babel

15+ flask-gravatar

16+ flask_login

17+ flask_mail

18+ flask_migrate

19+ flask_sqlalchemy

20+ flask_wtf

21+ flask-compress

22+ passlib

23+ pytz

24+ simplejson

25+ six

26+ sqlparse

27+ wtforms

28+ flask-paranoid

29+ psutil

30+ psycopg2

31+ python-dateutil

32+ sqlalchemy

33+ itsdangerous

34+ flask-security-too

35+ bcrypt

36+ cryptography

37+ sshtunnel

38+ ldap3

39+ gssapi

40+ flask-socketio

41+ eventlet

42+ httpagentparser

43+ user-agents

44+ wheel

45+ authlib

46+ qrcode

47+ pillow

48+ pyotp

49+ boto3

50+ ]);

2551 in

2652 {

2753 name = "pgadmin4";

@@ -29,27 +55,12 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

2955

3056 nodes.machine = { pkgs, ... }: {

3157 imports = [ ./common/x11.nix ];

32− # needed because pgadmin 6.8 will fail, if those dependencies get updated

33− nixpkgs.overlays = [

34− (self: super: {

35− pythonPackages = pythonEnv;

36− })

37− ];

38−

3958 environment.systemPackages = with pkgs; [

4059 pgadmin4

4160 postgresql

61+ python-with-needed-packages

4262 chromedriver

4363 chromium

44− # include the same packages as in pgadmin minus speaklater3

45− (python3.withPackages

46− (ps: buildDeps ++

47− [

48− # test suite package requirements

49− pythonPackages.testscenarios

50− pythonPackages.selenium

51− ])

52− )

5364 ];

5465 services.postgresql = {

5566 enable = true;

@@ -110,7 +121,7 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

110121 with subtest("run browser test"):

111122 machine.succeed(

112123 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

113− && python regression/runtests.py --pkg browser --exclude \

124+ && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \

114125 browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'

115126 )

116127

@@ -120,13 +131,13 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

120131 machine.succeed(

121132 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

122133 && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \

123− && python regression/runtests.py --pkg feature_tests'

134+ && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests'

124135 )

125136

126137 with subtest("run resql test"):

127138 machine.succeed(

128139 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

129− && python regression/runtests.py --pkg resql'

140+ && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql'

130141 )

131142 '';

132143 })

nixos/tests/systemd-initrd-simple.nix+1−1

@@ -1,7 +1,7 @@

11import ./make-test-python.nix ({ lib, pkgs, ... }: {

22 name = "systemd-initrd-simple";

33

4− nodes.machine = { pkgs, ... }: {

4+ machine = { pkgs, ... }: {

55 boot.initrd.systemd = {

66 enable = true;

77 emergencyAccess = true;

nixos/tests/xmpp/xmpp-sendmessage.nix+4−1

@@ -51,8 +51,11 @@ class CthonTest(ClientXMPP):

5151 log.info('Message sent')

5252

5353 # Test http upload (XEP_0363)

54+ def timeout_callback(arg):

55+ log.error("ERROR: Cannot upload file. XEP_0363 seems broken")

56+ sys.exit(1)

5457 try:

55− url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10)

58+ url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback)

5659 except:

5760 log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")

5861 sys.exit(1)

pkgs/applications/audio/audio-recorder/default.nix+1−1

@@ -2,7 +2,7 @@

22, pkg-config, intltool

33, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1

44, librsvg, wrapGAppsHook

5−, pulseaudioSupport ? true, libpulseaudio }:

5+, pulseaudioSupport ? true, libpulseaudio ? null }:

66

77stdenv.mkDerivation rec {

88 pname = "audio-recorder";

pkgs/applications/audio/cardinal/default.nix+11−2

@@ -23,14 +23,23 @@

2323

2424stdenv.mkDerivation rec {

2525 pname = "cardinal";

26− version = "22.04";

26+ version = "22.02";

2727

2828 src = fetchurl {

2929 url =

3030 "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";

31− sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE=";

31+ sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM=";

3232 };

3333

34+ patches = [

35+ # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260

36+ (fetchpatch {

37+ url =

38+ "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch";

39+ sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs=";

40+ })

41+ ];

42+

3443 prePatch = ''

3544 patchShebangs ./dpf/utils/generate-ttl.sh

3645 '';

pkgs/applications/audio/caudec/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, makeWrapper, bc, findutils, flac, lame, opusTools, procps, sox }:

1+{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:

22

33stdenv.mkDerivation rec {

44 pname = "caudec";

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

1313 patchShebangs ./install.sh

1414 '';

1515

16− nativeBuildInputs = [ makeWrapper ];

16+ nativeBuildInputs = [ bash makeWrapper ];

1717

1818 installPhase = ''

1919 ./install.sh --prefix=$out/bin

pkgs/applications/audio/faust/faust2.nix+2−2

@@ -20,13 +20,13 @@ with lib.strings;

2020

2121let

2222

23− version = "2.40.0";

23+ version = "2.37.3";

2424

2525 src = fetchFromGitHub {

2626 owner = "grame-cncm";

2727 repo = "faust";

2828 rev = version;

29− sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A=";

29+ sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc=";

3030 fetchSubmodules = true;

3131 };

3232

pkgs/applications/audio/faust/faustlive.nix+12−9

@@ -1,34 +1,37 @@

11{ lib, stdenv, fetchFromGitHub

22, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl

3−, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit

3+, bc, coreutils, which, libsndfile, pkg-config, libxcb

44}:

55

66stdenv.mkDerivation rec {

77 pname = "faustlive";

8− version = "2.5.8";

8+ version = "2.5.5";

99 src = fetchFromGitHub {

1010 owner = "grame-cncm";

1111 repo = "faustlive";

1212 rev = version;

13− sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8=";

13+ sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9";

1414 fetchSubmodules = true;

1515 };

1616

17− nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ];

17+ nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ];

1818

1919 buildInputs = [

2020 llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl

21− bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit

21+ bc coreutils which libsndfile libxcb

2222 ];

2323

2424 makeFlags = [ "PREFIX=$(out)" ];

2525

26− postInstall = ''

27− wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}"

28− '';

29−

3026 postPatch = "cd Build";

3127

28+ installPhase = ''

29+ install -d "$out/bin"

30+ install -d "$out/share/applications"

31+ install FaustLive/FaustLive "$out/bin"

32+ install rsrc/FaustLive.desktop "$out/share/applications"

33+ '';

34+

3235 meta = with lib; {

3336 description = "A standalone just-in-time Faust compiler";

3437 longDescription = ''

pkgs/applications/audio/fluidsynth/default.nix+2−2

@@ -5,13 +5,13 @@

55

66stdenv.mkDerivation rec {

77 pname = "fluidsynth";

8− version = "2.2.5";

8+ version = "2.2.3";

99

1010 src = fetchFromGitHub {

1111 owner = "FluidSynth";

1212 repo = "fluidsynth";

1313 rev = "v${version}";

14− sha256 = "sha256-aR8TLxl6OziP+DMSNro0DB/UtvzXDeDYQ3o/iy70XD4=";

14+ sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";

1515 };

1616

1717 nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];

pkgs/applications/audio/greg/default.nix+3−3

@@ -2,15 +2,15 @@

22

33with pythonPackages; buildPythonApplication rec {

44 pname = "greg";

5− version = "0.4.8";

5+ version = "0.4.7";

66

77 disabled = !isPy3k;

88

99 src = fetchFromGitHub {

1010 owner = "manolomartinez";

1111 repo = pname;

12− rev = "refs/tags/v${version}";

13− sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";

12+ rev = "v" + version;

13+ sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";

1414 };

1515

1616 propagatedBuildInputs = [ setuptools feedparser ];

pkgs/applications/audio/gspeech/default.nix+2−2

@@ -20,13 +20,13 @@

2020

2121python3.pkgs.buildPythonApplication rec {

2222 pname = "gSpeech";

23− version = "0.11.0";

23+ version = "0.10.1";

2424

2525 src = fetchFromGitHub {

2626 owner = "mothsart";

2727 repo = pname;

2828 rev = version;

29− sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp";

29+ sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";

3030 };

3131

3232 nativeBuildInputs = [

pkgs/applications/audio/guitarix/default.nix−2

@@ -108,8 +108,6 @@ stdenv.mkDerivation rec {

108108 "--install-roboto-font"

109109 ] ++ optional optimizationSupport "--optimization";

110110

111− NIX_CFLAGS_COMPILE = [ "-fpermissive" ];

112−

113111 meta = with lib; {

114112 description = "A virtual guitar amplifier for Linux running with JACK";

115113 longDescription = ''

pkgs/applications/audio/mopidy/mopidy.nix+3−3

@@ -4,13 +4,13 @@

44

55pythonPackages.buildPythonApplication rec {

66 pname = "mopidy";

7− version = "3.3.0";

7+ version = "3.2.0";

88

99 src = fetchFromGitHub {

1010 owner = "mopidy";

1111 repo = "mopidy";

12− rev = "refs/tags/v${version}";

13− sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw=";

12+ rev = "v${version}";

13+ sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f";

1414 };

1515

1616 nativeBuildInputs = [ wrapGAppsHook ];

pkgs/applications/audio/ncspot/default.nix+3−3

@@ -7,16 +7,16 @@

77

88rustPlatform.buildRustPackage rec {

99 pname = "ncspot";

10− version = "0.9.8";

10+ version = "0.9.7";

1111

1212 src = fetchFromGitHub {

1313 owner = "hrkfdn";

1414 repo = "ncspot";

1515 rev = "v${version}";

16− sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE=";

16+ sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0=";

1717 };

1818

19− cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M=";

19+ cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc=";

2020

2121 nativeBuildInputs = [ pkg-config ];

2222

pkgs/applications/audio/plexamp/default.nix+3−3

@@ -2,12 +2,12 @@

22

33let

44 pname = "plexamp";

5− version = "4.2.1";

5+ version = "4.2.0";

66

77 src = fetchurl {

88 url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

99 name="${pname}-${version}.AppImage";

10− sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A==";

10+ sha512 = "yIdZoKTJJEpUzEqvixQ7JJBxzrtCRov31dGBDOjMiK/oA2q00Xo6XVDvAhYuIn6ocZqK+I5jHfmf4qYaRePDvg==";

1111 };

1212

1313 appimageContents = appimageTools.extractType2 {

@@ -33,7 +33,7 @@ in appimageTools.wrapType2 {

3333 meta = with lib; {

3434 description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

3535 homepage = "https://plexamp.com/";

36− changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/44";

36+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/43";

3737 license = licenses.unfree;

3838 maintainers = with maintainers; [ killercup synthetica ];

3939 platforms = [ "x86_64-linux" ];

pkgs/applications/blockchains/bisq-desktop/default.nix+2−1

@@ -10,6 +10,7 @@

1010, writeScript

1111, bash

1212, tor

13+, gnutar

1314, zip

1415, xz

1516}:

@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {

4142 sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid";

4243 };

4344

44− nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];

45+ nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ];

4546

4647 desktopItems = [

4748 (makeDesktopItem {

pkgs/applications/blockchains/electrs/default.nix+3−3

@@ -12,16 +12,16 @@ let

1212in

1313rustPlatform.buildRustPackage rec {

1414 pname = "electrs";

15− version = "0.9.7";

15+ version = "0.9.6";

1616

1717 src = fetchFromGitHub {

1818 owner = "romanz";

1919 repo = pname;

2020 rev = "v${version}";

21− hash = "sha256-hdXc64gj7QtCnTq3f5mpQDEKLM6qaDBLkQE07xxNaDE=";

21+ hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw=";

2222 };

2323

24− cargoHash = "sha256-xMATO+H3bGkM/tLRimmLGYtrOAX8hzkw5Hb0c6iVAXY=";

24+ cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q=";

2525

2626 # needed for librocksdb-sys

2727 nativeBuildInputs = [ llvmPackages.clang ];

pkgs/applications/blockchains/monero-cli/default.nix+2−2

@@ -9,13 +9,13 @@

99

1010stdenv.mkDerivation rec {

1111 pname = "monero-cli";

12− version = "0.17.3.2";

12+ version = "0.17.3.0";

1313

1414 src = fetchFromGitHub {

1515 owner = "monero-project";

1616 repo = "monero";

1717 rev = "v${version}";

18− sha256 = "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy";

18+ sha256 = "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm";

1919 fetchSubmodules = true;

2020 };

2121

pkgs/applications/blockchains/monero-gui/default.nix+2−2

@@ -14,13 +14,13 @@

1414

1515stdenv.mkDerivation rec {

1616 pname = "monero-gui";

17− version = "0.17.3.2";

17+ version = "0.17.3.1";

1818

1919 src = fetchFromGitHub {

2020 owner = "monero-project";

2121 repo = "monero-gui";

2222 rev = "v${version}";

23− sha256 = "10gincmgc0qpsgm94m1fqfy9j8jn9g1gjk12lcqnf77kvcnz37hq";

23+ sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo=";

2424 };

2525

2626 nativeBuildInputs = [

pkgs/applications/blockchains/namecoin/default.nix+6−5

@@ -1,14 +1,15 @@

11{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump

22, withGui }:

33

4+with lib;

45stdenv.mkDerivation rec {

5− pname = "namecoin" + lib.optionalString (!withGui) "d";

6− version = "22.0";

6+ pname = "namecoin" + optionalString (!withGui) "d";

7+ version = "nc22.0";

78

89 src = fetchFromGitHub {

910 owner = "namecoin";

1011 repo = "namecoin-core";

11− rev = "nc${version}";

12+ rev = version;

1213 sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY=";

1314 };

1415

@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {

2526 db4

2627 miniupnpc

2728 eject

28− ] ++ lib.optionals withGui [

29+ ] ++ optionals withGui [

2930 qt4

3031 protobuf

3132 qrencode

@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {

3738 "--with-boost-libdir=${boost.out}/lib"

3839 ];

3940

40− meta = with lib; {

41+ meta = {

4142 description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";

4243 homepage = "https://namecoin.org";

4344 license = licenses.mit;

pkgs/applications/editors/android-studio/common.nix−2

@@ -52,7 +52,6 @@

5252, xkeyboard_config

5353, zlib

5454, makeDesktopItem

55−, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper

5655}:

5756

5857let

@@ -81,7 +80,6 @@ let

8180 --set-default JAVA_HOME "$out/jre" \

8281 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

8382 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \

84− ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \

8583 --set FONTCONFIG_FILE ${fontsConf} \

8684 --prefix PATH : "${lib.makeBinPath [

8785

pkgs/applications/editors/android-studio/default.nix+1−2

@@ -1,4 +1,4 @@

1−{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }:

1+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:

22

33let

44 mkStudio = opts: callPackage (import ./common.nix opts) {

@@ -7,7 +7,6 @@ let

77 };

88 inherit (gnome2) GConf gnome_vfs;

99 inherit buildFHSUserEnv;

10− inherit tiling_wm;

1110 };

1211 stableVersion = {

1312 version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"

pkgs/applications/editors/jetbrains/default.nix+14−14

@@ -127,7 +127,7 @@ let

127127 with JUnit, TestNG, popular SCMs, Ant & Maven. Also known

128128 as IntelliJ.

129129 '';

130− maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ];

130+ maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ];

131131 platforms = ideaPlatforms;

132132 };

133133 });

@@ -263,7 +263,7 @@ in

263263 sha256 = products.clion.sha256;

264264 };

265265 wmClass = "jetbrains-clion";

266− update-channel = products.clion.update-channel;

266+ update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

267267 };

268268

269269 datagrip = buildDataGrip rec {

@@ -276,7 +276,7 @@ in

276276 sha256 = products.datagrip.sha256;

277277 };

278278 wmClass = "jetbrains-datagrip";

279− update-channel = products.datagrip.update-channel;

279+ update-channel = "DataGrip RELEASE";

280280 };

281281

282282 goland = buildGoland rec {

@@ -289,7 +289,7 @@ in

289289 sha256 = products.goland.sha256;

290290 };

291291 wmClass = "jetbrains-goland";

292− update-channel = products.goland.update-channel;

292+ update-channel = "GoLand RELEASE";

293293 };

294294

295295 idea-community = buildIdea rec {

@@ -303,7 +303,7 @@ in

303303 sha256 = products.idea-community.sha256;

304304 };

305305 wmClass = "jetbrains-idea-ce";

306− update-channel = products.idea-community.update-channel;

306+ update-channel = "IntelliJ IDEA RELEASE";

307307 };

308308

309309 idea-ultimate = buildIdea rec {

@@ -317,12 +317,12 @@ in

317317 sha256 = products.idea-ultimate.sha256;

318318 };

319319 wmClass = "jetbrains-idea";

320− update-channel = products.idea-ultimate.update-channel;

320+ update-channel = "IntelliJ IDEA RELEASE";

321321 };

322322

323323 mps = buildMps rec {

324324 pname = "mps";

325− product = "MPS ${products.mps.version}";

325+ product = "MPS ${products.mps.version-major-minor}";

326326 version = products.mps.version;

327327 description = "Create your own domain-specific language";

328328 license = lib.licenses.asl20;

@@ -331,7 +331,7 @@ in

331331 sha256 = products.mps.sha256;

332332 };

333333 wmClass = "jetbrains-mps";

334− update-channel = products.mps.update-channel;

334+ update-channel = "MPS RELEASE";

335335 };

336336

337337 phpstorm = buildPhpStorm rec {

@@ -344,7 +344,7 @@ in

344344 sha256 = products.phpstorm.sha256;

345345 };

346346 wmClass = "jetbrains-phpstorm";

347− update-channel = products.phpstorm.update-channel;

347+ update-channel = "PhpStorm RELEASE";

348348 };

349349

350350 pycharm-community = buildPycharm rec {

@@ -358,7 +358,7 @@ in

358358 sha256 = products.pycharm-community.sha256;

359359 };

360360 wmClass = "jetbrains-pycharm-ce";

361− update-channel = products.pycharm-community.update-channel;

361+ update-channel = "PyCharm RELEASE";

362362 };

363363

364364 pycharm-professional = buildPycharm rec {

@@ -372,7 +372,7 @@ in

372372 sha256 = products.pycharm-professional.sha256;

373373 };

374374 wmClass = "jetbrains-pycharm";

375− update-channel = products.pycharm-professional.update-channel;

375+ update-channel = "PyCharm RELEASE";

376376 };

377377

378378 rider = buildRider rec {

@@ -385,7 +385,7 @@ in

385385 sha256 = products.rider.sha256;

386386 };

387387 wmClass = "jetbrains-rider";

388− update-channel = products.rider.update-channel;

388+ update-channel = "Rider RELEASE";

389389 };

390390

391391 ruby-mine = buildRubyMine rec {

@@ -398,7 +398,7 @@ in

398398 sha256 = products.ruby-mine.sha256;

399399 };

400400 wmClass = "jetbrains-rubymine";

401− update-channel = products.ruby-mine.update-channel;

401+ update-channel = "RubyMine RELEASE";

402402 };

403403

404404 webstorm = buildWebStorm rec {

@@ -411,7 +411,7 @@ in

411411 sha256 = products.webstorm.sha256;

412412 };

413413 wmClass = "jetbrains-webstorm";

414− update-channel = products.webstorm.update-channel;

414+ update-channel = "WebStorm RELEASE";

415415 };

416416

417417}

pkgs/applications/editors/jetbrains/update.py+14−17

@@ -1,5 +1,6 @@

11#! /usr/bin/env nix-shell

22#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict

3+import hashlib

34import json

45import pathlib

56import logging

@@ -32,8 +33,7 @@ def download_channels():

3233

3334

3435def build_version(build):

35− build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"]

36− return version.parse(build_number)

36+ return version.parse(build["@version"])

3737

3838

3939def latest_build(channel):

@@ -43,10 +43,11 @@ def latest_build(channel):

4343

4444

4545def download_sha256(url):

46− url = f"{url}.sha256"

4746 download_response = requests.get(url)

4847 download_response.raise_for_status()

49− return download_response.content.decode('UTF-8').split(' ')[0]

48+ h = hashlib.sha256()

49+ h.update(download_response.content)

50+ return h.hexdigest()

5051

5152

5253channels = download_channels()

@@ -62,22 +63,18 @@ def update_product(name, product):

6263 else:

6364 try:

6465 build = latest_build(channel)

65− new_version = build["@version"]

66− new_build_number = build["@fullNumber"]

67− if "EAP" not in channel["@name"]:

68− version_or_build_number = new_version

69− else:

70− version_or_build_number = new_build_number

71− version_number = new_version.split(' ')[0]

72− download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number)

66+ version = build["@version"]

67+ parsed_version = build_version(build)

68+ version_major_minor = f"{parsed_version.major}.{parsed_version.minor}"

69+ download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor)

7370 product["url"] = download_url

74− if "sha256" not in product or product.get("build_number") != new_build_number:

75− logging.info("Found a newer version %s with build number %s.", new_version, new_build_number)

76− product["version"] = new_version

77− product["build_number"] = new_build_number

71+ product["version-major-minor"] = version_major_minor

72+ if "sha256" not in product or product.get("version") != version:

73+ logging.info("Found a newer version %s.", version)

74+ product["version"] = version

7875 product["sha256"] = download_sha256(download_url)

7976 else:

80− logging.info("Already at the latest version %s with build number %s.", new_version, new_build_number)

77+ logging.info("Already at the latest version %s.", version)

8178 except Exception as e:

8279 logging.exception("Update failed:", exc_info=e)

8380 logging.warning("Skipping %s due to the above error.", name)

pkgs/applications/editors/oni2/common.nix+1

@@ -95,6 +95,7 @@ in stdenv.mkDerivation (rec {

9595 clang

9696 makeWrapper

9797 nodePackages.esy

98+ bash

9899 perl

99100 which

100101 nasm

pkgs/applications/editors/vim/plugins/default.nix+1−3

@@ -3,8 +3,7 @@

33

44let

55

6− inherit (vimUtils.override {inherit vim;})

7− buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

6+ inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

87

98 inherit (lib) extends;

109

@@ -25,7 +24,6 @@ let

2524

2625 plugins = callPackage ./generated.nix {

2726 inherit buildVimPluginFrom2Nix;

28− inherit (vimUtils) buildNeovimPluginFrom2Nix;

2927 };

3028

3129 # TL;DR

pkgs/applications/editors/vim/plugins/generated.nix+440−441

@@ -1,5 +1,5 @@

11# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!

2−{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

2+{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

33

44final: prev:

55{

@@ -53,12 +53,12 @@ final: prev:

5353

5454 Coqtail = buildVimPluginFrom2Nix {

5555 pname = "Coqtail";

56− version = "2022-04-21";

56+ version = "2022-04-15";

5757 src = fetchFromGitHub {

5858 owner = "whonore";

5959 repo = "Coqtail";

60− rev = "0b8f2408f96481a373f336b4405af03008e39a4e";

61− sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki";

60+ rev = "93fca5d307007c05722050ffa8b4e508ca6f3b81";

61+ sha256 = "022wv0lpz50ihvnkc38rmds0dl4g4b71yig9dc8nn8sicyv0312w";

6262 };

6363 meta.homepage = "https://github.com/whonore/Coqtail/";

6464 };

@@ -77,12 +77,12 @@ final: prev:

7777

7878 FTerm-nvim = buildVimPluginFrom2Nix {

7979 pname = "FTerm.nvim";

80− version = "2022-04-21";

80+ version = "2022-04-17";

8181 src = fetchFromGitHub {

8282 owner = "numToStr";

8383 repo = "FTerm.nvim";

84− rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a";

85− sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y";

84+ rev = "c2a4c4bbd00da68d864683cd09a5d3a2b80de11d";

85+ sha256 = "01xscq18slsib2liqp7mbd4wil6l61m2ipihg2i6a14s9bcd1b0y";

8686 };

8787 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";

8888 };

@@ -149,12 +149,12 @@ final: prev:

149149

150150 LeaderF = buildVimPluginFrom2Nix {

151151 pname = "LeaderF";

152− version = "2022-04-26";

152+ version = "2022-04-19";

153153 src = fetchFromGitHub {

154154 owner = "Yggdroot";

155155 repo = "LeaderF";

156− rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d";

157− sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn";

156+ rev = "ecd38845d65ffbe4b080cc3c2c1c7f0bfe835bb3";

157+ sha256 = "0cjx9v0fafm2npknr85wb37934ysdggnmiwr9cwbd5risp9ircwh";

158158 };

159159 meta.homepage = "https://github.com/Yggdroot/LeaderF/";

160160 };

@@ -173,12 +173,12 @@ final: prev:

173173

174174 Navigator-nvim = buildVimPluginFrom2Nix {

175175 pname = "Navigator.nvim";

176− version = "2022-04-29";

176+ version = "2022-04-11";

177177 src = fetchFromGitHub {

178178 owner = "numToStr";

179179 repo = "Navigator.nvim";

180− rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2";

181− sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc";

180+ rev = "52225923679ec866651bb0c2e0691374131ec939";

181+ sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv";

182182 };

183183 meta.homepage = "https://github.com/numToStr/Navigator.nvim/";

184184 };

@@ -269,12 +269,12 @@ final: prev:

269269

270270 SchemaStore-nvim = buildVimPluginFrom2Nix {

271271 pname = "SchemaStore.nvim";

272− version = "2022-05-02";

272+ version = "2022-04-19";

273273 src = fetchFromGitHub {

274274 owner = "b0o";

275275 repo = "SchemaStore.nvim";

276− rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a";

277− sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk";

276+ rev = "4112585513210a3a55e587344649a4bfb8709bdc";

277+ sha256 = "1sjm13vq8608xwfhc9hyfn1n4bwpgivnpw04331giwmf4j3kp422";

278278 };

279279 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

280280 };

@@ -305,12 +305,12 @@ final: prev:

305305

306306 SimpylFold = buildVimPluginFrom2Nix {

307307 pname = "SimpylFold";

308− version = "2022-05-02";

308+ version = "2021-11-04";

309309 src = fetchFromGitHub {

310310 owner = "tmhedberg";

311311 repo = "SimpylFold";

312− rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd";

313− sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25";

312+ rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";

313+ sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";

314314 };

315315 meta.homepage = "https://github.com/tmhedberg/SimpylFold/";

316316 };

@@ -329,12 +329,12 @@ final: prev:

329329

330330 SpaceVim = buildVimPluginFrom2Nix {

331331 pname = "SpaceVim";

332− version = "2022-05-02";

332+ version = "2022-04-19";

333333 src = fetchFromGitHub {

334334 owner = "SpaceVim";

335335 repo = "SpaceVim";

336− rev = "97b010245f42bda351fd050a3c6ccf7806b9b007";

337− sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f";

336+ rev = "a1b65988e72a091334cedfe7ed1d067819f4e1eb";

337+ sha256 = "096q33lrgn4i8ic6y66snb312ly3rdxm8a15mykawn1n533d04nq";

338338 };

339339 meta.homepage = "https://github.com/SpaceVim/SpaceVim/";

340340 };

@@ -486,12 +486,12 @@ final: prev:

486486

487487 aerial-nvim = buildVimPluginFrom2Nix {

488488 pname = "aerial.nvim";

489− version = "2022-05-02";

489+ version = "2022-04-19";

490490 src = fetchFromGitHub {

491491 owner = "stevearc";

492492 repo = "aerial.nvim";

493− rev = "8d2ef96e44768250a652826c6586005f40eeac7f";

494− sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx";

493+ rev = "6d5246a3f0d2861eaad4121eb467bc5e6537690d";

494+ sha256 = "0by8s35hhvk38l79y5nm88cvwy53vx21ps1wg9niway5xrp0khcs";

495495 };

496496 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

497497 };

@@ -522,12 +522,12 @@ final: prev:

522522

523523 ale = buildVimPluginFrom2Nix {

524524 pname = "ale";

525− version = "2022-05-02";

525+ version = "2022-04-06";

526526 src = fetchFromGitHub {

527527 owner = "dense-analysis";

528528 repo = "ale";

529− rev = "56399106fcf9d80d476307576bc307e67f0167e2";

530− sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv";

529+ rev = "607f33a1b0f662d9809d54363e8e81a4965862ce";

530+ sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx";

531531 };

532532 meta.homepage = "https://github.com/dense-analysis/ale/";

533533 };

@@ -546,12 +546,12 @@ final: prev:

546546

547547 aniseed = buildVimPluginFrom2Nix {

548548 pname = "aniseed";

549− version = "2022-04-27";

549+ version = "2022-04-09";

550550 src = fetchFromGitHub {

551551 owner = "Olical";

552552 repo = "aniseed";

553− rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c";

554− sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q";

553+ rev = "c55d4879935f07dbf46e86389246449d7af272b1";

554+ sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s";

555555 };

556556 meta.homepage = "https://github.com/Olical/aniseed/";

557557 };

@@ -654,12 +654,12 @@ final: prev:

654654

655655 asynctasks-vim = buildVimPluginFrom2Nix {

656656 pname = "asynctasks.vim";

657− version = "2022-05-01";

657+ version = "2022-04-06";

658658 src = fetchFromGitHub {

659659 owner = "skywind3000";

660660 repo = "asynctasks.vim";

661− rev = "9cdb34314d5066b40627c83829b9d04943c9c66d";

662− sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw";

661+ rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5";

662+ sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd";

663663 };

664664 meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";

665665 };

@@ -714,12 +714,12 @@ final: prev:

714714

715715 auto-session = buildVimPluginFrom2Nix {

716716 pname = "auto-session";

717− version = "2022-04-21";

717+ version = "2022-04-12";

718718 src = fetchFromGitHub {

719719 owner = "rmagatti";

720720 repo = "auto-session";

721− rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a";

722− sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw";

721+ rev = "e840b844abcc19ad6e406b193a2a5ce285238458";

722+ sha256 = "0yx662qipzdmg28x0h454y95jrp952p51pl9h1dxjnwyswn8xrnm";

723723 };

724724 meta.homepage = "https://github.com/rmagatti/auto-session/";

725725 };

@@ -894,12 +894,12 @@ final: prev:

894894

895895 bufferline-nvim = buildVimPluginFrom2Nix {

896896 pname = "bufferline.nvim";

897− version = "2022-05-02";

897+ version = "2022-04-20";

898898 src = fetchFromGitHub {

899899 owner = "akinsho";

900900 repo = "bufferline.nvim";

901− rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc";

902− sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh";

901+ rev = "f02e19bd29a27944e6bcc1e7a492fe07534b6630";

902+ sha256 = "10gwj4kd7kngcrfgm4jja08ss5hza7s1bzs11fjk08y489mhracp";

903903 };

904904 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

905905 };

@@ -1050,24 +1050,24 @@ final: prev:

10501050

10511051 cmp-calc = buildVimPluginFrom2Nix {

10521052 pname = "cmp-calc";

1053− version = "2022-04-25";

1053+ version = "2022-04-12";

10541054 src = fetchFromGitHub {

10551055 owner = "hrsh7th";

10561056 repo = "cmp-calc";

1057− rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312";

1058− sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg";

1057+ rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f";

1058+ sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch";

10591059 };

10601060 meta.homepage = "https://github.com/hrsh7th/cmp-calc/";

10611061 };

10621062

10631063 cmp-cmdline = buildVimPluginFrom2Nix {

10641064 pname = "cmp-cmdline";

1065− version = "2022-05-02";

1065+ version = "2022-02-13";

10661066 src = fetchFromGitHub {

10671067 owner = "hrsh7th";

10681068 repo = "cmp-cmdline";

1069− rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252";

1070− sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68";

1069+ rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0";

1070+ sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh";

10711071 };

10721072 meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";

10731073 };

@@ -1110,12 +1110,12 @@ final: prev:

11101110

11111111 cmp-nvim-lsp = buildVimPluginFrom2Nix {

11121112 pname = "cmp-nvim-lsp";

1113− version = "2022-05-01";

1113+ version = "2022-01-15";

11141114 src = fetchFromGitHub {

11151115 owner = "hrsh7th";

11161116 repo = "cmp-nvim-lsp";

1117− rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d";

1118− sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc";

1117+ rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba";

1118+ sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca";

11191119 };

11201120 meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";

11211121 };

@@ -1146,12 +1146,12 @@ final: prev:

11461146

11471147 cmp-nvim-ultisnips = buildVimPluginFrom2Nix {

11481148 pname = "cmp-nvim-ultisnips";

1149− version = "2022-04-22";

1149+ version = "2022-04-15";

11501150 src = fetchFromGitHub {

11511151 owner = "quangnguyen30192";

11521152 repo = "cmp-nvim-ultisnips";

1153− rev = "21f02b62deb409ce69928a23406076bd0043ddbc";

1154− sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv";

1153+ rev = "c6ace8ca97ca7db5cca319759efd93fbf6cc0bce";

1154+ sha256 = "0jys7fl9r6n7khacypkg643lk2aadsnniyrm7nar0k08swdwhl48";

11551155 };

11561156 meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";

11571157 };

@@ -1170,12 +1170,12 @@ final: prev:

11701170

11711171 cmp-pandoc-references = buildVimPluginFrom2Nix {

11721172 pname = "cmp-pandoc-references";

1173− version = "2022-04-20";

1173+ version = "2022-02-16";

11741174 src = fetchFromGitHub {

11751175 owner = "jc-doyle";

11761176 repo = "cmp-pandoc-references";

1177− rev = "2c808dff631a783ddd2c554c4c6033907589baf6";

1178− sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";

1177+ rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54";

1178+ sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs";

11791179 };

11801180 meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";

11811181 };

@@ -1230,12 +1230,12 @@ final: prev:

12301230

12311231 cmp-treesitter = buildVimPluginFrom2Nix {

12321232 pname = "cmp-treesitter";

1233− version = "2022-04-25";

1233+ version = "2021-12-02";

12341234 src = fetchFromGitHub {

12351235 owner = "ray-x";

12361236 repo = "cmp-treesitter";

1237− rev = "c5187c31abd081ecef8b41e5eb476b7340442310";

1238− sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5";

1237+ rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb";

1238+ sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa";

12391239 };

12401240 meta.homepage = "https://github.com/ray-x/cmp-treesitter/";

12411241 };

@@ -1266,12 +1266,12 @@ final: prev:

12661266

12671267 cmp_luasnip = buildVimPluginFrom2Nix {

12681268 pname = "cmp_luasnip";

1269− version = "2022-05-01";

1269+ version = "2022-04-01";

12701270 src = fetchFromGitHub {

12711271 owner = "saadparwaiz1";

12721272 repo = "cmp_luasnip";

1273− rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36";

1274− sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj";

1273+ rev = "b10829736542e7cc9291e60bab134df1273165c9";

1274+ sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l";

12751275 };

12761276 meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";

12771277 };

@@ -1314,12 +1314,12 @@ final: prev:

13141314

13151315 coc-lua = buildVimPluginFrom2Nix {

13161316 pname = "coc-lua";

1317− version = "2022-04-26";

1317+ version = "2022-04-20";

13181318 src = fetchFromGitHub {

13191319 owner = "josa42";

13201320 repo = "coc-lua";

1321− rev = "3601c8ddde380349764fc0bc016b915703c9ad86";

1322− sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx";

1321+ rev = "0df59c8c81acfb7b0abadd49222a769ddf0730ec";

1322+ sha256 = "0ij2q9q96dv3rms6qdjsqvgyl0fk3w1h67fhjq7kcagci78cka9k";

13231323 };

13241324 meta.homepage = "https://github.com/josa42/coc-lua/";

13251325 };

@@ -1374,24 +1374,24 @@ final: prev:

13741374

13751375 coc-nvim = buildVimPluginFrom2Nix {

13761376 pname = "coc.nvim";

1377− version = "2022-05-01";

1377+ version = "2022-04-19";

13781378 src = fetchFromGitHub {

13791379 owner = "neoclide";

13801380 repo = "coc.nvim";

1381− rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02";

1382− sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6";

1381+ rev = "6f81e3034bf04f2d8d65b82b3ac15d93b737cf0b";

1382+ sha256 = "0hx8g0xlh0n6yqpv58s8vb2k0gdh1h13d05l1m3wn3gpvid17xi3";

13831383 };

13841384 meta.homepage = "https://github.com/neoclide/coc.nvim/";

13851385 };

13861386

13871387 codi-vim = buildVimPluginFrom2Nix {

13881388 pname = "codi.vim";

1389− version = "2022-04-30";

1389+ version = "2022-04-16";

13901390 src = fetchFromGitHub {

13911391 owner = "metakirby5";

13921392 repo = "codi.vim";

1393− rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0";

1394− sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd";

1393+ rev = "d9a93193dbb23516eebb19ef5ba01b43287ea35d";

1394+ sha256 = "0yk3jfp8r432s0kan0g6ml0yyz731yygv0zzpx75l9lfagdv0xpy";

13951395 };

13961396 meta.homepage = "https://github.com/metakirby5/codi.vim/";

13971397 };

@@ -1435,12 +1435,12 @@ final: prev:

14351435

14361436 comment-nvim = buildVimPluginFrom2Nix {

14371437 pname = "comment.nvim";

1438− version = "2022-04-27";

1438+ version = "2022-04-19";

14391439 src = fetchFromGitHub {

14401440 owner = "numtostr";

14411441 repo = "comment.nvim";

1442− rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a";

1443− sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h";

1442+ rev = "ef3e6bfa41073a73c298ae90d2796f8ceda71c6a";

1443+ sha256 = "1ki607wsam22h01gwq8a4vw3jq1yj2zmfp2laglh5cy5dgarm4vv";

14441444 };

14451445 meta.homepage = "https://github.com/numtostr/comment.nvim/";

14461446 };

@@ -1579,12 +1579,12 @@ final: prev:

15791579

15801580 conjure = buildVimPluginFrom2Nix {

15811581 pname = "conjure";

1582− version = "2022-04-29";

1582+ version = "2022-04-09";

15831583 src = fetchFromGitHub {

15841584 owner = "Olical";

15851585 repo = "conjure";

1586− rev = "842c81892648de759e639ad2d395757b98be06d5";

1587− sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8";

1586+ rev = "422cadf51dd44306713f3f7965e40ec606290c49";

1587+ sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh";

15881588 };

15891589 meta.homepage = "https://github.com/Olical/conjure/";

15901590 };

@@ -1627,12 +1627,12 @@ final: prev:

16271627

16281628 coq_nvim = buildVimPluginFrom2Nix {

16291629 pname = "coq_nvim";

1630− version = "2022-05-02";

1630+ version = "2022-04-20";

16311631 src = fetchFromGitHub {

16321632 owner = "ms-jpq";

16331633 repo = "coq_nvim";

1634− rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3";

1635− sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf";

1634+ rev = "0502a7f14ab73b80353d076842d58730a0239a16";

1635+ sha256 = "1s46iafdwxr20qw08si0lwbh81x9ffh2wvd4rxcyvhlxc7h686rp";

16361636 };

16371637 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";

16381638 };

@@ -1663,12 +1663,12 @@ final: prev:

16631663

16641664 crates-nvim = buildVimPluginFrom2Nix {

16651665 pname = "crates.nvim";

1666− version = "2022-05-02";

1666+ version = "2022-04-19";

16671667 src = fetchFromGitHub {

16681668 owner = "saecki";

16691669 repo = "crates.nvim";

1670− rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383";

1671− sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q";

1670+ rev = "fc46bf69f0b2293f25581123b46023226d102cc1";

1671+ sha256 = "079hraq9cjxjpqrli4y2nk9xwpvkhxmrbrhxq9by1wb1q1a39da3";

16721672 };

16731673 meta.homepage = "https://github.com/saecki/crates.nvim/";

16741674 };

@@ -1795,12 +1795,12 @@ final: prev:

17951795

17961796 defx-nvim = buildVimPluginFrom2Nix {

17971797 pname = "defx.nvim";

1798− version = "2022-04-21";

1798+ version = "2022-04-14";

17991799 src = fetchFromGitHub {

18001800 owner = "Shougo";

18011801 repo = "defx.nvim";

1802− rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2";

1803− sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j";

1802+ rev = "b636df644005bb4805cba70b238df73b302640eb";

1803+ sha256 = "1aha5vashdiz59iy8l8kbkyvwngw5m7n131k7ar82gxi0zqsj6q8";

18041804 };

18051805 meta.homepage = "https://github.com/Shougo/defx.nvim/";

18061806 };

@@ -1855,12 +1855,12 @@ final: prev:

18551855

18561856 deol-nvim = buildVimPluginFrom2Nix {

18571857 pname = "deol.nvim";

1858− version = "2022-04-29";

1858+ version = "2022-03-16";

18591859 src = fetchFromGitHub {

18601860 owner = "Shougo";

18611861 repo = "deol.nvim";

1862− rev = "0bdb926d328765144dd788c062161c565dc38732";

1863− sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x";

1862+ rev = "4ecffa4502a65f90397c2194ae308dac49194a65";

1863+ sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9";

18641864 };

18651865 meta.homepage = "https://github.com/Shougo/deol.nvim/";

18661866 };

@@ -2169,12 +2169,12 @@ final: prev:

21692169

21702170 dressing-nvim = buildVimPluginFrom2Nix {

21712171 pname = "dressing.nvim";

2172− version = "2022-05-01";

2172+ version = "2022-03-31";

21732173 src = fetchFromGitHub {

21742174 owner = "stevearc";

21752175 repo = "dressing.nvim";

2176− rev = "a476efd3f372d6b5b0df431cac36911fb84c515e";

2177− sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy";

2176+ rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217";

2177+ sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy";

21782178 };

21792179 meta.homepage = "https://github.com/stevearc/dressing.nvim/";

21802180 };

@@ -2193,12 +2193,12 @@ final: prev:

21932193

21942194 edge = buildVimPluginFrom2Nix {

21952195 pname = "edge";

2196− version = "2022-04-27";

2196+ version = "2022-04-14";

21972197 src = fetchFromGitHub {

21982198 owner = "sainnhe";

21992199 repo = "edge";

2200− rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674";

2201− sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4";

2200+ rev = "957a0f4d17f253ac23f9c870eb92d7ad2ea4b7e0";

2201+ sha256 = "15m6b5svvcfsmiq87vhn77q5z7zg22vpnh9qbcv0y6cd04s69n2d";

22022202 };

22032203 meta.homepage = "https://github.com/sainnhe/edge/";

22042204 };

@@ -2279,12 +2279,12 @@ final: prev:

22792279

22802280 everforest = buildVimPluginFrom2Nix {

22812281 pname = "everforest";

2282− version = "2022-04-27";

2282+ version = "2022-04-14";

22832283 src = fetchFromGitHub {

22842284 owner = "sainnhe";

22852285 repo = "everforest";

2286− rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32";

2287− sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah";

2286+ rev = "64f486a4856bfbfd6604c700c938b34cf551561b";

2287+ sha256 = "18yxab99d9cy45ir2dfqr8wi0s56qyrzglgcslp97wnjiq79673d";

22882288 };

22892289 meta.homepage = "https://github.com/sainnhe/everforest/";

22902290 };

@@ -2460,12 +2460,12 @@ final: prev:

24602460

24612461 formatter-nvim = buildVimPluginFrom2Nix {

24622462 pname = "formatter.nvim";

2463− version = "2022-04-26";

2463+ version = "2022-03-29";

24642464 src = fetchFromGitHub {

24652465 owner = "mhartington";

24662466 repo = "formatter.nvim";

2467− rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9";

2468− sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp";

2467+ rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31";

2468+ sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n";

24692469 };

24702470 meta.homepage = "https://github.com/mhartington/formatter.nvim/";

24712471 };

@@ -2484,12 +2484,12 @@ final: prev:

24842484

24852485 friendly-snippets = buildVimPluginFrom2Nix {

24862486 pname = "friendly-snippets";

2487− version = "2022-04-25";

2487+ version = "2022-04-17";

24882488 src = fetchFromGitHub {

24892489 owner = "rafamadriz";

24902490 repo = "friendly-snippets";

2491− rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938";

2492− sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w";

2491+ rev = "804c3f55ec4ec46f7257451b3cd731df991b9212";

2492+ sha256 = "0sznw2q70zac924yf0z0ic3frmmjmryjh4af46fw2zrbrq4kk9vq";

24932493 };

24942494 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

24952495 };

@@ -2604,12 +2604,12 @@ final: prev:

26042604

26052605 gentoo-syntax = buildVimPluginFrom2Nix {

26062606 pname = "gentoo-syntax";

2607− version = "2022-05-02";

2607+ version = "2022-02-23";

26082608 src = fetchFromGitHub {

26092609 owner = "gentoo";

26102610 repo = "gentoo-syntax";

2611− rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1";

2612− sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h";

2611+ rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";

2612+ sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";

26132613 };

26142614 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";

26152615 };

@@ -2652,24 +2652,24 @@ final: prev:

26522652

26532653 git-blame-nvim = buildVimPluginFrom2Nix {

26542654 pname = "git-blame.nvim";

2655− version = "2022-04-29";

2655+ version = "2022-03-03";

26562656 src = fetchFromGitHub {

26572657 owner = "f-person";

26582658 repo = "git-blame.nvim";

2659− rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541";

2660− sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl";

2659+ rev = "e60bfbc314476777a5ce200e533699691a5cdfa5";

2660+ sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k";

26612661 };

26622662 meta.homepage = "https://github.com/f-person/git-blame.nvim/";

26632663 };

26642664

26652665 git-messenger-vim = buildVimPluginFrom2Nix {

26662666 pname = "git-messenger.vim";

2667− version = "2022-05-02";

2667+ version = "2021-11-13";

26682668 src = fetchFromGitHub {

26692669 owner = "rhysd";

26702670 repo = "git-messenger.vim";

2671− rev = "6c0b55fb38d0e0633127823aab89b0676d13e509";

2672− sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk";

2671+ rev = "2e67899355f3f631aad6845925e4c2c13546444d";

2672+ sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp";

26732673 };

26742674 meta.homepage = "https://github.com/rhysd/git-messenger.vim/";

26752675 };

@@ -2710,14 +2710,14 @@ final: prev:

27102710 meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";

27112711 };

27122712

2713− gitsigns-nvim = buildNeovimPluginFrom2Nix {

2713+ gitsigns-nvim = buildVimPluginFrom2Nix {

27142714 pname = "gitsigns.nvim";

2715− version = "2022-05-02";

2715+ version = "2022-04-19";

27162716 src = fetchFromGitHub {

27172717 owner = "lewis6991";

27182718 repo = "gitsigns.nvim";

2719− rev = "ef153188e849bd317c00448755bc4182a2bd495d";

2720− sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp";

2719+ rev = "498abfa13dd749be963bc87a5b37da0d3e42a50e";

2720+ sha256 = "11d2pnqgngm6546r1nr0cf1dj7qkgvdn0ld2h1jn3fm07l892sgv";

27212721 };

27222722 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

27232723 };

@@ -2760,12 +2760,12 @@ final: prev:

27602760

27612761 golden-ratio = buildVimPluginFrom2Nix {

27622762 pname = "golden-ratio";

2763− version = "2022-04-21";

2763+ version = "2020-04-03";

27642764 src = fetchFromGitHub {

27652765 owner = "roman";

27662766 repo = "golden-ratio";

2767− rev = "7df80253680e4755b82955425da31d8c1f8e23b6";

2768− sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq";

2767+ rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043";

2768+ sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654";

27692769 };

27702770 meta.homepage = "https://github.com/roman/golden-ratio/";

27712771 };

@@ -2844,24 +2844,24 @@ final: prev:

28442844

28452845 gruvbox-material = buildVimPluginFrom2Nix {

28462846 pname = "gruvbox-material";

2847− version = "2022-04-27";

2847+ version = "2022-04-14";

28482848 src = fetchFromGitHub {

28492849 owner = "sainnhe";

28502850 repo = "gruvbox-material";

2851− rev = "3d664943daf65bf99390a52c5dbc557f87fac552";

2852− sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj";

2851+ rev = "45d05b6affeec1f858a13c0d8fe511db32c85afd";

2852+ sha256 = "18sf80zgdsfb2bd9dgdww9prlhkydk695gj9wd9zah24zfc5mcv7";

28532853 };

28542854 meta.homepage = "https://github.com/sainnhe/gruvbox-material/";

28552855 };

28562856

28572857 gruvbox-nvim = buildVimPluginFrom2Nix {

28582858 pname = "gruvbox.nvim";

2859− version = "2022-04-26";

2859+ version = "2022-04-18";

28602860 src = fetchFromGitHub {

28612861 owner = "ellisonleao";

28622862 repo = "gruvbox.nvim";

2863− rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123";

2864− sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8";

2863+ rev = "028302225e19eb203ebb6876b689cc0ce2631169";

2864+ sha256 = "0npsh72z3xb9p1jdhz1g9jpx20c2d52mkkg4ix07bmy40ynkbsxs";

28652865 };

28662866 meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";

28672867 };

@@ -2976,24 +2976,24 @@ final: prev:

29762976

29772977 hop-nvim = buildVimPluginFrom2Nix {

29782978 pname = "hop.nvim";

2979− version = "2022-04-25";

2979+ version = "2022-03-22";

29802980 src = fetchFromGitHub {

29812981 owner = "phaazon";

29822982 repo = "hop.nvim";

2983− rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578";

2984− sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v";

2983+ rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3";

2984+ sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2";

29852985 };

29862986 meta.homepage = "https://github.com/phaazon/hop.nvim/";

29872987 };

29882988

29892989 hotpot-nvim = buildVimPluginFrom2Nix {

29902990 pname = "hotpot.nvim";

2991− version = "2022-04-24";

2991+ version = "2022-04-10";

29922992 src = fetchFromGitHub {

29932993 owner = "rktjmp";

29942994 repo = "hotpot.nvim";

2995− rev = "f481b30f1d93df6016092623199ddc8bfe1624d0";

2996− sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj";

2995+ rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e";

2996+ sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf";

29972997 };

29982998 meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";

29992999 };

@@ -3012,12 +3012,12 @@ final: prev:

30123012

30133013 iceberg-vim = buildVimPluginFrom2Nix {

30143014 pname = "iceberg.vim";

3015− version = "2022-04-26";

3015+ version = "2021-12-28";

30163016 src = fetchFromGitHub {

30173017 owner = "cocopon";

30183018 repo = "iceberg.vim";

3019− rev = "5ac9da61e8626d1218498a35e515f36387efe454";

3020− sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq";

3019+ rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c";

3020+ sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa";

30213021 };

30223022 meta.homepage = "https://github.com/cocopon/iceberg.vim/";

30233023 };

@@ -3277,12 +3277,12 @@ final: prev:

32773277

32783278 kanagawa-nvim = buildVimPluginFrom2Nix {

32793279 pname = "kanagawa.nvim";

3280− version = "2022-04-21";

3280+ version = "2022-04-14";

32813281 src = fetchFromGitHub {

32823282 owner = "rebelot";

32833283 repo = "kanagawa.nvim";

3284− rev = "0ad738e7cc43514d35388c1caca13990d688aa5c";

3285− sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca";

3284+ rev = "acf0f5d61236b416c804d649cd76db8390de9ae6";

3285+ sha256 = "03xmcph28q1y8n0ykga5m6biw9flpnx02sy7j2w3f1q2shknnwf3";

32863286 };

32873287 meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";

32883288 };

@@ -3361,12 +3361,12 @@ final: prev:

33613361

33623362 lean-nvim = buildVimPluginFrom2Nix {

33633363 pname = "lean.nvim";

3364− version = "2022-05-02";

3364+ version = "2022-04-19";

33653365 src = fetchFromGitHub {

33663366 owner = "Julian";

33673367 repo = "lean.nvim";

3368− rev = "902eb7f75d664bccd251c38d7921570b05b47cdc";

3369− sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3";

3368+ rev = "354630520ed3fe73c69796fb2e566a7c2125cd04";

3369+ sha256 = "1gwgbgg0dc0fwcdz6qs6mgvg0ybxgld3wm2wprq89abpacfz29dz";

33703370 };

33713371 meta.homepage = "https://github.com/Julian/lean.nvim/";

33723372 };

@@ -3469,12 +3469,12 @@ final: prev:

34693469

34703470 lightline-bufferline = buildVimPluginFrom2Nix {

34713471 pname = "lightline-bufferline";

3472− version = "2022-04-28";

3472+ version = "2022-03-27";

34733473 src = fetchFromGitHub {

34743474 owner = "mengelbrecht";

34753475 repo = "lightline-bufferline";

3476− rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab";

3477− sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj";

3476+ rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff";

3477+ sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq";

34783478 };

34793479 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

34803480 };

@@ -3613,12 +3613,12 @@ final: prev:

36133613

36143614 litee-nvim = buildVimPluginFrom2Nix {

36153615 pname = "litee.nvim";

3616− version = "2022-04-25";

3616+ version = "2022-02-28";

36173617 src = fetchFromGitHub {

36183618 owner = "ldelossa";

36193619 repo = "litee.nvim";

3620− rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff";

3621− sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y";

3620+ rev = "c9fd775aebf702c81e2077693336584a0027d496";

3621+ sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd";

36223622 };

36233623 meta.homepage = "https://github.com/ldelossa/litee.nvim/";

36243624 };

@@ -3684,12 +3684,12 @@ final: prev:

36843684

36853685 lsp_signature-nvim = buildVimPluginFrom2Nix {

36863686 pname = "lsp_signature.nvim";

3687− version = "2022-05-01";

3687+ version = "2022-04-16";

36883688 src = fetchFromGitHub {

36893689 owner = "ray-x";

36903690 repo = "lsp_signature.nvim";

3691− rev = "6d160406f948a810c40304224a1255c8bba5a415";

3692− sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3";

3691+ rev = "a351509512687293fd659ba4ee7e34412c3a8f70";

3692+ sha256 = "00xzd8b13krysdw21zm9ms902cxm04xl1wd2l7rb04431s2v9vc0";

36933693 };

36943694 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

36953695 };

@@ -3699,11 +3699,11 @@ final: prev:

36993699 version = "2022-04-18";

37003700 src = fetchFromGitHub {

37013701 owner = "onsails";

3702− repo = "lspkind.nvim";

3702+ repo = "lspkind-nvim";

37033703 rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7";

37043704 sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk";

37053705 };

3706− meta.homepage = "https://github.com/onsails/lspkind.nvim/";

3706+ meta.homepage = "https://github.com/onsails/lspkind-nvim/";

37073707 };

37083708

37093709 lspsaga-nvim = buildVimPluginFrom2Nix {

@@ -3744,24 +3744,24 @@ final: prev:

37443744

37453745 lualine-nvim = buildVimPluginFrom2Nix {

37463746 pname = "lualine.nvim";

3747− version = "2022-05-02";

3747+ version = "2022-04-17";

37483748 src = fetchFromGitHub {

37493749 owner = "nvim-lualine";

37503750 repo = "lualine.nvim";

3751− rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31";

3752− sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d";

3751+ rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d";

3752+ sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k";

37533753 };

37543754 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

37553755 };

37563756

37573757 luasnip = buildVimPluginFrom2Nix {

37583758 pname = "luasnip";

3759− version = "2022-05-01";

3759+ version = "2022-04-15";

37603760 src = fetchFromGitHub {

37613761 owner = "l3mon4d3";

37623762 repo = "luasnip";

3763− rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e";

3764− sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r";

3763+ rev = "6b67cb12747225a6412d8263bb97d6d2b8d9366a";

3764+ sha256 = "08a1kk8z3mcq65dh0hi44188dxkqjfg3yilr8viamyni1kwy7gf3";

37653765 };

37663766 meta.homepage = "https://github.com/l3mon4d3/luasnip/";

37673767 };

@@ -3864,12 +3864,12 @@ final: prev:

38643864

38653865 mini-nvim = buildVimPluginFrom2Nix {

38663866 pname = "mini.nvim";

3867− version = "2022-05-01";

3867+ version = "2022-04-20";

38683868 src = fetchFromGitHub {

38693869 owner = "echasnovski";

38703870 repo = "mini.nvim";

3871− rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88";

3872− sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7";

3871+ rev = "8134370549e73a5a72d24ffc7ea6a881cf4502ad";

3872+ sha256 = "0llkj31jkqnm3igs2f7cw8wxbc9877jk1mc2shnh1ii2dh0kmz68";

38733873 };

38743874 meta.homepage = "https://github.com/echasnovski/mini.nvim/";

38753875 };

@@ -3912,12 +3912,12 @@ final: prev:

39123912

39133913 mkdx = buildVimPluginFrom2Nix {

39143914 pname = "mkdx";

3915− version = "2022-04-29";

3915+ version = "2022-04-08";

39163916 src = fetchFromGitHub {

39173917 owner = "SidOfc";

39183918 repo = "mkdx";

3919− rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7";

3920− sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql";

3919+ rev = "a4645528e2ddedfb6350c142660c3e0468057f1c";

3920+ sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd";

39213921 };

39223922 meta.homepage = "https://github.com/SidOfc/mkdx/";

39233923 };

@@ -4176,12 +4176,12 @@ final: prev:

41764176

41774177 neco-vim = buildVimPluginFrom2Nix {

41784178 pname = "neco-vim";

4179− version = "2022-04-21";

4179+ version = "2022-02-02";

41804180 src = fetchFromGitHub {

41814181 owner = "Shougo";

41824182 repo = "neco-vim";

4183− rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692";

4184− sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k";

4183+ rev = "4b537fa01c28f2f7cf249722530561d2e477b49f";

4184+ sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv";

41854185 };

41864186 meta.homepage = "https://github.com/Shougo/neco-vim/";

41874187 };

@@ -4212,12 +4212,12 @@ final: prev:

42124212

42134213 neoformat = buildVimPluginFrom2Nix {

42144214 pname = "neoformat";

4215− version = "2022-05-01";

4215+ version = "2022-04-14";

42164216 src = fetchFromGitHub {

42174217 owner = "sbdchd";

42184218 repo = "neoformat";

4219− rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a";

4220− sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816";

4219+ rev = "06920fa90ec7db3f81c6f842ebaf008c39e088cf";

4220+ sha256 = "1f5j7aisnpvykgj7p64cbvfww05fsv47pi04ckkh0gkc49g5sjmg";

42214221 };

42224222 meta.homepage = "https://github.com/sbdchd/neoformat/";

42234223 };

@@ -4284,12 +4284,12 @@ final: prev:

42844284

42854285 neorg = buildVimPluginFrom2Nix {

42864286 pname = "neorg";

4287− version = "2022-05-01";

4287+ version = "2022-04-18";

42884288 src = fetchFromGitHub {

42894289 owner = "nvim-neorg";

42904290 repo = "neorg";

4291− rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8";

4292− sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1";

4291+ rev = "4a3ca2c0cb46a5320c124565fd4d9830435aa29f";

4292+ sha256 = "15jwzz2ldxg6ql1lzn626dcfxgndqzgpamakqk0yicbidhmdird0";

42934293 };

42944294 meta.homepage = "https://github.com/nvim-neorg/neorg/";

42954295 };

@@ -4332,24 +4332,24 @@ final: prev:

43324332

43334333 neoterm = buildVimPluginFrom2Nix {

43344334 pname = "neoterm";

4335− version = "2022-04-26";

4335+ version = "2022-01-20";

43364336 src = fetchFromGitHub {

43374337 owner = "kassio";

43384338 repo = "neoterm";

4339− rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9";

4340− sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq";

4339+ rev = "533d311a2a9187294ea52acab32d8565d6517059";

4340+ sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6";

43414341 };

43424342 meta.homepage = "https://github.com/kassio/neoterm/";

43434343 };

43444344

43454345 neovim-ayu = buildVimPluginFrom2Nix {

43464346 pname = "neovim-ayu";

4347− version = "2022-05-01";

4347+ version = "2022-04-19";

43484348 src = fetchFromGitHub {

43494349 owner = "Shatur";

43504350 repo = "neovim-ayu";

4351− rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac";

4352− sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2";

4351+ rev = "dde7e6f02fbcb5860b24f616c9a07b5f9e52a361";

4352+ sha256 = "0800qwxlj84f8ygvniwwyrcjyfwsx7kmzq8vyz9m50zd7b20al9f";

43534353 };

43544354 meta.homepage = "https://github.com/Shatur/neovim-ayu/";

43554355 };

@@ -4464,12 +4464,12 @@ final: prev:

44644464

44654465 nightfox-nvim = buildVimPluginFrom2Nix {

44664466 pname = "nightfox.nvim";

4467− version = "2022-05-02";

4467+ version = "2022-04-20";

44684468 src = fetchFromGitHub {

44694469 owner = "EdenEast";

44704470 repo = "nightfox.nvim";

4471− rev = "25b3f3e46c87c51e4d8075d2e11f481628716363";

4472− sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx";

4471+ rev = "5d2581a71510c319d128a8b02a21181abc611202";

4472+ sha256 = "118lda4cgxkbf13khyg2i36i7fcrlfz29l0wfjhg90ci3w8qvajs";

44734473 };

44744474 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";

44754475 };

@@ -4572,12 +4572,12 @@ final: prev:

45724572

45734573 null-ls-nvim = buildVimPluginFrom2Nix {

45744574 pname = "null-ls.nvim";

4575− version = "2022-05-01";

4575+ version = "2022-04-16";

45764576 src = fetchFromGitHub {

45774577 owner = "jose-elias-alvarez";

45784578 repo = "null-ls.nvim";

4579− rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9";

4580− sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c";

4579+ rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f";

4580+ sha256 = "1mifn1b83ypvaplmma1zx080vmm5nv40263lsva3z6byqyq3kfl1";

45814581 };

45824582 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

45834583 };

@@ -4620,36 +4620,36 @@ final: prev:

46204620

46214621 nvim-autopairs = buildVimPluginFrom2Nix {

46224622 pname = "nvim-autopairs";

4623− version = "2022-04-28";

4623+ version = "2022-04-13";

46244624 src = fetchFromGitHub {

46254625 owner = "windwp";

46264626 repo = "nvim-autopairs";

4627− rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb";

4628− sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y";

4627+ rev = "38d486a1c47ae2722a78cf569008de0a64f4b153";

4628+ sha256 = "0qka37c8ikcqvbjq0n0kxgm8l30jy3aixs5i00a25wcwxj40kzxv";

46294629 };

46304630 meta.homepage = "https://github.com/windwp/nvim-autopairs/";

46314631 };

46324632

46334633 nvim-base16 = buildVimPluginFrom2Nix {

46344634 pname = "nvim-base16";

4635− version = "2022-04-25";

4635+ version = "2022-03-28";

46364636 src = fetchFromGitHub {

46374637 owner = "RRethy";

46384638 repo = "nvim-base16";

4639− rev = "70fe3102158b2765d5bba46f398bd4213997936f";

4640− sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57";

4639+ rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776";

4640+ sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z";

46414641 };

46424642 meta.homepage = "https://github.com/RRethy/nvim-base16/";

46434643 };

46444644

46454645 nvim-bqf = buildVimPluginFrom2Nix {

46464646 pname = "nvim-bqf";

4647− version = "2022-04-30";

4647+ version = "2022-04-18";

46484648 src = fetchFromGitHub {

46494649 owner = "kevinhwang91";

46504650 repo = "nvim-bqf";

4651− rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70";

4652− sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk";

4651+ rev = "3dbd349cf75cb23c7d1575b235ee57ecbe665d9d";

4652+ sha256 = "12nlfz0imx6i6w8jc4pw5czyfzr8m2mhlmql10i5hdncqi9ggaar";

46534653 };

46544654 meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";

46554655 };

@@ -4680,12 +4680,12 @@ final: prev:

46804680

46814681 nvim-cmp = buildVimPluginFrom2Nix {

46824682 pname = "nvim-cmp";

4683− version = "2022-05-02";

4683+ version = "2022-04-20";

46844684 src = fetchFromGitHub {

46854685 owner = "hrsh7th";

46864686 repo = "nvim-cmp";

4687− rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4";

4688− sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq";

4687+ rev = "f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9";

4688+ sha256 = "11f53yic8j3iqd4yb0gy2d54vscqqll4lcqqcj1rp195vdd476ak";

46894689 };

46904690 meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

46914691 };

@@ -4776,24 +4776,24 @@ final: prev:

47764776

47774777 nvim-dap-ui = buildVimPluginFrom2Nix {

47784778 pname = "nvim-dap-ui";

4779− version = "2022-04-29";

4779+ version = "2022-04-17";

47804780 src = fetchFromGitHub {

47814781 owner = "rcarriga";

47824782 repo = "nvim-dap-ui";

4783− rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2";

4784− sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm";

4783+ rev = "f136bb253f6811984369a20924251bcbfe00a5cd";

4784+ sha256 = "00nxdgsxa3yc0ifsmbs8d1s428p37x3ax3rlxacs983f5xlgmizq";

47854785 };

47864786 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

47874787 };

47884788

47894789 nvim-dap-virtual-text = buildVimPluginFrom2Nix {

47904790 pname = "nvim-dap-virtual-text";

4791− version = "2022-04-30";

4791+ version = "2022-04-19";

47924792 src = fetchFromGitHub {

47934793 owner = "theHamsta";

47944794 repo = "nvim-dap-virtual-text";

4795− rev = "9b731b9748d243b60e61eecbe2d114c39554486e";

4796− sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9";

4795+ rev = "1c3560ecfe8a865118efe7092308abe9e8b0ae68";

4796+ sha256 = "1piz5qxymc2igqdscc3cvvympxrgmxd1ybsnqy13l7ycmknkp9hd";

47974797 };

47984798 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";

47994799 };

@@ -4836,36 +4836,36 @@ final: prev:

48364836

48374837 nvim-gdb = buildVimPluginFrom2Nix {

48384838 pname = "nvim-gdb";

4839− version = "2022-05-02";

4839+ version = "2021-12-09";

48404840 src = fetchFromGitHub {

48414841 owner = "sakhnik";

48424842 repo = "nvim-gdb";

4843− rev = "d064ee481b2aec86133ebcd514c835a28776f9c5";

4844− sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi";

4843+ rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608";

4844+ sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i";

48454845 };

48464846 meta.homepage = "https://github.com/sakhnik/nvim-gdb/";

48474847 };

48484848

48494849 nvim-gps = buildVimPluginFrom2Nix {

48504850 pname = "nvim-gps";

4851− version = "2022-04-30";

4851+ version = "2022-04-19";

48524852 src = fetchFromGitHub {

48534853 owner = "smiteshp";

48544854 repo = "nvim-gps";

4855− rev = "9552418fcbb9587025f4bd38364259b3888f582b";

4856− sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4";

4855+ rev = "944ea6e7244a839452ab721515141ea9208c0536";

4856+ sha256 = "0i3mjk9n9czpadzpwp2wx1640h5sl51cjgnggrm8rg9qxj5108g7";

48574857 };

48584858 meta.homepage = "https://github.com/smiteshp/nvim-gps/";

48594859 };

48604860

48614861 nvim-highlite = buildVimPluginFrom2Nix {

48624862 pname = "nvim-highlite";

4863− version = "2022-04-29";

4863+ version = "2022-04-18";

48644864 src = fetchFromGitHub {

48654865 owner = "Iron-E";

48664866 repo = "nvim-highlite";

4867− rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665";

4868− sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9";

4867+ rev = "e46cb5695b8457403488ad44b5379421c0c5dc17";

4868+ sha256 = "0343pk8wylms0lnrpa0a5x2ig97an2ps64fgjpa8n85ng1z49z97";

48694869 };

48704870 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

48714871 };

@@ -4896,12 +4896,12 @@ final: prev:

48964896

48974897 nvim-jdtls = buildVimPluginFrom2Nix {

48984898 pname = "nvim-jdtls";

4899− version = "2022-04-29";

4899+ version = "2022-04-14";

49004900 src = fetchFromGitHub {

49014901 owner = "mfussenegger";

49024902 repo = "nvim-jdtls";

4903− rev = "9010412f7de118168d2fe4ba97b578d0d76cc500";

4904− sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67";

4903+ rev = "ffb08466d51f717775d85e7e334ac83156c0ca98";

4904+ sha256 = "1rlnidcn8zww6lvqx1syw2331i2gn67765cip2pz5rh8mbv4l67x";

49054905 };

49064906 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";

49074907 };

@@ -4920,12 +4920,12 @@ final: prev:

49204920

49214921 nvim-lightbulb = buildVimPluginFrom2Nix {

49224922 pname = "nvim-lightbulb";

4923− version = "2022-05-02";

4923+ version = "2022-02-24";

49244924 src = fetchFromGitHub {

49254925 owner = "kosayoda";

49264926 repo = "nvim-lightbulb";

4927− rev = "407f05c71f757f09f775229d5709a3592f1a6910";

4928− sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9";

4927+ rev = "29ca81408119ba809d1f922edc941868af97ee86";

4928+ sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";

49294929 };

49304930 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

49314931 };

@@ -4944,12 +4944,12 @@ final: prev:

49444944

49454945 nvim-lint = buildVimPluginFrom2Nix {

49464946 pname = "nvim-lint";

4947− version = "2022-05-02";

4947+ version = "2022-04-18";

49484948 src = fetchFromGitHub {

49494949 owner = "mfussenegger";

49504950 repo = "nvim-lint";

4951− rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba";

4952− sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d";

4951+ rev = "e5416bdb27a0e61cd213850646534a18bb2ba61d";

4952+ sha256 = "1qrjpx99pb67yccvmb66ahcaa7wk9z6s9zvaxm5fpbm1xasci1mz";

49534953 };

49544954 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";

49554955 };

@@ -4968,12 +4968,12 @@ final: prev:

49684968

49694969 nvim-lspconfig = buildVimPluginFrom2Nix {

49704970 pname = "nvim-lspconfig";

4971− version = "2022-04-28";

4971+ version = "2022-04-17";

49724972 src = fetchFromGitHub {

49734973 owner = "neovim";

49744974 repo = "nvim-lspconfig";

4975− rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd";

4976− sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn";

4975+ rev = "ad9903c66bac88f344890acb6532f63f1cd4dac3";

4976+ sha256 = "10fg52g53yk0d10rm96kw907wdkgqw762ib6530zrnw7p8fbm2ms";

49774977 };

49784978 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

49794979 };

@@ -4992,24 +4992,24 @@ final: prev:

49924992

49934993 nvim-metals = buildVimPluginFrom2Nix {

49944994 pname = "nvim-metals";

4995− version = "2022-04-27";

4995+ version = "2022-04-16";

49964996 src = fetchFromGitHub {

49974997 owner = "scalameta";

49984998 repo = "nvim-metals";

4999− rev = "6bc7681b489b04feff394f832984d14510e97e47";

5000− sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx";

4999+ rev = "bc6f2ba6d6b2c5ffd65b41f3df74761a90e538da";

5000+ sha256 = "0fk41l2jmlhrylc9xbh4h9a35j106r0lr7rd0i2lp0acqai629qg";

50015001 };

50025002 meta.homepage = "https://github.com/scalameta/nvim-metals/";

50035003 };

50045004

50055005 nvim-neoclip-lua = buildVimPluginFrom2Nix {

50065006 pname = "nvim-neoclip.lua";

5007− version = "2022-04-29";

5007+ version = "2022-04-06";

50085008 src = fetchFromGitHub {

50095009 owner = "AckslD";

50105010 repo = "nvim-neoclip.lua";

5011− rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11";

5012− sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4";

5011+ rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e";

5012+ sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46";

50135013 };

50145014 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";

50155015 };

@@ -5028,12 +5028,12 @@ final: prev:

50285028

50295029 nvim-notify = buildVimPluginFrom2Nix {

50305030 pname = "nvim-notify";

5031− version = "2022-05-01";

5031+ version = "2022-04-17";

50325032 src = fetchFromGitHub {

50335033 owner = "rcarriga";

50345034 repo = "nvim-notify";

5035− rev = "ebe78bea13b60640816658ae798a199bd5118eb1";

5036− sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp";

5035+ rev = "2c8f744de34c72a5a1fabcc66da11aa017ffab88";

5036+ sha256 = "1yc98fv30fvkjb7d8acjqvl8kai1hz0mslp04n1d2069q0n6k08n";

50375037 };

50385038 meta.homepage = "https://github.com/rcarriga/nvim-notify/";

50395039 };

@@ -5100,24 +5100,24 @@ final: prev:

51005100

51015101 nvim-tree-lua = buildVimPluginFrom2Nix {

51025102 pname = "nvim-tree.lua";

5103− version = "2022-05-01";

5103+ version = "2022-04-18";

51045104 src = fetchFromGitHub {

51055105 owner = "kyazdani42";

51065106 repo = "nvim-tree.lua";

5107− rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3";

5108− sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr";

5107+ rev = "0f0f858348aacc94f98ba32880760c5a5440b825";

5108+ sha256 = "1ciir7h9s0g9i62b49swa8c8cgjqg4lz6zapkj5a8gqxqa10qh23";

51095109 };

51105110 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

51115111 };

51125112

51135113 nvim-treesitter = buildVimPluginFrom2Nix {

51145114 pname = "nvim-treesitter";

5115− version = "2022-05-01";

5115+ version = "2022-04-19";

51165116 src = fetchFromGitHub {

51175117 owner = "nvim-treesitter";

51185118 repo = "nvim-treesitter";

5119− rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b";

5120− sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r";

5119+ rev = "62fa8f77c43ed3a4ac2bbdfa4327f6b4a835bbea";

5120+ sha256 = "0cq0zbs9a52wx84ivpna4qw67dlz7i9nw6mln8948qadnzk1960r";

51215121 };

51225122 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

51235123 };

@@ -5160,24 +5160,24 @@ final: prev:

51605160

51615161 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

51625162 pname = "nvim-treesitter-textobjects";

5163− version = "2022-04-21";

5163+ version = "2022-04-15";

51645164 src = fetchFromGitHub {

51655165 owner = "nvim-treesitter";

51665166 repo = "nvim-treesitter-textobjects";

5167− rev = "094e8ad3cc839e825f8dcc91352837653e365a8f";

5168− sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz";

5167+ rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d";

5168+ sha256 = "09bpgd0fqpcwifs2wna1lqyrfn4rmp2gfan4635lwjp4sixj52vc";

51695169 };

51705170 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

51715171 };

51725172

51735173 nvim-ts-autotag = buildVimPluginFrom2Nix {

51745174 pname = "nvim-ts-autotag";

5175− version = "2022-04-22";

5175+ version = "2022-03-04";

51765176 src = fetchFromGitHub {

51775177 owner = "windwp";

51785178 repo = "nvim-ts-autotag";

5179− rev = "044a05c4c51051326900a53ba98fddacd15fea22";

5180− sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2";

5179+ rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2";

5180+ sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1";

51815181 };

51825182 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

51835183 };

@@ -5196,24 +5196,24 @@ final: prev:

51965196

51975197 nvim-ts-rainbow = buildVimPluginFrom2Nix {

51985198 pname = "nvim-ts-rainbow";

5199− version = "2022-04-24";

5199+ version = "2022-04-17";

52005200 src = fetchFromGitHub {

52015201 owner = "p00f";

52025202 repo = "nvim-ts-rainbow";

5203− rev = "a7767e2a1761078abb97f6516e45c56147e0952e";

5204− sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";

5203+ rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0";

5204+ sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3";

52055205 };

52065206 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

52075207 };

52085208

52095209 nvim-web-devicons = buildVimPluginFrom2Nix {

52105210 pname = "nvim-web-devicons";

5211− version = "2022-05-01";

5211+ version = "2022-03-22";

52125212 src = fetchFromGitHub {

52135213 owner = "kyazdani42";

52145214 repo = "nvim-web-devicons";

5215− rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f";

5216− sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5";

5215+ rev = "09e62319974d7d7ec7e53b974724f7942470ef78";

5216+ sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq";

52175217 };

52185218 meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";

52195219 };

@@ -5256,12 +5256,12 @@ final: prev:

52565256

52575257 nvimdev-nvim = buildVimPluginFrom2Nix {

52585258 pname = "nvimdev.nvim";

5259− version = "2022-04-24";

5259+ version = "2022-04-11";

52605260 src = fetchFromGitHub {

52615261 owner = "neovim";

52625262 repo = "nvimdev.nvim";

5263− rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9";

5264− sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4";

5263+ rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7";

5264+ sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz";

52655265 };

52665266 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";

52675267 };

@@ -5292,12 +5292,12 @@ final: prev:

52925292

52935293 octo-nvim = buildVimPluginFrom2Nix {

52945294 pname = "octo.nvim";

5295− version = "2022-04-26";

5295+ version = "2022-04-14";

52965296 src = fetchFromGitHub {

52975297 owner = "pwntester";

52985298 repo = "octo.nvim";

5299− rev = "622ab9feaa735dc0999e567183ce357f3dff080f";

5300− sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg";

5299+ rev = "0beb4de71062435ad934caba5728f7f01ae8b969";

5300+ sha256 = "01k7jl34x8wikq6ff456650wgf5f5z9z6a3ypr10a3pl8p7wfyzr";

53015301 };

53025302 meta.homepage = "https://github.com/pwntester/octo.nvim/";

53035303 };

@@ -5316,12 +5316,12 @@ final: prev:

53165316

53175317 onedark-nvim = buildVimPluginFrom2Nix {

53185318 pname = "onedark.nvim";

5319− version = "2022-04-25";

5319+ version = "2022-03-23";

53205320 src = fetchFromGitHub {

53215321 owner = "navarasu";

53225322 repo = "onedark.nvim";

5323− rev = "08cde8acf181b3278dafb9c8284726104a11cc0f";

5324− sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4";

5323+ rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6";

5324+ sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6";

53255325 };

53265326 meta.homepage = "https://github.com/navarasu/onedark.nvim/";

53275327 };

@@ -5340,12 +5340,12 @@ final: prev:

53405340

53415341 onedarkpro-nvim = buildVimPluginFrom2Nix {

53425342 pname = "onedarkpro.nvim";

5343− version = "2022-04-26";

5343+ version = "2022-04-12";

53445344 src = fetchFromGitHub {

53455345 owner = "olimorris";

53465346 repo = "onedarkpro.nvim";

5347− rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7";

5348− sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433";

5347+ rev = "653b5d729cb2c14c564cf5ab2145e2e24354a2ba";

5348+ sha256 = "1xw49fliqalz18nj0pa81xsx1d9zwphdzcai503m1bn2m2nclp6h";

53495349 };

53505350 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

53515351 };

@@ -5388,12 +5388,12 @@ final: prev:

53885388

53895389 orgmode = buildVimPluginFrom2Nix {

53905390 pname = "orgmode";

5391− version = "2022-05-02";

5391+ version = "2022-04-20";

53925392 src = fetchFromGitHub {

53935393 owner = "nvim-orgmode";

53945394 repo = "orgmode";

5395− rev = "1a52ca239c726d62104fad012472c28a00cdcc22";

5396− sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz";

5395+ rev = "8cd85f7afabef643db6b5d3dc01942870e71533d";

5396+ sha256 = "16rkvz8x6rvapyq7grch77j0wd5pnhjwv932v72ai6gy940d56l2";

53975397 };

53985398 meta.homepage = "https://github.com/nvim-orgmode/orgmode/";

53995399 };

@@ -5436,12 +5436,12 @@ final: prev:

54365436

54375437 papercolor-theme = buildVimPluginFrom2Nix {

54385438 pname = "papercolor-theme";

5439− version = "2022-04-30";

5439+ version = "2022-03-24";

54405440 src = fetchFromGitHub {

54415441 owner = "NLKNguyen";

54425442 repo = "papercolor-theme";

5443− rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c";

5444− sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c";

5443+ rev = "afde171829b1416125bf07a81fc28e4490aa91b2";

5444+ sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d";

54455445 };

54465446 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

54475447 };

@@ -5520,17 +5520,17 @@ final: prev:

55205520

55215521 playground = buildVimPluginFrom2Nix {

55225522 pname = "playground";

5523− version = "2022-05-01";

5523+ version = "2022-04-08";

55245524 src = fetchFromGitHub {

55255525 owner = "nvim-treesitter";

55265526 repo = "playground";

5527− rev = "71b00a3c665298e5155ad64a9020135808d4e3e8";

5528− sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8";

5527+ rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00";

5528+ sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns";

55295529 };

55305530 meta.homepage = "https://github.com/nvim-treesitter/playground/";

55315531 };

55325532

5533− plenary-nvim = buildNeovimPluginFrom2Nix {

5533+ plenary-nvim = buildVimPluginFrom2Nix {

55345534 pname = "plenary.nvim";

55355535 version = "2022-04-17";

55365536 src = fetchFromGitHub {

@@ -5617,12 +5617,12 @@ final: prev:

56175617

56185618 project-nvim = buildVimPluginFrom2Nix {

56195619 pname = "project.nvim";

5620− version = "2022-04-25";

5620+ version = "2022-01-19";

56215621 src = fetchFromGitHub {

56225622 owner = "ahmedkhalf";

56235623 repo = "project.nvim";

5624− rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77";

5625− sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w";

5624+ rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988";

5625+ sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6";

56265626 };

56275627 meta.homepage = "https://github.com/ahmedkhalf/project.nvim/";

56285628 };

@@ -5810,12 +5810,12 @@ final: prev:

58105810

58115811 refactoring-nvim = buildVimPluginFrom2Nix {

58125812 pname = "refactoring.nvim";

5813− version = "2022-04-27";

5813+ version = "2022-04-11";

58145814 src = fetchFromGitHub {

58155815 owner = "theprimeagen";

58165816 repo = "refactoring.nvim";

5817− rev = "fef309f654906d931f2c714a77f5182fe70ada7d";

5818− sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3";

5817+ rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb";

5818+ sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w";

58195819 };

58205820 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

58215821 };

@@ -5846,12 +5846,12 @@ final: prev:

58465846

58475847 rest-nvim = buildVimPluginFrom2Nix {

58485848 pname = "rest.nvim";

5849− version = "2022-05-01";

5849+ version = "2022-01-26";

58505850 src = fetchFromGitHub {

58515851 owner = "NTBBloodbath";

58525852 repo = "rest.nvim";

5853− rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef";

5854− sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0";

5853+ rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3";

5854+ sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8";

58555855 };

58565856 meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";

58575857 };

@@ -5930,12 +5930,12 @@ final: prev:

59305930

59315931 rust-tools-nvim = buildVimPluginFrom2Nix {

59325932 pname = "rust-tools.nvim";

5933− version = "2022-05-01";

5933+ version = "2022-03-26";

59345934 src = fetchFromGitHub {

59355935 owner = "simrat39";

59365936 repo = "rust-tools.nvim";

5937− rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac";

5938− sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42";

5937+ rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44";

5938+ sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h";

59395939 };

59405940 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

59415941 };

@@ -6147,12 +6147,12 @@ final: prev:

61476147

61486148 sonokai = buildVimPluginFrom2Nix {

61496149 pname = "sonokai";

6150− version = "2022-04-27";

6150+ version = "2022-04-14";

61516151 src = fetchFromGitHub {

61526152 owner = "sainnhe";

61536153 repo = "sonokai";

6154− rev = "9ad83caa675cb5160760bf85dcb951946c994572";

6155− sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh";

6154+ rev = "4f29ac457ac759286bce3bb1a34f9517c91306c9";

6155+ sha256 = "1yzyk78nb0xj5f2fnfvhrpgahg3mgx82bpw7nimvf0rd29dbpfqj";

61566156 };

61576157 meta.homepage = "https://github.com/sainnhe/sonokai/";

61586158 };

@@ -6243,12 +6243,12 @@ final: prev:

62436243

62446244 splitjoin-vim = buildVimPluginFrom2Nix {

62456245 pname = "splitjoin.vim";

6246− version = "2022-05-02";

6246+ version = "2022-04-03";

62476247 src = fetchFromGitHub {

62486248 owner = "AndrewRadev";

62496249 repo = "splitjoin.vim";

6250− rev = "64f68a641084d18903769ec138b8fab45477bd92";

6251− sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8";

6250+ rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6";

6251+ sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc";

62526252 fetchSubmodules = true;

62536253 };

62546254 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

@@ -6401,12 +6401,12 @@ final: prev:

64016401

64026402 symbols-outline-nvim = buildVimPluginFrom2Nix {

64036403 pname = "symbols-outline.nvim";

6404− version = "2022-05-01";

6404+ version = "2022-03-05";

64056405 src = fetchFromGitHub {

64066406 owner = "simrat39";

64076407 repo = "symbols-outline.nvim";

6408− rev = "15ae99c27360ab42e931be127d130611375307d5";

6409− sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi";

6408+ rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2";

6409+ sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd";

64106410 };

64116411 meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";

64126412 };

@@ -6510,12 +6510,12 @@ final: prev:

65106510

65116511 tagbar = buildVimPluginFrom2Nix {

65126512 pname = "tagbar";

6513− version = "2022-05-02";

6513+ version = "2022-04-07";

65146514 src = fetchFromGitHub {

65156515 owner = "preservim";

65166516 repo = "tagbar";

6517− rev = "a577ee4d650476243d91698f2d1228819c5fa0a5";

6518− sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85";

6517+ rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2";

6518+ sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m";

65196519 };

65206520 meta.homepage = "https://github.com/preservim/tagbar/";

65216521 };

@@ -6558,12 +6558,12 @@ final: prev:

65586558

65596559 tcomment_vim = buildVimPluginFrom2Nix {

65606560 pname = "tcomment_vim";

6561− version = "2022-04-24";

6561+ version = "2022-01-24";

65626562 src = fetchFromGitHub {

65636563 owner = "tomtom";

65646564 repo = "tcomment_vim";

6565− rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad";

6566− sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn";

6565+ rev = "3729ae43318faca94b0a1e878f9c6717b171d55e";

6566+ sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9";

65676567 };

65686568 meta.homepage = "https://github.com/tomtom/tcomment_vim/";

65696569 };

@@ -6642,12 +6642,12 @@ final: prev:

66426642

66436643 telescope-fzf-native-nvim = buildVimPluginFrom2Nix {

66446644 pname = "telescope-fzf-native.nvim";

6645− version = "2022-04-30";

6645+ version = "2022-02-19";

66466646 src = fetchFromGitHub {

66476647 owner = "nvim-telescope";

66486648 repo = "telescope-fzf-native.nvim";

6649− rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f";

6650− sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8";

6649+ rev = "8ec164b541327202e5e74f99bcc5fe5845720e18";

6650+ sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1";

66516651 };

66526652 meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";

66536653 };

@@ -6679,12 +6679,12 @@ final: prev:

66796679

66806680 telescope-github-nvim = buildVimPluginFrom2Nix {

66816681 pname = "telescope-github.nvim";

6682− version = "2022-04-22";

6682+ version = "2022-04-06";

66836683 src = fetchFromGitHub {

66846684 owner = "nvim-telescope";

66856685 repo = "telescope-github.nvim";

6686− rev = "ee95c509901c3357679e9f2f9eaac3561c811736";

6687− sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2";

6686+ rev = "c66aee748d572961af0e6ad5130b994343f922a7";

6687+ sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz";

66886688 };

66896689 meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";

66906690 };

@@ -6703,12 +6703,12 @@ final: prev:

67036703

67046704 telescope-project-nvim = buildVimPluginFrom2Nix {

67056705 pname = "telescope-project.nvim";

6706− version = "2022-04-28";

6706+ version = "2022-01-23";

67076707 src = fetchFromGitHub {

67086708 owner = "nvim-telescope";

67096709 repo = "telescope-project.nvim";

6710− rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae";

6711− sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7";

6710+ rev = "d317c3cef6917d650d9a638c627b54d3e1173031";

6711+ sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7";

67126712 };

67136713 meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";

67146714 };

@@ -6727,12 +6727,12 @@ final: prev:

67276727

67286728 telescope-ui-select-nvim = buildVimPluginFrom2Nix {

67296729 pname = "telescope-ui-select.nvim";

6730− version = "2022-04-30";

6730+ version = "2022-03-20";

67316731 src = fetchFromGitHub {

67326732 owner = "nvim-telescope";

67336733 repo = "telescope-ui-select.nvim";

6734− rev = "62ea5e58c7bbe191297b983a9e7e89420f581369";

6735− sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw";

6734+ rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939";

6735+ sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb";

67366736 };

67376737 meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";

67386738 };

@@ -6787,12 +6787,12 @@ final: prev:

67876787

67886788 telescope-nvim = buildVimPluginFrom2Nix {

67896789 pname = "telescope.nvim";

6790− version = "2022-05-02";

6790+ version = "2022-04-18";

67916791 src = fetchFromGitHub {

67926792 owner = "nvim-telescope";

67936793 repo = "telescope.nvim";

6794− rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe";

6795− sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn";

6794+ rev = "6e7ed1b9638f09661fcb3a6db68f3ad77c8036be";

6795+ sha256 = "11p5byic4qb9cgaffnrwa4s0qdzvxl6313phz5qdll78hwjw2fmy";

67966796 };

67976797 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

67986798 };

@@ -6968,12 +6968,12 @@ final: prev:

69686968

69696969 toggleterm-nvim = buildVimPluginFrom2Nix {

69706970 pname = "toggleterm.nvim";

6971− version = "2022-04-25";

6971+ version = "2022-04-18";

69726972 src = fetchFromGitHub {

69736973 owner = "akinsho";

69746974 repo = "toggleterm.nvim";

6975− rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6";

6976− sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131";

6975+ rev = "dca8f4d9516270cb41c147ed692f3ee420c5e515";

6976+ sha256 = "0ajypqnx9kglqh5h3vwyy9ccmazq8gjgb84hjrabr9hgvcnyj5hq";

69776977 };

69786978 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";

69796979 };

@@ -7088,12 +7088,12 @@ final: prev:

70887088

70897089 ultisnips = buildVimPluginFrom2Nix {

70907090 pname = "ultisnips";

7091− version = "2022-04-23";

7091+ version = "2022-04-19";

70927092 src = fetchFromGitHub {

70937093 owner = "SirVer";

70947094 repo = "ultisnips";

7095− rev = "f5ccf0977c611ffd774ca180774959301baaffad";

7096− sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb";

7095+ rev = "e1ae43e44fb6b53144a5a8703a3d6cf10492a4a0";

7096+ sha256 = "1rzhv8dma9ijf6g9z5drbi45bngzh4ccr3h4i0b8x3w4ab97p17q";

70977097 };

70987098 meta.homepage = "https://github.com/SirVer/ultisnips/";

70997099 };

@@ -7136,12 +7136,12 @@ final: prev:

71367136

71377137 urlview-nvim = buildVimPluginFrom2Nix {

71387138 pname = "urlview.nvim";

7139− version = "2022-04-25";

7139+ version = "2022-04-20";

71407140 src = fetchFromGitHub {

71417141 owner = "axieax";

71427142 repo = "urlview.nvim";

7143− rev = "3b637651d5f0de185a0ceac783582692e204b053";

7144− sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4";

7143+ rev = "fcd59fc3a49e75993c3828c49df18bf3da51f45d";

7144+ sha256 = "16y3hicljn9y60jzvq7xmhhp7r3y0v5v4f1i16hj65rly96wziq7";

71457145 };

71467146 meta.homepage = "https://github.com/axieax/urlview.nvim/";

71477147 };

@@ -7184,12 +7184,12 @@ final: prev:

71847184

71857185 venn-nvim = buildVimPluginFrom2Nix {

71867186 pname = "venn.nvim";

7187− version = "2022-04-27";

7187+ version = "2021-10-19";

71887188 src = fetchFromGitHub {

71897189 owner = "jbyuki";

71907190 repo = "venn.nvim";

7191− rev = "71856b548e3206e33bad10acea294ca8b44327ee";

7192− sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc";

7191+ rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f";

7192+ sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06";

71937193 };

71947194 meta.homepage = "https://github.com/jbyuki/venn.nvim/";

71957195 };

@@ -7688,12 +7688,12 @@ final: prev:

76887688

76897689 vim-autoformat = buildVimPluginFrom2Nix {

76907690 pname = "vim-autoformat";

7691− version = "2022-04-21";

7691+ version = "2021-11-07";

76927692 src = fetchFromGitHub {

76937693 owner = "vim-autoformat";

76947694 repo = "vim-autoformat";

7695− rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9";

7696− sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p";

7695+ rev = "bb11f30377985e45e2eecef570856d42dbabb8b0";

7696+ sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087";

76977697 };

76987698 meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";

76997699 };

@@ -7880,12 +7880,12 @@ final: prev:

78807880

78817881 vim-ccls = buildVimPluginFrom2Nix {

78827882 pname = "vim-ccls";

7883− version = "2022-04-23";

7883+ version = "2022-01-29";

78847884 src = fetchFromGitHub {

78857885 owner = "m-pilia";

78867886 repo = "vim-ccls";

7887− rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424";

7888− sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08";

7887+ rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886";

7888+ sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k";

78897889 };

78907890 meta.homepage = "https://github.com/m-pilia/vim-ccls/";

78917891 };

@@ -7916,12 +7916,12 @@ final: prev:

79167916

79177917 vim-clap = buildVimPluginFrom2Nix {

79187918 pname = "vim-clap";

7919− version = "2022-04-27";

7919+ version = "2022-04-08";

79207920 src = fetchFromGitHub {

79217921 owner = "liuchengxu";

79227922 repo = "vim-clap";

7923− rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15";

7924− sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5";

7923+ rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44";

7924+ sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65";

79257925 };

79267926 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

79277927 };

@@ -8204,12 +8204,12 @@ final: prev:

82048204

82058205 vim-dadbod-ui = buildVimPluginFrom2Nix {

82068206 pname = "vim-dadbod-ui";

8207− version = "2022-05-02";

8207+ version = "2022-03-06";

82088208 src = fetchFromGitHub {

82098209 owner = "kristijanhusak";

82108210 repo = "vim-dadbod-ui";

8211− rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7";

8212− sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw";

8211+ rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37";

8212+ sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q";

82138213 };

82148214 meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";

82158215 };

@@ -8276,12 +8276,12 @@ final: prev:

82768276

82778277 vim-dirvish = buildVimPluginFrom2Nix {

82788278 pname = "vim-dirvish";

8279− version = "2022-04-26";

8279+ version = "2022-03-27";

82808280 src = fetchFromGitHub {

82818281 owner = "justinmk";

82828282 repo = "vim-dirvish";

8283− rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00";

8284− sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y";

8283+ rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3";

8284+ sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq";

82858285 };

82868286 meta.homepage = "https://github.com/justinmk/vim-dirvish/";

82878287 };

@@ -8492,24 +8492,24 @@ final: prev:

84928492

84938493 vim-erlang-tags = buildVimPluginFrom2Nix {

84948494 pname = "vim-erlang-tags";

8495− version = "2022-04-02";

8495+ version = "2021-02-19";

84968496 src = fetchFromGitHub {

84978497 owner = "vim-erlang";

84988498 repo = "vim-erlang-tags";

8499− rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139";

8500− sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw";

8499+ rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611";

8500+ sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0";

85018501 };

85028502 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";

85038503 };

85048504

85058505 vim-eunuch = buildVimPluginFrom2Nix {

85068506 pname = "vim-eunuch";

8507− version = "2022-05-01";

8507+ version = "2022-04-19";

85088508 src = fetchFromGitHub {

85098509 owner = "tpope";

85108510 repo = "vim-eunuch";

8511− rev = "73b5e3fccfb5295e38546318c0d3139874c25efb";

8512− sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2";

8511+ rev = "c1ee64a9775b4adff8d4e052b158f380682bc249";

8512+ sha256 = "17m1632a4nwilg0d29gx7gsng8f1w82q049iynm4gy1aqczlwgxh";

85138513 };

85148514 meta.homepage = "https://github.com/tpope/vim-eunuch/";

85158515 };

@@ -8588,12 +8588,12 @@ final: prev:

85888588

85898589 vim-flagship = buildVimPluginFrom2Nix {

85908590 pname = "vim-flagship";

8591− version = "2022-04-21";

8591+ version = "2021-12-07";

85928592 src = fetchFromGitHub {

85938593 owner = "tpope";

85948594 repo = "vim-flagship";

8595− rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b";

8596− sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06";

8595+ rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087";

8596+ sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp";

85978597 };

85988598 meta.homepage = "https://github.com/tpope/vim-flagship/";

85998599 };

@@ -8696,12 +8696,12 @@ final: prev:

86968696

86978697 vim-fugitive = buildVimPluginFrom2Nix {

86988698 pname = "vim-fugitive";

8699− version = "2022-04-26";

8699+ version = "2022-04-14";

87008700 src = fetchFromGitHub {

87018701 owner = "tpope";

87028702 repo = "vim-fugitive";

8703− rev = "b7287bd5421da62986d9abf9131509b2c9f918e4";

8704− sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz";

8703+ rev = "4b0f2b604562e9681ae3b80c2665f168ac637cea";

8704+ sha256 = "0amph3kjqq0hl74akpp5czjw2gk6mh6l2zz113mrb95nri0bz73q";

87058705 };

87068706 meta.homepage = "https://github.com/tpope/vim-fugitive/";

87078707 };

@@ -8792,12 +8792,12 @@ final: prev:

87928792

87938793 vim-gitgutter = buildVimPluginFrom2Nix {

87948794 pname = "vim-gitgutter";

8795− version = "2022-04-25";

8795+ version = "2022-04-15";

87968796 src = fetchFromGitHub {

87978797 owner = "airblade";

87988798 repo = "vim-gitgutter";

8799− rev = "988a6dbad9a9777cd94aab18ba7821a41068685b";

8800− sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi";

8799+ rev = "d5bae104031bb1633cb5c5178dc7d4ac422b422a";

8800+ sha256 = "1k6bn3wm9chaqhkaw382169ia5ycbbnw00hwyaabx7fbzc8zf7zw";

88018801 };

88028802 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

88038803 };

@@ -8840,12 +8840,12 @@ final: prev:

88408840

88418841 vim-go = buildVimPluginFrom2Nix {

88428842 pname = "vim-go";

8843− version = "2022-04-23";

8843+ version = "2022-04-15";

88448844 src = fetchFromGitHub {

88458845 owner = "fatih";

88468846 repo = "vim-go";

8847− rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308";

8848− sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7";

8847+ rev = "687eb72bb6e84012ef2b0b2474175e46243e43b0";

8848+ sha256 = "0llf81fh166xvdvy0vj93a964hp2clb3lqdy2sp3fhzldzyv0bab";

88498849 };

88508850 meta.homepage = "https://github.com/fatih/vim-go/";

88518851 };

@@ -9538,24 +9538,24 @@ final: prev:

95389538

95399539 vim-lsc = buildVimPluginFrom2Nix {

95409540 pname = "vim-lsc";

9541− version = "2022-04-30";

9541+ version = "2021-04-28";

95429542 src = fetchFromGitHub {

95439543 owner = "natebosch";

95449544 repo = "vim-lsc";

9545− rev = "39ec72353c2170db2caf797072800c513647e9c5";

9546− sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx";

9545+ rev = "4b0fc48037c628f14209f30616a19287d9e54823";

9546+ sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv";

95479547 };

95489548 meta.homepage = "https://github.com/natebosch/vim-lsc/";

95499549 };

95509550

95519551 vim-lsp = buildVimPluginFrom2Nix {

95529552 pname = "vim-lsp";

9553− version = "2022-04-21";

9553+ version = "2022-04-17";

95549554 src = fetchFromGitHub {

95559555 owner = "prabirshrestha";

95569556 repo = "vim-lsp";

9557− rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d";

9558− sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy";

9557+ rev = "8df4aa40191717b34f5da8d3c8e90dc0f1f62e0b";

9558+ sha256 = "0nx63rn86cjprwbvqpzarxxn1id6jndvww9n10ssdf5cfkw697b7";

95599559 };

95609560 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

95619561 };

@@ -9586,12 +9586,12 @@ final: prev:

95869586

95879587 vim-maktaba = buildVimPluginFrom2Nix {

95889588 pname = "vim-maktaba";

9589− version = "2022-04-22";

9589+ version = "2021-08-09";

95909590 src = fetchFromGitHub {

95919591 owner = "google";

95929592 repo = "vim-maktaba";

9593− rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb";

9594− sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8";

9593+ rev = "f5127b339a9d776f220cc0393783c55def9d8ce0";

9594+ sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg";

95959595 };

95969596 meta.homepage = "https://github.com/google/vim-maktaba/";

95979597 };

@@ -9610,24 +9610,24 @@ final: prev:

96109610

96119611 vim-markbar = buildVimPluginFrom2Nix {

96129612 pname = "vim-markbar";

9613− version = "2022-04-27";

9613+ version = "2020-08-31";

96149614 src = fetchFromGitHub {

96159615 owner = "Yilin-Yang";

96169616 repo = "vim-markbar";

9617− rev = "b9b87339bca7572ffc506165069242b6c06c210b";

9618− sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59";

9617+ rev = "df13c3abe88c01a716b1099de953dcfa1679e663";

9618+ sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9";

96199619 };

96209620 meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";

96219621 };

96229622

96239623 vim-markdown = buildVimPluginFrom2Nix {

96249624 pname = "vim-markdown";

9625− version = "2022-04-26";

9625+ version = "2022-04-13";

96269626 src = fetchFromGitHub {

96279627 owner = "preservim";

96289628 repo = "vim-markdown";

9629− rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3";

9630− sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf";

9629+ rev = "c031a3e65c50d6aa0bfc81f8be9d248f9644426d";

9630+ sha256 = "0l8ginadb4jxnrggd1lvia8kan397x02jf3v6sgkcyxawwpgfl0x";

96319631 };

96329632 meta.homepage = "https://github.com/preservim/vim-markdown/";

96339633 };

@@ -9659,12 +9659,12 @@ final: prev:

96599659

96609660 vim-matchup = buildVimPluginFrom2Nix {

96619661 pname = "vim-matchup";

9662− version = "2022-04-20";

9662+ version = "2022-04-19";

96639663 src = fetchFromGitHub {

96649664 owner = "andymass";

96659665 repo = "vim-matchup";

9666− rev = "1cb069f2a526682b3ce69610cf7c05511295ad37";

9667− sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1";

9666+ rev = "bb04f9fa64b96bd3d6c4c146c6f9c55a69587fac";

9667+ sha256 = "1wrgxsdv3q2px0q7w6jf5dnj2abr0vf1pfq5f53zq784h08m07hq";

96689668 };

96699669 meta.homepage = "https://github.com/andymass/vim-matchup/";

96709670 };

@@ -9863,12 +9863,12 @@ final: prev:

98639863

98649864 vim-nix = buildVimPluginFrom2Nix {

98659865 pname = "vim-nix";

9866− version = "2022-04-25";

9866+ version = "2021-05-28";

98679867 src = fetchFromGitHub {

98689868 owner = "LnL7";

98699869 repo = "vim-nix";

9870− rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee";

9871− sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av";

9870+ rev = "63b47b39c8d481ebca3092822ca8972e08df769b";

9871+ sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361";

98729872 };

98739873 meta.homepage = "https://github.com/LnL7/vim-nix/";

98749874 };

@@ -10211,12 +10211,12 @@ final: prev:

1021110211

1021210212 vim-plug = buildVimPluginFrom2Nix {

1021310213 pname = "vim-plug";

10214− version = "2022-04-21";

10214+ version = "2022-04-04";

1021510215 src = fetchFromGitHub {

1021610216 owner = "junegunn";

1021710217 repo = "vim-plug";

10218− rev = "be55ec46b5ab031805487a9c3e895db57f53010b";

10219− sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh";

10218+ rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe";

10219+ sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv";

1022010220 };

1022110221 meta.homepage = "https://github.com/junegunn/vim-plug/";

1022210222 };

@@ -10235,12 +10235,12 @@ final: prev:

1023510235

1023610236 vim-polyglot = buildVimPluginFrom2Nix {

1023710237 pname = "vim-polyglot";

10238− version = "2022-04-30";

10238+ version = "2022-04-18";

1023910239 src = fetchFromGitHub {

1024010240 owner = "sheerun";

1024110241 repo = "vim-polyglot";

10242− rev = "38282d58387cff48ac203f6912c05e4c8686141b";

10243− sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569";

10242+ rev = "db7bb8ba22f5798bf3abe9f786bc6e6d002725f8";

10243+ sha256 = "1fjy26ncql66fn7jdmggkndad1ib9csblvyq42sq9qcdci0lb9jx";

1024410244 };

1024510245 meta.homepage = "https://github.com/sheerun/vim-polyglot/";

1024610246 };

@@ -10307,12 +10307,12 @@ final: prev:

1030710307

1030810308 vim-projectionist = buildVimPluginFrom2Nix {

1030910309 pname = "vim-projectionist";

10310− version = "2022-04-27";

10310+ version = "2022-04-19";

1031110311 src = fetchFromGitHub {

1031210312 owner = "tpope";

1031310313 repo = "vim-projectionist";

10314− rev = "df1e28dba36e69288173fdcdce122d98538ae782";

10315− sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq";

10314+ rev = "8fb9440ad4cea6ffea8efc3efa4d8d64e7fb9785";

10315+ sha256 = "0nlsi05r2gvmwzzrrcifvx1rq09d16mnfa3gl2qif5dgmrj7qzni";

1031610316 };

1031710317 meta.homepage = "https://github.com/tpope/vim-projectionist/";

1031810318 };

@@ -10475,12 +10475,12 @@ final: prev:

1047510475

1047610476 vim-rails = buildVimPluginFrom2Nix {

1047710477 pname = "vim-rails";

10478− version = "2022-04-27";

10478+ version = "2022-04-16";

1047910479 src = fetchFromGitHub {

1048010480 owner = "tpope";

1048110481 repo = "vim-rails";

10482− rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed";

10483− sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l";

10482+ rev = "d38f1bf8575b920042153689492721b80252ae41";

10483+ sha256 = "18c3maypsl265f3a03602mnq4lky5w786i9iaphv5x5rlnfwj8wa";

1048410484 };

1048510485 meta.homepage = "https://github.com/tpope/vim-rails/";

1048610486 };

@@ -10547,12 +10547,12 @@ final: prev:

1054710547

1054810548 vim-ruby = buildVimPluginFrom2Nix {

1054910549 pname = "vim-ruby";

10550− version = "2022-04-27";

10550+ version = "2022-03-22";

1055110551 src = fetchFromGitHub {

1055210552 owner = "vim-ruby";

1055310553 repo = "vim-ruby";

10554− rev = "811d8060f390837c49e8625e29c69672cdc56ec3";

10555− sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva";

10554+ rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1";

10555+ sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz";

1055610556 };

1055710557 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";

1055810558 };

@@ -10631,12 +10631,12 @@ final: prev:

1063110631

1063210632 vim-search-pulse = buildVimPluginFrom2Nix {

1063310633 pname = "vim-search-pulse";

10634− version = "2022-04-26";

10634+ version = "2017-01-05";

1063510635 src = fetchFromGitHub {

1063610636 owner = "inside";

1063710637 repo = "vim-search-pulse";

10638− rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445";

10639− sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx";

10638+ rev = "9f8f473e3813bd76ecb66e8d6182d96bda39b6df";

10639+ sha256 = "1xr90a8wvjfkgw1yrh0zcvpvp9ma6z0wqkl8v8pabf20vckgy2q0";

1064010640 };

1064110641 meta.homepage = "https://github.com/inside/vim-search-pulse/";

1064210642 };

@@ -10739,12 +10739,12 @@ final: prev:

1073910739

1074010740 vim-sleuth = buildVimPluginFrom2Nix {

1074110741 pname = "vim-sleuth";

10742− version = "2022-04-28";

10742+ version = "2022-04-14";

1074310743 src = fetchFromGitHub {

1074410744 owner = "tpope";

1074510745 repo = "vim-sleuth";

10746− rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8";

10747− sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs";

10746+ rev = "e116c2cc2555b09aee9b18eba405b925c8b7eaf9";

10747+ sha256 = "02ljdb3p7fp0h3nf6rxv5kgsxqdvgkwrwgb01x4xn100spkv6y6i";

1074810748 };

1074910749 meta.homepage = "https://github.com/tpope/vim-sleuth/";

1075010750 };

@@ -10835,12 +10835,12 @@ final: prev:

1083510835

1083610836 vim-snippets = buildVimPluginFrom2Nix {

1083710837 pname = "vim-snippets";

10838− version = "2022-04-30";

10838+ version = "2022-04-20";

1083910839 src = fetchFromGitHub {

1084010840 owner = "honza";

1084110841 repo = "vim-snippets";

10842− rev = "45c8e00d0bae9056713097ea655d76d463b66f10";

10843− sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd";

10842+ rev = "0decc32aad4564452c2f8a5cbfe387195f1a8bba";

10843+ sha256 = "1ycmls9xpkfzkrws2aby88zmsv1489d659sllrgmbmh04g0pq8vy";

1084410844 };

1084510845 meta.homepage = "https://github.com/honza/vim-snippets/";

1084610846 };

@@ -10979,12 +10979,12 @@ final: prev:

1097910979

1098010980 vim-surround = buildVimPluginFrom2Nix {

1098110981 pname = "vim-surround";

10982− version = "2022-04-22";

10982+ version = "2022-04-10";

1098310983 src = fetchFromGitHub {

1098410984 owner = "tpope";

1098510985 repo = "vim-surround";

10986− rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea";

10987− sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la";

10986+ rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7";

10987+ sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i";

1098810988 };

1098910989 meta.homepage = "https://github.com/tpope/vim-surround/";

1099010990 };

@@ -11340,12 +11340,12 @@ final: prev:

1134011340

1134111341 vim-unimpaired = buildVimPluginFrom2Nix {

1134211342 pname = "vim-unimpaired";

11343− version = "2022-04-29";

11343+ version = "2022-04-10";

1134411344 src = fetchFromGitHub {

1134511345 owner = "tpope";

1134611346 repo = "vim-unimpaired";

11347− rev = "98427183e2b35acee15c7628b1cd587b98025719";

11348− sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk";

11347+ rev = "80ab990c7ff7251f43262aae4b60ff6eff2ef3a4";

11348+ sha256 = "0qmxzk0vcglyrvx2hpxm6qgr6mcc1xnf6srw77ga9g0aazjr2hxc";

1134911349 };

1135011350 meta.homepage = "https://github.com/tpope/vim-unimpaired/";

1135111351 };

@@ -11424,12 +11424,12 @@ final: prev:

1142411424

1142511425 vim-vsnip = buildVimPluginFrom2Nix {

1142611426 pname = "vim-vsnip";

11427− version = "2022-04-22";

11427+ version = "2022-02-26";

1142811428 src = fetchFromGitHub {

1142911429 owner = "hrsh7th";

1143011430 repo = "vim-vsnip";

11431− rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9";

11432− sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai";

11431+ rev = "70a1131d64d75150ece513b983b0f42939bcb03c";

11432+ sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2";

1143311433 };

1143411434 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

1143511435 };

@@ -11460,12 +11460,12 @@ final: prev:

1146011460

1146111461 vim-wakatime = buildVimPluginFrom2Nix {

1146211462 pname = "vim-wakatime";

11463− version = "2022-04-29";

11463+ version = "2022-04-13";

1146411464 src = fetchFromGitHub {

1146511465 owner = "wakatime";

1146611466 repo = "vim-wakatime";

11467− rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996";

11468− sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj";

11467+ rev = "9cf2f1910d5cd7f25657176fe60b1745a310f1b3";

11468+ sha256 = "0jxkfiq5553ad7zabxlgwzwwsgwznkn0rahfmr79r1dvvqm9m1a6";

1146911469 };

1147011470 meta.homepage = "https://github.com/wakatime/vim-wakatime/";

1147111471 };

@@ -11520,12 +11520,12 @@ final: prev:

1152011520

1152111521 vim-wordmotion = buildVimPluginFrom2Nix {

1152211522 pname = "vim-wordmotion";

11523− version = "2022-04-23";

11523+ version = "2021-12-28";

1152411524 src = fetchFromGitHub {

1152511525 owner = "chaoren";

1152611526 repo = "vim-wordmotion";

11527− rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c";

11528− sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz";

11527+ rev = "0d810cc943a858a570a482055188b5e69c4c8724";

11528+ sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl";

1152911529 };

1153011530 meta.homepage = "https://github.com/chaoren/vim-wordmotion/";

1153111531 };

@@ -11748,12 +11748,12 @@ final: prev:

1174811748

1174911749 vimspector = buildVimPluginFrom2Nix {

1175011750 pname = "vimspector";

11751− version = "2022-05-01";

11751+ version = "2022-04-13";

1175211752 src = fetchFromGitHub {

1175311753 owner = "puremourning";

1175411754 repo = "vimspector";

11755− rev = "960f0444d21ebb20303e1796e4b478df042c3bd3";

11756− sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi";

11755+ rev = "ebeebc121423a5ab9a31c996f9881880b658c644";

11756+ sha256 = "0npcra2k49rz9ij4kc6dyb8dpmfi6kivpp89ggmpnd0989vn9i56";

1175711757 fetchSubmodules = true;

1175811758 };

1175911759 meta.homepage = "https://github.com/puremourning/vimspector/";

@@ -11761,12 +11761,12 @@ final: prev:

1176111761

1176211762 vimtex = buildVimPluginFrom2Nix {

1176311763 pname = "vimtex";

11764− version = "2022-05-02";

11764+ version = "2022-04-10";

1176511765 src = fetchFromGitHub {

1176611766 owner = "lervag";

1176711767 repo = "vimtex";

11768− rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898";

11769− sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c";

11768+ rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48";

11769+ sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn";

1177011770 };

1177111771 meta.homepage = "https://github.com/lervag/vimtex/";

1177211772 };

@@ -11869,12 +11869,12 @@ final: prev:

1186911869

1187011870 wilder-nvim = buildVimPluginFrom2Nix {

1187111871 pname = "wilder.nvim";

11872− version = "2022-04-23";

11872+ version = "2022-04-17";

1187311873 src = fetchFromGitHub {

1187411874 owner = "gelguy";

1187511875 repo = "wilder.nvim";

11876− rev = "777b163e394ba658ef288292efb533b25610ef9d";

11877− sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh";

11876+ rev = "a9ea0c69b37850752d5f8431b7be6bf8f1a0254c";

11877+ sha256 = "0vd01sjj4q26a653wv9icfyd7g34rnl4whbnl3ic6pvb9cvj72wk";

1187811878 };

1187911879 meta.homepage = "https://github.com/gelguy/wilder.nvim/";

1188011880 };

@@ -12038,12 +12038,12 @@ final: prev:

1203812038

1203912039 zig-vim = buildVimPluginFrom2Nix {

1204012040 pname = "zig.vim";

12041− version = "2022-05-01";

12041+ version = "2022-03-15";

1204212042 src = fetchFromGitHub {

1204312043 owner = "ziglang";

1204412044 repo = "zig.vim";

12045− rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3";

12046− sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7";

12045+ rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac";

12046+ sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4";

1204712047 };

1204812048 meta.homepage = "https://github.com/ziglang/zig.vim/";

1204912049 };

@@ -12086,12 +12086,12 @@ final: prev:

1208612086

1208712087 chad = buildVimPluginFrom2Nix {

1208812088 pname = "chad";

12089− version = "2022-05-02";

12089+ version = "2022-04-20";

1209012090 src = fetchFromGitHub {

1209112091 owner = "ms-jpq";

1209212092 repo = "chadtree";

12093− rev = "820c1913a77a12d080e3436e60a491327664589b";

12094− sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza";

12093+ rev = "d9a84322624d14c1e249e9a8a4573c9d205a9bc9";

12094+ sha256 = "16lha28fmi463snf71w0nz6ll0yiiiz7xrh2v7irkgx214q1gh6z";

1209512095 };

1209612096 meta.homepage = "https://github.com/ms-jpq/chadtree/";

1209712097 };

@@ -12122,12 +12122,12 @@ final: prev:

1212212122

1212312123 gruvbox-community = buildVimPluginFrom2Nix {

1212412124 pname = "gruvbox-community";

12125− version = "2022-04-29";

12125+ version = "2022-03-06";

1212612126 src = fetchFromGitHub {

1212712127 owner = "gruvbox-community";

1212812128 repo = "gruvbox";

12129− rev = "34ad436b234c5095d46bb065c5b32780618df83f";

12130− sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8";

12129+ rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";

12130+ sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";

1213112131 };

1213212132 meta.homepage = "https://github.com/gruvbox-community/gruvbox/";

1213312133 };

@@ -12158,12 +12158,12 @@ final: prev:

1215812158

1215912159 rose-pine = buildVimPluginFrom2Nix {

1216012160 pname = "rose-pine";

12161− version = "2022-04-25";

12161+ version = "2022-04-19";

1216212162 src = fetchFromGitHub {

1216312163 owner = "rose-pine";

1216412164 repo = "neovim";

12165− rev = "da67a549cf5d67e15618cc3001f1e07724a1597f";

12166− sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2";

12165+ rev = "758568b92e0a17c3618f71d43cce96a3a5436985";

12166+ sha256 = "0zxyyjp1527681rrw25f8vzx1d6djqac04zcay02hxi2rcnjpan5";

1216712167 };

1216812168 meta.homepage = "https://github.com/rose-pine/neovim/";

1216912169 };

@@ -12180,5 +12180,4 @@ final: prev:

1218012180 meta.homepage = "https://github.com/jhradilek/vim-snippets/";

1218112181 };

1218212182

12183−

1218412183}

pkgs/applications/editors/vim/plugins/update.py+16−47

@@ -26,24 +26,19 @@ from typing import List, Tuple

2626from pathlib import Path

2727

2828log = logging.getLogger()

29−

30−sh = logging.StreamHandler()

31−formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s')

32−sh.setFormatter(formatter)

33−log.addHandler(sh)

29+log.addHandler(logging.StreamHandler())

3430

3531# Import plugin update library from maintainers/scripts/pluginupdate.py

3632ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

3733# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree

3834sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))

3935import pluginupdate

40−from pluginupdate import run_nix_expr, PluginDesc

4136

4237GET_PLUGINS = f"""(with import <localpkgs> {{}};

4338let

44− inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

39+ inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix;

4540 generated = callPackage {ROOT}/generated.nix {{

46− inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

41+ inherit buildVimPluginFrom2Nix;

4742 }};

4843 hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;

4944 getChecksum = name: value:

@@ -55,69 +50,43 @@ let

5550 checksums = lib.mapAttrs getChecksum generated;

5651in lib.filterAttrs (n: v: v != null) checksums)"""

5752

58−GET_PLUGINS_LUA = """

59−with import <localpkgs> {};

60−lib.attrNames lua51Packages"""

61−

6253HEADER = (

6354 "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"

6455)

6556

66−def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:

67− '''

68− Whether it's a neovim-only plugin

69− We can check if it's available in lua packages

70− '''

71− global luaPlugins

72− if plug.normalized_name in luaPlugins:

73− log.debug("%s is a neovim plugin", plug)

74− return True

75− return False

76−

7757

7858class VimEditor(pluginupdate.Editor):

79− def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str):

59+ def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):

8060 sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())

8161

8262 with open(outfile, "w+") as f:

8363 f.write(HEADER)

8464 f.write(textwrap.dedent("""

85− { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

65+ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

8666

8767 final: prev:

88− {

89− """

68+ {"""

9069 ))

9170 for pdesc, plugin in sorted_plugins:

92− content = self.plugin2nix(pdesc, plugin)

93− f.write(content)

94− f.write("\n}\n")

95− print(f"updated {outfile}")

96−

97− def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str:

9871

99− repo = pdesc.repo

100− isNeovim = isNeovimPlugin(plugin)

101−

102− content = f" {plugin.normalized_name} = "

103− src_nix = repo.as_nix(plugin)

104− content += """{buildFn} {{

72+ repo = pdesc.repo

73+ src_nix = repo.as_nix(plugin)

74+ f.write(

75+ f"""

76+ {plugin.normalized_name} = buildVimPluginFrom2Nix {{

10577 pname = "{plugin.name}";

10678 version = "{plugin.version}";

10779 src = {src_nix};

10880 meta.homepage = "{repo.uri}";

10981 }};

82+"""

83+ )

84+ f.write("\n}\n")

85+ print(f"updated {outfile}")

11086

111−""".format(

112− buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)

113− print(content)

114− return content

115−

116−def main():

11787

118− global luaPlugins

119− luaPlugins = run_nix_expr(GET_PLUGINS_LUA)

12088

89+def main():

12190 editor = VimEditor("vim", ROOT, GET_PLUGINS)

12291 parser = editor.create_parser()

12392 args = parser.parse_args()

pkgs/applications/editors/vim/plugins/vim-utils.nix−5

@@ -535,11 +535,6 @@ rec {

535535 inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;

536536 }) buildVimPlugin buildVimPluginFrom2Nix;

537537

538−

539− # TODO placeholder to ease working on automatic plugin detection

540− # this should be a luarocks "flat" install with appropriate vim hooks

541− buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix;

542−

543538 # used to figure out which python dependencies etc. neovim needs

544539 requiredPlugins = {

545540 packages ? {},

pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix+1

@@ -43,6 +43,7 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens

4343 };

4444}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {

4545 nativeBuildInputs = nativeBuildInputs ++ [

46+ bash

4647 jq

4748 autoPatchelfHook

4849 makeWrapper

pkgs/applications/editors/vscode/update-vscodium.sh+12−16

@@ -14,27 +14,23 @@ if [ ! -f "$ROOT/vscodium.nix" ]; then

1414 exit 1

1515fi

1616

17−update_vscodium () {

18− VSCODIUM_VER=$1

19− ARCH=$2

20− ARCH_LONG=$3

21− ARCHIVE_FMT=$4

22− VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}"

23− VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL})

24− sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix"

25−}

26−

2717# VSCodium

2818

2919VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}')

3020sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix"

3121

32−update_vscodium $VSCODIUM_VER linux-x64 x86_64-linux tar.gz

33−

34−update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip

22+VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"

23+VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL})

24+sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix"

3525

36−update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz

26+VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"

27+VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL})

28+sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix"

3729

38−update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip

30+VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz"

31+VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL})

32+sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix"

3933

40−update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz

34+VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz"

35+VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL})

36+sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix"

pkgs/applications/editors/vscode/vscodium.nix+8−5

@@ -7,21 +7,24 @@ let

77 x86_64-linux = "linux-x64";

88 x86_64-darwin = "darwin-x64";

99 aarch64-linux = "linux-arm64";

10− aarch64-darwin = "darwin-arm64";

1110 armv7l-linux = "linux-armhf";

1211 }.${system};

1312

14− archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

13+ archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

1514

1615 sha256 = {

1716 x86_64-linux = "1i76ix318y6b2dcfnisg13bp5d7nzvcx7zcpl94mkrn974db30pn";

1817 x86_64-darwin = "1qk1vykl838vwsffyjpazx7x9ajwxczpgz5vhch16iikfz2vh1vk";

1918 aarch64-linux = "13jifiqn2v17d6vwacq6aib1lzyp2021kjdswkp7wpx6ck5lkm21";

20− aarch64-darwin = "1jgmvw52hp2zfvk6z51yni4vn7wfq63gsih42mzadg5a1b2fr9rx";

2119 armv7l-linux = "1zhriscsmfcsagsp2ds0fn316fybs5f2f2r3w5q29jwczgcnlam4";

2220 }.${system};

2321

24− sourceRoot = if stdenv.isDarwin then "" else ".";

22+ sourceRoot = {

23+ x86_64-linux = ".";

24+ x86_64-darwin = "";

25+ aarch64-linux = ".";

26+ armv7l-linux = ".";

27+ }.${system};

2528in

2629 callPackage ./generic.nix rec {

2730 inherit sourceRoot;

@@ -60,6 +63,6 @@ in

6063 downloadPage = "https://github.com/VSCodium/vscodium/releases";

6164 license = licenses.mit;

6265 maintainers = with maintainers; [ synthetica turion bobby285271 ];

63− platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];

66+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];

6467 };

6568 }

pkgs/applications/gis/qgis/unwrapped-ltr.nix+2−2

@@ -69,14 +69,14 @@ let

6969 six

7070 ];

7171in mkDerivation rec {

72− version = "3.22.6";

72+ version = "3.22.5";

7373 pname = "qgis-ltr-unwrapped";

7474

7575 src = fetchFromGitHub {

7676 owner = "qgis";

7777 repo = "QGIS";

7878 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

79− sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY=";

79+ sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o=";

8080 };

8181

8282 passthru = {

pkgs/applications/gis/qgis/unwrapped.nix+2−2

@@ -69,14 +69,14 @@ let

6969 six

7070 ];

7171in mkDerivation rec {

72− version = "3.24.2";

72+ version = "3.24.1";

7373 pname = "qgis-unwrapped";

7474

7575 src = fetchFromGitHub {

7676 owner = "qgis";

7777 repo = "QGIS";

7878 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

79− sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo=";

79+ sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg=";

8080 };

8181

8282 passthru = {

pkgs/applications/graphics/ImageMagick/7.0.nix+2−2

@@ -45,13 +45,13 @@ in

4545

4646stdenv.mkDerivation rec {

4747 pname = "imagemagick";

48− version = "7.1.0-32";

48+ version = "7.1.0-31";

4949

5050 src = fetchFromGitHub {

5151 owner = "ImageMagick";

5252 repo = "ImageMagick";

5353 rev = version;

54− hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ=";

54+ hash = "sha256-Pf+x3TnmvKTCDL3dGLyAr6JUl5E3BRi/XW/dkuCr2YA=";

5555 };

5656

5757 outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

pkgs/applications/graphics/geeqie/default.nix+2−2

@@ -1,6 +1,6 @@

11{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool

22, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida

3−, wrapGAppsHook, fetchpatch, doxygen

3+, wrapGAppsHook, fetchpatch, bash, doxygen

44, nix-update-script

55}:

66

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232

3333 nativeBuildInputs =

3434 [ pkg-config autoconf automake gettext intltool

35− wrapGAppsHook doxygen

35+ wrapGAppsHook bash doxygen

3636 ];

3737

3838 buildInputs = [

pkgs/applications/graphics/sane/backends/brscan4/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }:

1+{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:

22let

33 myPatchElf = file: with lib; ''

44 patchelf --set-interpreter \

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

2828 tar xfvz data.tar.gz

2929 '';

3030

31− nativeBuildInputs = [ makeWrapper patchelf udevRules ];

31+ nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];

3232 buildInputs = [ libusb-compat-0_1 ];

3333 dontBuild = true;

3434

pkgs/applications/graphics/sane/backends/brscan5/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:

1+{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }:

22let

33 myPatchElf = file: with lib; ''

44 patchelf --set-interpreter \

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

2727 tar xfv data.tar.xz

2828 '';

2929

30− nativeBuildInputs = [ makeWrapper patchelf ];

30+ nativeBuildInputs = [ makeWrapper patchelf coreutils ];

3131 buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ];

3232 dontBuild = true;

3333

pkgs/applications/graphics/tesseract/default.nix−6

@@ -3,7 +3,6 @@

33let

44 base3 = callPackage ./tesseract3.nix {};

55 base4 = callPackage ./tesseract4.nix {};

6− base5 = callPackage ./tesseract5.nix {};

76 languages = callPackage ./languages.nix {};

87in

98{

@@ -16,9 +15,4 @@ in

1615 tesseractBase = base4;

1716 languages = languages.v4;

1817 });

19−

20− tesseract5 = lowPrio (callPackage ./wrapper.nix {

21− tesseractBase = base5;

22− languages = languages.v4;

23− });

2418}

pkgs/applications/graphics/tesseract/fetch-language-hashes+2−2

@@ -25,11 +25,11 @@ else

2525 >&2 echo "Invalid tessdataRev: $tessdataRev"

2626 exit 1

2727 })

28− langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/ ]+?(?=\.traineddata)" | sort -u))

28+ langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort))

2929fi

3030

3131for lang in $langCodes; do

3232 url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata

33− hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null))

33+ hash=$(nix-prefetch-url $url 2>/dev/null)

3434 echo "$lang = \"$hash\";"

3535done

pkgs/applications/graphics/tesseract/languages.nix+245−245

@@ -7,12 +7,12 @@ rec {

77 owner = "tesseract-ocr";

88 repo = "tessdata";

99 rev = tessdataRev;

10− hash = tessdata;

10+ sha256 = tessdata;

1111 };

1212

13− languageFile = lang: hash: fetchurl {

13+ languageFile = lang: sha256: fetchurl {

1414 url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata";

15− inherit hash;

15+ inherit sha256;

1616 };

1717 in

1818 {

@@ -32,258 +32,258 @@ rec {

3232

3333 v3 = makeLanguages {

3434 tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";

35− tessdata = "sha256-591NFrPdZ9orB9PtxKqsukh6aAq5DDO8yJ19W/Ywi+w=";

36− all = "sha256-FuIGfE0bNPvB8ip6cL8GRl0U9T7oD6sx+38CaGyCRno=";

35+ tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";

36+ all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn";

3737

3838 # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes

3939 languages = {

40− afr = "sha256-birhlXVhETYI4SYipFROA0xGpJtvnEqjEVGlSPy3upU=";

41− amh = "sha256-BJ73M3RYuc7ZuLBLr52GLilxdA9mUhXkUK9vPXDTbPE=";

42− ara = "sha256-IcmKr3rroicawMxKNj02TYBmSdfLC8q4XUuaOF9JZFo=";

43− asm = "sha256-0LW2Utq5Resb+MKweGRxLHwzQXLDaqHJ6QfD60vAfDA=";

44− aze = "sha256-vCtISRgsNyDAmEf1pkXR40gawizvUahZUKFP3OE44F8=";

45− aze_cyrl = "sha256-uFMD0kJq6x0Ho2ofBvd5pghZMzbmgCuslmx6JPpzSzY=";

46− bel = "sha256-QvPRVfIO6TNpeKrOZD14FM4JJUfXXWXwVMyBGTfy+BM=";

47− ben = "sha256-FXgmuvSAY1R7d5PhveDJ+C1IQ0iPtcfgIVX2YqcI6GA=";

48− bod = "sha256-Vql4san2bCVfcUVEG6YHdXIWfhkluAV0R9r9n0Y5mGc=";

49− bos = "sha256-5J2i7uhl7cHYHW6izqvAvb638nW22Hj7O2R0emQjIOM=";

50− bul = "sha256-ygvSU7SrYgLbXoss7LxCGbT3JeUUaMq/W8mTOOLD3jM=";

51− cat = "sha256-Ka9nRn7Bsf/U0tl0jwIZ8iIJdLDlOmbscjTxdotD/E0=";

52− ceb = "sha256-wSEDsspJiHLcctcemjMAZjU6zSx1is4dP1nBTa4lNrw=";

53− ces = "sha256-YMWOzZeHWkHsyuSEai5L90yw5LwGbRvEMJGcdqGfs38=";

54− chi_sim = "sha256-MjrnTUov9J6TLbtNYoL+Dmfd+v2gdeyFgD7NB3IHRUw=";

55− chi_tra = "sha256-d01Wa9CzbktsB0Fd+ltrV/6yV1sfXyMdf+AaUtrF3Q4=";

56− chr = "sha256-i7IPinjjGkgC+p8eB1y33o18LqxbezOUKm2Cq+B4Osw=";

57− cym = "sha256-B8jj1qE5cR3NtMkvkNGIAvbhXeOTMViNcT/nypJb3DQ=";

58− dan = "sha256-+VIag4GrGCO+CAj5M6m7jxFylopE45HjcLH+m02RPug=";

59− dan_frak = "sha256-cYNhenunY/WcHth+vItIhdoDqbuiuZ1GAK+sWP0osa8=";

60− deu = "sha256-y360Kn6XLOx++QT+gYJde1R8Rt9oTIFP2xGpMLE7yjo=";

61− deu_frak = "sha256-y7IA45RIXFtRXeIDljwqdsFL3vLPJYIZ7PK8rPbMk/g=";

62− dzo = "sha256-tR/wbc8wEjWfqoIcPSReTIofS2WuX2FOSrH/E2sEn7k=";

63− ell = "sha256-u+DtB1jGkEMRSxP8jwCkI0LGR/J741LAW0l44mU4DmQ=";

64− eng = "sha256-wFFcnx4MeeEGn8wFwrL2poQfteEILWldsWAzPBFU8G0=";

65− enm = "sha256-hliaWydvYxeD4DhyNkD/JAYIixdivVw+ftcHPnYPxoM=";

66− epo = "sha256-xCTSmiNBRpNT//JfRmtn3jkEFWvBUXwqG6OzVUuBtPg=";

67− equ = "sha256-OvQ6JCDOkn285oR01kRiWUcYmoLOauT9MhBjmRRoGds=";

68− est = "sha256-j6jyZJrjFok4lnlTzjrLwZ2MDgcCjARhwppJGDBFlIo=";

69− eus = "sha256-3Jo0mQQMYA6sBwNiabvBauHlhFyrMuG2Jypwem5Nmgw=";

70− fas = "sha256-XUZC4yxm6UULypwM7SLK6TGINArP2MbKcX8C5he5wVQ=";

71− fin = "sha256-+DDGJfY1pjfLEaalZRJrGuEFwkrp/Xy5LI1RMMcYTPE=";

72− fra = "sha256-hq+yOtFGRn8mPoreVv05UbHMKPjE7rw0+ZPTwC2Ip6s=";

73− frk = "sha256-t0UWINMKPabRxryZiwiplt++USa4lh7mJuKMdMPJ1Zo=";

74− frm = "sha256-trW44scT9PZqr2+Vb7dh6oxlGLkq9MURpiozfj4c3wM=";

75− gle = "sha256-6n4lfOjP5yJ5UFoVTB1VyhBoeAS7/PdpRsLUYutEH9k=";

76− glg = "sha256-X5AhWWqOUwYWWhNCnNFtJ9UXYFZ0wV1p5XEwer2Ktjk=";

77− grc = "sha256-q9sWDD0MNCTjVPFUWRmL/KRw3EK2o5TKUh53hkcKIhM=";

78− guj = "sha256-VAUO0X64PQ4lihJ9kjCLA3zeNAKFgdfQ4qkDVzut6DY=";

79− hat = "sha256-aIsDZWV2q8ffaG9OT6y3h5j/Gd0NygECYgms1WmtIx0=";

80− heb = "sha256-T3koiv3pFi7ieEHw3pmeaQAizx470XI+NMqPGJxL6ps=";

81− hin = "sha256-bplFnb3MQL/sEydHvCMwVJFr7Z2gL4lWfJOIwy4v1u4=";

82− hrv = "sha256-w3oh7zZ4gBP3GpG6ZJ9K3EwP+O7Z6LKoqm2JHbtpOJc=";

83− hun = "sha256-pnBNLo2uYiQFlzQsM3Ns172DaojhiPx02wOOyHvj/6c=";

84− iku = "sha256-q4GeYBOPhDJQiLEZcxe14hAjLywQRrKeZB6TFALbPuw=";

85− ind = "sha256-NzjesAe6+fAbOmAYNQA/ccMU0blV+KdDY09vHsgiDYg=";

86− isl = "sha256-v2tsHHb4vLn3gNwXLYth02X6tDSxXoQnfc1s19B8dgA=";

87− ita = "sha256-Wk5ugm4CHQTzSUwr107Rr1l3tn/e3Os8mqMP9seks9M=";

88− ita_old = "sha256-P9C5+JRtoRTt7weyQv0RvGhoQjvBI+aZD+qG4oNfD6E=";

89− jav = "sha256-d/G12l/6oJZyTsNpmuTb/en4VE9LdLtcLJpCJu2XXro=";

90− jpn = "sha256-PDyVfLv7b+ZrOLRrwX+GFY39sWiKKijt5+4OyJH0qvI=";

91− kan = "sha256-bxsg1jOTODXA7K7OQuZMYf1pDsAQ0N9S24lDPkoiU0E=";

92− kat = "sha256-I9aIBop6SWlLEMh7cl44nJ3Mxm5w61KtNqztzU4BYJo=";

93− kat_old = "sha256-0GWX+Xp1f1Ghw2P0v3PSck3sntwdS8f/9vSi0Uo59Ak=";

94− kaz = "sha256-9WmAKI6bkL/rGSkXV9oLKT09UAYbCDE184qX/w83g0E=";

95− khm = "sha256-WoT8I+5T24WLygalGpoWZhlykZGO4J54+q7ghsu2Yr0=";

96− kir = "sha256-A0J7mgB7dK/OObXQJhtP5vZHbjZn3k6gwxhFjM2zMaw=";

97− kor = "sha256-+zEuvhGadnPKaMCp97nd0TpwT2RgndIvL9YGiJyRjeY=";

98− kur = "sha256-LIZeBRn+W4/eC24hhHRcnAbsluuT+xP7fsKYZ5q74rI=";

99− lao = "sha256-rr8gJe4exxsO5TKCWCjQ0tStp/t/Wb1TXuv2OlVXbQ0=";

100− lat = "sha256-Up/0i6rZ0QERaYnJj/MJRoYdO21LpkPFTMpebnM7++A=";

101− lav = "sha256-Tx8GN29JjQ2uEfsDIA7hJMYV3ISP7hwFr/kYe/j2vzs=";

102− lit = "sha256-FYpSd1cvBLufsHCjvACtOl/npeJYVsn5JIlmLOV7ADg=";

103− mal = "sha256-CnWrck61tl1tPtBfj/d+qfzyrKd/i3QR1qYOGyG9A8U=";

104− mar = "sha256-Mzbn1UBQf7btrpmJPlqphsPTZWKJFrszS+AM6kfBxys=";

105− mkd = "sha256-4/QQaE6Q3HNF7CbvuCZ227AfKx7kY++1/i1IkllTPOA=";

106− mlt = "sha256-EGgCdZh/8WtJQ3IdSa7LzUq56eNCDJ77oWGqpaDZ5OI=";

107− msa = "sha256-0vfS1XrxrIZocDBE9IDleMMf7QNx7aKTBiT/1Gc1FxE=";

108− mya = "sha256-VKDRg9eramczalBJKPPfibTJeB02CDJa3H8K0lbJ3p4=";

109− nep = "sha256-DMvPyc9L5a1XX2hdH2MXa3c+7np7snAt27VpMXI5g5Q=";

110− nld = "sha256-vYSTRehHb0e0DBcgT+9c9kKHJEwZudF+KX/+cPxcnLI=";

111− nor = "sha256-qZAmnz2BWtIG6g8nsU0H56C+DBcTNTl7wLRuoM3P2/o=";

112− ori = "sha256-TCliwoXMw8c14DHvMnGc84Vh12xcsD7LNxpy+xCbSjc=";

113− osd = "sha256-nPXVdvzEdWTxEmWEHlyoOQAefm84/396rPRtFalrAP8=";

114− pan = "sha256-e1UefVLiddjb3uUoAWrLIovwE7Ifz8dzM7m65ie/jbs=";

115− pol = "sha256-HSKSMZ0uPGXhXxn1W5Ycm0kmUfwXnzvNIZr/58FBv5Q=";

116− por = "sha256-CJ+0Gc170TUjYkTdmkuKQt/i7pfZe0ge/de5LJxjJKA=";

117− pus = "sha256-q4hOL9P/cir/tmGSfhjnULSQUucxy7BeosFu94O15cc=";

118− ron = "sha256-9PNhTUsAnusKtYFevvCA67p8Rws/gMn5ftbaDT9AmYY=";

119− rus = "sha256-GADcrwQ+lQByafBxaKEiWM2Lh79BN2nCtaPVRR5FyrQ=";

120− san = "sha256-b0ylBT8U4W2nDuO26w5VS4W9X9uO0+ya8ylZ/qQiLpk=";

121− sin = "sha256-9YU8Nu/e2xQhmMpokdCidz6in1THamCJM9I4k1F4IZA=";

122− slk = "sha256-ul0qugn1nhlSWDgl3XsOubpwYoPRwPk76Nc4G15eri8=";

123− slk_frak = "sha256-Hn8eWerSShNtwGJumAGVlKBC5iCHv8+PD92z4oO12H8=";

124− slv = "sha256-MFiE4VGgFCHoR6SjDwXpyJn879SDoS0uqODyBVNNVs4=";

125− spa = "sha256-8jmFmWu8/itXhkzLCCeDwcdMh0KfBEEaBKa6TT2i79o=";

126− spa_old = "sha256-XaOG/YRQhpbjrmPQo13Oe1JtW2aZSU/lOtZTh/bckXA=";

127− sqi = "sha256-rs21rvcLz/o6UAZ2kQ/eHStdY3hHlgmcP92Pig3cn5c=";

128− srp = "sha256-Nb/rPOFPWv64LJviSQ2zQXjA4T996AYQE6CDsWPGdBU=";

129− srp_latn = "sha256-mVvApX5lqdQgkhESLm3PCuMR7v526aFE0wgrYPDQSGs=";

130− swa = "sha256-jhCnJU532THt+MkzqYvls2q+H9IcMmbAZkHgRk+HnN8=";

131− swe = "sha256-KmQHu/GH6x/P0WM/rpq//NYiDnq3TgXmW/FkJqyPIFA=";

132− syr = "sha256-YD3JPEm4bP9OHcXcnA15D7/rj/ZM9rUhgeV6PgKNfSE=";

133− tam = "sha256-f7c0foBtVA74PrnEJt3iNmommjcPEf/+c5ILtfwsJbw=";

134− tel = "sha256-+0btVJoVYzve8ad2sjQxSkQzNOlnjPUVrtUsUhbLzTs=";

135− tgk = "sha256-QPOySbwYy3WHvDqvs4BDXROpTJVgOzGCP5L7mN0Z0jg=";

136− tgl = "sha256-55SvYHQmJpuzLu2y8gcG4nj7sA5KdcQ9xKe4yOIDOTg=";

137− tha = "sha256-ykpC1Egb0Dd80CcxtRScIov3Pot6YeRLmi1eJ0vhUPg=";

138− tir = "sha256-EKWKtn1ibgk5KOYCBW5ek/RsKT5fygI9UWygLKHP8fg=";

139− tur = "sha256-XLzOXvtms9oQoUOX+8OojYRXufG3JLnI2WRJsVLCFnc=";

140− uig = "sha256-uy+C97n4OqtNP62AYDF0q4TmaIkfnhbaHGPRX0Jurek=";

141− ukr = "sha256-L4ss0PC1uGEqS4CrzrqjrEb18DaJJmKbPP9Xa52VvDE=";

142− urd = "sha256-KDB7+JK4jDhWxMexkiE+qGh5np8MROXL5dpRoX+wrIM=";

143− uzb = "sha256-NJE0a17k3P25IUSimi8JB/IdHncrX/7KlqXrbWRpc8o=";

144− uzb_cyrl = "sha256-pSBiXV3h8Aia+DbABLLPvT/lpQhEAeTpaFjUl9FQsc0=";

145− vie = "sha256-zvXmN0fIbiG8u9MLtoOhsQT5gpO3SyqJF0hw1btEQck=";

146− yid = "sha256-zZm4mvPApL0hpD3UPxN+/96j3V0ZrVk+ALvUih5orck=";

147−

40+ afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf";

41+ amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4";

42+ ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91";

43+ asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh";

44+ aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw";

45+ aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq";

46+ bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2";

47+ ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m";

48+ bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan";

49+ bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4";

50+ bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya";

51+ cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9";

52+ ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1";

53+ ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0";

54+ chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij";

55+ chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp";

56+ chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb";

57+ cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07";

58+ dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr";

59+ dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi";

60+ deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb";

61+ deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb";

62+ dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm";

63+ ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v";

64+ eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0";

65+ enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46";

66+ epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964";

67+ equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s";

68+ est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g";

69+ eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw";

70+ fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx";

71+ fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q";

72+ fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6";

73+ frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp";

74+ frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn";

75+ gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa";

76+ glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z";

77+ grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb";

78+ guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al";

79+ hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8";

80+ heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag";

81+ hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf";

82+ hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3";

83+ hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56";

84+ iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db";

85+ ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p";

86+ isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz";

87+ ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs";

88+ ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z";

89+ jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp";

90+ jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w";

91+ kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg";

92+ kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3";

93+ kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh";

94+ kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm";

95+ khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s";

96+ kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3";

97+ kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv";

98+ kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic";

99+ lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf";

100+ lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj";

101+ lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg";

102+ lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm";

103+ mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a";

104+ mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik";

105+ mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73";

106+ mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h";

107+ msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj";

108+ mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l";

109+ nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc";

110+ nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x";

111+ nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459";

112+ ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac";

113+ osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw";

114+ pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv";

115+ pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx";

116+ por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8";

117+ pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b";

118+ ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl";

119+ rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q";

120+ san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g";

121+ sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm";

122+ slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds";

123+ slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy";

124+ slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h";

125+ spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj";

126+ spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx";

127+ sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf";

128+ srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm";

129+ srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr";

130+ swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f";

131+ swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a";

132+ syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0";

133+ tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz";

134+ tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv";

135+ tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0";

136+ tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577";

137+ tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna";

138+ tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h";

139+ tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w";

140+ uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv";

141+ ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg";

142+ urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18";

143+ uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l";

144+ uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855";

145+ vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff";

146+ yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd";

148147 };

149148 };

150149

151150 v4 = makeLanguages {

152− tessdataRev = "4.1.0";

153− tessdata = "sha256-70bp4prs1zUbSzQmcqd7v736cyYWv8oNNbmZXypik5I=";

154− all = "sha256-hk+DjoVWf7RW9S+Gu9XUX8aWYYsL5dU5c6jLSKJp+MY=";

151+ tessdataRev = "4.0.0";

152+ tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";

153+ all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg";

155154

156155 # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes

157156 languages = {

158− afr = "sha256-XsQc6+0/SheO6dcuERKsmko4p7DdyvsSZtVdne1FLqk=";

159− amh = "sha256-QIoWQufDlggA/5P5SyxmwSdQZhgXqIyFq/OULrtvO1Q=";

160− ara = "sha256-IAWXZ3i7wU/Fak6o1DxggIR67ucvzCIBSI8kDayhXFs=";

161− asm = "sha256-juqmGgEUh8NphXBfnlZ+LELcUQ88Q8OYaZ5nJvNOrQg=";

162− aze = "sha256-7mkrPPlvOXe5FVbwgaz7sLjEQhfEj4t8HbYbhY5mUAc=";

163− aze_cyrl = "sha256-bwdsYITvHB6RyRdRmSiN0dme6QUS2SignDafXGJCbek=";

164− bel = "sha256-DFkWfO4s/KJmPr9NKNICeypRx1MHk0MQVfx71nX1HjY=";

165− ben = "sha256-YCO2Ign/zAiUUngauWMUT3shzqePYdHPsNmNSQJJ+Cg=";

166− bod = "sha256-Wc3pXuVwN/sQl3S6kUe4lEP0ToRIMtaoydFAaknpB2Y=";

167− bos = "sha256-zY74ANUNk704ni8LAaViWpqjpST/7qRE6BQWYCyp/us=";

168− bre = "sha256-M2cbvdi0oVzq18AEdMxyFmndEvyXT0m4psv+SBAjDhw=";

169− bul = "sha256-kvd9UV+2rkcrI5rQnQwE0GU5wkBIJD8IzejRdLgXbw0=";

170− cat = "sha256-Gx/vnnDYzpug7JLVBxQsjcV/QP1vsAOcE94jqUIyuqc=";

171− ceb = "sha256-OR2KxjF5M8HTzuVqDutFF0QhgLV5S2iqVYRhGIjdJqE=";

172− ces = "sha256-zoYe0dwg5020ScRjbUSoMELNKuuM2VyQCCk7XQ95Ajo=";

173− chi_sim = "sha256-/AXYmrMdi04iaRDxaovL945DuuPiWAu1/u/QUu/as2M=";

174− chi_sim_vert = "sha256-hyNJp2YWhVDeLoSrPwOCegSXVvphfaH6Fki11fe/5bg=";

175− chi_tra = "sha256-VZBn3A98lHiIhHQhKdZqARfd5/T/ErJj2SFHFzSX2xQ=";

176− chi_tra_vert = "sha256-hGJKlSn650+h69dGyAl1gh9wPYIamPcon0WFx3xjiYE=";

177− chr = "sha256-1BAbYlHTt6/Kr+S5IDoqWSQd6WS3E6ZlGycdwYxCGKc=";

178− cos = "sha256-3dPsVxypXXNMP5+hOTMHRXmOAFK0Q8UuALZAxGHoM30=";

179− cym = "sha256-TUCW6JEQWoU4jm1Jo5tRNTQvthLf0TX+wr0P4i5L844=";

180− dan = "sha256-Ii+1rRqxMffokBlD1uOo5zOvMNs2wu8h5Nr73aGqOco=";

181− dan_frak = "sha256-AFbqCzSZD7rGCXyQyResnEhVgNKvdAsZPvav2nF7jJ8=";

182− deu = "sha256-iWs7SVZQOrnaoQKF2zMIgbLXS3DYibeSYsxTS57GmaQ=";

183− deu_frak = "sha256-p649BhD51E1V3QbCquokQd9UI68FXCm4O6wEJ8aFEIo=";

184− div = "sha256-gXx/fy6jvdvDjgrMjzpXt03BaqoehOcvJkzDDktOtSY=";

185− dzo = "sha256-K/AnF2DDwn8z6L3hMJS0B2guCY/mUl1/8fh9xV5mZ/4=";

186− ell = "sha256-D2uLRAmE/pFYAZ1yLGJPMqYuD5myHyJHSSGQpFCoHsI=";

187− eng = "sha256-2qDJfWUcGfujsl6BMXzWl+mQjIIICQyUw5BTgcI/wEc=";

188− enm = "sha256-dXtF3SVXfG4Xo/j45IWvoy5diImsTD4IjQsNGjcOGbY=";

189− epo = "sha256-yRIyCVJRzisB16vfmP7bYAU5XvRY9y0G5xsUcFYjL8o=";

190− equ = "sha256-j2YDI9int6Do0vrho0OebkcCIr+7mQsqt/6eH7R5HAs=";

191− est = "sha256-9KGCAXcFltDbv7sWOFTAwBQzkWlV1pXjcscv46F6vss=";

192− eus = "sha256-tyZYz8/JGp+gA6ZIvTNAKU6d3EKa5rwVQAZFfao9UTE=";

193− fao = "sha256-CnHutxfwLTEo1s2UZ86ApCnBlRzPf+rXVH+h4CQZZNg=";

194− fas = "sha256-CzsV6cy+Q1glGH+norsif1Vd03z4USbGz0WcpKabkp8=";

195− fil = "sha256-H65YA5/Mj1Y1dXmhCgSeJcaOewhBW4LGT64d8dAc4Vw=";

196− fin = "sha256-T6zqajTwlK8megAusSaVRyx5NjtyusIEEyufam3yg/E=";

197− fra = "sha256-6sAcHXJUDWCQ+st7L0LdCi7o/FfFvhsgVIrmaOJ2GRM=";

198− frk = "sha256-18fZ/9zd1naVD+SYLIcz7UrbY73NxO8lLLRh2XuvmBU=";

199− frm = "sha256-wm9GwlmBr2Ia87ipNm09NgP2r/JVfrv/opuCBo33Bik=";

200− fry = "sha256-8BRoZ3OCITSfjKxNPPVlC2ZmDaaEXg+pTXlSmB7KBEU=";

201− gla = "sha256-WU0FUhx4ajDD4V6EtXcH/nDlSJm6oWVb+ooXUBb0LZ4=";

202− gle = "sha256-s3ZdQ5gYnlkswhUH6WnztMGEDYWjETPeJUVt9n+BB+E=";

203− glg = "sha256-5AENqozozcDbPmJsbn7WgvFg1LKDRFI1UMNfmMPXugc=";

204− grc = "sha256-1L/cwkD6HoeFM114D9zwYUohAVVpCS8CLI+TXvXQoAM=";

205− guj = "sha256-pIT0pwAv9Ooi3KJoIeQEMTE6Mc1CmrkJASJ+YJ8jGwk=";

206− hat = "sha256-WkPgMxD5cpv4NeDCYgpaslX3TL6HMc+p9JaJfE0oiq0=";

207− heb = "sha256-fabqa3omIOyOi0HeKWehPUKWNaVmV6CzC2IlAaVz0+E=";

208− hin = "sha256-zHbQn6T+0cekZ0BG4l5jdg0Mm/3OOQpSETRiw0pVbuY=";

209− hrv = "sha256-91VXBv5BFRUBiIMYeoC/eNzWruTMT7zoT4xnMKtZRzU=";

210− hun = "sha256-sSf5igeLuCT2JS1SMgfZBer3TwACwnTrx5+cm2wlWnA=";

211− hye = "sha256-Lvd3XbnEExINu4aOQMgJEVUSnLFB1js3gXJRXg6q30U=";

212− iku = "sha256-trY4sUGfNkP4gZaMWQ84hf1CddguuYs8W7CvLtC2WaU=";

213− ind = "sha256-Ra2q3ocV9VPBCDNPYD8k5LyQL8Z2OJK1qSRa/iMMgrQ=";

214− isl = "sha256-+CIAk5r5SrZ2wdXhXG01wflpRu684PhBSgqnLCbiUsI=";

215− ita = "sha256-T3R2xhExK+uPjhgoiNoI6mQtmCSuRALMYjX2GrFAZAY=";

216− ita_old = "sha256-Rqe6BVbAbZmArLvTSWBNcwk3a2akLOCzvxvIJYMhyN0=";

217− jav = "sha256-FdR83e0UDnMdHBzsJIUIFNkEjcKbV1mVMMQDWaNfe6M=";

218− jpn = "sha256-b0FrkC0SnYzCjpnDMkQDSxz1JUnoVg9jILBtMXhSFZo=";

219− jpn_vert = "sha256-NoecGqB2NDAsncssHtT4+zR8cFrXUi3Wk+4unWgCink=";

220− kan = "sha256-TRLkRNe4lc2AVrD/O1biqU4+a7Oh0bwgXLM7mc/olVE=";

221− kat = "sha256-Kl4c1ZW3ERSUmjdRx/wicDkAXXcInhMI32sdxd8iJqw=";

222− kat_old = "sha256-UQXCYrpz3cniTUOXc70G7rX8XptxMgD5uA2OBPVx7tU=";

223− kaz = "sha256-cYeSnrIP+8cjbVlZ12GhjWKfx+t7HXp/uZrTsibwZ0A=";

224− khm = "sha256-yzU4Ejok/gjjYRsaZZgDCqgZk+qISzlFixqFbL0L/VQ=";

225− kir = "sha256-Q6MzrZYZXfm/7Qjdr7MI8w8UY9SY4gNilH0ahy/mfSY=";

226− kmr = "sha256-5llHfGE87Pk14mkvc+a4cqb8TQXx/uVSCDhF+BkDcuk=";

227− kor = "sha256-lSC/6ePPw41KgI4DawKHyIodN/uAuaCiOSjdzN0gWVs=";

228− kor_vert = "sha256-CC7y5mG3c8wilEZAuY2grHamhbDbucYPdmnOWO1vu/I=";

229− lao = "sha256-ha5mxb8EqMRbV8T49I/X2eBDvVCCjfdjYkQNvtCjfb8=";

230− lat = "sha256-eQ/IVLwoZVqnCnduPgFFSL1C6IEYR7hKYcnlPvCw6iw=";

231− lav = "sha256-goEdo/Hf7TbtvVsz4naueyXl5mvZSd9bq+p5doivGjs=";

232− lit = "sha256-e5q1JBf7CJ286H/UFPrdnWgILfUnUoUbnMWtwfhcT3I=";

233− ltz = "sha256-zEF9dLOAXmw77EFJWH4JWzvc6MNKRf3dQdThGO3q7Qs=";

234− mal = "sha256-LbtjlyAwyMZVXleRLZn4E6r+e/WbT9m5F5KaiL6LgSg=";

235− mar = "sha256-hFDLsZaxriMQwHoRRN+DGCdLZOG0Oqs6rXuylSCFXAM=";

236− mkd = "sha256-T6rQudft4N7GrDaG6RXLEAewFxeRlU+0I/+6TzuPDq8=";

237− mlt = "sha256-339C19/kfmP+maUlA2INzj5t4WYlO3bwyRAhroR6teY=";

238− mon = "sha256-kFqPMTZu/vNkg2+/tELLm+aCeQXkwdpk1fQmuxXbeso=";

239− mri = "sha256-sUAeaw9iNhstgpkpAh0jsMUv9vDNCjStpqxoIDpXjko=";

240− msa = "sha256-VhF0PATZ0xvidV5QqshtgVyviYZr9+HKJ3QoZRXS/1Q=";

241− mya = "sha256-YVUU69R2bHV+VYfunMDJ2bLnJ9yVcJjLJJk2pWCpkkI=";

242− nep = "sha256-wxRu8CWZYdWmUzm9uR3MtRmRrO48iuRW5M91A0UFHrY=";

243− nld = "sha256-sfZ2f1Da9ZA4AvuXDnufZO4fEr4LKzJN/fjosFdxVy8=";

244− nor = "sha256-uFnk3iTS0jkA2ZPXSBnTMzklVBQFe1CY2tKBmhiUqiI=";

245− oci = "sha256-u/UgOdCUpgbEn44h15/PsmD5/iv07D9kDy3Lpl/i+dc=";

246− ori = "sha256-6GhQO+YzSoyqCS45FNDO/PwqXeTjSkoNNRuG9WUVBOo=";

247− osd = "sha256-4Z8q6GB5L983LPSNjOcK5do8QFKWL+IuneH2gMN0uw4=";

248− pan = "sha256-UIwPtYrp41yqVx3oW8zlnqW373UaXaJ/96WbS1KexQQ=";

249− pol = "sha256-F56Rr7MjKUkoik4YbeROsL7/tqKVKDvr9K81o2s4Czw=";

250− por = "sha256-AWxqNxux5MSP5SGQjPO6PXUfreCrhGrV1AhrVj9cUow=";

251− pus = "sha256-uQ/O5S4DoeeMvN0yz7SLx94izFb6xa1CoAodYqelL0Y=";

252− que = "sha256-ZaWf96rz505Z3GX/fNyBZQMab8+V0lv21Fy2mKKrcwc=";

253− ron = "sha256-FTyCyAcYUpiDqeeREJCAJL72KFXZ1aC38lkPy4De5ik=";

254− rus = "sha256-aBviwr6tG8e9I134jETo5grnOuhmhAwK1OO0wke9N8I=";

255− san = "sha256-XR/UK1JNC5krfDuYyknbFu+mxPE30r2CY5gXVvLEl+I=";

256− sin = "sha256-xCQWB6/iV7nP2vpaFxKHt9BEH/VB47IUwPoDVYkW7SQ=";

257− slk = "sha256-M0U5fhZJqntniIoZKPBNGIeeB0a9AKOq/w06F8u9JzE=";

258− slk_frak = "sha256-cT7dJUQ5cueNftGCoAPfGcGz+N8tvmv4pR+FF6rSO5o=";

259− slv = "sha256-TvPT/0JarymFq5MlYjpZ34y9KtQqP8g+eQ3cUiqVhBg=";

260− snd = "sha256-ZyoVGmnKGp79/Ygbt6tHmUnhU0nHS/tt2oOSQEh0VcQ=";

261− spa = "sha256-Cw/LtGZRieAauAGeWR8BTdcmBGDeByVD7dSyy07efJY=";

262− spa_old = "sha256-Q2XJ2WyFEkVVinKuuF4NIEQGsFKrjgWd5TWPWAkDCMs=";

263− sqi = "sha256-ARyC6wqo2VQ7CdeRS1W5Kxs08s1PxMTINSClD3vcm6U=";

264− srp = "sha256-FPCNtRrj6luycyu0jAmVWQDYqsFGrv+G0n0bOIItosk=";

265− srp_latn = "sha256-P8I6VlHDejPY4t0GDEHh+/JiNQkUtaRqqQv8Yes55cw=";

266− sun = "sha256-6oaA9XYmP6G0TACWl6ZuMoVaEZ7JmAR2WSdvJwdXdFM=";

267− swa = "sha256-4EMKiLBjLTub/5b7qkUjOfxC0HyA/AAz/r8FdQvDyWM=";

268− swe = "sha256-JOLdFcwAiNIRxfG9SZceYAMX8gFQLerbxBfw/9bJpvg=";

269− syr = "sha256-aHg+E1WKiTXpzJ2+GeJUutUUwfe8Z5/hk+CEHbUr0u0=";

270− tam = "sha256-rrrgRz04udD5znUYO0M0gwvKuu+A3Q3Au1AocO1qEGY=";

271− tat = "sha256-5lyctRvEfR7td2FWPjLTCDL+OqrCsy72jp5cf9HN5Cg=";

272− tel = "sha256-fQkoEoidyLsfQtk7jZj2mFJ4AJ4xztMP9DTuDjtEmD0=";

273− tgk = "sha256-xzgovz+eBvpBwH95mCmwHU7ODj3SmUyRTWQ+M8F8qJA=";

274− tgl = "sha256-dnJiuUmQHqczAjmZ8bLUUfD+ggBBZr1rEHT4Nhln2os=";

275− tha = "sha256-iAMqnyGsz/gl767SlgTrilNOJlz4BYqV6lQXpt+RwAU=";

276− tir = "sha256-06XlsFwn4iCV6xxxJwasvkn5bQQC3xFOKRsyGRYi3OA=";

277− ton = "sha256-uK3o84oF7AaFs+3rRb4NGgMCtyZtZ1yjkkj7jNQD5hk=";

278− tur = "sha256-SJuVBOgNcYTtGsmhl2ZHiE7nEUnaIx/zwsHcFTcPLz0=";

279− uig = "sha256-iBTbyJjNR7k3nLBpEGSsAit5QcjYN2HgHWpwGkSXSic=";

280− ukr = "sha256-ZAyfvaGsRdHIh0HvAcaIwzdVnDf1Y8NuYufl+ZCmCJM=";

281− urd = "sha256-gLwoL7uumavWtAcITEAakw3cSTQ3GRCeZQ13lTH8epc=";

282− uzb = "sha256-9jx8jWFvVOiIMJ8E6vVWgof0CsqlTU40zlHWrTbgHg4=";

283− uzb_cyrl = "sha256-B6vbCeDHm5FE3SL94BBlUqwyFhBMEwVmWM9RcXOmY5A=";

284− vie = "sha256-Fk2b7X5aZERYbTlDTMGt9N+XbP4jz/1kaOREyUcDZAo=";

285− yid = "sha256-H1AC4G/G7jOuvJJZb9u8ofDF5RqKi/PwVTjsTkDcy3Y=";

286− yor = "sha256-m35CeoAKh2Rg8CDVaDgCkuIm1i/4pOutieZZUSJTgx8=";

157+ afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y";

158+ amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0";

159+ ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190";

160+ asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf";

161+ aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf";

162+ aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg";

163+ bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c";

164+ ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0";

165+ bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar";

166+ bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd";

167+ bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk";

168+ bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj";

169+ cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv";

170+ ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r";

171+ ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf";

172+ chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw";

173+ chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7";

174+ chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m";

175+ chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4";

176+ chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l";

177+ cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx";

178+ cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d";

179+ dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2";

180+ dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0";

181+ deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9";

182+ deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7";

183+ div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41";

184+ dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b";

185+ ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg";

186+ eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s";

187+ enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm";

188+ epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9";

189+ equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg";

190+ est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl";

191+ eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp";

192+ fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a";

193+ fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb";

194+ fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz";

195+ fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g";

196+ fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a";

197+ frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp";

198+ frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2";

199+ fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h";

200+ gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar";

201+ gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk";

202+ glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4";

203+ grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl";

204+ guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154";

205+ hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss";

206+ heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx";

207+ hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc";

208+ hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp";

209+ hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi";

210+ hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf";

211+ iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn";

212+ ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5";

213+ isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq";

214+ ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r";

215+ ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6";

216+ jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m";

217+ jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg";

218+ jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn";

219+ kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd";

220+ kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia";

221+ kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai";

222+ kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi";

223+ khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb";

224+ kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3";

225+ kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m";

226+ kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8";

227+ kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25";

228+ kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6";

229+ lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5";

230+ lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr";

231+ lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2";

232+ lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv";

233+ ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc";

234+ mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd";

235+ mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44";

236+ mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg";

237+ mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz";

238+ mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh";

239+ mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i";

240+ msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an";

241+ mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1";

242+ nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563";

243+ nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi";

244+ nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq";

245+ oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv";

246+ ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78";

247+ osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1";

248+ pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h";

249+ pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp";

250+ por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01";

251+ pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr";

252+ que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5";

253+ ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m";

254+ rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8";

255+ san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx";

256+ sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964";

257+ slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k";

258+ slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki";

259+ slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf";

260+ snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7";

261+ spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb";

262+ spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3";

263+ sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701";

264+ srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l";

265+ srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz";

266+ sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa";

267+ swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0";

268+ swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4";

269+ syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38";

270+ tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf";

271+ tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76";

272+ tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx";

273+ tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67";

274+ tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn";

275+ tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8";

276+ tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk";

277+ ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq";

278+ tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8";

279+ uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548";

280+ ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334";

281+ urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40";

282+ uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n";

283+ uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7";

284+ vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n";

285+ yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z";

286+ yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv";

287287 };

288288 };

289289}

pkgs/applications/graphics/tesseract/tesseract3.nix+3−14

@@ -9,24 +9,13 @@ stdenv.mkDerivation rec {

99 owner = "tesseract-ocr";

1010 repo = "tesseract";

1111 rev = version;

12− hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc=";

12+ sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";

1313 };

1414

1515 enableParallelBuilding = true;

1616

17− nativeBuildInputs = [

18− pkg-config

19− autoreconfHook

20− ];

21−

22− buildInputs = [

23− leptonica

24− libpng

25− libtiff

26− icu

27− pango

28− opencl-headers

29− ];

17+ nativeBuildInputs = [ pkg-config autoreconfHook ];

18+ buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];

3019

3120 LIBLEPT_HEADERSDIR = "${leptonica}/include";

3221

pkgs/applications/graphics/tesseract/tesseract4.nix+3−15

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

99 owner = "tesseract-ocr";

1010 repo = "tesseract";

1111 rev = version;

12− hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE=";

12+ sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn";

1313 };

1414

1515 patches = [

@@ -26,20 +26,8 @@ stdenv.mkDerivation rec {

2626

2727 enableParallelBuilding = true;

2828

29− nativeBuildInputs = [

30− pkg-config

31− autoreconfHook

32− autoconf-archive

33− ];

34−

35− buildInputs = [

36− leptonica

37− libpng

38− libtiff

39− icu

40− pango

41− opencl-headers

42− ];

29+ nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];

30+ buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];

4331

4432 meta = {

4533 description = "OCR engine";

pkgs/applications/graphics/tesseract/tesseract5.nixdeleted−39

@@ -1,39 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config

2−, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }:

3−

4−stdenv.mkDerivation rec {

5− pname = "tesseract";

6− version = "5.1.0";

7−

8− src = fetchFromGitHub {

9− owner = "tesseract-ocr";

10− repo = "tesseract";

11− rev = version;

12− sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU=";

13− };

14−

15− enableParallelBuilding = true;

16−

17− nativeBuildInputs = [

18− pkg-config

19− autoreconfHook

20− autoconf-archive

21− ];

22−

23− buildInputs = [

24− leptonica

25− libpng

26− libtiff

27− icu

28− pango

29− opencl-headers

30− ];

31−

32− meta = {

33− description = "OCR engine";

34− homepage = "https://github.com/tesseract-ocr/tesseract";

35− license = lib.licenses.asl20;

36− maintainers = with lib.maintainers; [ anselmschueler ];

37− platforms = with lib.platforms; linux ++ darwin;

38− };

39−}

pkgs/applications/graphics/tesseract/wrapper.nix+3−29

@@ -1,5 +1,4 @@

11{ lib, makeWrapper, tesseractBase, languages

2−, runCommand, imagemagick

32

43# A list of languages like [ "eng" "spa" … ] or `null` for all available languages

54, enableLanguages ? null

@@ -13,6 +12,8 @@

1312}:

1413

1514let

15+ passthru = { inherit tesseractBase languages tessdata; };

16+

1617 tesseractWithData = tesseractBase.overrideAttrs (_: {

1718 inherit tesseractBase tessdata;

1819

@@ -46,36 +47,9 @@ let

4647 exit 1

4748 fi

4849 '';

49−

5050 });

5151

52− passthru = { inherit tesseractBase languages tessdata; };

53−

54− # Only run test when all languages are available

55− test = lib.optionalAttrs (enableLanguages == null) {

56− tests.default = runCommand "tesseract-test-ocr" {

57− buildInputs = [

58− tesseractWithData

59− imagemagick

60− ];

61− } ''

62− text="hello nix"

63−

64− convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \

65− -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null

66− ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f")

67−

68− if [[ $ocrResult != $text ]]; then

69− echo "OCR test failed"

70− echo "expected: '$text'"

71− echo "actual: '$ocrResult'"

72− exit 1

73− fi

74− touch $out

75− '';

76− };

77−

78− tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru // test;

52+ tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru;

7953in

8054 if enableLanguagesHash == null then

8155 tesseract

pkgs/applications/misc/anytype/default.nix+2−2

@@ -2,13 +2,13 @@

22

33let

44 pname = "anytype";

5− version = "0.25.4";

5+ version = "0.25.0";

66 name = "Anytype-${version}";

77 nameExecutable = pname;

88 src = fetchurl {

99 url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";

1010 name = "Anytype-${version}.AppImage";

11− sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM=";

11+ sha256 = "sha256-cfiSZLfaVmxsZWDwulbMHKzHCG7zMKCWwg8q/2MolVs=";

1212 };

1313 appimageContents = appimageTools.extractType2 { inherit name src; };

1414in

pkgs/applications/misc/audio/wavesurfer/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "wavesurfer";

5+ version = "1.8.5";

6+

7+ src = fetchurl {

8+ url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz";

9+ sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";

10+ };

11+

12+ nativeBuildInputs = [ makeWrapper ];

13+ buildInputs = [ snack tcl tk ];

14+

15+ installPhase = ''

16+ mkdir -p $out/{bin,nix-support,share/wavesurfer/}

17+ mv doc $out/share/wavesurfer

18+ mv * $out/nix-support

19+ ln -s $out/{nix-support,bin}/wavesurfer.tcl

20+ wrapProgram "$out/nix-support/wavesurfer.tcl" \

21+ --set TCLLIBPATH "${snack}/lib" \

22+ --prefix PATH : "${lib.makeBinPath [ tcl tk ]}"

23+ '';

24+

25+ meta = {

26+ description = "Tool for recording, playing, editing, viewing and labeling of audio";

27+ homepage = "https://www.speech.kth.se/wavesurfer/";

28+ license = lib.licenses.bsd0;

29+ };

30+}

pkgs/applications/misc/authy/default.nix+7−30

@@ -1,29 +1,7 @@

1−{ alsa-lib

2−, at-spi2-atk

3−, at-spi2-core

4−, atk

5−, autoPatchelfHook

6−, cairo

7−, cups

8−, dbus

9−, electron_9

10−, expat

11−, fetchurl

12−, gdk-pixbuf

13−, glib

14−, gtk3

15−, lib

16−, libappindicator-gtk3

17−, libdbusmenu-gtk3

18−, libuuid

19−, makeWrapper

20−, nspr

21−, nss

22−, pango

23−, squashfsTools

24−, stdenv

25−, systemd

26−, xorg

1+{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups

2+, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib

3+, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper

4+, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg

275}:

286

297let

@@ -33,9 +11,8 @@ in

3311

3412stdenv.mkDerivation rec {

3513 pname = "authy";

36− # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'

37− version = "2.1.0";

38− rev = "9";

14+ version = "1.9.0";

15+ rev = "7";

3916

4017 buildInputs = [

4118 alsa-lib

@@ -73,7 +50,7 @@ stdenv.mkDerivation rec {

7350

7451 src = fetchurl {

7552 url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";

76− sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU=";

53+ sha256 = "10az47cc3lgsdi0ixmmna08nqf9xm7gsl1ph00wfwrxzsi05ygx3";

7754 };

7855

7956 nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];

pkgs/applications/misc/bottles/default.nix+2−2

@@ -20,13 +20,13 @@ let

2020in

2121python3Packages.buildPythonApplication rec {

2222 pname = "bottles";

23− version = "2022.5.2-trento";

23+ version = "2022.4.28-trento";

2424

2525 src = fetchFromGitHub {

2626 owner = "bottlesdevs";

2727 repo = pname;

2828 rev = version;

29− sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84=";

29+ sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w=";

3030 };

3131

3232 postPatch = ''

pkgs/applications/misc/calibre/default.nix+1−5

@@ -104,6 +104,7 @@ mkDerivation rec {

104104 pillow

105105 pyqt-builder

106106 pyqt5

107+ pyqtwebengine

107108 python

108109 regex

109110 sip

@@ -113,11 +114,6 @@ mkDerivation rec {

113114 pycryptodome

114115 # the following are distributed with calibre, but we use upstream instead

115116 odfpy

116− ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [

117− # much of calibre's functionality is usable without a web

118− # browser, so we enable building on platforms which qtwebengine

119− # does not support by simply omitting qtwebengine.

120− pyqtwebengine

121117 ] ++ lib.optional (unrarSupport) unrardll

122118 );

123119

pkgs/applications/misc/charm/default.nix+3−3

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "charm";

5− version = "0.12.0";

5+ version = "0.11.0";

66

77 src = fetchFromGitHub {

88 owner = "charmbracelet";

99 repo = "charm";

1010 rev = "v${version}";

11− sha256 = "sha256-XXKzK5MXJsB3LE7iE5BqnLm0hPs7WbyHR0x9aTldrj4=";

11+ sha256 = "sha256-98TUiFy4X7lMUostkgZikk6r6wzBPF0pqWthrS9nU+U=";

1212 };

1313

14− vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4=";

14+ vendorSha256 = "sha256-enkt7BUAntbB75LR12NB0vW6z9dTPzk0bGdRrn3JHm4=";

1515

1616 ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

1717

pkgs/applications/misc/ff2mpv/default.nixdeleted−34

@@ -1,34 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, python3, mpv }:

2−

3−stdenv.mkDerivation rec {

4− pname = "ff2mpv";

5− version = "4.0.0";

6−

7− src = fetchFromGitHub {

8− owner = "woodruffw";

9− repo = pname;

10− rev = "v${version}";

11− sha256 = "sha256-sxUp/JlmnYW2sPDpIO2/q40cVJBVDveJvbQMT70yjP4=";

12− };

13−

14− buildInputs = [ python3 mpv ];

15−

16− postPatch = ''

17− patchShebangs .

18− substituteInPlace ff2mpv.json \

19− --replace '/home/william/scripts/ff2mpv' "$out/bin/ff2mpv.py"

20− '';

21−

22− installPhase = ''

23− mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts

24− cp ff2mpv.py $out/bin

25− cp ff2mpv.json $out/lib/mozilla/native-messaging-hosts

26− '';

27−

28− meta = {

29− description = "Native Messaging Host for ff2mpv firefox addon.";

30− homepage = "https://github.com/woodruffw/ff2mpv";

31− license = lib.licenses.mit;

32− maintainers = with lib.maintainers; [ Enzime ];

33− };

34−}

pkgs/applications/misc/hello/default.nix+5−8

@@ -1,5 +1,4 @@

1−{ callPackage

2−, lib

1+{ lib

32, stdenv

43, fetchurl

54, nixos

@@ -7,12 +6,12 @@

76, hello

87}:

98

10−stdenv.mkDerivation (finalAttrs: {

9+stdenv.mkDerivation rec {

1110 pname = "hello";

1211 version = "2.12";

1312

1413 src = fetchurl {

15− url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";

14+ url = "mirror://gnu/hello/${pname}-${version}.tar.gz";

1615 sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";

1716 };

1817

@@ -28,8 +27,6 @@ stdenv.mkDerivation (finalAttrs: {

2827 (nixos { environment.noXlibs = true; }).pkgs.hello;

2928 };

3029

31− passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };

32−

3330 meta = with lib; {

3431 description = "A program that produces a familiar, friendly greeting";

3532 longDescription = ''

@@ -37,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: {

3734 It is fully customizable.

3835 '';

3936 homepage = "https://www.gnu.org/software/hello/manual/";

40− changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";

37+ changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}";

4138 license = licenses.gpl3Plus;

4239 maintainers = [ maintainers.eelco ];

4340 platforms = platforms.all;

4441 };

45−})

42+}

pkgs/applications/misc/hello/test.nixdeleted−8

@@ -1,8 +0,0 @@

1−{ runCommand, hello }:

2−

3−runCommand "hello-test-run" {

4− nativeBuildInputs = [ hello ];

5−} ''

6− diff -U3 --color=auto <(hello) <(echo 'Hello, world!')

7− touch $out

8−''

pkgs/applications/misc/joplin-desktop/default.nix+3−3

@@ -2,7 +2,7 @@

22

33let

44 pname = "joplin-desktop";

5− version = "2.7.15";

5+ version = "2.7.13";

66 name = "${pname}-${version}";

77

88 inherit (stdenv.hostPlatform) system;

@@ -16,8 +16,8 @@ let

1616 src = fetchurl {

1717 url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";

1818 sha256 = {

19− x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts=";

20− x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA=";

19+ x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs=";

20+ x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k=";

2121 }.${system} or throwSystem;

2222 };

2323

pkgs/applications/misc/kiln/default.nix+3−3

@@ -2,18 +2,18 @@

22

33buildGoModule rec {

44 pname = "kiln";

5− version = "0.3.0";

5+ version = "0.2.1";

66

77 src = fetchFromSourcehut {

88 owner = "~adnano";

99 repo = pname;

1010 rev = version;

11− hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";

11+ hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";

1212 };

1313

1414 nativeBuildInputs = [ scdoc ];

1515

16− vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";

16+ vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";

1717

1818 installPhase = ''

1919 runHook preInstall

pkgs/applications/misc/libosmocore/default.nix+6−21

@@ -1,25 +1,16 @@

1−{ lib, stdenv

2−, autoreconfHook

3−, fetchFromGitHub

4−, gnutls

5−, libmnl

6−, libusb1

7−, lksctp-tools

8−, pcsclite

9−, pkg-config

10−, python3

11−, talloc

1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config

2+, pcsclite, talloc, python2, gnutls

123}:

134

145stdenv.mkDerivation rec {

156 pname = "libosmocore";

16− version = "1.6.0";

7+ version = "1.2.0";

178

189 src = fetchFromGitHub {

1910 owner = "osmocom";

2011 repo = "libosmocore";

2112 rev = version;

22− hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";

13+ sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";

2314 };

2415

2516 propagatedBuildInputs = [

@@ -27,17 +18,11 @@ stdenv.mkDerivation rec {

2718 ];

2819

2920 nativeBuildInputs = [

30− autoreconfHook

31− pkg-config

32− python3

21+ autoreconfHook pkg-config

3322 ];

3423

3524 buildInputs = [

36− gnutls

37− libmnl

38− libusb1

39− lksctp-tools

40− pcsclite

25+ pcsclite python2 gnutls

4126 ];

4227

4328 enableParallelBuilding = true;

pkgs/applications/misc/marktext/default.nix+6−5

@@ -2,19 +2,20 @@

22

33let

44 pname = "marktext";

5− version = "0.17.1";

5+ version = "v0.17.1";

6+ name = "${pname}-${version}-binary";

67

78 src = fetchurl {

8− url = "https://github.com/marktext/marktext/releases/download/v${version}/marktext-x86_64.AppImage";

9+ url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";

910 sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7";

1011 };

1112

1213 appimageContents = appimageTools.extractType2 {

13− inherit pname version src;

14+ inherit name src;

1415 };

1516in

1617appimageTools.wrapType2 rec {

17− inherit pname version src;

18+ inherit name src;

1819

1920 profile = ''

2021 export LC_ALL=C.UTF-8

@@ -34,7 +35,7 @@ appimageTools.wrapType2 rec {

3435

3536 extraInstallCommands = ''

3637 # Strip version from binary name.

37− mv $out/bin/${pname}-${version} $out/bin/${pname}

38+ mv $out/bin/${name} $out/bin/${pname}

3839

3940 install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop

4041 substituteInPlace $out/share/applications/marktext.desktop \

pkgs/applications/misc/moonlight-qt/default.nix+2−2

@@ -20,13 +20,13 @@

2020

2121stdenv.mkDerivation rec {

2222 pname = "moonlight-qt";

23− version = "4.0.0";

23+ version = "3.2.0";

2424

2525 src = fetchFromGitHub {

2626 owner = "moonlight-stream";

2727 repo = pname;

2828 rev = "v${version}";

29− sha256 = "sha256-CfOphr8QILCZg+UrImp5JO/1DTqoan5EwiQeTKR15Fo=";

29+ sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI=";

3030 fetchSubmodules = true;

3131 };

3232

pkgs/applications/misc/opencpn/default.nix+16−85

@@ -1,100 +1,31 @@

1−{ stdenv, lib

2−, alsa-utils

3−, at-spi2-core

4−, cmake

5−, curl

6−, dbus

7−, epoxy

8−, fetchFromGitHub

9−, flac

10−, gtk3

11−, jasper

12−, libGLU

13−, libarchive

14−, libdatrie

15−, libelf

16−, libexif

17−, libogg

18−, libopus

19−, libselinux

20−, libsepol

21−, libsndfile

22−, libthai

23−, libunarr

24−, libusb

25−, libvorbis

26−, libxkbcommon

27−, lsb-release

28−, lz4

29−, pcre

30−, pkg-config

31−, portaudio

32−, sqlite

33−, tinyxml

34−, udev

35−, util-linux

36−, wxGTK31-gtk3

37−, xorg

38−}:

1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,

2+ gettext, glib, portaudio }:

393

404stdenv.mkDerivation rec {

41− pname = "opencpn";

42− version = "5.6.2";

5+ pname = "opencpn-unstable";

6+ version = "2019-11-21";

437

448 src = fetchFromGitHub {

459 owner = "OpenCPN";

4610 repo = "OpenCPN";

47− rev = "Release_${version}";

48− hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";

11+ rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";

12+ sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";

4913 };

5014

51− nativeBuildInputs = [ cmake lsb-release pkg-config ];

52− buildInputs = [

53− alsa-utils

54− at-spi2-core

55− curl

56− dbus

57− epoxy

58− flac

59− gtk3

60− jasper

61− libGLU

62− libarchive

63− libdatrie

64− libelf

65− libexif

66− libogg

67− libopus

68− libselinux

69− libsepol

70− libsndfile

71− libthai

72− libunarr

73− libusb

74− libvorbis

75− libxkbcommon

76− lz4

77− pcre

78− portaudio

79− sqlite

80− tinyxml

81− udev

82− util-linux

83− wxGTK31-gtk3

84− xorg.libXdmcp

85− xorg.libXtst

86− ];

87−

15+ nativeBuildInputs = [ cmake pkg-config ];

16+ buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext

17+ glib portaudio ];

8818

89− cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];

90−

91− doCheck = true;

19+ cmakeFlags = [

20+ "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

21+ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

22+ ];

9223

93− meta = with lib; {

24+ meta = {

9425 description = "A concise ChartPlotter/Navigator";

95− maintainers = with maintainers; [ kragniz lovesegfault ];

26+ maintainers = [ lib.maintainers.kragniz ];

9627 platforms = [ "x86_64-linux" ];

97− license = licenses.gpl2;

28+ license = lib.licenses.gpl2;

9829 homepage = "https://opencpn.org/";

9930 };

10031}

pkgs/applications/misc/prusa-slicer/default.nix+2−2

@@ -4,7 +4,7 @@

44}:

55stdenv.mkDerivation rec {

66 pname = "prusa-slicer";

7− version = "2.4.2";

7+ version = "2.4.1";

88

99 nativeBuildInputs = [

1010 cmake

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {

7474 src = fetchFromGitHub {

7575 owner = "prusa3d";

7676 repo = "PrusaSlicer";

77− sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af";

77+ sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA=";

7878 rev = "version_${version}";

7979 };

8080

pkgs/applications/misc/skytemple/default.nix+2−5

@@ -2,13 +2,13 @@

22

33python3Packages.buildPythonApplication rec {

44 pname = "skytemple";

5− version = "1.3.10";

5+ version = "1.3.2";

66

77 src = fetchFromGitHub {

88 owner = "SkyTemple";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";

11+ sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";

1212 };

1313

1414 buildInputs = [

@@ -26,10 +26,7 @@ python3Packages.buildPythonApplication rec {

2626 packaging

2727 pycairo

2828 pygal

29− psutil

30− gbulb

3129 pypresence

32− sentry-sdk

3330 setuptools

3431 skytemple-dtef

3532 skytemple-eventserver

pkgs/applications/misc/sqls/default.nix+3−5

@@ -2,21 +2,19 @@

22

33buildGoModule rec {

44 pname = "sqls";

5− version = "0.2.22";

5+ version = "0.2.20";

66

77 src = fetchFromGitHub {

88 owner = "lighttiger2505";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-xtvm/NVL98dRzQL1id/WwT/NdsnB7qTRVR7jfrRsabY=";

11+ sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ=";

1212 };

1313

14− vendorSha256 = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw=";

14+ vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo=";

1515

1616 ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ];

1717

18− doCheck = false;

19−

2018 meta = with lib; {

2119 homepage = "https://github.com/lighttiger2505/sqls";

2220 description = "SQL language server written in Go";

pkgs/applications/misc/tut/default.nix+2−2

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "tut";

5− version = "0.0.46";

5+ version = "0.0.42";

66

77 src = fetchFromGitHub {

88 owner = "RasmusLindroth";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w=";

11+ sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";

1212 };

1313

1414 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";

pkgs/applications/misc/udiskie/default.nix+25−30

@@ -1,47 +1,42 @@

11{ lib

2−, asciidoc

32, fetchFromGitHub

3+, buildPythonApplication

4+, asciidoc-full

5+, docopt

6+, gettext

47, gobject-introspection

58, gtk3

6−, installShellFiles

9+, keyutils

710, libappindicator-gtk3

811, libnotify

912, librsvg

10−, python3

13+, nose

14+, pygobject3

15+, pyyaml

1116, udisks2

1217, wrapGAppsHook

1318}:

1419

15−python3.pkgs.buildPythonApplication rec {

20+buildPythonApplication rec {

1621 pname = "udiskie";

17− version = "2.4.2";

18−

19− format = "setuptools";

22+ version = "2.4.0";

2023

2124 src = fetchFromGitHub {

2225 owner = "coldfix";

2326 repo = "udiskie";

2427 rev = "v${version}";

25− hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";

28+ hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";

2629 };

2730

28− patches = [

29− ./locale-path.patch

30− ];

31−

32− postPatch = ''

33− substituteInPlace udiskie/locale.py --subst-var out

34− '';

31+ outputs = [ "out" "man" ];

3532

3633 nativeBuildInputs = [

37− asciidoc # Man page

34+ asciidoc-full # Man page

35+ gettext

3836 gobject-introspection

39− installShellFiles

4037 wrapGAppsHook

4138 ];

4239

43− dontWrapGApps = true;

44−

4540 buildInputs = [

4641 gobject-introspection

4742 gtk3

@@ -51,9 +46,8 @@ python3.pkgs.buildPythonApplication rec {

5146 udisks2

5247 ];

5348

54− propagatedBuildInputs = with python3.pkgs; [

49+ propagatedBuildInputs = [

5550 docopt

56− keyutils

5751 pygobject3

5852 pyyaml

5953 ];

@@ -63,20 +57,21 @@ python3.pkgs.buildPythonApplication rec {

6357 '';

6458

6559 postInstall = ''

66− installManPage doc/udiskie.8

60+ mkdir -p $man/share/man/man8

61+ cp -v doc/udiskie.8 $man/share/man/man8/

6762 '';

6863

69− preFixup = ''

70− makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

71− '';

72−

73− checkInputs = with python3.pkgs; [

74− pytestCheckHook

64+ checkInputs = [

65+ keyutils

66+ nose

7567 ];

7668

69+ checkPhase = ''

70+ nosetests

71+ '';

72+

7773 meta = with lib; {

7874 homepage = "https://github.com/coldfix/udiskie";

79− changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";

8075 description = "Removable disk automounter for udisks";

8176 longDescription = ''

8277 udiskie is a udisks2 front-end that allows to manage removeable media such

@@ -93,6 +88,6 @@ python3.pkgs.buildPythonApplication rec {

9388 - password caching (requires python keyutils 0.3)

9489 '';

9590 license = licenses.mit;

96− maintainers = with maintainers; [ AndersonTorres dotlambda ];

91+ maintainers = with maintainers; [ AndersonTorres ];

9792 };

9893}

pkgs/applications/misc/udiskie/locale-path.patchdeleted−17

@@ -1,17 +0,0 @@

1−diff --git a/udiskie/locale.py b/udiskie/locale.py

2−index f12bea9..450e38b 100644

3−--- a/udiskie/locale.py

4−+++ b/udiskie/locale.py

5−@@ -10,10 +10,8 @@ from gettext import translation

6− testdirs = [

7− # manual override:

8− os.environ.get('TEXTDOMAINDIR'),

9−- # editable installation:

10−- os.path.join(os.path.dirname(__file__), '../build/locale'),

11−- # user or virtualenv installation:

12−- os.path.join(sys.prefix, 'share/locale'),

13−+ # Nix installation:

14−+ os.path.join('@out@', 'share/locale'),

15− ]

16− testfile = 'en_US/LC_MESSAGES/udiskie.mo'

17− localedir = next(

pkgs/applications/misc/upwork/default.nix+3−3

@@ -6,11 +6,11 @@

66

77stdenv.mkDerivation rec {

88 pname = "upwork";

9− version = "5.6.10.13";

9+ version = "5.6.10.7";

1010

1111 src = fetchurl {

12− url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";

13− sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";

12+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";

13+ sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";

1414 };

1515

1616 nativeBuildInputs = [

pkgs/applications/misc/xpdf/default.nix+2−2

@@ -12,11 +12,11 @@ assert enablePrinting -> cups != null;

1212

1313stdenv.mkDerivation rec {

1414 pname = "xpdf";

15− version = "4.04";

15+ version = "4.03";

1616

1717 src = fetchzip {

1818 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";

19− hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY=";

19+ sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";

2020 };

2121

2222 # Fix "No known features for CXX compiler", see

pkgs/applications/misc/xplr/default.nix+3−3

@@ -2,18 +2,18 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "xplr";

5− version = "0.17.6";

5+ version = "0.17.3";

66

77 src = fetchFromGitHub {

88 owner = "sayanarijit";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";

11+ sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";

1212 };

1313

1414 buildInputs = lib.optional stdenv.isDarwin libiconv;

1515

16− cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";

16+ cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";

1717

1818 meta = with lib; {

1919 description = "A hackable, minimal, fast TUI file explorer";

pkgs/applications/networking/bee/bee.nix+3−1

@@ -1,4 +1,4 @@

1−{ version ? "release", lib, fetchFromGitHub, buildGoModule }:

1+{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }:

22

33let

44

@@ -39,6 +39,8 @@ buildGoModule {

3939 inherit (versionSpec) rev sha256;

4040 };

4141

42+ nativeBuildInputs = [ coreutils ];

43+

4244 subPackages = [ "cmd/bee" ];

4345

4446 # no symbol table, no debug info, and pass the commit for the version string

pkgs/applications/networking/browsers/brave/default.nix+55−71

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, wrapGAppsHook

1+{ stdenv, lib, fetchurl

22, dpkg

33, alsa-lib

44, at-spi2-atk

@@ -15,6 +15,7 @@

1515, gnome

1616, gsettings-desktop-schemas

1717, gtk3

18+, libpulseaudio

1819, libuuid

1920, libdrm

2021, libX11

@@ -40,61 +41,63 @@

4041, xorg

4142, zlib

4243, xdg-utils

43−, snappy

44−

45−# command line arguments which are always set e.g "--disable-gpu"

44+, wrapGAppsHook

4645, commandLineArgs ? ""

47−

48−# Necessary for USB audio devices.

49−, pulseSupport ? stdenv.isLinux

50−, libpulseaudio

51−

52−# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)

53−, libGL

54−

55−# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)

56−, libvaSupport ? stdenv.isLinux

57−, libva

58−, enableVideoAcceleration ? libvaSupport

59−

60−# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API

61−, vulkanSupport ? false

62−, addOpenGLRunpath

63−, enableVulkan ? vulkanSupport

6446}:

6547

6648let

67− inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath

68− optionalString strings escapeShellArg;

69−

70− deps = [

71− alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat

72− fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL

73− libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

74− libXext libXfixes libXi libXrandr libXrender libxshmfence

75− libXtst libuuid mesa nspr nss pango pipewire udev wayland

76− xdg-utils xorg.libxcb zlib snappy

77− ]

78− ++ optional pulseSupport libpulseaudio

79− ++ optional libvaSupport libva;

80−

81− rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;

82− binpath = makeBinPath deps;

83−

84− enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ]

85− ++ optional enableVulkan "Vulkan";

86−

87− # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935

88− disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder";

49+

50+rpath = lib.makeLibraryPath [

51+ alsa-lib

52+ at-spi2-atk

53+ at-spi2-core

54+ atk

55+ cairo

56+ cups

57+ dbus

58+ expat

59+ fontconfig

60+ freetype

61+ gdk-pixbuf

62+ glib

63+ gtk3

64+ libdrm

65+ libpulseaudio

66+ libX11

67+ libxkbcommon

68+ libXScrnSaver

69+ libXcomposite

70+ libXcursor

71+ libXdamage

72+ libXext

73+ libXfixes

74+ libXi

75+ libXrandr

76+ libXrender

77+ libxshmfence

78+ libXtst

79+ libuuid

80+ mesa

81+ nspr

82+ nss

83+ pango

84+ pipewire

85+ udev

86+ wayland

87+ xdg-utils

88+ xorg.libxcb

89+ zlib

90+];

91+

8992in

9093

9194stdenv.mkDerivation rec {

9295 pname = "brave";

93− version = "1.38.109";

96+ version = "1.37.116";

9497

9598 src = fetchurl {

9699 url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

97− sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI=";

100+ sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw=";

98101 };

99102

100103 dontConfigure = true;

@@ -104,13 +107,7 @@ stdenv.mkDerivation rec {

104107

105108 nativeBuildInputs = [ dpkg wrapGAppsHook ];

106109

107− buildInputs = [

108− # needed for GSETTINGS_SCHEMAS_PATH

109− glib gsettings-desktop-schemas gtk3

110−

111− # needed for XDG_ICON_DIRS

112− gnome.adwaita-icon-theme

113− ];

110+ buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ];

114111

115112 unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";

116113

@@ -131,9 +128,9 @@ stdenv.mkDerivation rec {

131128 ln -sf $BINARYWRAPPER $out/bin/brave

132129

133130 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do

134− patchelf \

135− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

136− --set-rpath "${rpath}" $exe

131+ patchelf \

132+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

133+ --set-rpath "${rpath}" $exe

137134 done

138135

139136 # Fix paths

@@ -164,21 +161,8 @@ stdenv.mkDerivation rec {

164161

165162 preFixup = ''

166163 # Add command line args to wrapGApp.

167− gappsWrapperArgs+=(

168− --prefix LD_LIBRARY_PATH : ${rpath}

169− --prefix PATH : ${binpath}

170− ${optionalString (enableFeatures != []) ''

171− --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}"

172− ''}

173− ${optionalString (disableFeatures != []) ''

174− --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"

175− ''}

176− --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"

177− ${optionalString vulkanSupport ''

178− --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"

179− --add-flags ${escapeShellArg commandLineArgs}

180− ''}

181− )

164+ gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs})

165+ gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}")

182166 '';

183167

184168 installCheckPhase = ''

@@ -191,7 +175,7 @@ stdenv.mkDerivation rec {

191175 meta = with lib; {

192176 homepage = "https://brave.com/";

193177 description = "Privacy-oriented browser for Desktop and Laptop computers";

194− changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + replaceStrings [ "." ] [ "" ] version;

178+ changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version;

195179 longDescription = ''

196180 Brave browser blocks the ads and trackers that slow you down,

197181 chew up your bandwidth, and invade your privacy. Brave lets you

pkgs/applications/networking/browsers/chromium/common.nix+2−2

@@ -7,7 +7,7 @@

77# Native build inputs:

88, ninja, pkg-config

99, python3, perl

10−, which

10+, gnutar, which

1111, llvmPackages

1212# postPatch:

1313, pkgsBuildHost

@@ -126,7 +126,7 @@ let

126126 nativeBuildInputs = [

127127 ninja pkg-config

128128 python3WithPackages perl

129− which

129+ gnutar which

130130 llvmPackages.bintools

131131 ];

132132

pkgs/applications/networking/browsers/chromium/upstream-info.json+5−5

@@ -45,9 +45,9 @@

4545 }

4646 },

4747 "ungoogled-chromium": {

48− "version": "101.0.4951.54",

49− "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",

50− "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",

48+ "version": "101.0.4951.41",

49+ "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",

50+ "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",

5151 "deps": {

5252 "gn": {

5353 "version": "2022-03-14",

@@ -56,8 +56,8 @@

5656 "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"

5757 },

5858 "ungoogled-patches": {

59− "rev": "101.0.4951.54-1",

60− "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"

59+ "rev": "101.0.4951.41-1",

60+ "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"

6161 }

6262 }

6363 }

pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393

@@ -1,985 +1,985 @@

11{

2− version = "101.0b2";

2+ version = "100.0b6";

33 sources = [

4− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ach/firefox-101.0b2.tar.bz2";

4+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ach/firefox-100.0b6.tar.bz2";

55 locale = "ach";

66 arch = "linux-x86_64";

7− sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6";

7+ sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085";

88 }

9− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/af/firefox-101.0b2.tar.bz2";

9+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/af/firefox-100.0b6.tar.bz2";

1010 locale = "af";

1111 arch = "linux-x86_64";

12− sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82";

12+ sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790";

1313 }

14− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/an/firefox-101.0b2.tar.bz2";

14+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/an/firefox-100.0b6.tar.bz2";

1515 locale = "an";

1616 arch = "linux-x86_64";

17− sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1";

17+ sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f";

1818 }

19− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ar/firefox-101.0b2.tar.bz2";

19+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ar/firefox-100.0b6.tar.bz2";

2020 locale = "ar";

2121 arch = "linux-x86_64";

22− sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50";

22+ sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e";

2323 }

24− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ast/firefox-101.0b2.tar.bz2";

24+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ast/firefox-100.0b6.tar.bz2";

2525 locale = "ast";

2626 arch = "linux-x86_64";

27− sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e";

27+ sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb";

2828 }

29− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/az/firefox-101.0b2.tar.bz2";

29+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/az/firefox-100.0b6.tar.bz2";

3030 locale = "az";

3131 arch = "linux-x86_64";

32− sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c";

32+ sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701";

3333 }

34− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/be/firefox-101.0b2.tar.bz2";

34+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/be/firefox-100.0b6.tar.bz2";

3535 locale = "be";

3636 arch = "linux-x86_64";

37− sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2";

37+ sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3";

3838 }

39− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bg/firefox-101.0b2.tar.bz2";

39+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bg/firefox-100.0b6.tar.bz2";

4040 locale = "bg";

4141 arch = "linux-x86_64";

42− sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2";

42+ sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3";

4343 }

44− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bn/firefox-101.0b2.tar.bz2";

44+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bn/firefox-100.0b6.tar.bz2";

4545 locale = "bn";

4646 arch = "linux-x86_64";

47− sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb";

47+ sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b";

4848 }

49− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/br/firefox-101.0b2.tar.bz2";

49+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/br/firefox-100.0b6.tar.bz2";

5050 locale = "br";

5151 arch = "linux-x86_64";

52− sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267";

52+ sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130";

5353 }

54− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bs/firefox-101.0b2.tar.bz2";

54+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bs/firefox-100.0b6.tar.bz2";

5555 locale = "bs";

5656 arch = "linux-x86_64";

57− sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3";

57+ sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61";

5858 }

59− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca-valencia/firefox-101.0b2.tar.bz2";

59+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca-valencia/firefox-100.0b6.tar.bz2";

6060 locale = "ca-valencia";

6161 arch = "linux-x86_64";

62− sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99";

62+ sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a";

6363 }

64− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca/firefox-101.0b2.tar.bz2";

64+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca/firefox-100.0b6.tar.bz2";

6565 locale = "ca";

6666 arch = "linux-x86_64";

67− sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc";

67+ sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4";

6868 }

69− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cak/firefox-101.0b2.tar.bz2";

69+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cak/firefox-100.0b6.tar.bz2";

7070 locale = "cak";

7171 arch = "linux-x86_64";

72− sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014";

72+ sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a";

7373 }

74− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cs/firefox-101.0b2.tar.bz2";

74+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cs/firefox-100.0b6.tar.bz2";

7575 locale = "cs";

7676 arch = "linux-x86_64";

77− sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c";

77+ sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35";

7878 }

79− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cy/firefox-101.0b2.tar.bz2";

79+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cy/firefox-100.0b6.tar.bz2";

8080 locale = "cy";

8181 arch = "linux-x86_64";

82− sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae";

82+ sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2";

8383 }

84− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/da/firefox-101.0b2.tar.bz2";

84+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/da/firefox-100.0b6.tar.bz2";

8585 locale = "da";

8686 arch = "linux-x86_64";

87− sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781";

87+ sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25";

8888 }

89− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/de/firefox-101.0b2.tar.bz2";

89+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/de/firefox-100.0b6.tar.bz2";

9090 locale = "de";

9191 arch = "linux-x86_64";

92− sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360";

92+ sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee";

9393 }

94− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/dsb/firefox-101.0b2.tar.bz2";

94+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/dsb/firefox-100.0b6.tar.bz2";

9595 locale = "dsb";

9696 arch = "linux-x86_64";

97− sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc";

97+ sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a";

9898 }

99− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/el/firefox-101.0b2.tar.bz2";

99+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/el/firefox-100.0b6.tar.bz2";

100100 locale = "el";

101101 arch = "linux-x86_64";

102− sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa";

102+ sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac";

103103 }

104− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-CA/firefox-101.0b2.tar.bz2";

104+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-CA/firefox-100.0b6.tar.bz2";

105105 locale = "en-CA";

106106 arch = "linux-x86_64";

107− sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e";

107+ sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587";

108108 }

109− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-GB/firefox-101.0b2.tar.bz2";

109+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-GB/firefox-100.0b6.tar.bz2";

110110 locale = "en-GB";

111111 arch = "linux-x86_64";

112− sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23";

112+ sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab";

113113 }

114− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-US/firefox-101.0b2.tar.bz2";

114+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-US/firefox-100.0b6.tar.bz2";

115115 locale = "en-US";

116116 arch = "linux-x86_64";

117− sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0";

117+ sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e";

118118 }

119− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eo/firefox-101.0b2.tar.bz2";

119+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eo/firefox-100.0b6.tar.bz2";

120120 locale = "eo";

121121 arch = "linux-x86_64";

122− sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95";

122+ sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5";

123123 }

124− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-AR/firefox-101.0b2.tar.bz2";

124+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-AR/firefox-100.0b6.tar.bz2";

125125 locale = "es-AR";

126126 arch = "linux-x86_64";

127− sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf";

127+ sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946";

128128 }

129− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-CL/firefox-101.0b2.tar.bz2";

129+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-CL/firefox-100.0b6.tar.bz2";

130130 locale = "es-CL";

131131 arch = "linux-x86_64";

132− sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb";

132+ sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff";

133133 }

134− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-ES/firefox-101.0b2.tar.bz2";

134+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-ES/firefox-100.0b6.tar.bz2";

135135 locale = "es-ES";

136136 arch = "linux-x86_64";

137− sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4";

137+ sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5";

138138 }

139− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-MX/firefox-101.0b2.tar.bz2";

139+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-MX/firefox-100.0b6.tar.bz2";

140140 locale = "es-MX";

141141 arch = "linux-x86_64";

142− sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200";

142+ sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026";

143143 }

144− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/et/firefox-101.0b2.tar.bz2";

144+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/et/firefox-100.0b6.tar.bz2";

145145 locale = "et";

146146 arch = "linux-x86_64";

147− sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375";

147+ sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322";

148148 }

149− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eu/firefox-101.0b2.tar.bz2";

149+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eu/firefox-100.0b6.tar.bz2";

150150 locale = "eu";

151151 arch = "linux-x86_64";

152− sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b";

152+ sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9";

153153 }

154− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fa/firefox-101.0b2.tar.bz2";

154+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fa/firefox-100.0b6.tar.bz2";

155155 locale = "fa";

156156 arch = "linux-x86_64";

157− sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624";

157+ sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d";

158158 }

159− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ff/firefox-101.0b2.tar.bz2";

159+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ff/firefox-100.0b6.tar.bz2";

160160 locale = "ff";

161161 arch = "linux-x86_64";

162− sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80";

162+ sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234";

163163 }

164− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fi/firefox-101.0b2.tar.bz2";

164+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fi/firefox-100.0b6.tar.bz2";

165165 locale = "fi";

166166 arch = "linux-x86_64";

167− sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0";

167+ sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4";

168168 }

169− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fr/firefox-101.0b2.tar.bz2";

169+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fr/firefox-100.0b6.tar.bz2";

170170 locale = "fr";

171171 arch = "linux-x86_64";

172− sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198";

172+ sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c";

173173 }

174− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fy-NL/firefox-101.0b2.tar.bz2";

174+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fy-NL/firefox-100.0b6.tar.bz2";

175175 locale = "fy-NL";

176176 arch = "linux-x86_64";

177− sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584";

177+ sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d";

178178 }

179− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ga-IE/firefox-101.0b2.tar.bz2";

179+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ga-IE/firefox-100.0b6.tar.bz2";

180180 locale = "ga-IE";

181181 arch = "linux-x86_64";

182− sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657";

182+ sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc";

183183 }

184− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gd/firefox-101.0b2.tar.bz2";

184+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gd/firefox-100.0b6.tar.bz2";

185185 locale = "gd";

186186 arch = "linux-x86_64";

187− sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49";

187+ sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c";

188188 }

189− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gl/firefox-101.0b2.tar.bz2";

189+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gl/firefox-100.0b6.tar.bz2";

190190 locale = "gl";

191191 arch = "linux-x86_64";

192− sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e";

192+ sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2";

193193 }

194− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gn/firefox-101.0b2.tar.bz2";

194+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gn/firefox-100.0b6.tar.bz2";

195195 locale = "gn";

196196 arch = "linux-x86_64";

197− sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de";

197+ sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634";

198198 }

199− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gu-IN/firefox-101.0b2.tar.bz2";

199+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gu-IN/firefox-100.0b6.tar.bz2";

200200 locale = "gu-IN";

201201 arch = "linux-x86_64";

202− sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499";

202+ sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7";

203203 }

204− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/he/firefox-101.0b2.tar.bz2";

204+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/he/firefox-100.0b6.tar.bz2";

205205 locale = "he";

206206 arch = "linux-x86_64";

207− sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4";

207+ sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5";

208208 }

209− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hi-IN/firefox-101.0b2.tar.bz2";

209+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hi-IN/firefox-100.0b6.tar.bz2";

210210 locale = "hi-IN";

211211 arch = "linux-x86_64";

212− sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f";

212+ sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09";

213213 }

214− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hr/firefox-101.0b2.tar.bz2";

214+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hr/firefox-100.0b6.tar.bz2";

215215 locale = "hr";

216216 arch = "linux-x86_64";

217− sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270";

217+ sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945";

218218 }

219− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hsb/firefox-101.0b2.tar.bz2";

219+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hsb/firefox-100.0b6.tar.bz2";

220220 locale = "hsb";

221221 arch = "linux-x86_64";

222− sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f";

222+ sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c";

223223 }

224− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hu/firefox-101.0b2.tar.bz2";

224+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hu/firefox-100.0b6.tar.bz2";

225225 locale = "hu";

226226 arch = "linux-x86_64";

227− sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10";

227+ sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03";

228228 }

229− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hy-AM/firefox-101.0b2.tar.bz2";

229+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hy-AM/firefox-100.0b6.tar.bz2";

230230 locale = "hy-AM";

231231 arch = "linux-x86_64";

232− sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e";

232+ sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5";

233233 }

234− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ia/firefox-101.0b2.tar.bz2";

234+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ia/firefox-100.0b6.tar.bz2";

235235 locale = "ia";

236236 arch = "linux-x86_64";

237− sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6";

237+ sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098";

238238 }

239− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/id/firefox-101.0b2.tar.bz2";

239+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/id/firefox-100.0b6.tar.bz2";

240240 locale = "id";

241241 arch = "linux-x86_64";

242− sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3";

242+ sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b";

243243 }

244− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/is/firefox-101.0b2.tar.bz2";

244+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/is/firefox-100.0b6.tar.bz2";

245245 locale = "is";

246246 arch = "linux-x86_64";

247− sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab";

247+ sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733";

248248 }

249− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/it/firefox-101.0b2.tar.bz2";

249+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/it/firefox-100.0b6.tar.bz2";

250250 locale = "it";

251251 arch = "linux-x86_64";

252− sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c";

252+ sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2";

253253 }

254− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ja/firefox-101.0b2.tar.bz2";

254+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ja/firefox-100.0b6.tar.bz2";

255255 locale = "ja";

256256 arch = "linux-x86_64";

257− sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378";

257+ sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921";

258258 }

259− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ka/firefox-101.0b2.tar.bz2";

259+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ka/firefox-100.0b6.tar.bz2";

260260 locale = "ka";

261261 arch = "linux-x86_64";

262− sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c";

262+ sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9";

263263 }

264− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kab/firefox-101.0b2.tar.bz2";

264+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kab/firefox-100.0b6.tar.bz2";

265265 locale = "kab";

266266 arch = "linux-x86_64";

267− sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712";

267+ sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f";

268268 }

269− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kk/firefox-101.0b2.tar.bz2";

269+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kk/firefox-100.0b6.tar.bz2";

270270 locale = "kk";

271271 arch = "linux-x86_64";

272− sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05";

272+ sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab";

273273 }

274− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/km/firefox-101.0b2.tar.bz2";

274+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/km/firefox-100.0b6.tar.bz2";

275275 locale = "km";

276276 arch = "linux-x86_64";

277− sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f";

277+ sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d";

278278 }

279− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kn/firefox-101.0b2.tar.bz2";

279+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kn/firefox-100.0b6.tar.bz2";

280280 locale = "kn";

281281 arch = "linux-x86_64";

282− sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5";

282+ sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0";

283283 }

284− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ko/firefox-101.0b2.tar.bz2";

284+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ko/firefox-100.0b6.tar.bz2";

285285 locale = "ko";

286286 arch = "linux-x86_64";

287− sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094";

287+ sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630";

288288 }

289− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lij/firefox-101.0b2.tar.bz2";

289+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lij/firefox-100.0b6.tar.bz2";

290290 locale = "lij";

291291 arch = "linux-x86_64";

292− sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4";

292+ sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8";

293293 }

294− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lt/firefox-101.0b2.tar.bz2";

294+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lt/firefox-100.0b6.tar.bz2";

295295 locale = "lt";

296296 arch = "linux-x86_64";

297− sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31";

297+ sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d";

298298 }

299− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lv/firefox-101.0b2.tar.bz2";

299+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lv/firefox-100.0b6.tar.bz2";

300300 locale = "lv";

301301 arch = "linux-x86_64";

302− sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29";

302+ sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9";

303303 }

304− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mk/firefox-101.0b2.tar.bz2";

304+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mk/firefox-100.0b6.tar.bz2";

305305 locale = "mk";

306306 arch = "linux-x86_64";

307− sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b";

307+ sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d";

308308 }

309− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mr/firefox-101.0b2.tar.bz2";

309+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mr/firefox-100.0b6.tar.bz2";

310310 locale = "mr";

311311 arch = "linux-x86_64";

312− sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c";

312+ sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5";

313313 }

314− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ms/firefox-101.0b2.tar.bz2";

314+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ms/firefox-100.0b6.tar.bz2";

315315 locale = "ms";

316316 arch = "linux-x86_64";

317− sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b";

317+ sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949";

318318 }

319− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/my/firefox-101.0b2.tar.bz2";

319+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/my/firefox-100.0b6.tar.bz2";

320320 locale = "my";

321321 arch = "linux-x86_64";

322− sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031";

322+ sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9";

323323 }

324− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nb-NO/firefox-101.0b2.tar.bz2";

324+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nb-NO/firefox-100.0b6.tar.bz2";

325325 locale = "nb-NO";

326326 arch = "linux-x86_64";

327− sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2";

327+ sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284";

328328 }

329− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ne-NP/firefox-101.0b2.tar.bz2";

329+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ne-NP/firefox-100.0b6.tar.bz2";

330330 locale = "ne-NP";

331331 arch = "linux-x86_64";

332− sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d";

332+ sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b";

333333 }

334− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nl/firefox-101.0b2.tar.bz2";

334+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nl/firefox-100.0b6.tar.bz2";

335335 locale = "nl";

336336 arch = "linux-x86_64";

337− sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d";

337+ sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51";

338338 }

339− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nn-NO/firefox-101.0b2.tar.bz2";

339+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nn-NO/firefox-100.0b6.tar.bz2";

340340 locale = "nn-NO";

341341 arch = "linux-x86_64";

342− sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b";

342+ sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd";

343343 }

344− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/oc/firefox-101.0b2.tar.bz2";

344+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/oc/firefox-100.0b6.tar.bz2";

345345 locale = "oc";

346346 arch = "linux-x86_64";

347− sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513";

347+ sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7";

348348 }

349− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pa-IN/firefox-101.0b2.tar.bz2";

349+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pa-IN/firefox-100.0b6.tar.bz2";

350350 locale = "pa-IN";

351351 arch = "linux-x86_64";

352− sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552";

352+ sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb";

353353 }

354− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pl/firefox-101.0b2.tar.bz2";

354+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pl/firefox-100.0b6.tar.bz2";

355355 locale = "pl";

356356 arch = "linux-x86_64";

357− sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0";

357+ sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585";

358358 }

359− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-BR/firefox-101.0b2.tar.bz2";

359+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-BR/firefox-100.0b6.tar.bz2";

360360 locale = "pt-BR";

361361 arch = "linux-x86_64";

362− sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030";

362+ sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4";

363363 }

364− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-PT/firefox-101.0b2.tar.bz2";

364+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-PT/firefox-100.0b6.tar.bz2";

365365 locale = "pt-PT";

366366 arch = "linux-x86_64";

367− sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428";

367+ sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44";

368368 }

369− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/rm/firefox-101.0b2.tar.bz2";

369+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/rm/firefox-100.0b6.tar.bz2";

370370 locale = "rm";

371371 arch = "linux-x86_64";

372− sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b";

372+ sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53";

373373 }

374− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ro/firefox-101.0b2.tar.bz2";

374+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ro/firefox-100.0b6.tar.bz2";

375375 locale = "ro";

376376 arch = "linux-x86_64";

377− sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a";

377+ sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9";

378378 }

379− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ru/firefox-101.0b2.tar.bz2";

379+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ru/firefox-100.0b6.tar.bz2";

380380 locale = "ru";

381381 arch = "linux-x86_64";

382− sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f";

382+ sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281";

383383 }

384− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sco/firefox-101.0b2.tar.bz2";

384+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sco/firefox-100.0b6.tar.bz2";

385385 locale = "sco";

386386 arch = "linux-x86_64";

387− sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad";

387+ sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f";

388388 }

389− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/si/firefox-101.0b2.tar.bz2";

389+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/si/firefox-100.0b6.tar.bz2";

390390 locale = "si";

391391 arch = "linux-x86_64";

392− sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75";

392+ sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f";

393393 }

394− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sk/firefox-101.0b2.tar.bz2";

394+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sk/firefox-100.0b6.tar.bz2";

395395 locale = "sk";

396396 arch = "linux-x86_64";

397− sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db";

397+ sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235";

398398 }

399− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sl/firefox-101.0b2.tar.bz2";

399+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sl/firefox-100.0b6.tar.bz2";

400400 locale = "sl";

401401 arch = "linux-x86_64";

402− sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49";

402+ sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6";

403403 }

404− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/son/firefox-101.0b2.tar.bz2";

404+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/son/firefox-100.0b6.tar.bz2";

405405 locale = "son";

406406 arch = "linux-x86_64";

407− sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f";

407+ sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa";

408408 }

409− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sq/firefox-101.0b2.tar.bz2";

409+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sq/firefox-100.0b6.tar.bz2";

410410 locale = "sq";

411411 arch = "linux-x86_64";

412− sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f";

412+ sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6";

413413 }

414− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sr/firefox-101.0b2.tar.bz2";

414+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sr/firefox-100.0b6.tar.bz2";

415415 locale = "sr";

416416 arch = "linux-x86_64";

417− sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2";

417+ sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad";

418418 }

419− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sv-SE/firefox-101.0b2.tar.bz2";

419+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sv-SE/firefox-100.0b6.tar.bz2";

420420 locale = "sv-SE";

421421 arch = "linux-x86_64";

422− sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23";

422+ sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b";

423423 }

424− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/szl/firefox-101.0b2.tar.bz2";

424+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/szl/firefox-100.0b6.tar.bz2";

425425 locale = "szl";

426426 arch = "linux-x86_64";

427− sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8";

427+ sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970";

428428 }

429− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ta/firefox-101.0b2.tar.bz2";

429+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ta/firefox-100.0b6.tar.bz2";

430430 locale = "ta";

431431 arch = "linux-x86_64";

432− sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d";

432+ sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587";

433433 }

434− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/te/firefox-101.0b2.tar.bz2";

434+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/te/firefox-100.0b6.tar.bz2";

435435 locale = "te";

436436 arch = "linux-x86_64";

437− sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c";

437+ sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0";

438438 }

439− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/th/firefox-101.0b2.tar.bz2";

439+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/th/firefox-100.0b6.tar.bz2";

440440 locale = "th";

441441 arch = "linux-x86_64";

442− sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349";

442+ sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9";

443443 }

444− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tl/firefox-101.0b2.tar.bz2";

444+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tl/firefox-100.0b6.tar.bz2";

445445 locale = "tl";

446446 arch = "linux-x86_64";

447− sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408";

447+ sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07";

448448 }

449− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tr/firefox-101.0b2.tar.bz2";

449+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tr/firefox-100.0b6.tar.bz2";

450450 locale = "tr";

451451 arch = "linux-x86_64";

452− sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa";

452+ sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf";

453453 }

454− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/trs/firefox-101.0b2.tar.bz2";

454+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/trs/firefox-100.0b6.tar.bz2";

455455 locale = "trs";

456456 arch = "linux-x86_64";

457− sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597";

457+ sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa";

458458 }

459− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uk/firefox-101.0b2.tar.bz2";

459+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uk/firefox-100.0b6.tar.bz2";

460460 locale = "uk";

461461 arch = "linux-x86_64";

462− sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d";

462+ sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494";

463463 }

464− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ur/firefox-101.0b2.tar.bz2";

464+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ur/firefox-100.0b6.tar.bz2";

465465 locale = "ur";

466466 arch = "linux-x86_64";

467− sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e";

467+ sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563";

468468 }

469− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uz/firefox-101.0b2.tar.bz2";

469+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uz/firefox-100.0b6.tar.bz2";

470470 locale = "uz";

471471 arch = "linux-x86_64";

472− sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49";

472+ sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880";

473473 }

474− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/vi/firefox-101.0b2.tar.bz2";

474+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/vi/firefox-100.0b6.tar.bz2";

475475 locale = "vi";

476476 arch = "linux-x86_64";

477− sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e";

477+ sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb";

478478 }

479− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/xh/firefox-101.0b2.tar.bz2";

479+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/xh/firefox-100.0b6.tar.bz2";

480480 locale = "xh";

481481 arch = "linux-x86_64";

482− sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce";

482+ sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b";

483483 }

484− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-CN/firefox-101.0b2.tar.bz2";

484+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-CN/firefox-100.0b6.tar.bz2";

485485 locale = "zh-CN";

486486 arch = "linux-x86_64";

487− sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0";

487+ sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172";

488488 }

489− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-TW/firefox-101.0b2.tar.bz2";

489+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-TW/firefox-100.0b6.tar.bz2";

490490 locale = "zh-TW";

491491 arch = "linux-x86_64";

492− sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c";

492+ sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7";

493493 }

494− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ach/firefox-101.0b2.tar.bz2";

494+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ach/firefox-100.0b6.tar.bz2";

495495 locale = "ach";

496496 arch = "linux-i686";

497− sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c";

497+ sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab";

498498 }

499− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/af/firefox-101.0b2.tar.bz2";

499+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/af/firefox-100.0b6.tar.bz2";

500500 locale = "af";

501501 arch = "linux-i686";

502− sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48";

502+ sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b";

503503 }

504− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/an/firefox-101.0b2.tar.bz2";

504+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/an/firefox-100.0b6.tar.bz2";

505505 locale = "an";

506506 arch = "linux-i686";

507− sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d";

507+ sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97";

508508 }

509− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ar/firefox-101.0b2.tar.bz2";

509+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ar/firefox-100.0b6.tar.bz2";

510510 locale = "ar";

511511 arch = "linux-i686";

512− sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895";

512+ sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc";

513513 }

514− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ast/firefox-101.0b2.tar.bz2";

514+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ast/firefox-100.0b6.tar.bz2";

515515 locale = "ast";

516516 arch = "linux-i686";

517− sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124";

517+ sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11";

518518 }

519− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/az/firefox-101.0b2.tar.bz2";

519+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/az/firefox-100.0b6.tar.bz2";

520520 locale = "az";

521521 arch = "linux-i686";

522− sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e";

522+ sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d";

523523 }

524− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/be/firefox-101.0b2.tar.bz2";

524+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/be/firefox-100.0b6.tar.bz2";

525525 locale = "be";

526526 arch = "linux-i686";

527− sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81";

527+ sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b";

528528 }

529− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bg/firefox-101.0b2.tar.bz2";

529+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bg/firefox-100.0b6.tar.bz2";

530530 locale = "bg";

531531 arch = "linux-i686";

532− sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a";

532+ sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d";

533533 }

534− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bn/firefox-101.0b2.tar.bz2";

534+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bn/firefox-100.0b6.tar.bz2";

535535 locale = "bn";

536536 arch = "linux-i686";

537− sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce";

537+ sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d";

538538 }

539− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/br/firefox-101.0b2.tar.bz2";

539+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/br/firefox-100.0b6.tar.bz2";

540540 locale = "br";

541541 arch = "linux-i686";

542− sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812";

542+ sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e";

543543 }

544− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bs/firefox-101.0b2.tar.bz2";

544+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bs/firefox-100.0b6.tar.bz2";

545545 locale = "bs";

546546 arch = "linux-i686";

547− sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86";

547+ sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137";

548548 }

549− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca-valencia/firefox-101.0b2.tar.bz2";

549+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca-valencia/firefox-100.0b6.tar.bz2";

550550 locale = "ca-valencia";

551551 arch = "linux-i686";

552− sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac";

552+ sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e";

553553 }

554− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca/firefox-101.0b2.tar.bz2";

554+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca/firefox-100.0b6.tar.bz2";

555555 locale = "ca";

556556 arch = "linux-i686";

557− sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07";

557+ sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722";

558558 }

559− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cak/firefox-101.0b2.tar.bz2";

559+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cak/firefox-100.0b6.tar.bz2";

560560 locale = "cak";

561561 arch = "linux-i686";

562− sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94";

562+ sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc";

563563 }

564− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cs/firefox-101.0b2.tar.bz2";

564+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cs/firefox-100.0b6.tar.bz2";

565565 locale = "cs";

566566 arch = "linux-i686";

567− sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd";

567+ sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db";

568568 }

569− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cy/firefox-101.0b2.tar.bz2";

569+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cy/firefox-100.0b6.tar.bz2";

570570 locale = "cy";

571571 arch = "linux-i686";

572− sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad";

572+ sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964";

573573 }

574− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/da/firefox-101.0b2.tar.bz2";

574+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/da/firefox-100.0b6.tar.bz2";

575575 locale = "da";

576576 arch = "linux-i686";

577− sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a";

577+ sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b";

578578 }

579− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/de/firefox-101.0b2.tar.bz2";

579+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/de/firefox-100.0b6.tar.bz2";

580580 locale = "de";

581581 arch = "linux-i686";

582− sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649";

582+ sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d";

583583 }

584− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/dsb/firefox-101.0b2.tar.bz2";

584+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/dsb/firefox-100.0b6.tar.bz2";

585585 locale = "dsb";

586586 arch = "linux-i686";

587− sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7";

587+ sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae";

588588 }

589− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/el/firefox-101.0b2.tar.bz2";

589+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/el/firefox-100.0b6.tar.bz2";

590590 locale = "el";

591591 arch = "linux-i686";

592− sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0";

592+ sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad";

593593 }

594− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-CA/firefox-101.0b2.tar.bz2";

594+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-CA/firefox-100.0b6.tar.bz2";

595595 locale = "en-CA";

596596 arch = "linux-i686";

597− sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc";

597+ sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc";

598598 }

599− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-GB/firefox-101.0b2.tar.bz2";

599+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-GB/firefox-100.0b6.tar.bz2";

600600 locale = "en-GB";

601601 arch = "linux-i686";

602− sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01";

602+ sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a";

603603 }

604− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-US/firefox-101.0b2.tar.bz2";

604+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-US/firefox-100.0b6.tar.bz2";

605605 locale = "en-US";

606606 arch = "linux-i686";

607− sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e";

607+ sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20";

608608 }

609− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eo/firefox-101.0b2.tar.bz2";

609+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eo/firefox-100.0b6.tar.bz2";

610610 locale = "eo";

611611 arch = "linux-i686";

612− sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4";

612+ sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca";

613613 }

614− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-AR/firefox-101.0b2.tar.bz2";

614+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-AR/firefox-100.0b6.tar.bz2";

615615 locale = "es-AR";

616616 arch = "linux-i686";

617− sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25";

617+ sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e";

618618 }

619− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-CL/firefox-101.0b2.tar.bz2";

619+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-CL/firefox-100.0b6.tar.bz2";

620620 locale = "es-CL";

621621 arch = "linux-i686";

622− sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273";

622+ sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b";

623623 }

624− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-ES/firefox-101.0b2.tar.bz2";

624+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-ES/firefox-100.0b6.tar.bz2";

625625 locale = "es-ES";

626626 arch = "linux-i686";

627− sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f";

627+ sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10";

628628 }

629− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-MX/firefox-101.0b2.tar.bz2";

629+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-MX/firefox-100.0b6.tar.bz2";

630630 locale = "es-MX";

631631 arch = "linux-i686";

632− sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30";

632+ sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea";

633633 }

634− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/et/firefox-101.0b2.tar.bz2";

634+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/et/firefox-100.0b6.tar.bz2";

635635 locale = "et";

636636 arch = "linux-i686";

637− sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b";

637+ sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b";

638638 }

639− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eu/firefox-101.0b2.tar.bz2";

639+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eu/firefox-100.0b6.tar.bz2";

640640 locale = "eu";

641641 arch = "linux-i686";

642− sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be";

642+ sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69";

643643 }

644− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fa/firefox-101.0b2.tar.bz2";

644+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fa/firefox-100.0b6.tar.bz2";

645645 locale = "fa";

646646 arch = "linux-i686";

647− sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8";

647+ sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b";

648648 }

649− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ff/firefox-101.0b2.tar.bz2";

649+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ff/firefox-100.0b6.tar.bz2";

650650 locale = "ff";

651651 arch = "linux-i686";

652− sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582";

652+ sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce";

653653 }

654− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fi/firefox-101.0b2.tar.bz2";

654+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fi/firefox-100.0b6.tar.bz2";

655655 locale = "fi";

656656 arch = "linux-i686";

657− sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed";

657+ sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51";

658658 }

659− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fr/firefox-101.0b2.tar.bz2";

659+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fr/firefox-100.0b6.tar.bz2";

660660 locale = "fr";

661661 arch = "linux-i686";

662− sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771";

662+ sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3";

663663 }

664− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fy-NL/firefox-101.0b2.tar.bz2";

664+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fy-NL/firefox-100.0b6.tar.bz2";

665665 locale = "fy-NL";

666666 arch = "linux-i686";

667− sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28";

667+ sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6";

668668 }

669− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ga-IE/firefox-101.0b2.tar.bz2";

669+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ga-IE/firefox-100.0b6.tar.bz2";

670670 locale = "ga-IE";

671671 arch = "linux-i686";

672− sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1";

672+ sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e";

673673 }

674− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gd/firefox-101.0b2.tar.bz2";

674+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gd/firefox-100.0b6.tar.bz2";

675675 locale = "gd";

676676 arch = "linux-i686";

677− sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2";

677+ sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e";

678678 }

679− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gl/firefox-101.0b2.tar.bz2";

679+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gl/firefox-100.0b6.tar.bz2";

680680 locale = "gl";

681681 arch = "linux-i686";

682− sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4";

682+ sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604";

683683 }

684− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gn/firefox-101.0b2.tar.bz2";

684+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gn/firefox-100.0b6.tar.bz2";

685685 locale = "gn";

686686 arch = "linux-i686";

687− sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612";

687+ sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc";

688688 }

689− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gu-IN/firefox-101.0b2.tar.bz2";

689+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gu-IN/firefox-100.0b6.tar.bz2";

690690 locale = "gu-IN";

691691 arch = "linux-i686";

692− sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682";

692+ sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300";

693693 }

694− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/he/firefox-101.0b2.tar.bz2";

694+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/he/firefox-100.0b6.tar.bz2";

695695 locale = "he";

696696 arch = "linux-i686";

697− sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193";

697+ sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90";

698698 }

699− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hi-IN/firefox-101.0b2.tar.bz2";

699+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hi-IN/firefox-100.0b6.tar.bz2";

700700 locale = "hi-IN";

701701 arch = "linux-i686";

702− sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0";

702+ sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6";

703703 }

704− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hr/firefox-101.0b2.tar.bz2";

704+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hr/firefox-100.0b6.tar.bz2";

705705 locale = "hr";

706706 arch = "linux-i686";

707− sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490";

707+ sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f";

708708 }

709− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hsb/firefox-101.0b2.tar.bz2";

709+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hsb/firefox-100.0b6.tar.bz2";

710710 locale = "hsb";

711711 arch = "linux-i686";

712− sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8";

712+ sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1";

713713 }

714− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hu/firefox-101.0b2.tar.bz2";

714+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hu/firefox-100.0b6.tar.bz2";

715715 locale = "hu";

716716 arch = "linux-i686";

717− sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45";

717+ sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f";

718718 }

719− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hy-AM/firefox-101.0b2.tar.bz2";

719+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hy-AM/firefox-100.0b6.tar.bz2";

720720 locale = "hy-AM";

721721 arch = "linux-i686";

722− sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d";

722+ sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6";

723723 }

724− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ia/firefox-101.0b2.tar.bz2";

724+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ia/firefox-100.0b6.tar.bz2";

725725 locale = "ia";

726726 arch = "linux-i686";

727− sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0";

727+ sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6";

728728 }

729− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/id/firefox-101.0b2.tar.bz2";

729+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/id/firefox-100.0b6.tar.bz2";

730730 locale = "id";

731731 arch = "linux-i686";

732− sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2";

732+ sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690";

733733 }

734− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/is/firefox-101.0b2.tar.bz2";

734+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/is/firefox-100.0b6.tar.bz2";

735735 locale = "is";

736736 arch = "linux-i686";

737− sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e";

737+ sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c";

738738 }

739− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/it/firefox-101.0b2.tar.bz2";

739+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/it/firefox-100.0b6.tar.bz2";

740740 locale = "it";

741741 arch = "linux-i686";

742− sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8";

742+ sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80";

743743 }

744− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ja/firefox-101.0b2.tar.bz2";

744+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ja/firefox-100.0b6.tar.bz2";

745745 locale = "ja";

746746 arch = "linux-i686";

747− sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c";

747+ sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf";

748748 }

749− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ka/firefox-101.0b2.tar.bz2";

749+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ka/firefox-100.0b6.tar.bz2";

750750 locale = "ka";

751751 arch = "linux-i686";

752− sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180";

752+ sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3";

753753 }

754− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kab/firefox-101.0b2.tar.bz2";

754+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kab/firefox-100.0b6.tar.bz2";

755755 locale = "kab";

756756 arch = "linux-i686";

757− sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf";

757+ sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01";

758758 }

759− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kk/firefox-101.0b2.tar.bz2";

759+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kk/firefox-100.0b6.tar.bz2";

760760 locale = "kk";

761761 arch = "linux-i686";

762− sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60";

762+ sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d";

763763 }

764− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/km/firefox-101.0b2.tar.bz2";

764+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/km/firefox-100.0b6.tar.bz2";

765765 locale = "km";

766766 arch = "linux-i686";

767− sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2";

767+ sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce";

768768 }

769− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kn/firefox-101.0b2.tar.bz2";

769+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kn/firefox-100.0b6.tar.bz2";

770770 locale = "kn";

771771 arch = "linux-i686";

772− sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a";

772+ sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8";

773773 }

774− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ko/firefox-101.0b2.tar.bz2";

774+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ko/firefox-100.0b6.tar.bz2";

775775 locale = "ko";

776776 arch = "linux-i686";

777− sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f";

777+ sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039";

778778 }

779− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lij/firefox-101.0b2.tar.bz2";

779+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lij/firefox-100.0b6.tar.bz2";

780780 locale = "lij";

781781 arch = "linux-i686";

782− sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72";

782+ sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a";

783783 }

784− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lt/firefox-101.0b2.tar.bz2";

784+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lt/firefox-100.0b6.tar.bz2";

785785 locale = "lt";

786786 arch = "linux-i686";

787− sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648";

787+ sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e";

788788 }

789− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lv/firefox-101.0b2.tar.bz2";

789+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lv/firefox-100.0b6.tar.bz2";

790790 locale = "lv";

791791 arch = "linux-i686";

792− sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5";

792+ sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34";

793793 }

794− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mk/firefox-101.0b2.tar.bz2";

794+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mk/firefox-100.0b6.tar.bz2";

795795 locale = "mk";

796796 arch = "linux-i686";

797− sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640";

797+ sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c";

798798 }

799− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mr/firefox-101.0b2.tar.bz2";

799+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mr/firefox-100.0b6.tar.bz2";

800800 locale = "mr";

801801 arch = "linux-i686";

802− sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595";

802+ sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9";

803803 }

804− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ms/firefox-101.0b2.tar.bz2";

804+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ms/firefox-100.0b6.tar.bz2";

805805 locale = "ms";

806806 arch = "linux-i686";

807− sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93";

807+ sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad";

808808 }

809− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/my/firefox-101.0b2.tar.bz2";

809+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/my/firefox-100.0b6.tar.bz2";

810810 locale = "my";

811811 arch = "linux-i686";

812− sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c";

812+ sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe";

813813 }

814− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nb-NO/firefox-101.0b2.tar.bz2";

814+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nb-NO/firefox-100.0b6.tar.bz2";

815815 locale = "nb-NO";

816816 arch = "linux-i686";

817− sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353";

817+ sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24";

818818 }

819− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ne-NP/firefox-101.0b2.tar.bz2";

819+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ne-NP/firefox-100.0b6.tar.bz2";

820820 locale = "ne-NP";

821821 arch = "linux-i686";

822− sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f";

822+ sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61";

823823 }

824− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nl/firefox-101.0b2.tar.bz2";

824+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nl/firefox-100.0b6.tar.bz2";

825825 locale = "nl";

826826 arch = "linux-i686";

827− sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c";

827+ sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12";

828828 }

829− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nn-NO/firefox-101.0b2.tar.bz2";

829+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nn-NO/firefox-100.0b6.tar.bz2";

830830 locale = "nn-NO";

831831 arch = "linux-i686";

832− sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58";

832+ sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241";

833833 }

834− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/oc/firefox-101.0b2.tar.bz2";

834+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/oc/firefox-100.0b6.tar.bz2";

835835 locale = "oc";

836836 arch = "linux-i686";

837− sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680";

837+ sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd";

838838 }

839− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pa-IN/firefox-101.0b2.tar.bz2";

839+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pa-IN/firefox-100.0b6.tar.bz2";

840840 locale = "pa-IN";

841841 arch = "linux-i686";

842− sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a";

842+ sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f";

843843 }

844− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pl/firefox-101.0b2.tar.bz2";

844+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pl/firefox-100.0b6.tar.bz2";

845845 locale = "pl";

846846 arch = "linux-i686";

847− sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29";

847+ sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96";

848848 }

849− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-BR/firefox-101.0b2.tar.bz2";

849+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-BR/firefox-100.0b6.tar.bz2";

850850 locale = "pt-BR";

851851 arch = "linux-i686";

852− sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280";

852+ sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c";

853853 }

854− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-PT/firefox-101.0b2.tar.bz2";

854+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-PT/firefox-100.0b6.tar.bz2";

855855 locale = "pt-PT";

856856 arch = "linux-i686";

857− sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c";

857+ sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3";

858858 }

859− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/rm/firefox-101.0b2.tar.bz2";

859+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/rm/firefox-100.0b6.tar.bz2";

860860 locale = "rm";

861861 arch = "linux-i686";

862− sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c";

862+ sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d";

863863 }

864− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ro/firefox-101.0b2.tar.bz2";

864+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ro/firefox-100.0b6.tar.bz2";

865865 locale = "ro";

866866 arch = "linux-i686";

867− sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41";

867+ sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f";

868868 }

869− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ru/firefox-101.0b2.tar.bz2";

869+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ru/firefox-100.0b6.tar.bz2";

870870 locale = "ru";

871871 arch = "linux-i686";

872− sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5";

872+ sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4";

873873 }

874− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sco/firefox-101.0b2.tar.bz2";

874+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sco/firefox-100.0b6.tar.bz2";

875875 locale = "sco";

876876 arch = "linux-i686";

877− sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd";

877+ sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510";

878878 }

879− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/si/firefox-101.0b2.tar.bz2";

879+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/si/firefox-100.0b6.tar.bz2";

880880 locale = "si";

881881 arch = "linux-i686";

882− sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d";

882+ sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732";

883883 }

884− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sk/firefox-101.0b2.tar.bz2";

884+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sk/firefox-100.0b6.tar.bz2";

885885 locale = "sk";

886886 arch = "linux-i686";

887− sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27";

887+ sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0";

888888 }

889− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sl/firefox-101.0b2.tar.bz2";

889+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sl/firefox-100.0b6.tar.bz2";

890890 locale = "sl";

891891 arch = "linux-i686";

892− sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229";

892+ sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9";

893893 }

894− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/son/firefox-101.0b2.tar.bz2";

894+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/son/firefox-100.0b6.tar.bz2";

895895 locale = "son";

896896 arch = "linux-i686";

897− sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0";

897+ sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16";

898898 }

899− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sq/firefox-101.0b2.tar.bz2";

899+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sq/firefox-100.0b6.tar.bz2";

900900 locale = "sq";

901901 arch = "linux-i686";

902− sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1";

902+ sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756";

903903 }

904− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sr/firefox-101.0b2.tar.bz2";

904+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sr/firefox-100.0b6.tar.bz2";

905905 locale = "sr";

906906 arch = "linux-i686";

907− sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231";

907+ sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153";

908908 }

909− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sv-SE/firefox-101.0b2.tar.bz2";

909+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sv-SE/firefox-100.0b6.tar.bz2";

910910 locale = "sv-SE";

911911 arch = "linux-i686";

912− sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49";

912+ sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0";

913913 }

914− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/szl/firefox-101.0b2.tar.bz2";

914+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/szl/firefox-100.0b6.tar.bz2";

915915 locale = "szl";

916916 arch = "linux-i686";

917− sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd";

917+ sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f";

918918 }

919− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ta/firefox-101.0b2.tar.bz2";

919+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ta/firefox-100.0b6.tar.bz2";

920920 locale = "ta";

921921 arch = "linux-i686";

922− sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4";

922+ sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64";

923923 }

924− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/te/firefox-101.0b2.tar.bz2";

924+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/te/firefox-100.0b6.tar.bz2";

925925 locale = "te";

926926 arch = "linux-i686";

927− sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd";

927+ sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275";

928928 }

929− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/th/firefox-101.0b2.tar.bz2";

929+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/th/firefox-100.0b6.tar.bz2";

930930 locale = "th";

931931 arch = "linux-i686";

932− sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad";

932+ sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383";

933933 }

934− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tl/firefox-101.0b2.tar.bz2";

934+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tl/firefox-100.0b6.tar.bz2";

935935 locale = "tl";

936936 arch = "linux-i686";

937− sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151";

937+ sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9";

938938 }

939− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tr/firefox-101.0b2.tar.bz2";

939+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tr/firefox-100.0b6.tar.bz2";

940940 locale = "tr";

941941 arch = "linux-i686";

942− sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e";

942+ sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42";

943943 }

944− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/trs/firefox-101.0b2.tar.bz2";

944+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/trs/firefox-100.0b6.tar.bz2";

945945 locale = "trs";

946946 arch = "linux-i686";

947− sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526";

947+ sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648";

948948 }

949− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uk/firefox-101.0b2.tar.bz2";

949+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uk/firefox-100.0b6.tar.bz2";

950950 locale = "uk";

951951 arch = "linux-i686";

952− sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75";

952+ sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2";

953953 }

954− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ur/firefox-101.0b2.tar.bz2";

954+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ur/firefox-100.0b6.tar.bz2";

955955 locale = "ur";

956956 arch = "linux-i686";

957− sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837";

957+ sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca";

958958 }

959− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uz/firefox-101.0b2.tar.bz2";

959+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uz/firefox-100.0b6.tar.bz2";

960960 locale = "uz";

961961 arch = "linux-i686";

962− sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d";

962+ sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9";

963963 }

964− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/vi/firefox-101.0b2.tar.bz2";

964+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/vi/firefox-100.0b6.tar.bz2";

965965 locale = "vi";

966966 arch = "linux-i686";

967− sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4";

967+ sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061";

968968 }

969− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/xh/firefox-101.0b2.tar.bz2";

969+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/xh/firefox-100.0b6.tar.bz2";

970970 locale = "xh";

971971 arch = "linux-i686";

972− sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77";

972+ sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f";

973973 }

974− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-CN/firefox-101.0b2.tar.bz2";

974+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-CN/firefox-100.0b6.tar.bz2";

975975 locale = "zh-CN";

976976 arch = "linux-i686";

977− sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6";

977+ sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d";

978978 }

979− { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-TW/firefox-101.0b2.tar.bz2";

979+ { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-TW/firefox-100.0b6.tar.bz2";

980980 locale = "zh-TW";

981981 arch = "linux-i686";

982− sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98";

982+ sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac";

983983 }

984984 ];

985985}

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+393−393

@@ -1,985 +1,985 @@

11{

2− version = "100.0";

2+ version = "99.0.1";

33 sources = [

4− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ach/firefox-100.0.tar.bz2";

4+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ach/firefox-99.0.1.tar.bz2";

55 locale = "ach";

66 arch = "linux-x86_64";

7− sha256 = "3e85609f0b3e4eb15262cd8567d8973bed2195f6a19199d76a99ed361cc0d0cf";

7+ sha256 = "e2054f03b413f783f287c14fb670ee97415e89181e2ca1f9bbe05a18fb529330";

88 }

9− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/af/firefox-100.0.tar.bz2";

9+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/af/firefox-99.0.1.tar.bz2";

1010 locale = "af";

1111 arch = "linux-x86_64";

12− sha256 = "0950ef9c6c9c386df1e2d9f85312d9f3fe0dbc1668aff6710da54f8a3cdbc5de";

12+ sha256 = "102c4460ae7a8242c770bda09baee07004f84d95a885c621fbe23f2fdb585398";

1313 }

14− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/an/firefox-100.0.tar.bz2";

14+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/an/firefox-99.0.1.tar.bz2";

1515 locale = "an";

1616 arch = "linux-x86_64";

17− sha256 = "af97c6a4dcc34e7edd52111c6ba9480f5ecd2765ca972cb43745ecb54ba01d7b";

17+ sha256 = "0f8aeacc3a7abbb5f571aff8a6580c9779336bccb0d30005b46d336447123b10";

1818 }

19− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ar/firefox-100.0.tar.bz2";

19+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ar/firefox-99.0.1.tar.bz2";

2020 locale = "ar";

2121 arch = "linux-x86_64";

22− sha256 = "0f9947456cee9db27baffd0476e62ce529b349213ad1a0c2196bcf6d7f0e582c";

22+ sha256 = "720c5d872243631ddf67102e6a54504912b33f6e21c666d84e73a399f10a2559";

2323 }

24− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ast/firefox-100.0.tar.bz2";

24+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ast/firefox-99.0.1.tar.bz2";

2525 locale = "ast";

2626 arch = "linux-x86_64";

27− sha256 = "c0da6abaaecee287732a5e00520d2bacfd61a3a7ca64a5bffe37830f53cf5d20";

27+ sha256 = "194345cdce1e9c6462a80423d1b97be4c757dc69b1f5a0055ac14e2624d1d145";

2828 }

29− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/az/firefox-100.0.tar.bz2";

29+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/az/firefox-99.0.1.tar.bz2";

3030 locale = "az";

3131 arch = "linux-x86_64";

32− sha256 = "1d57a9d3038dff5a354f24e7ebc7d93d11dccc57be72644988dbbb20c734d243";

32+ sha256 = "9936c9d172ddd291d34679c33f28d7ec425e4835abdfb25dd0252e50ab5eca09";

3333 }

34− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/be/firefox-100.0.tar.bz2";

34+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/be/firefox-99.0.1.tar.bz2";

3535 locale = "be";

3636 arch = "linux-x86_64";

37− sha256 = "d20e556064f10c5730f094b55b4014816df7b49840d0e9934fe3167e135bd789";

37+ sha256 = "420f519aa954b708da735605e32acf9f11bfa2195e7a9bd2ebd954a58df2db10";

3838 }

39− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bg/firefox-100.0.tar.bz2";

39+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bg/firefox-99.0.1.tar.bz2";

4040 locale = "bg";

4141 arch = "linux-x86_64";

42− sha256 = "2d26cdef7ee0d7c263599c38d5352268380125ccc3f901f48ed60134badae1c7";

42+ sha256 = "2a7cbc2903894934024fb8ea2212e7f23a47c7db707e4c88a33656366b810dfc";

4343 }

44− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bn/firefox-100.0.tar.bz2";

44+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bn/firefox-99.0.1.tar.bz2";

4545 locale = "bn";

4646 arch = "linux-x86_64";

47− sha256 = "61395cb64c519a14ef879b6b1f9444f727a6ac73074d0e67e3e68a89428c7651";

47+ sha256 = "46984d43f628ecdc1674d41f45c57177dfe24eb6dec0e5ae5e6a8efec7157791";

4848 }

49− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/br/firefox-100.0.tar.bz2";

49+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/br/firefox-99.0.1.tar.bz2";

5050 locale = "br";

5151 arch = "linux-x86_64";

52− sha256 = "486b59f31c0a63155d04cf0818d5c8629e846b313cd6eabcc762bb0c51adf35a";

52+ sha256 = "1427aaca5903a1ecb3e17aa7e3351334b1a2183a1180c9a4942535b50f64c0db";

5353 }

54− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bs/firefox-100.0.tar.bz2";

54+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bs/firefox-99.0.1.tar.bz2";

5555 locale = "bs";

5656 arch = "linux-x86_64";

57− sha256 = "656911e5fdd030ee191f1bcab6dc9f2a66f888a6fa726007e528716df5d6667e";

57+ sha256 = "8377ad8c27236c5336e370acf70e901f4dbb53dd25142a74dc61f98fd2beab91";

5858 }

59− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca-valencia/firefox-100.0.tar.bz2";

59+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca-valencia/firefox-99.0.1.tar.bz2";

6060 locale = "ca-valencia";

6161 arch = "linux-x86_64";

62− sha256 = "f31c75df5bf3639bfa4db86cc0237f7602a725b242e6330259ca4cbb61dd715d";

62+ sha256 = "78f8dd650fb9398b1cb999db887bb5764f4b015539c3aac0eee2fdd05477bf3e";

6363 }

64− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca/firefox-100.0.tar.bz2";

64+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca/firefox-99.0.1.tar.bz2";

6565 locale = "ca";

6666 arch = "linux-x86_64";

67− sha256 = "7f53e06ccec188fb5e85a33c7968ba90c88bf1d3a782aee179e3fef5010a33b4";

67+ sha256 = "18b0acda5e75ec1412273a016d2cc36f6c65b68ebae5251ef13289cf73ef00d6";

6868 }

69− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cak/firefox-100.0.tar.bz2";

69+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cak/firefox-99.0.1.tar.bz2";

7070 locale = "cak";

7171 arch = "linux-x86_64";

72− sha256 = "a1b8349ffe436cce151c5358b2e1d5a928a0ef3e623ef2c98e9f55b0ce2f405b";

72+ sha256 = "505c3f2c8f39aeea7ca4f8285d59fcef995e5c6c64d318d7b143e7060982d7a7";

7373 }

74− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cs/firefox-100.0.tar.bz2";

74+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cs/firefox-99.0.1.tar.bz2";

7575 locale = "cs";

7676 arch = "linux-x86_64";

77− sha256 = "b11f724a20c13ccec73c9058e90387a031e6a9b22e02ae4ab59357d8f191ce65";

77+ sha256 = "d33f7f5adf068743a523f54fb2dec1edf7302993ef3684dd86cbab25b96c3247";

7878 }

79− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cy/firefox-100.0.tar.bz2";

79+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cy/firefox-99.0.1.tar.bz2";

8080 locale = "cy";

8181 arch = "linux-x86_64";

82− sha256 = "71e1faa584d6c9243ab806f694e548fec92672f44d6239828fb7f3c5363850b8";

82+ sha256 = "8a0d5e3a4ad8650d4e8e77e92c24b27da1d5c0b44878e97462ec94597020e548";

8383 }

84− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/da/firefox-100.0.tar.bz2";

84+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/da/firefox-99.0.1.tar.bz2";

8585 locale = "da";

8686 arch = "linux-x86_64";

87− sha256 = "e811e13df31bf0e55904a696b69ca0fd0785c7e60f9bc79fae920cc7bb55ee39";

87+ sha256 = "c9c8355c3cab4e189a4ba322f4a7e2a189617786e912930f0c17b217ff89c1c6";

8888 }

89− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/de/firefox-100.0.tar.bz2";

89+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/de/firefox-99.0.1.tar.bz2";

9090 locale = "de";

9191 arch = "linux-x86_64";

92− sha256 = "22c6c8d312db6b64dabc7d401751ce7aecd3b5889eb8e5538433bbf5aeb55d5f";

92+ sha256 = "83468180a67fae5a5df8810e3b7bfdc6b01faaf60dd18a0914715ac89531c7a4";

9393 }

94− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/dsb/firefox-100.0.tar.bz2";

94+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/dsb/firefox-99.0.1.tar.bz2";

9595 locale = "dsb";

9696 arch = "linux-x86_64";

97− sha256 = "76d7d9ba4483c6b727568dfbf497940dc38871cc18f5cf6823cdbd539d9f559d";

97+ sha256 = "feeda2e3f021d459c98371e244d29b9e6e6fdaa6250a8a6700b34a981f3dcf13";

9898 }

99− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/el/firefox-100.0.tar.bz2";

99+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/el/firefox-99.0.1.tar.bz2";

100100 locale = "el";

101101 arch = "linux-x86_64";

102− sha256 = "59f4fab29a3888a7b86b8f50281eff8d3c7ed512a92fbceb5ab3ebfaaa4faad6";

102+ sha256 = "4fc65f4b6d84a01c79165ee9e058c980659089e86da72b016cfc5efbe973e592";

103103 }

104− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-CA/firefox-100.0.tar.bz2";

104+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-CA/firefox-99.0.1.tar.bz2";

105105 locale = "en-CA";

106106 arch = "linux-x86_64";

107− sha256 = "1c493929d5ab703f59b2e6e6ca86004725dcda7ca23c3a2b34de425e6a969cad";

107+ sha256 = "10e324101932b7290814ea2ab747657363023a88857ca90e25d54f89115ffbcf";

108108 }

109− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-GB/firefox-100.0.tar.bz2";

109+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-GB/firefox-99.0.1.tar.bz2";

110110 locale = "en-GB";

111111 arch = "linux-x86_64";

112− sha256 = "2e48068db4bed6722568a35d7a2aaa84b68a8e18304744940c36437cf88b10d4";

112+ sha256 = "83ba931e4f6afd0d0c32b3bf0db55a7ff0fdfda080e906bb3ada5b4e61a4c3f1";

113113 }

114− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-US/firefox-100.0.tar.bz2";

114+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-US/firefox-99.0.1.tar.bz2";

115115 locale = "en-US";

116116 arch = "linux-x86_64";

117− sha256 = "528845df1a15acf081fdc9e1e7276f0b4601acc9df3553324e02c9c6fb9b7d9d";

117+ sha256 = "7bc57f06fc9c52e16815f1a4208c33bc5819423c68da441d001f7c2200591bcd";

118118 }

119− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eo/firefox-100.0.tar.bz2";

119+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eo/firefox-99.0.1.tar.bz2";

120120 locale = "eo";

121121 arch = "linux-x86_64";

122− sha256 = "0fa2f3f4a7cbe7e9e41d0d08ba8649efa84b727d9adb621b408cf7732312fc6f";

122+ sha256 = "3fc945331b62f9998d2adb6a99d3390528975c97b6776f97a4c461eb124da462";

123123 }

124− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-AR/firefox-100.0.tar.bz2";

124+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-AR/firefox-99.0.1.tar.bz2";

125125 locale = "es-AR";

126126 arch = "linux-x86_64";

127− sha256 = "6afb61b7e361735321934a4189063cc5f424c79022b7482b0923a0204160c2b0";

127+ sha256 = "908723c7445b92b4c4e26fc999562681e4bf3ffffee0ea1db6362aed0f615c0e";

128128 }

129− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-CL/firefox-100.0.tar.bz2";

129+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-CL/firefox-99.0.1.tar.bz2";

130130 locale = "es-CL";

131131 arch = "linux-x86_64";

132− sha256 = "382ba75ab94f81ecdaeeb98b41467969b103e9feb73cbbad18b69d5f39013dc0";

132+ sha256 = "77363cfa3c2ce655a9f6203c495f8f54700b44e0b66d021050cea59e2b0e0a3e";

133133 }

134− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-ES/firefox-100.0.tar.bz2";

134+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-ES/firefox-99.0.1.tar.bz2";

135135 locale = "es-ES";

136136 arch = "linux-x86_64";

137− sha256 = "1a09045c93cceb449e6f0dd9d644abcab2ec30bd39f5c9aab091fc49f32a2592";

137+ sha256 = "ee59faf4bd7472a14fd8e420aa7f408abccd72f31d162da0c5f9b530593722f2";

138138 }

139− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-MX/firefox-100.0.tar.bz2";

139+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-MX/firefox-99.0.1.tar.bz2";

140140 locale = "es-MX";

141141 arch = "linux-x86_64";

142− sha256 = "68f0ef188418452de2efc73d3f94a5c1e515bd07b6907168b20b909f7739be84";

142+ sha256 = "732b1edb21462281e029de794ccdb3c20ceea0c6d5c0f1c885ef76ad57df7abf";

143143 }

144− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/et/firefox-100.0.tar.bz2";

144+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/et/firefox-99.0.1.tar.bz2";

145145 locale = "et";

146146 arch = "linux-x86_64";

147− sha256 = "7142bcf0d715b73f11cba9f181f3a02cfeef9e07e825dae7120df51b10697765";

147+ sha256 = "b816c47c20a674256dc176a15dbeec830b47f8c3eecde31c615f003260e69668";

148148 }

149− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eu/firefox-100.0.tar.bz2";

149+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eu/firefox-99.0.1.tar.bz2";

150150 locale = "eu";

151151 arch = "linux-x86_64";

152− sha256 = "563fed2bb7c6168aa9d973d1578e59c2ed1e785ca82d796de4aecebb8d6dc404";

152+ sha256 = "4f54fa8f7718bc55b733c6986c8ffa17517afac92383dae03fb972beed876665";

153153 }

154− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fa/firefox-100.0.tar.bz2";

154+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fa/firefox-99.0.1.tar.bz2";

155155 locale = "fa";

156156 arch = "linux-x86_64";

157− sha256 = "f7ec308585ab8aa0e112057cd0af1df524e6712611b7ae93e893e681c8b117c6";

157+ sha256 = "ee716492cc2cc0a11c98ea8e8bd7d142ec21c006e2f12a96707d9dad82bf92b5";

158158 }

159− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ff/firefox-100.0.tar.bz2";

159+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ff/firefox-99.0.1.tar.bz2";

160160 locale = "ff";

161161 arch = "linux-x86_64";

162− sha256 = "d678cc64bba6370a300a64dbdc52343b7eaae73953ddec584038d70dee8f09ed";

162+ sha256 = "36d1c4b3966a807c6bc90c4f6fecbef327442398a463167535dae318f286d222";

163163 }

164− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fi/firefox-100.0.tar.bz2";

164+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fi/firefox-99.0.1.tar.bz2";

165165 locale = "fi";

166166 arch = "linux-x86_64";

167− sha256 = "998746f48e543897806e8024e8e6c6cac3dd63471b3896d83ebd80279d8f026e";

167+ sha256 = "9855e6d25d34d6df614ef2b48b4b1e60d527fe00c0da132a0609ac6262354623";

168168 }

169− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fr/firefox-100.0.tar.bz2";

169+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fr/firefox-99.0.1.tar.bz2";

170170 locale = "fr";

171171 arch = "linux-x86_64";

172− sha256 = "11bd3ad17ad680049dcb262ffa18a477d9d8285040e403b26a2f45a449a63139";

172+ sha256 = "b999d3ed98eb594335e810a4a81de86e7e3466a2c32cc6bef0bc260ae883a6d4";

173173 }

174− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fy-NL/firefox-100.0.tar.bz2";

174+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fy-NL/firefox-99.0.1.tar.bz2";

175175 locale = "fy-NL";

176176 arch = "linux-x86_64";

177− sha256 = "508f784775df7b89e6144d9290f98e05b17b831f43f81fde5f45cadb0355bfcf";

177+ sha256 = "be9fce28930fb80a94cc5c6343b34ff6b05538a08cee657d995d647f3d9dec7d";

178178 }

179− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ga-IE/firefox-100.0.tar.bz2";

179+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ga-IE/firefox-99.0.1.tar.bz2";

180180 locale = "ga-IE";

181181 arch = "linux-x86_64";

182− sha256 = "3185a57d4a065ed4cc85fac6c3ee14597b25b5f3acdf9f0c9232d7b1935ad25b";

182+ sha256 = "92bbd149f59a6c2594d6fe1e2ba8e545bd7f9040ae35ec924414c59d06d0f4c7";

183183 }

184− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gd/firefox-100.0.tar.bz2";

184+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gd/firefox-99.0.1.tar.bz2";

185185 locale = "gd";

186186 arch = "linux-x86_64";

187− sha256 = "580397f6ec486a571768f9eb4b4d1b5b7e10a9e791c90907c7b0be0eccfb355a";

187+ sha256 = "bb2cd80e2d1c9b08363a0025b428473334596f3e34ff321e3d6c69f723fb18f0";

188188 }

189− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gl/firefox-100.0.tar.bz2";

189+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gl/firefox-99.0.1.tar.bz2";

190190 locale = "gl";

191191 arch = "linux-x86_64";

192− sha256 = "485a806aeaafda44d687fc41eab57a276cca691c01a67eae6baf10288e7aec67";

192+ sha256 = "f74e552aea8622136679cfb162b2c192ccefa91705e8352830efdec3cae9a0b1";

193193 }

194− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gn/firefox-100.0.tar.bz2";

194+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gn/firefox-99.0.1.tar.bz2";

195195 locale = "gn";

196196 arch = "linux-x86_64";

197− sha256 = "44a2699e0c3d79bfb2dbf3d4da4bcb92e7a4453daebfd57a53d9a0a6ac3e3248";

197+ sha256 = "261cb7858277e012b8d67f890312b3fa333522542a6a7c71019f06e1340e0349";

198198 }

199− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gu-IN/firefox-100.0.tar.bz2";

199+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gu-IN/firefox-99.0.1.tar.bz2";

200200 locale = "gu-IN";

201201 arch = "linux-x86_64";

202− sha256 = "5d817fdcff89b4c440580facabb01d30915962d8b076e7e79781f7209bf83023";

202+ sha256 = "7a3421aa896d08984f9d2cb38fea3e4bf93d9d0dbcb74bdf06dccb3f5039db44";

203203 }

204− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/he/firefox-100.0.tar.bz2";

204+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/he/firefox-99.0.1.tar.bz2";

205205 locale = "he";

206206 arch = "linux-x86_64";

207− sha256 = "1756cb46aa5cae3d4cdedd720441a2ef97dfc5cfb22eed734f0b649eb65a282f";

207+ sha256 = "f734cef92e78b3713e179959c6af917a64c4b16d00d834c776652337d42bc65e";

208208 }

209− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hi-IN/firefox-100.0.tar.bz2";

209+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hi-IN/firefox-99.0.1.tar.bz2";

210210 locale = "hi-IN";

211211 arch = "linux-x86_64";

212− sha256 = "27dcf3edd4b9fa67132c761dc3186d8ddbc0f63b32d5606abd43140a4f2a58b6";

212+ sha256 = "e0694ff508e38ae758a96ef5023e7d7d39cabc2b7bbb56cff2854b51009a0732";

213213 }

214− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hr/firefox-100.0.tar.bz2";

214+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hr/firefox-99.0.1.tar.bz2";

215215 locale = "hr";

216216 arch = "linux-x86_64";

217− sha256 = "1aa433ebcb2b0fc185efd98b8312dc1c5b5315ffb6710e3ab69ceac0d22e1871";

217+ sha256 = "438665aa04f02cb9275c8b76ee5c0ff6d7814fc0c1439f50f714613fb902b9c6";

218218 }

219− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hsb/firefox-100.0.tar.bz2";

219+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hsb/firefox-99.0.1.tar.bz2";

220220 locale = "hsb";

221221 arch = "linux-x86_64";

222− sha256 = "a0d343a341c593f6b746acb81eab4386a68cd023a5409e0182d908786243e5e1";

222+ sha256 = "1b17d24231fd22db70f6f7bcfe793d31390a441355275771749352221320d4cd";

223223 }

224− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hu/firefox-100.0.tar.bz2";

224+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hu/firefox-99.0.1.tar.bz2";

225225 locale = "hu";

226226 arch = "linux-x86_64";

227− sha256 = "de0a800eef3f292b7157dda727878d9ed953c1ffff1c7ecdd2cf49c1024dfcf0";

227+ sha256 = "d2be4860a0019e9385f48b989300ad42ced0ab2c3873e8074a6863f3afc4719a";

228228 }

229− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hy-AM/firefox-100.0.tar.bz2";

229+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hy-AM/firefox-99.0.1.tar.bz2";

230230 locale = "hy-AM";

231231 arch = "linux-x86_64";

232− sha256 = "44c824309b419151fcc634d4d20774fee6f514df428c6203990ffbe7cb56e6bd";

232+ sha256 = "b9decd8f427362e1070c17242a906d170122c2bcc17641a2132d87ab24e52467";

233233 }

234− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ia/firefox-100.0.tar.bz2";

234+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ia/firefox-99.0.1.tar.bz2";

235235 locale = "ia";

236236 arch = "linux-x86_64";

237− sha256 = "edf777a9904981d1b345390a7ab06c23e543f600a57d3e0ce0e41ab7dcca2ee0";

237+ sha256 = "97a9ec4317bc432ed6c79f796fd0547fab0a156d9c9c959235f6b941ad4fb6fe";

238238 }

239− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/id/firefox-100.0.tar.bz2";

239+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/id/firefox-99.0.1.tar.bz2";

240240 locale = "id";

241241 arch = "linux-x86_64";

242− sha256 = "458ad2e7a89dfb4c50376114f270d36220c9986bad5103ccfdb11eb5452d6f5f";

242+ sha256 = "621add55642a28cf95ff1f0acde8881862c1d4487500e5cc0705bf3ba0055c56";

243243 }

244− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/is/firefox-100.0.tar.bz2";

244+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/is/firefox-99.0.1.tar.bz2";

245245 locale = "is";

246246 arch = "linux-x86_64";

247− sha256 = "5bf8868b2dbea3f4d08a4201864dab6682c351912a7cd3622dcda5eb0fc67e20";

247+ sha256 = "9293bce28c6252e9ee561f41e54b39e6a66d916e18e34965d1fec77a2d8088de";

248248 }

249− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/it/firefox-100.0.tar.bz2";

249+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/it/firefox-99.0.1.tar.bz2";

250250 locale = "it";

251251 arch = "linux-x86_64";

252− sha256 = "057b3ee3698696b59b49a66a8622d281c50c35c2b900fcfc95aedf4cb06701b4";

252+ sha256 = "aeeface0275cdb426fe851d91bd49014aa8aadc7becf18f4763b44f0526260a4";

253253 }

254− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ja/firefox-100.0.tar.bz2";

254+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ja/firefox-99.0.1.tar.bz2";

255255 locale = "ja";

256256 arch = "linux-x86_64";

257− sha256 = "168207c2ed591603529d9f281f0fba5be8c775d130082fa6016ab77a06e392b4";

257+ sha256 = "dc51a842e0a8aaeea874fc73e99de5978615c250afc17309e7edaf80802acb56";

258258 }

259− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ka/firefox-100.0.tar.bz2";

259+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ka/firefox-99.0.1.tar.bz2";

260260 locale = "ka";

261261 arch = "linux-x86_64";

262− sha256 = "92564e5dda8d74245d00d83ef06c29fbff798db36d665cdd69b88d4e00474299";

262+ sha256 = "85562b0af98292e923c39de4b0c15d2ea0e95cd8fcb7d86c4d941eabdf9a1827";

263263 }

264− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kab/firefox-100.0.tar.bz2";

264+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kab/firefox-99.0.1.tar.bz2";

265265 locale = "kab";

266266 arch = "linux-x86_64";

267− sha256 = "c6641d1b22d9fd07885e18ac4ae6d0770ff6c1f88c04d41c6e43020c774a47cd";

267+ sha256 = "c06e7fd59bcb82a989c90a2095c467eccdd1a98b4e704348befc89061ad9a6da";

268268 }

269− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kk/firefox-100.0.tar.bz2";

269+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kk/firefox-99.0.1.tar.bz2";

270270 locale = "kk";

271271 arch = "linux-x86_64";

272− sha256 = "24dce49c8e0c343f3178b0280e01c34716654fa705cfc16f22b5815f2d4c524b";

272+ sha256 = "d041abeb5f207a234fde69fd265ec98b5bc94a29ba5d231334d74caccd7c1d16";

273273 }

274− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/km/firefox-100.0.tar.bz2";

274+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/km/firefox-99.0.1.tar.bz2";

275275 locale = "km";

276276 arch = "linux-x86_64";

277− sha256 = "662aabaa2dfb2d6d217f359979770cc698063816d4f2db28d959cde88931aa4f";

277+ sha256 = "b02b241b7ca07732c26aad728d1d15b637d4bb032673d92b0ff1a65fefca0d80";

278278 }

279− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kn/firefox-100.0.tar.bz2";

279+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kn/firefox-99.0.1.tar.bz2";

280280 locale = "kn";

281281 arch = "linux-x86_64";

282− sha256 = "343213168dd6522af4e206a33c9c6f8872853207ecfa34e85189439a46be6aa3";

282+ sha256 = "0ad5133784a27dec78031db198ee762e4ee0d0514d03dc175130a64eab93d302";

283283 }

284− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ko/firefox-100.0.tar.bz2";

284+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ko/firefox-99.0.1.tar.bz2";

285285 locale = "ko";

286286 arch = "linux-x86_64";

287− sha256 = "31cfa145a16c339911b9374f70b9124fcdc94c7fd630263fd19676279f257ab6";

287+ sha256 = "01adfa538c52df224c6b982cb96ed50a3f19b8e0608d323003f2264e6d1c18c1";

288288 }

289− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lij/firefox-100.0.tar.bz2";

289+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lij/firefox-99.0.1.tar.bz2";

290290 locale = "lij";

291291 arch = "linux-x86_64";

292− sha256 = "7b3cf0ac4286c6ba3dd8167349cefee9f55979651566e82e2d4e979d5f8b47ea";

292+ sha256 = "1cd93f13d9cc732f7b580c611f31ce8a71ba20436bc7acc996fa1d22c4c8b954";

293293 }

294− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lt/firefox-100.0.tar.bz2";

294+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lt/firefox-99.0.1.tar.bz2";

295295 locale = "lt";

296296 arch = "linux-x86_64";

297− sha256 = "47715eb38d43b6cf2c873d7d7c9f643c3e895dc31e64b0481fe46d20ea670572";

297+ sha256 = "fd92972d632c5c3d1822feaf2372bd6a06ea957b0c8a5663b0eda787da53e4c4";

298298 }

299− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lv/firefox-100.0.tar.bz2";

299+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lv/firefox-99.0.1.tar.bz2";

300300 locale = "lv";

301301 arch = "linux-x86_64";

302− sha256 = "77afd745728346eeba893bb8eb7bc2517c69f68ade939fd2273c595607f7a4f1";

302+ sha256 = "cfb5112aca7d7e7af298a0c035ca2d549c849d9ef1536bcc958726df81f64665";

303303 }

304− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mk/firefox-100.0.tar.bz2";

304+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mk/firefox-99.0.1.tar.bz2";

305305 locale = "mk";

306306 arch = "linux-x86_64";

307− sha256 = "2c287aa2b2854e45b3a49df38d3aa8ded24d63a931c7f37ff320bc8d4358e0a5";

307+ sha256 = "bd1c8a1175326fce66cd32ebf394585fe09c5a65cf72e0e0598e572583e46515";

308308 }

309− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mr/firefox-100.0.tar.bz2";

309+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mr/firefox-99.0.1.tar.bz2";

310310 locale = "mr";

311311 arch = "linux-x86_64";

312− sha256 = "4212b8ddb9cd59bc692921d2ab70613ea738ca3a4a23bda0cb038707dda1262e";

312+ sha256 = "9912aff12281b1ec3b4605ae72fba291f24e193ff976658e638fdb35a9d40cd0";

313313 }

314− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ms/firefox-100.0.tar.bz2";

314+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ms/firefox-99.0.1.tar.bz2";

315315 locale = "ms";

316316 arch = "linux-x86_64";

317− sha256 = "a0b878c3171af29ab631b734c20dac581ec7c1cd0487835bdb23db6ca72ca378";

317+ sha256 = "4f155ab0ce5420d272a86eb8b52cb816b90aabf34900bc5ba56d869e44408733";

318318 }

319− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/my/firefox-100.0.tar.bz2";

319+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/my/firefox-99.0.1.tar.bz2";

320320 locale = "my";

321321 arch = "linux-x86_64";

322− sha256 = "afeeea7ec03567ec058c5d77e813997f8cda6a654771da1a433a69bc27bf254a";

322+ sha256 = "5b01096123e71ff94e6a44ba44edaf9453d2770f8918019e349f20f55f4fbe04";

323323 }

324− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nb-NO/firefox-100.0.tar.bz2";

324+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nb-NO/firefox-99.0.1.tar.bz2";

325325 locale = "nb-NO";

326326 arch = "linux-x86_64";

327− sha256 = "a359e3b9a83aec399890324ab484c811a9a5f615ee8237bf1a1f58d9140432f5";

327+ sha256 = "2d4b0706d46e92438a3ec1067515ca4eaa37aa168f6c633339a7c78c1e447f62";

328328 }

329− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ne-NP/firefox-100.0.tar.bz2";

329+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ne-NP/firefox-99.0.1.tar.bz2";

330330 locale = "ne-NP";

331331 arch = "linux-x86_64";

332− sha256 = "2aa43032307675ce450c2e35a2e833edddd9ab94626be008785c8226f0d62ecc";

332+ sha256 = "3f6e8d2b081bd23bc0a6425b0f956fbb8431c301b01563d43d1ec976ec5daa32";

333333 }

334− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nl/firefox-100.0.tar.bz2";

334+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nl/firefox-99.0.1.tar.bz2";

335335 locale = "nl";

336336 arch = "linux-x86_64";

337− sha256 = "ca8eaebfbbc6843f1273ff8ae8bca03209a436a3de86784049aafe52d7a3e950";

337+ sha256 = "00d8fb594fd4ced7ab5c7fe3de74bc193630547b5a537f0025a1ac11ec2adc53";

338338 }

339− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nn-NO/firefox-100.0.tar.bz2";

339+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nn-NO/firefox-99.0.1.tar.bz2";

340340 locale = "nn-NO";

341341 arch = "linux-x86_64";

342− sha256 = "5472b83b2e26c8ce88a959cc3e97c140f6e3efdff5f0c9208fb2d599f43081e0";

342+ sha256 = "de3b36fabf65ff0d6f8f24c2dd0490214f08fe4216645c7af0a0f271f443aec5";

343343 }

344− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/oc/firefox-100.0.tar.bz2";

344+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/oc/firefox-99.0.1.tar.bz2";

345345 locale = "oc";

346346 arch = "linux-x86_64";

347− sha256 = "19552e9822f186ec64e38ce170f0d93f433ba1d15fa25fd7388567af48925bc4";

347+ sha256 = "df7391bdfbf21175f3e935dbdb6985b0fbd3550824d4203c93b91d52ef0841e8";

348348 }

349− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pa-IN/firefox-100.0.tar.bz2";

349+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pa-IN/firefox-99.0.1.tar.bz2";

350350 locale = "pa-IN";

351351 arch = "linux-x86_64";

352− sha256 = "75f3516e0f14233bb158cde3a57be644fcd6b01256ade0a9cef21ad81d434454";

352+ sha256 = "653b0bb83de0787c37985968822c1637e4707a9dd96a521450048e25d220f1fd";

353353 }

354− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pl/firefox-100.0.tar.bz2";

354+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pl/firefox-99.0.1.tar.bz2";

355355 locale = "pl";

356356 arch = "linux-x86_64";

357− sha256 = "2cbb208a9f23b39c66c9e50be0a873d989083f0abf9ab56e48e9b7ada91718e6";

357+ sha256 = "31e861138205a8d69503550dff92e3a530b5d4212bd2f1f905298cceb53dbf40";

358358 }

359− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-BR/firefox-100.0.tar.bz2";

359+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-BR/firefox-99.0.1.tar.bz2";

360360 locale = "pt-BR";

361361 arch = "linux-x86_64";

362− sha256 = "2b9a5b1d37a000d86fb7cc41977c3ff8444047330ab0b2e10da288e418569905";

362+ sha256 = "20e992c16e7dc1d0c2e641a7ecac46e29fb00bcbe1ddca3a34cfe7a9344eadd1";

363363 }

364− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-PT/firefox-100.0.tar.bz2";

364+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-PT/firefox-99.0.1.tar.bz2";

365365 locale = "pt-PT";

366366 arch = "linux-x86_64";

367− sha256 = "73de91287952c4bc9dc53099ce911aab140bcda6356788e8bab5c667f1d363c4";

367+ sha256 = "5be572a2928648ba36d1e775c79967ac17810f341dc84a2c69e8d7bad07e3a21";

368368 }

369− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/rm/firefox-100.0.tar.bz2";

369+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/rm/firefox-99.0.1.tar.bz2";

370370 locale = "rm";

371371 arch = "linux-x86_64";

372− sha256 = "39c934e5c3b08e41889ed47f63e2e9f24a08602e40d20497cc7d9edb42132aff";

372+ sha256 = "47d11d7f4ba7fa8753845f3ab2cb4c36c2a20fa31cd9dd561d7032f3c28a9b22";

373373 }

374− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ro/firefox-100.0.tar.bz2";

374+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ro/firefox-99.0.1.tar.bz2";

375375 locale = "ro";

376376 arch = "linux-x86_64";

377− sha256 = "d23606050f9956d22efd779f09db6cb439cf8624cdc3e509f0ec6a7f0e3c9e46";

377+ sha256 = "c533fb1f8f845970e647a2d612c6ca23962d476b51696d12dde01e143ec50857";

378378 }

379− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ru/firefox-100.0.tar.bz2";

379+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ru/firefox-99.0.1.tar.bz2";

380380 locale = "ru";

381381 arch = "linux-x86_64";

382− sha256 = "b940390f3199cba2de06ef37a48ce6d0a892c8edd6e0125be088d50fa6c2e06b";

382+ sha256 = "571b016d12ec198148d52fa3e8ed25781cde49f3aaf8187ba881764b52d1c3f9";

383383 }

384− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sco/firefox-100.0.tar.bz2";

384+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sco/firefox-99.0.1.tar.bz2";

385385 locale = "sco";

386386 arch = "linux-x86_64";

387− sha256 = "3a1bb5b617b7a1633c79b6d7c80e559de15e6e6c9265d574de89628cc246e2f8";

387+ sha256 = "b30a42bd17bd2ee8843d791a00ac29f3ac91aa3d4de7b70ae603fe6365fc7906";

388388 }

389− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/si/firefox-100.0.tar.bz2";

389+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/si/firefox-99.0.1.tar.bz2";

390390 locale = "si";

391391 arch = "linux-x86_64";

392− sha256 = "e90f56c11a25fd023b3fe282858d93504e49cace7c26fd542fef10565f844742";

392+ sha256 = "509f987eac7b593cf24f6446ac7b78b2dc8e43dbf8b29dd82d0a107a596207f0";

393393 }

394− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sk/firefox-100.0.tar.bz2";

394+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sk/firefox-99.0.1.tar.bz2";

395395 locale = "sk";

396396 arch = "linux-x86_64";

397− sha256 = "a33f598ef8e2d9865cc01ef4a03a1a0e6ea96231dec4301ada4d128bb672d35f";

397+ sha256 = "4f44c500b355c5100dc476a807e8b212962e12c45b058b14cc0b5f84abac81b5";

398398 }

399− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sl/firefox-100.0.tar.bz2";

399+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sl/firefox-99.0.1.tar.bz2";

400400 locale = "sl";

401401 arch = "linux-x86_64";

402− sha256 = "939ffbab94871eb84bf36719debfaad1f160e0b10e0481082e5a1cf534537a54";

402+ sha256 = "6ecd0f30d8ecf6e6b63512f59363c7a4a17389f468a21ac1119a98b467ecee39";

403403 }

404− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/son/firefox-100.0.tar.bz2";

404+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/son/firefox-99.0.1.tar.bz2";

405405 locale = "son";

406406 arch = "linux-x86_64";

407− sha256 = "ecb166da7e16c925f14cbc3fb4748a039b942f20088ff6f9ba02489f1602c0c4";

407+ sha256 = "ddefd1ef806f3b39a51cd52d33a286f0145fc106c479e3f14a45a9e63c8ee374";

408408 }

409− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sq/firefox-100.0.tar.bz2";

409+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sq/firefox-99.0.1.tar.bz2";

410410 locale = "sq";

411411 arch = "linux-x86_64";

412− sha256 = "53b31c2c83fd1aab0b54cbbcf77459c38a8d466b4df866a49b1a0474038651d9";

412+ sha256 = "b69459ef0165648ba0b13b6d4ff6b27e80ad81181bf65b415e87574b21a2a021";

413413 }

414− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sr/firefox-100.0.tar.bz2";

414+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sr/firefox-99.0.1.tar.bz2";

415415 locale = "sr";

416416 arch = "linux-x86_64";

417− sha256 = "15b9b971d1ca2a7ab1422b040b813de9e984c451ea41eab8bad2939c5b9ae604";

417+ sha256 = "8d53bd7943aa99bbea08be26cd4e5465b3889c8ee0dfb718c82f1ab65ce9e2fe";

418418 }

419− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sv-SE/firefox-100.0.tar.bz2";

419+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sv-SE/firefox-99.0.1.tar.bz2";

420420 locale = "sv-SE";

421421 arch = "linux-x86_64";

422− sha256 = "7f44e7cec1f32a69b173ef832501dcb38002c0b690284af21a53b4862053c596";

422+ sha256 = "d70d78df84a39f921253c613518e0737439d1e516248b64c8b79fe29eadf4520";

423423 }

424− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/szl/firefox-100.0.tar.bz2";

424+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/szl/firefox-99.0.1.tar.bz2";

425425 locale = "szl";

426426 arch = "linux-x86_64";

427− sha256 = "df3d1186c2472d0e42e36efedd231b6beef43c1dbf18bcb1a27f86aee47257d2";

427+ sha256 = "c02e86f128049d894f1d2144bc1baa3ceac4b58745c19428f2de5def7dc8ca36";

428428 }

429− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ta/firefox-100.0.tar.bz2";

429+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ta/firefox-99.0.1.tar.bz2";

430430 locale = "ta";

431431 arch = "linux-x86_64";

432− sha256 = "d14d94ab5bed1b3c2118d5ac1dd31caf950f287b3b40de80e136b3500bdc773c";

432+ sha256 = "18754112a15bd8d25ebc8ee456e43fd7bc97b5af014a8bb6ebc481e0fc18559d";

433433 }

434− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/te/firefox-100.0.tar.bz2";

434+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/te/firefox-99.0.1.tar.bz2";

435435 locale = "te";

436436 arch = "linux-x86_64";

437− sha256 = "e11c66e7eae928a06f3d705ce3024cda3961c52727bed2217ac6dce444367107";

437+ sha256 = "afeb892e3656d2d3c802d548bc78bada5a9a2d4f7300d5dccbb4af0b96902371";

438438 }

439− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/th/firefox-100.0.tar.bz2";

439+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/th/firefox-99.0.1.tar.bz2";

440440 locale = "th";

441441 arch = "linux-x86_64";

442− sha256 = "4b29e95c96b9c8c5ff9fce146c3d85a1313c849a74694b56de177d921173956d";

442+ sha256 = "049baf07a0db7abecdc3477c9965119c4acb0da26a9e8a4201fc2311ae3bc966";

443443 }

444− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tl/firefox-100.0.tar.bz2";

444+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tl/firefox-99.0.1.tar.bz2";

445445 locale = "tl";

446446 arch = "linux-x86_64";

447− sha256 = "0d9c3749adc06152e7bf8a72f81e1652901a020abee1a46c9e68b1a37009f96c";

447+ sha256 = "9898714292846b9ec1bd277c279d6bc3a33186ad02e1c09a995c766044d168a2";

448448 }

449− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tr/firefox-100.0.tar.bz2";

449+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tr/firefox-99.0.1.tar.bz2";

450450 locale = "tr";

451451 arch = "linux-x86_64";

452− sha256 = "fea26051836eaec249373404e594329c7a0f357cf94edd93f494989a80e8b6c6";

452+ sha256 = "378a940ecc44d0016f5e1764f667abd60fa2241ac11477811eda477621085475";

453453 }

454− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/trs/firefox-100.0.tar.bz2";

454+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/trs/firefox-99.0.1.tar.bz2";

455455 locale = "trs";

456456 arch = "linux-x86_64";

457− sha256 = "cef307d45f53e95ee954731106a66bc313a007dbaf96ec3b670acc392345cea8";

457+ sha256 = "c338b68e0fb85bde3949abe2bb739e127453acd692e0460ffe1914ea4a5cf150";

458458 }

459− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uk/firefox-100.0.tar.bz2";

459+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uk/firefox-99.0.1.tar.bz2";

460460 locale = "uk";

461461 arch = "linux-x86_64";

462− sha256 = "20b1054ed238bf426ecdc511a86e1a01c946522caed30a21f8d0b470949db921";

462+ sha256 = "2602c70ef4e449e15f95e661e916a4f5b978158f8e2e998f552ef79c4462d319";

463463 }

464− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ur/firefox-100.0.tar.bz2";

464+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ur/firefox-99.0.1.tar.bz2";

465465 locale = "ur";

466466 arch = "linux-x86_64";

467− sha256 = "3009c02b5983a89dcb331daedc49bfc6bd629161a755a5e29f28405b4706ca32";

467+ sha256 = "bc195325efa7668db62c3307d488b721843c620d804e75754d540789b0545950";

468468 }

469− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uz/firefox-100.0.tar.bz2";

469+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uz/firefox-99.0.1.tar.bz2";

470470 locale = "uz";

471471 arch = "linux-x86_64";

472− sha256 = "2ecf4078582f805b624f6ac612ceb10c22d1c2c3fd1a855cb86704addb9f9180";

472+ sha256 = "14cff13fe9ba0bc91629b95cc3f2f6df5164b538be5e285acd54cb8d6656e109";

473473 }

474− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/vi/firefox-100.0.tar.bz2";

474+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/vi/firefox-99.0.1.tar.bz2";

475475 locale = "vi";

476476 arch = "linux-x86_64";

477− sha256 = "a73072f4a152256972a41a38ebd7dd72f1cae40bbb568bd6384bef2ffa8c7d64";

477+ sha256 = "5852f4eee3136058d7228c5eccc173153706d72b90c61ca632623d926aa84d7b";

478478 }

479− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xh/firefox-100.0.tar.bz2";

479+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/xh/firefox-99.0.1.tar.bz2";

480480 locale = "xh";

481481 arch = "linux-x86_64";

482− sha256 = "eec036004690e9fbd1e1d6934b594787e8e269e2a2a10a818096ea5854da481f";

482+ sha256 = "ca10968059585ceb6bdc0902f94bb69798c9b0666e2dec1cbcf42e5979be97c3";

483483 }

484− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-CN/firefox-100.0.tar.bz2";

484+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-CN/firefox-99.0.1.tar.bz2";

485485 locale = "zh-CN";

486486 arch = "linux-x86_64";

487− sha256 = "b65ee16996593d88be41f19fae95f7f5826db828b3f0d7e40f1dbd9c45f43fbc";

487+ sha256 = "f9d5c1a1aef830b4276e0af88c783b419674219d599c52c414bc8da3eb99fd4f";

488488 }

489− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-TW/firefox-100.0.tar.bz2";

489+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-TW/firefox-99.0.1.tar.bz2";

490490 locale = "zh-TW";

491491 arch = "linux-x86_64";

492− sha256 = "c3e5b7119b95c3da1145cdecded90b8194b99f722d41855e5282d615ae2a86f9";

492+ sha256 = "6857ee348392d9cedc4f2bbe1c355bcbdaa1a886d4babc65ccfb2c95421219c5";

493493 }

494− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ach/firefox-100.0.tar.bz2";

494+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ach/firefox-99.0.1.tar.bz2";

495495 locale = "ach";

496496 arch = "linux-i686";

497− sha256 = "6ada766fccaa1e54ecbf0ee75bd807a42ecbfcedd9f218ff65443aa43f4e18e1";

497+ sha256 = "9b8a8950e770bf53cb85b0fb79f63d6aaed9a09df86421ef2ee30dab3b250ede";

498498 }

499− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/af/firefox-100.0.tar.bz2";

499+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/af/firefox-99.0.1.tar.bz2";

500500 locale = "af";

501501 arch = "linux-i686";

502− sha256 = "6925ff4e7b2746249c526c11b65a87b95ccfaaa2e3f57dfe38fa5ed8bfde7637";

502+ sha256 = "fd464ccc673892932cf98fc4696146034928078de14f8c5df68a9103c20076df";

503503 }

504− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/an/firefox-100.0.tar.bz2";

504+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/an/firefox-99.0.1.tar.bz2";

505505 locale = "an";

506506 arch = "linux-i686";

507− sha256 = "bf146035e88c2b2c80bd3e352a251f4bf527089fd0252ef320b13752e045b0d4";

507+ sha256 = "76837e6555079a23fc33e83bbf9e507d4eb6e896501d43ae78cf5b8536e88a62";

508508 }

509− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ar/firefox-100.0.tar.bz2";

509+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ar/firefox-99.0.1.tar.bz2";

510510 locale = "ar";

511511 arch = "linux-i686";

512− sha256 = "f891728a186e9746b46b12cdaf7a28e81152bf71a361f49b3fb9e048050b216d";

512+ sha256 = "8346570bb699370f34d19ee93a705c9f81b57164ca14f7758c339be0837e9319";

513513 }

514− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ast/firefox-100.0.tar.bz2";

514+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ast/firefox-99.0.1.tar.bz2";

515515 locale = "ast";

516516 arch = "linux-i686";

517− sha256 = "3fe9530affb6eee7fd3c35d8f3274c0659f54ff45a51e04b02d4685b22283d97";

517+ sha256 = "f14088ae65cda0b3ae518cc517d6d786fa4c7a471510ddf4d45f6c268761d324";

518518 }

519− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/az/firefox-100.0.tar.bz2";

519+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/az/firefox-99.0.1.tar.bz2";

520520 locale = "az";

521521 arch = "linux-i686";

522− sha256 = "7d62e6cb2de5130e24aef684a014ae72db408cfd3227e0b67f080a8395004d71";

522+ sha256 = "e15d3764842a0febc41882c9f82e607b0b4dd875d765ab4079880b1cf8d0f327";

523523 }

524− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/be/firefox-100.0.tar.bz2";

524+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/be/firefox-99.0.1.tar.bz2";

525525 locale = "be";

526526 arch = "linux-i686";

527− sha256 = "2c7c9285e61e0b74f7fec985462098459475e9932b6e2a44243bf54c649add52";

527+ sha256 = "e7336bcf602bb95697eb5c134da3ef96cdb9229233a4f135e44d7439fbc3d972";

528528 }

529− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bg/firefox-100.0.tar.bz2";

529+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bg/firefox-99.0.1.tar.bz2";

530530 locale = "bg";

531531 arch = "linux-i686";

532− sha256 = "31ba288d27f7b045cc7c685e83f49ec8b9b6579745f7c1ab373a18c8e8264aa8";

532+ sha256 = "a5c9d5cb091f4a643293879f7f0f0e2afa4a2e53efe08a97eca1fc8f5c77cb41";

533533 }

534− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bn/firefox-100.0.tar.bz2";

534+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bn/firefox-99.0.1.tar.bz2";

535535 locale = "bn";

536536 arch = "linux-i686";

537− sha256 = "927749fadf833f84120c36996e1364e714bf353de6cff38cc68f78af6143390e";

537+ sha256 = "2edcbeebb3a7afdb1322c55ad1ac1a8cd4f2dae7e45a009d113cfee4d159ef2e";

538538 }

539− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/br/firefox-100.0.tar.bz2";

539+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/br/firefox-99.0.1.tar.bz2";

540540 locale = "br";

541541 arch = "linux-i686";

542− sha256 = "82f398c8b1ae36706b8d5e0e1bd12a568de584d342141eab4d35a40abcf14fcb";

542+ sha256 = "dc78c6a0a71856b42c6654b3f3d2f93bd30808878a90c49dfecf2b724f42532c";

543543 }

544− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bs/firefox-100.0.tar.bz2";

544+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bs/firefox-99.0.1.tar.bz2";

545545 locale = "bs";

546546 arch = "linux-i686";

547− sha256 = "01609251ed3198064326e99c9e97b2c9128f1216581971896ccbd692ea9aaefa";

547+ sha256 = "f9ba0d138252aff3abbd8f8447680b59f24f1a9b7a40d6ec753fccb74344a853";

548548 }

549− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca-valencia/firefox-100.0.tar.bz2";

549+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca-valencia/firefox-99.0.1.tar.bz2";

550550 locale = "ca-valencia";

551551 arch = "linux-i686";

552− sha256 = "c35d207480e63f3b2538290e74fe6859e1de3061eeebddc10de4e44d040080b8";

552+ sha256 = "68a8522e03191f286514b648d1cc7d6c9b7d1683638bb7a88d2ba33c3c8031c1";

553553 }

554− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca/firefox-100.0.tar.bz2";

554+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca/firefox-99.0.1.tar.bz2";

555555 locale = "ca";

556556 arch = "linux-i686";

557− sha256 = "3419b0ce1e30db92646c4675701eb6a7201c0c65b722b3f86bbd90c4cc236ace";

557+ sha256 = "71b29981fe6da252296c9669e3b05bcfa8914282b982455f6c21e1e47fc6c452";

558558 }

559− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cak/firefox-100.0.tar.bz2";

559+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cak/firefox-99.0.1.tar.bz2";

560560 locale = "cak";

561561 arch = "linux-i686";

562− sha256 = "3f19b7d4a9ab541b12f2a2156039d38af9c13b10ff2f80a22dc365e41d307d96";

562+ sha256 = "0964328bc005e028371852ecfeefed0b1bb4334840dd9e343ed15b3e0add3cfa";

563563 }

564− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cs/firefox-100.0.tar.bz2";

564+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cs/firefox-99.0.1.tar.bz2";

565565 locale = "cs";

566566 arch = "linux-i686";

567− sha256 = "2df78b68ddf8771f5e0bb2b24d024a04972a75b2b4aacfb85ac5d1b122cfc47d";

567+ sha256 = "b72dbc0d7bc48884fb55d1e419680d753175e2d2d7fc91b362337e5963c59339";

568568 }

569− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cy/firefox-100.0.tar.bz2";

569+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cy/firefox-99.0.1.tar.bz2";

570570 locale = "cy";

571571 arch = "linux-i686";

572− sha256 = "263fc246ede739f74cdb5d266a871cfc063fc162c42ace9cd111c2522bd7044a";

572+ sha256 = "553ba01218ca17602bf67fc4cd7940d6259fd1cedf1d70665d06053b7336311f";

573573 }

574− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/da/firefox-100.0.tar.bz2";

574+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/da/firefox-99.0.1.tar.bz2";

575575 locale = "da";

576576 arch = "linux-i686";

577− sha256 = "225a09327f2d8bdcd2084eeb5cba8995b899150fe5a42f97efd34e39ca9b9693";

577+ sha256 = "41c01f3979fdec4823e18031497fcccba3380393a3b5e142ab8b1e59e247c87a";

578578 }

579− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/de/firefox-100.0.tar.bz2";

579+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/de/firefox-99.0.1.tar.bz2";

580580 locale = "de";

581581 arch = "linux-i686";

582− sha256 = "e636784c7a794d8a18741aa4915c8028dfb8259381c1a0dcccd8a17796a9e340";

582+ sha256 = "7d88786442c856c8502019d494d8c3b5bd09ad9aa0ce1e5a45216594ac915b5b";

583583 }

584− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/dsb/firefox-100.0.tar.bz2";

584+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/dsb/firefox-99.0.1.tar.bz2";

585585 locale = "dsb";

586586 arch = "linux-i686";

587− sha256 = "f9bad69c8fda65665c556f736401a4ce522fcc90592aedc7576076fa530a3599";

587+ sha256 = "4b94ebf19d6fdd64e7fd1181bb47f1b89d68f04a5e9b3c29a3cd8e43c36ac898";

588588 }

589− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/el/firefox-100.0.tar.bz2";

589+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/el/firefox-99.0.1.tar.bz2";

590590 locale = "el";

591591 arch = "linux-i686";

592− sha256 = "b825735e8461779f3dab037360e67fe4fa8d849881f811a179f8db33d49f44f6";

592+ sha256 = "12f61d5b97c906a9532028b14c7d86ef8ee04398460ecdb08496922f4c6abe34";

593593 }

594− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-CA/firefox-100.0.tar.bz2";

594+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-CA/firefox-99.0.1.tar.bz2";

595595 locale = "en-CA";

596596 arch = "linux-i686";

597− sha256 = "e944d750a11e9ab1ee653402e058cb3f65b46eadf551a29d31919ee1640b1272";

597+ sha256 = "b5804a8edc39eca3b04ec76fd87f5fc228a3df02b47094ca1a9d2020de0c1c29";

598598 }

599− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-GB/firefox-100.0.tar.bz2";

599+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-GB/firefox-99.0.1.tar.bz2";

600600 locale = "en-GB";

601601 arch = "linux-i686";

602− sha256 = "0039ab82d3eb22e9c8d1036f2d3ada46d37faeb192209b447d3e20dbe0450163";

602+ sha256 = "211b7adde34ffc0ef075cc4d34fb5bbc50d00543920747db7e434268c0948e74";

603603 }

604− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-US/firefox-100.0.tar.bz2";

604+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-US/firefox-99.0.1.tar.bz2";

605605 locale = "en-US";

606606 arch = "linux-i686";

607− sha256 = "5013a7a3d601c4f532becf4efad8090e73fab442a1bc8599f4195c65d5813dc0";

607+ sha256 = "da446e05101a645ebc51cb9fb60bb33e68b8570448072c56baea4561b638338a";

608608 }

609− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eo/firefox-100.0.tar.bz2";

609+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eo/firefox-99.0.1.tar.bz2";

610610 locale = "eo";

611611 arch = "linux-i686";

612− sha256 = "b05d2600e407bf47c1eeeda8a5154495dfee6f0aa7044f089d5fad558134ff3f";

612+ sha256 = "e217817389a32bfd05272210b7bef6c80547c58e51d7df69b26e2931b2e89ec9";

613613 }

614− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-AR/firefox-100.0.tar.bz2";

614+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-AR/firefox-99.0.1.tar.bz2";

615615 locale = "es-AR";

616616 arch = "linux-i686";

617− sha256 = "27e30ab50cf1be112c8dcc625d98de5a14495bdc639de9b0e5d8795eab90f4c3";

617+ sha256 = "5f5c35e50809f33b769344c986fe468a404dad2b5c0a933f5dccf9481bad32c3";

618618 }

619− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-CL/firefox-100.0.tar.bz2";

619+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-CL/firefox-99.0.1.tar.bz2";

620620 locale = "es-CL";

621621 arch = "linux-i686";

622− sha256 = "c82b39f32baf5a63bed4ddd4bd97e7c45ba213957d114559506039986cc78c0d";

622+ sha256 = "12434003ff87d5269cbe751adc53ce5396f98f36c8df7ab5535236cf778deb26";

623623 }

624− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-ES/firefox-100.0.tar.bz2";

624+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-ES/firefox-99.0.1.tar.bz2";

625625 locale = "es-ES";

626626 arch = "linux-i686";

627− sha256 = "1ca07d869f0f36cfb79b00cc24f374f546f8e8ed9061caeba9ccd82ea1890b62";

627+ sha256 = "eef66f4f53ef38baf4b664b0428528117e376fbc57a743cade265adebe451d62";

628628 }

629− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-MX/firefox-100.0.tar.bz2";

629+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-MX/firefox-99.0.1.tar.bz2";

630630 locale = "es-MX";

631631 arch = "linux-i686";

632− sha256 = "8775da0ec29b758d82e2c33defe858c45a50eaeb824c34c1e31f97a07c9a9f48";

632+ sha256 = "e56dfa4f160d60b70d905c4acde1b78d4598dadaa63a0833f638cdadcc850e35";

633633 }

634− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/et/firefox-100.0.tar.bz2";

634+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/et/firefox-99.0.1.tar.bz2";

635635 locale = "et";

636636 arch = "linux-i686";

637− sha256 = "29655eefbcbb0975f4d73124881c13ce465d0422088d33ea2c62bcc23a94a372";

637+ sha256 = "ab7b3244b55e3d663a89e46f7cf1ee211ab643c6f92112cf921b05343ded25e7";

638638 }

639− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eu/firefox-100.0.tar.bz2";

639+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eu/firefox-99.0.1.tar.bz2";

640640 locale = "eu";

641641 arch = "linux-i686";

642− sha256 = "47394c402cbb327335d7ed47670cc3f0c16a875581637d171d3c714d03e859c1";

642+ sha256 = "b626fa244d85a9c266e2c11f311133e6704adfcfcaa0ebd00a7dbf487e0d7a8b";

643643 }

644− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fa/firefox-100.0.tar.bz2";

644+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fa/firefox-99.0.1.tar.bz2";

645645 locale = "fa";

646646 arch = "linux-i686";

647− sha256 = "133433694832d6b4d0a03ff93f1a51a52543e67da3b58d171ee9ddf8caf10d24";

647+ sha256 = "743f58643846d3a769da6ba2fec2ba50f7c00a7f4a4447b684ef08f64d8be16d";

648648 }

649− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ff/firefox-100.0.tar.bz2";

649+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ff/firefox-99.0.1.tar.bz2";

650650 locale = "ff";

651651 arch = "linux-i686";

652− sha256 = "16078dcca2ef7dff68d20f29cdf941f08df9ca2b3c247be26e0386e88fc1b16e";

652+ sha256 = "3cd80abe0d157427d17cc502cdfb67fb4f48f237de97c7ba9e9d4af5f8ee1fc7";

653653 }

654− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fi/firefox-100.0.tar.bz2";

654+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fi/firefox-99.0.1.tar.bz2";

655655 locale = "fi";

656656 arch = "linux-i686";

657− sha256 = "2c2a44c45a3f4e449f270b8eabfbf279c922eaa0596794c0fa80b06d2f17db19";

657+ sha256 = "d7ddda88e29c89e34c56e7467aabd3262430267fda1814933b2b03e1201b549d";

658658 }

659− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fr/firefox-100.0.tar.bz2";

659+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fr/firefox-99.0.1.tar.bz2";

660660 locale = "fr";

661661 arch = "linux-i686";

662− sha256 = "59b0f88988d896144cbf6c9f4ed607fc318e8357b2d96c6df6ad3488f73fc9e4";

662+ sha256 = "b442b7cd5b1dafe98fb04ef68ef3d21fdb6a6beeacda3537c0fb2ff26a5d0a67";

663663 }

664− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fy-NL/firefox-100.0.tar.bz2";

664+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fy-NL/firefox-99.0.1.tar.bz2";

665665 locale = "fy-NL";

666666 arch = "linux-i686";

667− sha256 = "97a98a714e543c101e159d7f3ca052a970421a1f74e2bcbbfdb9b9755388caa2";

667+ sha256 = "fbbe401d602c88cec32ea608eab714ebfa873ccf70d07102bfd3b8c59bcc39e4";

668668 }

669− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ga-IE/firefox-100.0.tar.bz2";

669+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ga-IE/firefox-99.0.1.tar.bz2";

670670 locale = "ga-IE";

671671 arch = "linux-i686";

672− sha256 = "3221dda3f7d232f986e1e111a6cfb945bc1c1768464cc18d0a345ba140eef706";

672+ sha256 = "fe6c9544bf67a30bd8266fafa92c56e1825c0e155d6e30225b5587719a683fe1";

673673 }

674− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gd/firefox-100.0.tar.bz2";

674+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gd/firefox-99.0.1.tar.bz2";

675675 locale = "gd";

676676 arch = "linux-i686";

677− sha256 = "c61156527cfe9966916573cfd7005a16313b134e353258b05e2362414ef0d9f8";

677+ sha256 = "d62bad0b209df9b74173e894af3a5e6c48b8d9321a2bbc3ef05e40f24db972e2";

678678 }

679− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gl/firefox-100.0.tar.bz2";

679+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gl/firefox-99.0.1.tar.bz2";

680680 locale = "gl";

681681 arch = "linux-i686";

682− sha256 = "16f762ba8291f190b165b05f9980c22d93a1612ed2251d6ec1ec18fa465044b6";

682+ sha256 = "caa93a08ac9fe456f6f1480b514492ba884814dada450845a86cfb486463ef90";

683683 }

684− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gn/firefox-100.0.tar.bz2";

684+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gn/firefox-99.0.1.tar.bz2";

685685 locale = "gn";

686686 arch = "linux-i686";

687− sha256 = "c1d51a4e5629a0f04187d76edd1dd94bb5d55ff2e0757932aa218eec3a50027c";

687+ sha256 = "eb44f048ae40e1c5693bcb31f7c2b50644b55c7f7229fb087b3757ad7c232fc3";

688688 }

689− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gu-IN/firefox-100.0.tar.bz2";

689+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gu-IN/firefox-99.0.1.tar.bz2";

690690 locale = "gu-IN";

691691 arch = "linux-i686";

692− sha256 = "a3f92bc8d213b0cdd4df2a853951a5f446786ae5d08bebef2799e866fcde06bd";

692+ sha256 = "5a536e35bb8734541b9a8266def5418c8b4eae66a60323c40dca7e0bc11e2ecd";

693693 }

694− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/he/firefox-100.0.tar.bz2";

694+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/he/firefox-99.0.1.tar.bz2";

695695 locale = "he";

696696 arch = "linux-i686";

697− sha256 = "ea432d8c4cb390f92d42c27101b7b1b3c331d7b1f18a88f6acfbd3ef1b2c1544";

697+ sha256 = "b045e3b0a9789804775fdb9f28cf7c8a1293b12adb06f105afc4001648f22dd9";

698698 }

699− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hi-IN/firefox-100.0.tar.bz2";

699+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hi-IN/firefox-99.0.1.tar.bz2";

700700 locale = "hi-IN";

701701 arch = "linux-i686";

702− sha256 = "a6aa3110e9b792398860bbb2ceed29d6fa619a8ac73af96b858813d2d388855e";

702+ sha256 = "955ba8c9936da6b12f1422b0de5a696a849a72a352b994d62818477b07af5890";

703703 }

704− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hr/firefox-100.0.tar.bz2";

704+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hr/firefox-99.0.1.tar.bz2";

705705 locale = "hr";

706706 arch = "linux-i686";

707− sha256 = "ea1e36606ac218db3dd39891fb17ce2ac398381ab41102a3dd3170ccc37fd329";

707+ sha256 = "bbbc1d1bd23b49197861fe389d2ab92580def84ce97f1643e50f4cd8de748e8c";

708708 }

709− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hsb/firefox-100.0.tar.bz2";

709+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hsb/firefox-99.0.1.tar.bz2";

710710 locale = "hsb";

711711 arch = "linux-i686";

712− sha256 = "ec80f48bcc37a517bacc258411da614c472a5179743717cb47561f8968c395e1";

712+ sha256 = "23afed3429959fee426a2e5fc08cb0cba058e2544b5f8c742fbcbdd51ac31afe";

713713 }

714− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hu/firefox-100.0.tar.bz2";

714+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hu/firefox-99.0.1.tar.bz2";

715715 locale = "hu";

716716 arch = "linux-i686";

717− sha256 = "d8622685ea6132887d8f9657d2e09d5dbcf6b9571cc7c64a85646219e5c972b0";

717+ sha256 = "2a42af969db30183a5fc547f4cdc75db99a8405550a2791de4303e5604a24133";

718718 }

719− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hy-AM/firefox-100.0.tar.bz2";

719+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hy-AM/firefox-99.0.1.tar.bz2";

720720 locale = "hy-AM";

721721 arch = "linux-i686";

722− sha256 = "dd3eb9c5db97fe3e6c6dd0705406eed897e955423a96e773eb842d2e4d65f845";

722+ sha256 = "79d134d0c95fb3be213ded965d02ec898891efe2c07dd82046e02adeb24641e4";

723723 }

724− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ia/firefox-100.0.tar.bz2";

724+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ia/firefox-99.0.1.tar.bz2";

725725 locale = "ia";

726726 arch = "linux-i686";

727− sha256 = "7e94b98322ad8cbcbe5ee4bebd84f2ac82a4b78673ed357bbb02a4f0b2c63c6c";

727+ sha256 = "3e9f078057e53822a59509f1658f64b8d5563ffc69528193aa1473668e390f62";

728728 }

729− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/id/firefox-100.0.tar.bz2";

729+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/id/firefox-99.0.1.tar.bz2";

730730 locale = "id";

731731 arch = "linux-i686";

732− sha256 = "b4bc9b6384b44b392a70144cb71fbd9e6d5afc3cccec4e7c86ad023bcc52dd72";

732+ sha256 = "5133875012d3165d3941740b80addfa3adcd0eec015dc21a6b1261b4d48b824c";

733733 }

734− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/is/firefox-100.0.tar.bz2";

734+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/is/firefox-99.0.1.tar.bz2";

735735 locale = "is";

736736 arch = "linux-i686";

737− sha256 = "951d6273c916a84e9139f74f916a9db4b4a976f83900d3e5506356b8817943ee";

737+ sha256 = "d59c86f8c71468cbbb7d8d4641e8baa8672fae0ee38a232782a63f29d1ad4d10";

738738 }

739− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/it/firefox-100.0.tar.bz2";

739+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/it/firefox-99.0.1.tar.bz2";

740740 locale = "it";

741741 arch = "linux-i686";

742− sha256 = "ac5c51fb5e42544696d975d769edf81c07e2a42bd5279eddb016e434c1945f1e";

742+ sha256 = "d583c577d73623e06aec514635c4191a9dbfc14a8cfd88880bc50abb0f5ae308";

743743 }

744− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ja/firefox-100.0.tar.bz2";

744+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ja/firefox-99.0.1.tar.bz2";

745745 locale = "ja";

746746 arch = "linux-i686";

747− sha256 = "99c6b533a3e3ddab8dfd9b4a66f6e403bc79ab214027d604671d9f27ae897041";

747+ sha256 = "31fd6b653338050651b8432a84278ae26bccdd7cdf0d4c2674a6208f5a3ad9a0";

748748 }

749− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ka/firefox-100.0.tar.bz2";

749+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ka/firefox-99.0.1.tar.bz2";

750750 locale = "ka";

751751 arch = "linux-i686";

752− sha256 = "73eb8f1c4f22fda48ba752982265363730e23d4695fe2296b30cd74191da3c08";

752+ sha256 = "09e6a905151bcf7d373c6b9ec3bb00043361a4e06e08752834d581f6f211a595";

753753 }

754− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kab/firefox-100.0.tar.bz2";

754+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kab/firefox-99.0.1.tar.bz2";

755755 locale = "kab";

756756 arch = "linux-i686";

757− sha256 = "a3ee102058a90cc02c745434178fe519aead9ed4552d3923eaddfaed8fbea207";

757+ sha256 = "117bd25831806d7d8774907a49288ea91c8160add23d0decce9d1dd95bd3c918";

758758 }

759− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kk/firefox-100.0.tar.bz2";

759+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kk/firefox-99.0.1.tar.bz2";

760760 locale = "kk";

761761 arch = "linux-i686";

762− sha256 = "0858af4f79d5b8592ce18701968331a19ac0d35d50117dc95096bb9f7d3cbca1";

762+ sha256 = "6511f3a53cea4f210b52d37e7298427382c7a5738e1a055b38a4d41b6eb9fe3d";

763763 }

764− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/km/firefox-100.0.tar.bz2";

764+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/km/firefox-99.0.1.tar.bz2";

765765 locale = "km";

766766 arch = "linux-i686";

767− sha256 = "b4509b98696f18d19850320f6b9e3d97dbcc0f5f55019cf3e0e62581ebd5d747";

767+ sha256 = "af231614cea8b247215d79c101bd59a135ff86965b6aaab2226016215164d240";

768768 }

769− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kn/firefox-100.0.tar.bz2";

769+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kn/firefox-99.0.1.tar.bz2";

770770 locale = "kn";

771771 arch = "linux-i686";

772− sha256 = "8b9e139b3e0e98f266a77cba5d5a7deb3ee714176cffd5cb2b8f9e8ae85189e4";

772+ sha256 = "abe0ba12cad7eb53f8592476efe3fbd93a1cf3d1108828db7eb3d9d6d3b639a5";

773773 }

774− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ko/firefox-100.0.tar.bz2";

774+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ko/firefox-99.0.1.tar.bz2";

775775 locale = "ko";

776776 arch = "linux-i686";

777− sha256 = "a43471bf0cb5e36f8e8db03e6d9e8be46bf4cb3209f66c6d721cd8ddcaf1b560";

777+ sha256 = "6415de365af3c132afacaf114a804446d4df566693254e6659551d95016ed830";

778778 }

779− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lij/firefox-100.0.tar.bz2";

779+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lij/firefox-99.0.1.tar.bz2";

780780 locale = "lij";

781781 arch = "linux-i686";

782− sha256 = "8dadda12fef18c64ed1331eac980c87772a45b821f524f48d73384758a003357";

782+ sha256 = "d882562d34ea5e49cd035cda2aa2489bc75db90b1e777be1a74dedc394d02e8f";

783783 }

784− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lt/firefox-100.0.tar.bz2";

784+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lt/firefox-99.0.1.tar.bz2";

785785 locale = "lt";

786786 arch = "linux-i686";

787− sha256 = "93dbe1924d766b5dce326597c7a5557b26bf1137bae68bed6a319ce5caf63ab1";

787+ sha256 = "59add081878210ffbb9445dacf12f999ea6995fddec1444fb11b9c93c615abb5";

788788 }

789− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lv/firefox-100.0.tar.bz2";

789+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lv/firefox-99.0.1.tar.bz2";

790790 locale = "lv";

791791 arch = "linux-i686";

792− sha256 = "a161963a911846e93e64beff2eda2db9bf449f266697214a4483dafa97d1a2fb";

792+ sha256 = "d11227308bb407aedc6d2559256d92fe931e5ea34498b511f5e23b8091e91766";

793793 }

794− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mk/firefox-100.0.tar.bz2";

794+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mk/firefox-99.0.1.tar.bz2";

795795 locale = "mk";

796796 arch = "linux-i686";

797− sha256 = "77db19a56be146f189436ca7d6c71defa6006ba3e34f2e10a8d1d362526dad71";

797+ sha256 = "34e1a97d0944d241d12b8a5d2f64ff34f7bc7a3c43b23ac05d13d794bf36e960";

798798 }

799− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mr/firefox-100.0.tar.bz2";

799+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mr/firefox-99.0.1.tar.bz2";

800800 locale = "mr";

801801 arch = "linux-i686";

802− sha256 = "fbdf4862658eb780d499f089c1fa89b4374945e1990ed8892b2fdbaeffb28ed5";

802+ sha256 = "98746bc7f75898bbd5ca5c38b47f311d09d43a2264da85b0303ea4bd01d7a0fb";

803803 }

804− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ms/firefox-100.0.tar.bz2";

804+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ms/firefox-99.0.1.tar.bz2";

805805 locale = "ms";

806806 arch = "linux-i686";

807− sha256 = "16e5dcdba19020f498c767732f3426915cb5f9b8f5b2be3adb2825d0db52a1d4";

807+ sha256 = "48a1a0892ad1ef2ab03e3e66f05401c1d6e231801d5f03ac63a7984225624818";

808808 }

809− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/my/firefox-100.0.tar.bz2";

809+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/my/firefox-99.0.1.tar.bz2";

810810 locale = "my";

811811 arch = "linux-i686";

812− sha256 = "c19ed3d409233f055ac633b4baa40de0e2be99d731f3091f0cccf772eaa39f2b";

812+ sha256 = "745a7e7c73d3161aff4bcaba915ed9939970d8e4478cbaebbb32f47380f1c029";

813813 }

814− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nb-NO/firefox-100.0.tar.bz2";

814+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nb-NO/firefox-99.0.1.tar.bz2";

815815 locale = "nb-NO";

816816 arch = "linux-i686";

817− sha256 = "c36dd328395d5fe3e7907d990e1f8185144e93961da9d8aaf81a1bbede55eed8";

817+ sha256 = "c67804a726c68c534fc763893f0e7cc94ab55b9fd4844113ffffb467cefb63ed";

818818 }

819− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ne-NP/firefox-100.0.tar.bz2";

819+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ne-NP/firefox-99.0.1.tar.bz2";

820820 locale = "ne-NP";

821821 arch = "linux-i686";

822− sha256 = "6672d29f0fb08645f7cd4b7b7de2edff850da86e29f078fe7e49c10dbf4c35ca";

822+ sha256 = "69073cf042a8e78184f7f01db3ca88bd3b3d59960a3e51124cb9908150452115";

823823 }

824− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nl/firefox-100.0.tar.bz2";

824+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nl/firefox-99.0.1.tar.bz2";

825825 locale = "nl";

826826 arch = "linux-i686";

827− sha256 = "71f9339624aa2014238c35c78142a1fda6762c61f5b199becc0682532c9c8de8";

827+ sha256 = "24d30ce7f9cc2ad445c9aca32616a2efb9a3d392e62f855bbf5709d8160823bd";

828828 }

829− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nn-NO/firefox-100.0.tar.bz2";

829+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nn-NO/firefox-99.0.1.tar.bz2";

830830 locale = "nn-NO";

831831 arch = "linux-i686";

832− sha256 = "5f9f59d3ef36aaa01d3b058adb9a08f09e184ed408d1b5b25ec415c3e83b404a";

832+ sha256 = "d3a5034cb8ce135ec245c2ef94e799a31744a8592e6c5ba3935b19a77c087d53";

833833 }

834− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/oc/firefox-100.0.tar.bz2";

834+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/oc/firefox-99.0.1.tar.bz2";

835835 locale = "oc";

836836 arch = "linux-i686";

837− sha256 = "76d7b330ba2f5c7df4df6bdddda7a887a5222f0ba3caa13f77d6ea956ec7e685";

837+ sha256 = "dbe0dfd961a543017ca8dcca6fae7168ca4d85a637f4d2dae7b02b6ea671b28f";

838838 }

839− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pa-IN/firefox-100.0.tar.bz2";

839+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pa-IN/firefox-99.0.1.tar.bz2";

840840 locale = "pa-IN";

841841 arch = "linux-i686";

842− sha256 = "569b151ad53b47338ad8f78d4266247e7e7fa4ef207ee58b3606dc299b0f16af";

842+ sha256 = "1bcfb488ec1f3934415ee4af684e7dd40966265be65f43488d3d670d14790124";

843843 }

844− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pl/firefox-100.0.tar.bz2";

844+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pl/firefox-99.0.1.tar.bz2";

845845 locale = "pl";

846846 arch = "linux-i686";

847− sha256 = "af4ca741d8eb82e40775b0a2cc9338c2e81854df5107815bab8f4b6188c7189a";

847+ sha256 = "484a8ee788ab6edce6b66f31c94f7fd0e671269ae470569129662ed4b7e9294b";

848848 }

849− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-BR/firefox-100.0.tar.bz2";

849+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-BR/firefox-99.0.1.tar.bz2";

850850 locale = "pt-BR";

851851 arch = "linux-i686";

852− sha256 = "16ed593e6c116418ca5969a07fbcbd9f93af3972edc2227271256d269066b61d";

852+ sha256 = "d764f17b9eb2c8ac61c92490a20bcb4dd83810635b89a6405c4a0389ab15104f";

853853 }

854− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-PT/firefox-100.0.tar.bz2";

854+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-PT/firefox-99.0.1.tar.bz2";

855855 locale = "pt-PT";

856856 arch = "linux-i686";

857− sha256 = "2a5b5a26185ff4560691d5f32fbb29ecd9123df63020492aa2829e0088aa6b1b";

857+ sha256 = "1a9b64665abf305dd38c6441e22448fa0cd5d142a69de96220b2f8683230a341";

858858 }

859− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/rm/firefox-100.0.tar.bz2";

859+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/rm/firefox-99.0.1.tar.bz2";

860860 locale = "rm";

861861 arch = "linux-i686";

862− sha256 = "e80cf9ebb3010c97acd5d2f6cc672aa6ce4fdca930974238a148c2683f8a8dd8";

862+ sha256 = "8870c35cf68d654db389cea3df9951660d371c53804cb2d9fb5d8006155cb82c";

863863 }

864− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ro/firefox-100.0.tar.bz2";

864+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ro/firefox-99.0.1.tar.bz2";

865865 locale = "ro";

866866 arch = "linux-i686";

867− sha256 = "4db1842a3ead551700c83be677aacdd00e1957ecb6534f2b8933a19a6eedb38b";

867+ sha256 = "cb72b5316bc807095a64d8767822732ad18a2cec28c7a23bd603dcafbfd08f1a";

868868 }

869− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ru/firefox-100.0.tar.bz2";

869+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ru/firefox-99.0.1.tar.bz2";

870870 locale = "ru";

871871 arch = "linux-i686";

872− sha256 = "6f821c7186343dc0bc5860bce1ae24f45c3de253223a0e99d05e582f037e7447";

872+ sha256 = "a5456041bc8cfc22d3f7a96a610c6d37b77bcba32b630fdab7fdb2753e46b40c";

873873 }

874− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sco/firefox-100.0.tar.bz2";

874+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sco/firefox-99.0.1.tar.bz2";

875875 locale = "sco";

876876 arch = "linux-i686";

877− sha256 = "e213b13f3ffc309feb993239308053d029f200fa58cb35f27a52e540e544e83c";

877+ sha256 = "539014a44ac79130666c6c4f5205ababf3bbb17d357632a0ba584a73c63bda93";

878878 }

879− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/si/firefox-100.0.tar.bz2";

879+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/si/firefox-99.0.1.tar.bz2";

880880 locale = "si";

881881 arch = "linux-i686";

882− sha256 = "a59e9a00f0e1b054e08706abb823ec7c6a87ca0975b97444f6cfd265e0c25b22";

882+ sha256 = "5f231e14acf1c896fdb9778d7821dfda13a756d4f861e74076b8fb02848dd08d";

883883 }

884− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sk/firefox-100.0.tar.bz2";

884+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sk/firefox-99.0.1.tar.bz2";

885885 locale = "sk";

886886 arch = "linux-i686";

887− sha256 = "b6602ad437d41c679d43cbe7e705bb5ed31909591a8ef51ef4b5604b3a4c884e";

887+ sha256 = "17c32fb881566fa09759d1374e957023c5fc6123b24791d4e8c94d4c2e971405";

888888 }

889− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sl/firefox-100.0.tar.bz2";

889+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sl/firefox-99.0.1.tar.bz2";

890890 locale = "sl";

891891 arch = "linux-i686";

892− sha256 = "b82f1f2745235271d7a99ad0c36f664b67826276a447285165100678f4de3030";

892+ sha256 = "d6121d2dcf47504111e924150cdf8360b039a5d7c4cef2a42b80ddb876a47127";

893893 }

894− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/son/firefox-100.0.tar.bz2";

894+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/son/firefox-99.0.1.tar.bz2";

895895 locale = "son";

896896 arch = "linux-i686";

897− sha256 = "508c90bede375fe243f39a6ee26b972e0ec86bfa2978f3d01d0e83784731cafb";

897+ sha256 = "e83f6e4da3820c91cdb3125d49a71e4417cb37c0e7598fcf1bf138f21d94f485";

898898 }

899− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sq/firefox-100.0.tar.bz2";

899+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sq/firefox-99.0.1.tar.bz2";

900900 locale = "sq";

901901 arch = "linux-i686";

902− sha256 = "db2799e56ade9c1b691d41803255a5fd1ddc08c69e199f5c1b253df11249cf67";

902+ sha256 = "dcf6ed239eb78e370db2a60b9fc0eed96f71e741be66f9ac2a537357648304b2";

903903 }

904− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sr/firefox-100.0.tar.bz2";

904+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sr/firefox-99.0.1.tar.bz2";

905905 locale = "sr";

906906 arch = "linux-i686";

907− sha256 = "d3502cba898ee0009292f942c2e3fc2ca0225cdd2470667bd943103fa7770201";

907+ sha256 = "d724ad02d8153aa15bfeba33e476bbbc937c5a5210a3747a5ba253ab3605b725";

908908 }

909− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sv-SE/firefox-100.0.tar.bz2";

909+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sv-SE/firefox-99.0.1.tar.bz2";

910910 locale = "sv-SE";

911911 arch = "linux-i686";

912− sha256 = "eca5f29ebd1e756206dde952980c03b8d4fb19c544bdf814bdab5ed05ce5fef3";

912+ sha256 = "6c6ce7c4a7bf73b3cc26af264e4d6dfabcf75d88226903ffb11142657cfbf94e";

913913 }

914− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/szl/firefox-100.0.tar.bz2";

914+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/szl/firefox-99.0.1.tar.bz2";

915915 locale = "szl";

916916 arch = "linux-i686";

917− sha256 = "fbc098de33187fde99bbf3d205882d281e404140619d624961d0b8d1af7e3fed";

917+ sha256 = "d9996d12531225e5d181a2304326ca8de19cd6c0f02efedc890f90e4d5d1b72e";

918918 }

919− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ta/firefox-100.0.tar.bz2";

919+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ta/firefox-99.0.1.tar.bz2";

920920 locale = "ta";

921921 arch = "linux-i686";

922− sha256 = "a3f3f3472932be60c4f8296a13538bd12b898057a977dd7c33edc12016438dbd";

922+ sha256 = "d4b3776a8728da72a233db501eed0014cb60e87dd0c3b76cb4e5fd834dc323da";

923923 }

924− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/te/firefox-100.0.tar.bz2";

924+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/te/firefox-99.0.1.tar.bz2";

925925 locale = "te";

926926 arch = "linux-i686";

927− sha256 = "d0b562f554afa76bcc034eca7a167151a7ee38c6e82005d9a47273df08e6c0f5";

927+ sha256 = "8246cfb157b68d09a7e57f910ae33d522495120112a6debc3cfeb60a3e238d92";

928928 }

929− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/th/firefox-100.0.tar.bz2";

929+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/th/firefox-99.0.1.tar.bz2";

930930 locale = "th";

931931 arch = "linux-i686";

932− sha256 = "c362a365677131af77786b0f6390b62bd224ba26b7f79e69ad1826a6a15800db";

932+ sha256 = "80c37b977ae6eaf6da2647800584a6ff9c430d6fd368ad89713a1ed7166cb197";

933933 }

934− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tl/firefox-100.0.tar.bz2";

934+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tl/firefox-99.0.1.tar.bz2";

935935 locale = "tl";

936936 arch = "linux-i686";

937− sha256 = "8249e0d3bb2aaf5c0be9def1842874af417bae275ba224c912371049de62a43d";

937+ sha256 = "f7757f0e751989854f240bf5eb13b8c660a587bdb7f44616ee8e7a41bb71b2d3";

938938 }

939− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tr/firefox-100.0.tar.bz2";

939+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tr/firefox-99.0.1.tar.bz2";

940940 locale = "tr";

941941 arch = "linux-i686";

942− sha256 = "82a3a504ba862849c4574ed96bdc5a737479a06a21f011f6cd74b2001bb192ff";

942+ sha256 = "533a04e78947202d86dbd79b170495e9027c81bd2db8be3d5f281d665e3505d6";

943943 }

944− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/trs/firefox-100.0.tar.bz2";

944+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/trs/firefox-99.0.1.tar.bz2";

945945 locale = "trs";

946946 arch = "linux-i686";

947− sha256 = "da6f0d69580df77ae2b1d091aecfbeda640440d3a15348ac38221209c6674079";

947+ sha256 = "eda683d0df13db0de392bd136ed86c3abbaf41a0617d559ee1d308e28f519487";

948948 }

949− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uk/firefox-100.0.tar.bz2";

949+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uk/firefox-99.0.1.tar.bz2";

950950 locale = "uk";

951951 arch = "linux-i686";

952− sha256 = "c04848cd11abb05635e33977c98f76b4acda3a6807c8f5bc8b5d2a9b49208f1d";

952+ sha256 = "4c1cce01a785b8fa7c31fd5394337231db614cd96dacfa7963bb612996fc287c";

953953 }

954− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ur/firefox-100.0.tar.bz2";

954+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ur/firefox-99.0.1.tar.bz2";

955955 locale = "ur";

956956 arch = "linux-i686";

957− sha256 = "ba779105d6a9dfe3138f4b73ba60078ec66ad9fe8468f2d72f57dd19161fa09c";

957+ sha256 = "628baa7d2e0f200ba2b623aada71bd0e69856b903a92d98c46f0552df8acca4c";

958958 }

959− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uz/firefox-100.0.tar.bz2";

959+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uz/firefox-99.0.1.tar.bz2";

960960 locale = "uz";

961961 arch = "linux-i686";

962− sha256 = "190691fd5777153daa29d56542f6792356aa916073d5e842845fe1c9444e632b";

962+ sha256 = "626cc29fd753802c3a57d2521553d5957f985b925561eee6c2046464ded084f4";

963963 }

964− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/vi/firefox-100.0.tar.bz2";

964+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/vi/firefox-99.0.1.tar.bz2";

965965 locale = "vi";

966966 arch = "linux-i686";

967− sha256 = "b5ea01ae5980892d6379eac4ba7d0f3d2643c54ade18452d39be84e44c676c01";

967+ sha256 = "963ea1b4758b64b67fe05a25d6775a1f8601a438d639bdda0d3ed740fe9ad8a5";

968968 }

969− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/xh/firefox-100.0.tar.bz2";

969+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/xh/firefox-99.0.1.tar.bz2";

970970 locale = "xh";

971971 arch = "linux-i686";

972− sha256 = "6c2f218caa8effa6fd6d9553088f7eb9a8ccf6297e3a9cd8c57d0ec5902c4c19";

972+ sha256 = "030f5a08c37ecaae8ef9c59f58e007b3c3484b9eabba33dbae91d89710390d85";

973973 }

974− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-CN/firefox-100.0.tar.bz2";

974+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-CN/firefox-99.0.1.tar.bz2";

975975 locale = "zh-CN";

976976 arch = "linux-i686";

977− sha256 = "61838f9c25bec8dbb0d386ae8412f34be8701e0d6f593503eab51c2009c5e069";

977+ sha256 = "097b3e3912b1b024d7cb615ed400ea244af47ef90cdb0c89d7223915a040108d";

978978 }

979− { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-TW/firefox-100.0.tar.bz2";

979+ { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-TW/firefox-99.0.1.tar.bz2";

980980 locale = "zh-TW";

981981 arch = "linux-i686";

982− sha256 = "48ea7e4ae524dbb9ef83aada60b597524091be85a1dfc3665d1fdc9dba16498b";

982+ sha256 = "ca10fd6cafa25cdbd12b4e087d80a8212c947099a848b0b9f754ec6dbe8c6be9";

983983 }

984984 ];

985985}

pkgs/applications/networking/browsers/firefox/common.nix+12

@@ -19,10 +19,12 @@

1919

2020{ lib

2121, stdenv

22+, fetchpatch

2223

2324# build time

2425, autoconf

2526, cargo

27+, gnused

2628, makeWrapper

2729, nodejs

2830, perl

@@ -110,6 +112,7 @@

110112## other

111113

112114, crashreporterSupport ? false

115+, safeBrowsingSupport ? false

113116

114117# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at

115118# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we

@@ -177,6 +180,14 @@ buildStdenv.mkDerivation ({

177180 ];

178181

179182 patches = [

183+ (fetchpatch {

184+ # RDD Sandbox paths for NixOS, remove with Firefox>=100

185+ # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14

186+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692

187+ name = "mozbz-1761692-rdd-sandbox-paths.patch";

188+ url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";

189+ hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";

190+ })

180191 ]

181192 ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

182193 ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch

@@ -197,6 +208,7 @@ buildStdenv.mkDerivation ({

197208 nativeBuildInputs = [

198209 autoconf

199210 cargo

211+ gnused

200212 llvmPackages.llvm # llvm-objdump

201213 makeWrapper

202214 nodejs

pkgs/applications/networking/browsers/firefox/librewolf/src.json+5−5

@@ -1,11 +1,11 @@

11{

2− "packageVersion": "100.0-1",

2+ "packageVersion": "99.0.1-4",

33 "source": {

4− "rev": "100.0-1",

5− "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla"

4+ "rev": "99.0.1-4",

5+ "sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni"

66 },

77 "firefox": {

8− "version": "100.0",

9− "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"

8+ "version": "99.0.1",

9+ "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"

1010 }

1111}

pkgs/applications/networking/browsers/firefox/packages.nix+4−4

@@ -7,10 +7,10 @@ in

77rec {

88 firefox = common rec {

99 pname = "firefox";

10− version = "100.0";

10+ version = "99.0.1";

1111 src = fetchurl {

1212 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

13− sha512 = "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa";

13+ sha512 = "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f";

1414 };

1515

1616 meta = {

@@ -32,10 +32,10 @@ rec {

3232

3333 firefox-esr-91 = common rec {

3434 pname = "firefox-esr";

35− version = "91.9.0esr";

35+ version = "91.8.0esr";

3636 src = fetchurl {

3737 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

38− sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133";

38+ sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";

3939 };

4040

4141 meta = {

pkgs/applications/networking/browsers/google-chrome/default.nix+1−1

@@ -32,7 +32,7 @@

3232, channel ? "stable"

3333

3434# Necessary for USB audio devices.

35−, pulseSupport ? true, libpulseaudio

35+, pulseSupport ? true, libpulseaudio ? null

3636

3737# Only needed for getting information about upstream binaries

3838, chromium

pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6

@@ -1,20 +1,20 @@

11{

22 beta = import ./browser.nix {

33 channel = "beta";

4− version = "101.0.1210.19";

4+ version = "99.0.1150.16";

55 revision = "1";

6− sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";

6+ sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";

77 };

88 dev = import ./browser.nix {

99 channel = "dev";

10− version = "102.0.1227.0";

10+ version = "100.0.1163.1";

1111 revision = "1";

12− sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";

12+ sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";

1313 };

1414 stable = import ./browser.nix {

1515 channel = "stable";

16− version = "100.0.1185.44";

16+ version = "98.0.1108.56";

1717 revision = "1";

18− sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";

18+ sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";

1919 };

2020}

pkgs/applications/networking/browsers/qutebrowser/default.nix−1

@@ -132,6 +132,5 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {

132132 description = "Keyboard-focused browser with a minimal GUI";

133133 license = licenses.gpl3Plus;

134134 maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ];

135− inherit (backendPackage.meta) platforms;

136135 };

137136}

pkgs/applications/networking/browsers/vivaldi/default.nix+2−2

@@ -20,11 +20,11 @@ let

2020 vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

2121in stdenv.mkDerivation rec {

2222 pname = "vivaldi";

23− version = "5.2.2623.41-1";

23+ version = "5.2.2623.39-1";

2424

2525 src = fetchurl {

2626 url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

27− sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d";

27+ sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk";

2828 };

2929

3030 unpackPhase = ''

pkgs/applications/networking/cloudflare-dyndns/default.nixdeleted−53

@@ -1,53 +0,0 @@

1−{ buildPythonApplication

2−, attrs

3−, click

4−, cloudflare

5−, fetchFromGitHub

6−, lib

7−, poetry

8−, pydantic

9−, pytestCheckHook

10−, requests

11−}:

12−

13−buildPythonApplication rec {

14− pname = "cloudflare-dyndns";

15− version = "4.1";

16−

17− src = fetchFromGitHub {

18− owner = "kissgyorgy";

19− repo = pname;

20− rev = "v${version}";

21− hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis=";

22− };

23−

24− format = "pyproject";

25−

26− nativeBuildInputs = [ poetry ];

27−

28− propagatedBuildInputs = [

29− attrs

30− click

31− cloudflare

32− pydantic

33− requests

34− ];

35−

36− postPatch = ''

37− substituteInPlace pyproject.toml \

38− --replace 'click = "^7.0"' 'click = "*"'

39− '';

40−

41− checkInputs = [ pytestCheckHook ];

42−

43− disabledTests = [

44− "test_get_ipv4"

45− ];

46−

47− meta = with lib; {

48− description = " CloudFlare Dynamic DNS client ";

49− homepage = "https://github.com/kissgyorgy/cloudflare-dyndns";

50− license = licenses.mit;

51− maintainers = with maintainers; [ lovesegfault ];

52− };

53−}

pkgs/applications/networking/cloudflared/default.nix+2−2

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2022.5.0";

5+ version = "2022.4.1";

66

77 src = fetchFromGitHub {

88 owner = "cloudflare";

99 repo = "cloudflared";

1010 rev = version;

11− hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";

11+ hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";

1212 };

1313

1414 vendorSha256 = null;

pkgs/applications/networking/cluster/fluxcd/default.nix+5−5

@@ -1,9 +1,9 @@

11{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

22

33let

4− version = "0.30.2";

5− sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";

6− manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";

4+ version = "0.29.5";

5+ sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";

6+ manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";

77

88 manifests = fetchzip {

99 url =

@@ -23,7 +23,7 @@ in buildGoModule rec {

2323 inherit sha256;

2424 };

2525

26− vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";

26+ vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";

2727

2828 postUnpack = ''

2929 cp -r ${manifests} source/cmd/flux/manifests

@@ -65,6 +65,6 @@ in buildGoModule rec {

6565 '';

6666 homepage = "https://fluxcd.io";

6767 license = licenses.asl20;

68− maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];

68+ maintainers = with maintainers; [ jlesquembre bryanasdev000 ];

6969 };

7070}

pkgs/applications/networking/cluster/fluxcd/update.sh+1−1

@@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then

3535 fi

3636

3737 # `git` flag here is to be used by local maintainers to speed up the bump process

38− if [ $# -eq 1 ] && [ "$1" = "git" ]; then

38+ if [ "$1" = "git" ]; then

3939 git switch -c "package-fluxcd-${LATEST_VERSION}"

4040 git add "$FLUXCD_PATH"/default.nix

4141 git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"

pkgs/applications/networking/cluster/kube3d/default.nix+12−28

@@ -1,28 +1,16 @@

1−{ lib

2−, buildGoModule

3−, fetchFromGitHub

4−, installShellFiles

5−, k3sVersion ? null

6−}:

1+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.22.2-k3s2" }:

72

8−let

9− hasVPrefix = ver: (builtins.elemAt (lib.stringToCharacters ver) 0) == "v";

10− k3sVersionSet =

11− if k3sVersion != null then

12− if hasVPrefix k3sVersion then throw "k3sVersion should not have a v prefix" else true

13− else

14− false;

15−in

163buildGoModule rec {

174 pname = "kube3d";

18− version = "5.4.1";

5+ version = "5.3.0";

196

207 src = fetchFromGitHub {

21− owner = "k3d-io";

8+ owner = "rancher";

229 repo = "k3d";

2310 rev = "v${version}";

24− sha256 = "sha256-DVQrD4JMei9yRFzuiVb6AcydEupNSlpgYLfGWWRiaao=";

11+ sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc=";

2512 };

13+

2614 vendorSha256 = null;

2715

2816 nativeBuildInputs = [ installShellFiles ];

@@ -30,14 +18,10 @@ buildGoModule rec {

3018 excludedPackages = [ "tools" "docgen" ];

3119

3220 ldflags =

33− let t = "github.com/k3d-io/k3d/v5/version"; in

34− [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];

21+ let t = "github.com/rancher/k3d/v5/version"; in

22+ [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ];

3523

36− preCheck = ''

37− # skip test that uses networking

38− substituteInPlace version/version_test.go \

39− --replace "TestGetK3sVersion" "SkipGetK3sVersion"

40− '';

24+ doCheck = false;

4125

4226 postInstall = ''

4327 installShellCompletion --cmd k3d \

@@ -50,13 +34,13 @@ buildGoModule rec {

5034 installCheckPhase = ''

5135 runHook preInstallCheck

5236 $out/bin/k3d --help

53− $out/bin/k3d --version | grep -e "k3d version v${version}" ${lib.optionalString k3sVersionSet "-e \"k3s version v${k3sVersion}\""}

37+ $out/bin/k3d --version | grep -e "k3d version v${version}" -e "k3s version v${k3sVersion}"

5438 runHook postInstallCheck

5539 '';

5640

5741 meta = with lib; {

58− homepage = "https://github.com/k3d-io/k3d/";

59− changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";

42+ homepage = "https://github.com/rancher/k3d";

43+ changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";

6044 description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";

6145 longDescription = ''

6246 k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s

@@ -66,7 +50,7 @@ buildGoModule rec {

6650 '';

6751 license = licenses.mit;

6852 maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];

69− platforms = platforms.linux ++ platforms.darwin;

7053 mainProgram = "k3d";

54+ platforms = platforms.linux ++ platforms.darwin;

7155 };

7256}

pkgs/applications/networking/cluster/kubecfg/default.nix+7−7

@@ -1,17 +1,17 @@

1−{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

1+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:

22

3−buildGoModule rec {

3+buildGoPackage rec {

44 pname = "kubecfg";

5− version = "0.26.0";

5+ version = "0.22.0";

66

77 src = fetchFromGitHub {

8− owner = "kubecfg";

8+ owner = "bitnami";

99 repo = "kubecfg";

1010 rev = "v${version}";

11− sha256 = "sha256-ekojX7gl8wC7GlHG3Y+dwry7jxjIm5dbS7cNN1xu4kY=";

11+ sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY=";

1212 };

1313

14− vendorSha256 = "sha256-dPdF3qTrYRbKUepgo6WVIVyGnaWxhQ0371fzXlBD8rE=";

14+ goPackagePath = "github.com/bitnami/kubecfg";

1515

1616 ldflags = [ "-s" "-w" "-X main.version=v${version}" ];

1717

@@ -25,7 +25,7 @@ buildGoModule rec {

2525

2626 meta = {

2727 description = "A tool for managing Kubernetes resources as code";

28− homepage = "https://github.com/kubecfg/kubecfg";

28+ homepage = "https://github.com/bitnami/kubecfg";

2929 license = lib.licenses.asl20;

3030 maintainers = with lib.maintainers; [ benley ];

3131 platforms = lib.platforms.unix;

pkgs/applications/networking/cluster/nomad-pack/default.nix+4−4

@@ -5,17 +5,17 @@

55

66buildGoModule rec {

77 pname = "nomad-pack";

8− version = "2022-04-12";

9− rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea";

8+ version = "2022-02-11";

9+ rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff";

1010

1111 src = fetchFromGitHub {

1212 owner = "hashicorp";

1313 repo = pname;

1414 inherit rev;

15− sha256 = "sha256-VG6Dmx5WD2AzKReMbmrpzXCNhrJqaZY3aQV9P+4ET68=";

15+ sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8=";

1616 };

1717

18− vendorSha256 = "sha256-7ovR2F9N94iFK/B5OXRcqfykOYHST3354+Ge2L8yzq0=";

18+ vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s=";

1919

2020 # skip running go tests as they require network access

2121 doCheck = false;

pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3

@@ -1,13 +1,13 @@

11{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:

22let

3− ver = "1.2.312.0";

3+ ver = "1.2.54.0";

44 source =

55 if stdenv.isDarwin then {

66 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";

7− sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";

7+ sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";

88 } else {

99 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";

10− sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";

10+ sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";

1111 };

1212 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";

1313in

pkgs/applications/networking/cluster/terraform-providers/providers.json+35−35

@@ -39,10 +39,10 @@

3939 "owner": "akamai",

4040 "provider-source-address": "registry.terraform.io/akamai/akamai",

4141 "repo": "terraform-provider-akamai",

42− "rev": "v2.0.0",

43− "sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=",

44− "vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=",

45− "version": "2.0.0"

42+ "rev": "v1.12.1",

43+ "sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=",

44+ "vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=",

45+ "version": "1.12.1"

4646 },

4747 "alicloud": {

4848 "deleteVendor": true,

@@ -103,28 +103,28 @@

103103 "owner": "hashicorp",

104104 "provider-source-address": "registry.terraform.io/hashicorp/aws",

105105 "repo": "terraform-provider-aws",

106− "rev": "v4.12.1",

107− "sha256": "sha256-z19DTiio6dXIgTmOxehOjIno6XhSUIS/YFtXKocq2Kk=",

108− "vendorSha256": "sha256-zxOiLStuGuylsKTJteR/9Xs/XcVgDlihCBmnMNLTTd4=",

109− "version": "4.12.1"

106+ "rev": "v4.11.0",

107+ "sha256": "sha256-d7edKXwjktpHGMxL/sAowOjiGdsAk9cdGVMgj0uIVIg=",

108+ "vendorSha256": "sha256-xQ9EbzwLfRZuBzytJ4SpoEIYJ9DuN+eWPy7RRg4jPkU=",

109+ "version": "4.11.0"

110110 },

111111 "azuread": {

112112 "owner": "hashicorp",

113113 "provider-source-address": "registry.terraform.io/hashicorp/azuread",

114114 "repo": "terraform-provider-azuread",

115− "rev": "v2.22.0",

116− "sha256": "sha256-x3SRTGCokEZGoG2l46PSelI8+FkHp5sbDdd14Iyei54=",

115+ "rev": "v2.21.0",

116+ "sha256": "sha256-H2G9n9pvDF1VKXC773ubRFzGYZJeAj+t/V89omxmcps=",

117117 "vendorSha256": null,

118− "version": "2.22.0"

118+ "version": "2.21.0"

119119 },

120120 "azurerm": {

121121 "owner": "hashicorp",

122122 "provider-source-address": "registry.terraform.io/hashicorp/azurerm",

123123 "repo": "terraform-provider-azurerm",

124− "rev": "v3.4.0",

125− "sha256": "sha256-hfjwlW7tbs/b7mvtbmFnNXr82b2exCRC4WxfCdZ6bbw=",

124+ "rev": "v3.3.0",

125+ "sha256": "sha256-ZkyuZ2q9V2CKuXGUcDI5X3O21y8xtZiYGPnl5mIjuZc=",

126126 "vendorSha256": null,

127− "version": "3.4.0"

127+ "version": "3.3.0"

128128 },

129129 "azurestack": {

130130 "owner": "hashicorp",

@@ -375,19 +375,19 @@

375375 "owner": "fastly",

376376 "provider-source-address": "registry.terraform.io/fastly/fastly",

377377 "repo": "terraform-provider-fastly",

378− "rev": "v1.1.4",

379− "sha256": "sha256-sLVeVXVCvhSx51B4unYEOs0UpNsChF9guB22gpsratw=",

378+ "rev": "v1.1.3",

379+ "sha256": "sha256-zkZ3ZORky0OmM5YvDU30lqpIhO7f49imW+pWjndXSwQ=",

380380 "vendorSha256": null,

381− "version": "1.1.4"

381+ "version": "1.1.3"

382382 },

383383 "flexibleengine": {

384384 "owner": "FlexibleEngineCloud",

385385 "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",

386386 "repo": "terraform-provider-flexibleengine",

387− "rev": "v1.29.0",

388− "sha256": "sha256-HPcJRLP20fDt3qr2edkol2jXSsWLotJkx13ZV7n7w8g=",

389− "vendorSha256": "sha256-De4NRWTdE4QutQkB0m0YlJg6LNysxi4bSSIxYY6lRP0=",

390− "version": "1.29.0"

387+ "rev": "v1.28.0",

388+ "sha256": "sha256-UeRgbPHwKZ6HfoHOG3yYLFhv6GqzGhLB3fETYWq6k7A=",

389+ "vendorSha256": "sha256-/Z8VbNtwBYROyzvhwFwpmyGMWF1LeWEKxgwbFd9M+Gw=",

390+ "version": "1.28.0"

391391 },

392392 "fortios": {

393393 "owner": "fortinetdev",

@@ -411,10 +411,10 @@

411411 "owner": "integrations",

412412 "provider-source-address": "registry.terraform.io/integrations/github",

413413 "repo": "terraform-provider-github",

414− "rev": "v4.24.1",

415− "sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=",

414+ "rev": "v4.23.0",

415+ "sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=",

416416 "vendorSha256": null,

417− "version": "4.24.1"

417+ "version": "4.23.0"

418418 },

419419 "gitlab": {

420420 "owner": "gitlabhq",

@@ -665,10 +665,10 @@

665665 "owner": "logicmonitor",

666666 "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",

667667 "repo": "terraform-provider-logicmonitor",

668− "rev": "v2.0.1",

669− "sha256": "sha256-LW88NTWwzGrpOpliVqc1AOjxaZ4p/8gq9twEpjY3FzE=",

668+ "rev": "v2.0.0",

669+ "sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=",

670670 "vendorSha256": null,

671− "version": "2.0.1"

671+ "version": "2.0.0"

672672 },

673673 "lxd": {

674674 "owner": "terraform-lxd",

@@ -1026,10 +1026,10 @@

10261026 "owner": "splunk-terraform",

10271027 "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",

10281028 "repo": "terraform-provider-signalfx",

1029− "rev": "v6.13.0",

1030− "sha256": "sha256-te5+WjbvU7RV22o22iWu8rGEnBfPkZNzkigziOlxMQg=",

1031− "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=",

1032− "version": "6.13.0"

1029+ "rev": "v6.12.1",

1030+ "sha256": "sha256-JmkuYv3vDCSUuD69+dw8fG4EvuDMhfImlfmZslp8AfQ=",

1031+ "vendorSha256": "sha256-hI0yz796+xxAFQg+O/2g5ueNx/wrx/40DlQyxtx11aQ=",

1032+ "version": "6.12.1"

10331033 },

10341034 "skytap": {

10351035 "owner": "skytap",

@@ -1062,10 +1062,10 @@

10621062 "owner": "spotinst",

10631063 "provider-source-address": "registry.terraform.io/spotinst/spotinst",

10641064 "repo": "terraform-provider-spotinst",

1065− "rev": "v1.73.2",

1066− "sha256": "sha256-Q5DNFJ1g6jfHQVYF5Xf5Phx/4b2nbUvE651JNp/zgJg=",

1067− "vendorSha256": "sha256-szdzI/42RExYQlHnm178RM3wlKOLax+nwgRVzonxXoI=",

1068− "version": "1.73.2"

1065+ "rev": "v1.73.1",

1066+ "sha256": "sha256-tA80gL0IJVO0g+sXdXLYgW1a0hLP0rnQCUtLAS9Y614=",

1067+ "vendorSha256": "sha256-25h8VMeXKWth06+5ZBibDWvjWyJmKM64k0zhkUsIYeM=",

1068+ "version": "1.73.1"

10691069 },

10701070 "stackpath": {

10711071 "owner": "stackpath",

pkgs/applications/networking/firewalld/default.nixdeleted−104

@@ -1,104 +0,0 @@

1−{ lib

2−, stdenv

3−, fetchFromGitHub

4−, autoreconfHook

5−, bash

6−, docbook_xml_dtd_42

7−, docbook-xsl-nons

8−, glib

9−, gobject-introspection

10−, gtk3

11−, intltool

12−, libnotify

13−, libxml2

14−, libxslt

15−, networkmanagerapplet

16−, pkg-config

17−, python3

18−, wrapGAppsNoGuiHook

19−, withGui ? false

20−}:

21−

22−let

23− pythonPath = python3.withPackages (ps: with ps; [

24− dbus-python

25− nftables

26− pygobject3

27− ] ++ lib.optionals withGui [

28− pyqt5

29− pyqt5_sip

30− ]);

31−in

32−stdenv.mkDerivation rec {

33− pname = "firewalld";

34− version = "1.1.1";

35−

36− src = fetchFromGitHub {

37− owner = "firewalld";

38− repo = "firewalld";

39− rev = "v${version}";

40− sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";

41− };

42−

43− patches = [

44− ./respect-xml-catalog-files-var.patch

45− ];

46−

47− postPatch = ''

48− substituteInPlace src/firewall/config/__init__.py.in \

49− --replace "/usr/share" "$out/share"

50−

51− for file in config/firewall-{applet,config}.desktop.in; do

52− substituteInPlace $file \

53− --replace "/usr/bin/" "$out/bin/"

54− done

55− '' + lib.optionalString withGui ''

56− substituteInPlace src/firewall-applet.in \

57− --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"

58− '';

59−

60− nativeBuildInputs = [

61− autoreconfHook

62− docbook_xml_dtd_42

63− docbook-xsl-nons

64− glib

65− intltool

66− libxml2

67− libxslt

68− pkg-config

69− python3

70− python3.pkgs.wrapPython

71− ] ++ lib.optionals withGui [

72− gobject-introspection

73− wrapGAppsNoGuiHook

74− ];

75−

76− buildInputs = [

77− bash

78− glib

79− ] ++ lib.optionals withGui [

80− gtk3

81− libnotify

82− pythonPath

83− ];

84−

85− dontWrapGApps = true;

86−

87− preFixup = lib.optionalString withGui ''

88− makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

89− '';

90−

91− postFixup = ''

92− chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite

93− patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py

94− wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"

95− wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"

96− '';

97−

98− meta = with lib; {

99− description = "Firewall daemon with D-Bus interface";

100− homepage = "https://github.com/firewalld/firewalld";

101− license = licenses.gpl2Plus;

102− maintainers = with maintainers; [ SuperSandro2000 ];

103− };

104−}

pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchdeleted−13

@@ -1,13 +0,0 @@

1−--- a/m4/jh_path_xml_catalog.m4

2−+++ b/m4/jh_path_xml_catalog.m4

3−@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],

4− [

5− AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

6− AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

7−- if $jh_found_xmlcatalog && \

8−- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

9−+ # empty argument forces libxml to use XML_CATALOG_FILES variable

10−+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

11− AC_MSG_RESULT([found])

12− ifelse([$3],,,[$3

13− ])dnl

pkgs/applications/networking/gmailctl/default.nix+6−4

@@ -6,16 +6,18 @@

66

77buildGoModule rec {

88 pname = "gmailctl";

9− version = "0.10.2";

9+ # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232

10+ # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f

11+ version = "unstable-2022-03-24";

1012

1113 src = fetchFromGitHub {

1214 owner = "mbrt";

1315 repo = "gmailctl";

14− rev = "v${version}";

15− sha256 = "sha256-tj+jKJuKwuqic/qfaUbf+Tao1X2FW0VVoGwqyx3q+go=";

16+ rev = "484bb689866987580e0576165180ef06375a543f";

17+ sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA=";

1618 };

1719

18− vendorSha256 = "sha256-aBw9C488a3Wxde3QCCU0eiagiRYOS9mkjcCsB2Mrdr0=";

20+ vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo=";

1921

2022 nativeBuildInputs = [

2123 installShellFiles

pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3

@@ -1,7 +1,7 @@

11{ lib, callPackage, stdenvNoCC }:

22let

33 pname = "caprine";

4− version = "2.55.4";

4+ version = "2.55.2";

55 metaCommon = with lib; {

66 description = "An elegant Facebook Messenger desktop app";

77 homepage = "https://sindresorhus.com/caprine";

@@ -10,11 +10,11 @@ let

1010 };

1111 x86_64-appimage = callPackage ./build-from-appimage.nix {

1212 inherit pname version metaCommon;

13− sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";

13+ sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";

1414 };

1515 x86_64-dmg = callPackage ./build-from-dmg.nix {

1616 inherit pname version metaCommon;

17− sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";

17+ sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA=";

1818 };

1919in

2020(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {

pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix−1

@@ -31,7 +31,6 @@ let

3131 name = "${old.pname}-${version}";

3232 hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";

3333 };

34− patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;

3534 });

3635 electronExec = if stdenv.isDarwin then

3736 "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"

pkgs/applications/networking/instant-messengers/linphone/default.nix+2

@@ -13,6 +13,7 @@

1313, ffmpeg

1414, gdk-pixbuf

1515, glib

16+, gnused

1617, graphviz

1718, gtk2

1819, intltool

@@ -142,6 +143,7 @@ mkDerivation rec {

142143 bcunit

143144

144145 cmake

146+ gnused

145147 graphviz

146148 intltool

147149 makeWrapper

pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2

@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;

4343

4444mkDerivation rec {

4545 pname = "psi-plus";

46− version = "1.5.1618";

46+ version = "1.5.1615";

4747

4848 src = fetchFromGitHub {

4949 owner = "psi-plus";

5050 repo = "psi-plus-snapshots";

5151 rev = version;

52− sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A=";

52+ sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI=";

5353 };

5454

5555 cmakeFlags = [

pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix+3−3

@@ -4,11 +4,11 @@ let

44in

55stdenv.mkDerivation rec {

66 pname = "rocketchat-desktop";

7− version = "3.8.5";

7+ version = "3.7.8";

88

99 src = fetchurl {

10− url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";

11− sha256 = "sha256-nKEfdbHfLjM4w79hzQdKiC4+IT3WXdDdlXkzelCKqOw";

10+ url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";

11+ sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI=";

1212 };

1313

1414 nativeBuildInputs = [

pkgs/applications/networking/instant-messengers/teams/default.nix+3−3

@@ -22,7 +22,7 @@

2222

2323let

2424 pname = "teams";

25− version = "1.5.00.10453";

25+ version = "1.4.00.26453";

2626 meta = with lib; {

2727 description = "Microsoft Teams";

2828 homepage = "https://teams.microsoft.com";

@@ -37,7 +37,7 @@ let

3737

3838 src = fetchurl {

3939 url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";

40− hash = "sha256-fLVw2axSMetuaoRzjg+x4DRYY8WP5TQbL7LbfF6LFfA=";

40+ sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf";

4141 };

4242

4343 nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];

@@ -134,7 +134,7 @@ let

134134

135135 src = fetchurl {

136136 url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg";

137− hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810=";

137+ sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0";

138138 };

139139

140140 buildInputs = [ xar cpio makeWrapper ];

pkgs/applications/networking/instant-messengers/zulip/default.nix+2−2

@@ -5,12 +5,12 @@

55

66let

77 pname = "zulip";

8− version = "5.9.3";

8+ version = "5.9.2";

99 name = "${pname}-${version}";

1010

1111 src = fetchurl {

1212 url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";

13− hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk=";

13+ hash = "sha256-PJ7/KOtfjH1RHMzAKSr9Y/82Z0vL2wBy3GgI/0JrlpM=";

1414 name="${pname}-${version}.AppImage";

1515 };

1616

pkgs/applications/networking/irc/senpai/default.nix+4−4

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "senpai";

5− version = "unstable-2022-04-29";

5+ version = "unstable-2021-12-14";

66

77 src = fetchFromSourcehut {

88 owner = "~taiite";

99 repo = "senpai";

10− rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";

11− sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";

10+ rev = "8091752a67781273944e7a79a803b7a671378313";

11+ sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";

1212 };

1313

14− vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";

14+ vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

1515

1616 subPackages = [

1717 "cmd/senpai"

pkgs/applications/networking/mailreaders/meli/default.nix+2−1

@@ -6,6 +6,7 @@

66, dbus

77, sqlite

88, file

9+, gzip

910, makeWrapper

1011, notmuch

1112 # Build with support for notmuch backend

@@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec {

2425

2526 cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc=";

2627

27− nativeBuildInputs = [ pkg-config makeWrapper ];

28+ nativeBuildInputs = [ pkg-config gzip makeWrapper ];

2829

2930 buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;

3031

pkgs/applications/networking/mailreaders/mutt/default.nix+2−2

@@ -27,11 +27,11 @@ with lib;

2727

2828stdenv.mkDerivation rec {

2929 pname = "mutt";

30− version = "2.2.4";

30+ version = "2.2.3";

3131

3232 src = fetchurl {

3333 url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";

34− sha256 = "0q70qrsjvmkfns1qxc0il2rlmfjwzbmfg89zlch0iqghpyz7c9xq";

34+ sha256 = "12cds5qm0x51wj1bz1a2f4q4qwbyfssq9pnisxz48ks5mg6xv2lp";

3535 };

3636

3737 patches = optional smimeSupport (fetchpatch {

pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }:

1+{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:

22

33stdenv.mkDerivation rec {

44 pname = "notmuch-bower";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";

1212 };

1313

14− nativeBuildInputs = [ mercury pandoc ];

14+ nativeBuildInputs = [ gawk mercury pandoc ];

1515

1616 buildInputs = [ ncurses gpgme ];

1717

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+261−261

@@ -1,655 +1,655 @@

11{

2− version = "91.8.1";

2+ version = "91.8.0";

33 sources = [

4− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/af/thunderbird-91.8.1.tar.bz2";

4+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/af/thunderbird-91.8.0.tar.bz2";

55 locale = "af";

66 arch = "linux-x86_64";

7− sha256 = "b7a5a88216d094bce6d1f18f506dc4c500c13340e0c6a9da2aeadc32d9ae0062";

7+ sha256 = "9f6fe7d931b4f9ec06e6d22e69ad6e638a82fcd709cfaabd52ed6283a75a8d31";

88 }

9− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ar/thunderbird-91.8.1.tar.bz2";

9+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ar/thunderbird-91.8.0.tar.bz2";

1010 locale = "ar";

1111 arch = "linux-x86_64";

12− sha256 = "33f807c2a2182149f2da7a394e455775027753a082b998db766c036d0aa7c976";

12+ sha256 = "f8523e3b9b4229a7f977c25ba08dad4edad0fd56c90c8c8bb473db2a1e00265d";

1313 }

14− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ast/thunderbird-91.8.1.tar.bz2";

14+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ast/thunderbird-91.8.0.tar.bz2";

1515 locale = "ast";

1616 arch = "linux-x86_64";

17− sha256 = "08a38759b492ac47e567774b5a4fe5ee75f5a4c513ee046b7ace9636cd61a00a";

17+ sha256 = "3a95ba998b4f863fe39fb3e3dfecb827108b92c317ed5594e4a409ccecc8b303";

1818 }

19− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/be/thunderbird-91.8.1.tar.bz2";

19+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/be/thunderbird-91.8.0.tar.bz2";

2020 locale = "be";

2121 arch = "linux-x86_64";

22− sha256 = "09644be773dea25b602b30c0e783a2be3de406d63a1aa528e80830357cec8756";

22+ sha256 = "fd41c8189eb64d70038b0a3551b46386c3d6e4afc1474bc7e50d0b88208a5547";

2323 }

24− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/bg/thunderbird-91.8.1.tar.bz2";

24+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/bg/thunderbird-91.8.0.tar.bz2";

2525 locale = "bg";

2626 arch = "linux-x86_64";

27− sha256 = "546bc2422a40ed4c04b1d8fa2c203a60fbb8c2a060b7c63ae4464109d08c440e";

27+ sha256 = "c7957994f4e3bb70b4f118ff6b939f52f46bc0d471a6098e18abbe23dbb58675";

2828 }

29− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/br/thunderbird-91.8.1.tar.bz2";

29+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/br/thunderbird-91.8.0.tar.bz2";

3030 locale = "br";

3131 arch = "linux-x86_64";

32− sha256 = "1977584751a826bb52e8bd154880f34b009df777481915f0cb84e018f7a3a1fe";

32+ sha256 = "6987eb50cb3460d42794f9192c57262479ed7082662395893bb3a5b9e094c0f3";

3333 }

34− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ca/thunderbird-91.8.1.tar.bz2";

34+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ca/thunderbird-91.8.0.tar.bz2";

3535 locale = "ca";

3636 arch = "linux-x86_64";

37− sha256 = "e2c6e403fbcdb58eaf747f36796d4a0af1d8f112715c068ca98f85198189e884";

37+ sha256 = "b09400e218281f8b09d688f5dbab2c732761da8e47141726941dcaedc3780097";

3838 }

39− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cak/thunderbird-91.8.1.tar.bz2";

39+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cak/thunderbird-91.8.0.tar.bz2";

4040 locale = "cak";

4141 arch = "linux-x86_64";

42− sha256 = "f5992ea2ab6acf94993f6bc590e95e36c5ab87b650e0f38ee5e808a2bf9189da";

42+ sha256 = "02efc2043ddc4485a239b19d5b3593bb68f5780ccd11f6d4eb968594192a1bf5";

4343 }

44− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cs/thunderbird-91.8.1.tar.bz2";

44+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cs/thunderbird-91.8.0.tar.bz2";

4545 locale = "cs";

4646 arch = "linux-x86_64";

47− sha256 = "4770e0c95ba84953aab5585f4059c1e20e69b9ee98578ebda34ded2a1b170a25";

47+ sha256 = "13af2518a999650cebff031813b812141b014b3fcd9a7bd3953b64229e870dac";

4848 }

49− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cy/thunderbird-91.8.1.tar.bz2";

49+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/cy/thunderbird-91.8.0.tar.bz2";

5050 locale = "cy";

5151 arch = "linux-x86_64";

52− sha256 = "a9729784e7a05d763e6dd715da80ca7f65e42f27b25e58ed2139f26f12061855";

52+ sha256 = "ec9def864905036110381f901de0d9c7609116cd1d9bee9414627a133d5fb19e";

5353 }

54− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/da/thunderbird-91.8.1.tar.bz2";

54+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/da/thunderbird-91.8.0.tar.bz2";

5555 locale = "da";

5656 arch = "linux-x86_64";

57− sha256 = "a917c157c7507d2ee457a5c8dcff3b1b23225b5ea946be547e801e93c10d4a5d";

57+ sha256 = "d6cc0667d1be9fc73491bc57a0b44715433eae3743ea8aba59229e19fd24a642";

5858 }

59− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/de/thunderbird-91.8.1.tar.bz2";

59+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/de/thunderbird-91.8.0.tar.bz2";

6060 locale = "de";

6161 arch = "linux-x86_64";

62− sha256 = "73141650aba88315828e5419d9a9a05861dcd504b9256c8a184396e3824211f2";

62+ sha256 = "112bf23c33cacbf54319ac4534cff5be85d49704e69498f039cc45fd3abd0c8b";

6363 }

64− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/dsb/thunderbird-91.8.1.tar.bz2";

64+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/dsb/thunderbird-91.8.0.tar.bz2";

6565 locale = "dsb";

6666 arch = "linux-x86_64";

67− sha256 = "7b7adb5c1e01efa9a0129a22308eb878f45d1ed0190b7430aae92b55f061fb35";

67+ sha256 = "7e190cf921b1b76cb3702e3ce534e1575b7dcc63ccc94d3d8bf384bd42000a60";

6868 }

69− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/el/thunderbird-91.8.1.tar.bz2";

69+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/el/thunderbird-91.8.0.tar.bz2";

7070 locale = "el";

7171 arch = "linux-x86_64";

72− sha256 = "ffa921418d6d334e48aa51f4fff1b4855f3cf7ce3ac77ed38c6b0b699606d971";

72+ sha256 = "74917356bab02953ba56acf5736b3d2c9a1847f49fb4a75a273655e7678b80f0";

7373 }

74− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-CA/thunderbird-91.8.1.tar.bz2";

74+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-CA/thunderbird-91.8.0.tar.bz2";

7575 locale = "en-CA";

7676 arch = "linux-x86_64";

77− sha256 = "caa62088b677cbf18cd95a80ebc57b97597df35f8172d27a7cc55ded145e29c9";

77+ sha256 = "813d6df5de5768a3c82d3fc042907fd16f1f18695c5c294bb345cc593b71dfd7";

7878 }

79− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-GB/thunderbird-91.8.1.tar.bz2";

79+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-GB/thunderbird-91.8.0.tar.bz2";

8080 locale = "en-GB";

8181 arch = "linux-x86_64";

82− sha256 = "6dff28a894f3b48798939105a9742b3f9dcc3c4389160f71126cdd08ff573c74";

82+ sha256 = "0cbefc0c52f32b7654d045cc85c5ae882ca83b6ca138b3f6b82e194b53b0940f";

8383 }

84− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-US/thunderbird-91.8.1.tar.bz2";

84+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/en-US/thunderbird-91.8.0.tar.bz2";

8585 locale = "en-US";

8686 arch = "linux-x86_64";

87− sha256 = "3a6c1302f51a86297960d40f40fe6273349ae407b07e634b1c01758bc8cc3a0b";

87+ sha256 = "d57fd4df24d4acb36ddcca83062114d16a8fa4e9255606e5f2ffcd4ac9b5ea5d";

8888 }

89− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/es-AR/thunderbird-91.8.1.tar.bz2";

89+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/es-AR/thunderbird-91.8.0.tar.bz2";

9090 locale = "es-AR";

9191 arch = "linux-x86_64";

92− sha256 = "383d13f5094543f99dd64e29df261c956e6f13782c3158d4ac831a8c734b7d18";

92+ sha256 = "ffc858a7474ea2b6c95a6bacf2f0a9257c95f9ae67ea3d04bbb2f5499a58d618";

9393 }

94− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/es-ES/thunderbird-91.8.1.tar.bz2";

94+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/es-ES/thunderbird-91.8.0.tar.bz2";

9595 locale = "es-ES";

9696 arch = "linux-x86_64";

97− sha256 = "d2753f076d929933cb51e79c0c0b66f2fc3457e3f25bb68b9b10c84566cfb70d";

97+ sha256 = "d3d77d80550c1ea96dff1f7fe59d12cd2bcf8b6d4f8db558c1c80d42e3767871";

9898 }

99− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/et/thunderbird-91.8.1.tar.bz2";

99+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/et/thunderbird-91.8.0.tar.bz2";

100100 locale = "et";

101101 arch = "linux-x86_64";

102− sha256 = "a71e3bdee857892bd62d582fd6cd9e7df41be92854c65d34b26b57fbad16ce2f";

102+ sha256 = "03b95415f92d446bf24e392a14ddb3f1256158f711e65156745270fe61d2c565";

103103 }

104− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/eu/thunderbird-91.8.1.tar.bz2";

104+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/eu/thunderbird-91.8.0.tar.bz2";

105105 locale = "eu";

106106 arch = "linux-x86_64";

107− sha256 = "40f3aa9558eab5511c0176dd817880142e49bfc157546676ce15d559ace8e359";

107+ sha256 = "272f5e568abe042c6ce3d9ea53693bd1f2a18cc4ddcb0729fd2825a62ceb89af";

108108 }

109− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fi/thunderbird-91.8.1.tar.bz2";

109+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fi/thunderbird-91.8.0.tar.bz2";

110110 locale = "fi";

111111 arch = "linux-x86_64";

112− sha256 = "c758f45ff3b714e6e7fd1c66421a0f815ac54fa3590df682c11bd05f604bd848";

112+ sha256 = "7171f34f07c49206eecfb1c3cf4d122b8fa9f24e68dd4075dd5c7313ba140fd4";

113113 }

114− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fr/thunderbird-91.8.1.tar.bz2";

114+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fr/thunderbird-91.8.0.tar.bz2";

115115 locale = "fr";

116116 arch = "linux-x86_64";

117− sha256 = "1e2588b80017f6f10ada4675c4af5165de9216d65881f20feb844fa59fa60fbe";

117+ sha256 = "45004e1b26c234969a805fe13a56ce3ed53e30d400965f61a6e95b4be79fd811";

118118 }

119− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fy-NL/thunderbird-91.8.1.tar.bz2";

119+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/fy-NL/thunderbird-91.8.0.tar.bz2";

120120 locale = "fy-NL";

121121 arch = "linux-x86_64";

122− sha256 = "c3ab99f1539a40f60cb2b3ca68178307b39b013a763a671ffd05124ed8d82988";

122+ sha256 = "bdd6a130ae5a1c12a49a2d2b84410b445e7d8b62bd3aa1eb64cf66fbb7436047";

123123 }

124− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ga-IE/thunderbird-91.8.1.tar.bz2";

124+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ga-IE/thunderbird-91.8.0.tar.bz2";

125125 locale = "ga-IE";

126126 arch = "linux-x86_64";

127− sha256 = "7af72cd55c26e368378a3b86844b6ee72f08b7f2c207170817ccbeaad1a114a0";

127+ sha256 = "c03c8f98c0850402d909d1d802bc6fe189d145ed45bc576a821536a79e492bd7";

128128 }

129− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/gd/thunderbird-91.8.1.tar.bz2";

129+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/gd/thunderbird-91.8.0.tar.bz2";

130130 locale = "gd";

131131 arch = "linux-x86_64";

132− sha256 = "9a91e7b6d3572ee78a4df915a2b30e5dbd10351e6f16316e6dbbbffdbe1217d4";

132+ sha256 = "b55a5edafa3ca381544c1e2d2ecf23a1557cdd9b10f937cc6f45c7a40e0a0831";

133133 }

134− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/gl/thunderbird-91.8.1.tar.bz2";

134+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/gl/thunderbird-91.8.0.tar.bz2";

135135 locale = "gl";

136136 arch = "linux-x86_64";

137− sha256 = "2c8f4043668dfa15ab191ed05218c1772472dbee932ea98e3cc08c05764812cb";

137+ sha256 = "89f1cafa62a8334ea2250c6c8b9c07716fc99745aeafa6a689760c8eb288ad5a";

138138 }

139− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/he/thunderbird-91.8.1.tar.bz2";

139+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/he/thunderbird-91.8.0.tar.bz2";

140140 locale = "he";

141141 arch = "linux-x86_64";

142− sha256 = "e3b038e94553d388eb4cf53c250d8297531ddb2fb0fc7c678291fa48c46fbc12";

142+ sha256 = "82f9405f187471371a137838a8d39d289f2160ca3ffde007fbc5f643c11c0a0a";

143143 }

144− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hr/thunderbird-91.8.1.tar.bz2";

144+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hr/thunderbird-91.8.0.tar.bz2";

145145 locale = "hr";

146146 arch = "linux-x86_64";

147− sha256 = "a66c1c904f58879e11ceeba5c214302fc982468718af1567634ec53d16850cc4";

147+ sha256 = "4920edd369b2317976d98707e4f59febe0b252a85666ddfe29e7f7043c502509";

148148 }

149− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hsb/thunderbird-91.8.1.tar.bz2";

149+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hsb/thunderbird-91.8.0.tar.bz2";

150150 locale = "hsb";

151151 arch = "linux-x86_64";

152− sha256 = "e2f3b04485ba430799e1049ed9cdc4cf191014f6a2aa44c3f8e51d87d47332dc";

152+ sha256 = "88a84bf4f2a599527da8dc082bfc8e7d2e94fec446057bde2296c52cd1d25e76";

153153 }

154− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hu/thunderbird-91.8.1.tar.bz2";

154+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hu/thunderbird-91.8.0.tar.bz2";

155155 locale = "hu";

156156 arch = "linux-x86_64";

157− sha256 = "611bd8281d26324503fac16bd6e25175c988f6fb12b6bcf6f3016dcfa6ec44d8";

157+ sha256 = "a996700c6846850579b599cf31f837320859861f4b459554cabe35fe75f07059";

158158 }

159− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hy-AM/thunderbird-91.8.1.tar.bz2";

159+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/hy-AM/thunderbird-91.8.0.tar.bz2";

160160 locale = "hy-AM";

161161 arch = "linux-x86_64";

162− sha256 = "88cd6e24ae4a54f0b4684bf3ab7116fcdce2dbe2d6a074af5cb50c3967ebda1f";

162+ sha256 = "05d31752442946111c5b35873bf2b2c4a87e3739bac6a4704d94c54f199a3c6c";

163163 }

164− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/id/thunderbird-91.8.1.tar.bz2";

164+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/id/thunderbird-91.8.0.tar.bz2";

165165 locale = "id";

166166 arch = "linux-x86_64";

167− sha256 = "1be3f82fc0a8254548c35a08d2fd4ef77b86df774acbe5bb17784d25af802eb7";

167+ sha256 = "c8df7bf840268f4493403e849757eb6cfcd0cf59137bae948252eb9e9ace96ac";

168168 }

169− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/is/thunderbird-91.8.1.tar.bz2";

169+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/is/thunderbird-91.8.0.tar.bz2";

170170 locale = "is";

171171 arch = "linux-x86_64";

172− sha256 = "332e85aba591c744a9d53b70e06218fafbdc94600643963c63f6a693edbfd035";

172+ sha256 = "697487eba3eaf49d2613d877a2d58a1e357ad2f772ae2de031695902ad4514ad";

173173 }

174− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/it/thunderbird-91.8.1.tar.bz2";

174+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/it/thunderbird-91.8.0.tar.bz2";

175175 locale = "it";

176176 arch = "linux-x86_64";

177− sha256 = "95ca9342dd991d8306922df03c5f09adeb63dc93f678384989315ddf1df622d3";

177+ sha256 = "0749d5dcd105b82aea94bc704e10812bfd3fa375a776f7a95b94bb4886e543ce";

178178 }

179− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ja/thunderbird-91.8.1.tar.bz2";

179+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ja/thunderbird-91.8.0.tar.bz2";

180180 locale = "ja";

181181 arch = "linux-x86_64";

182− sha256 = "977a0e4ca8d9e8d8d6c289608a9318971553b011bbcda66ee888624ef6b9d56b";

182+ sha256 = "ac6aa38f830a8f3eea7d0c7d0c9695ce1351e84a19a831e3d87d212369353ef7";

183183 }

184− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ka/thunderbird-91.8.1.tar.bz2";

184+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ka/thunderbird-91.8.0.tar.bz2";

185185 locale = "ka";

186186 arch = "linux-x86_64";

187− sha256 = "1a8360cd576a4e2a0b6d316441eff481c2a1d9b80e7f9eeeb0fc6fc38df08d1f";

187+ sha256 = "b051d95f3b69a7c2d8de178e517abd37afec4502de1a580788f150c77c0187dc";

188188 }

189− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/kab/thunderbird-91.8.1.tar.bz2";

189+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/kab/thunderbird-91.8.0.tar.bz2";

190190 locale = "kab";

191191 arch = "linux-x86_64";

192− sha256 = "d318ccb72f4476d8222eb4423c755378f10cf187cc6ea73152833953375cac35";

192+ sha256 = "2e635bdf5de067b57ba639be3465fcff3bbe00119d0c3f031d6471aab7a9b9f8";

193193 }

194− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/kk/thunderbird-91.8.1.tar.bz2";

194+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/kk/thunderbird-91.8.0.tar.bz2";

195195 locale = "kk";

196196 arch = "linux-x86_64";

197− sha256 = "854f310728f2c1c2e3e3dec57787bb293f344a31cb1f0b8a131f0768c409fb08";

197+ sha256 = "369cc371e500bc6ce224f9563c6bd586fb4748181372754c4b2c58e81d9f19c6";

198198 }

199− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ko/thunderbird-91.8.1.tar.bz2";

199+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ko/thunderbird-91.8.0.tar.bz2";

200200 locale = "ko";

201201 arch = "linux-x86_64";

202− sha256 = "c740a972a708627d9700c9dd3b2bb56a5b1a3e0ac6f438021aa56033e6e6b40e";

202+ sha256 = "6b4270b67c7e2e47201cb37c7bc9b22599cc65ea3efc87e35b0fddedc0af8170";

203203 }

204− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/lt/thunderbird-91.8.1.tar.bz2";

204+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/lt/thunderbird-91.8.0.tar.bz2";

205205 locale = "lt";

206206 arch = "linux-x86_64";

207− sha256 = "7a1c14eb2fd539dc9e2681a8868fb6e82ed2e9ce0b9523a613e20a48ec52d2ac";

207+ sha256 = "a140ae146bb64c704130e6e84a63ccf7ccac77433a95964b0b5d1c2a52485e7c";

208208 }

209− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/lv/thunderbird-91.8.1.tar.bz2";

209+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/lv/thunderbird-91.8.0.tar.bz2";

210210 locale = "lv";

211211 arch = "linux-x86_64";

212− sha256 = "bde11f8e943b462f4c8a084ee7d1328f59e93a6bf2d39fed8a3dd1408b0ee716";

212+ sha256 = "5f88b779588a36ff7eac1c652400ebdaad501b00c83101e6614f1689bb0aebfa";

213213 }

214− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ms/thunderbird-91.8.1.tar.bz2";

214+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ms/thunderbird-91.8.0.tar.bz2";

215215 locale = "ms";

216216 arch = "linux-x86_64";

217− sha256 = "f76f9bde41a1be40c32bb3fa1990adba3460bdca0b98e466e6dcbbc6d8d944a0";

217+ sha256 = "48632dc4e44bae95dc2c435f334c4d65a7058b0f5cdaf492ba4b7788d2c5df9d";

218218 }

219− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nb-NO/thunderbird-91.8.1.tar.bz2";

219+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nb-NO/thunderbird-91.8.0.tar.bz2";

220220 locale = "nb-NO";

221221 arch = "linux-x86_64";

222− sha256 = "e8a052e7c841feda1c54b5f349181695c03f2549f95ca1d9108b60e8dd13c85e";

222+ sha256 = "c065ca752ff112aeafb51684b2f8877af8a61a52a6e1a70b884967c78fb30880";

223223 }

224− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nl/thunderbird-91.8.1.tar.bz2";

224+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nl/thunderbird-91.8.0.tar.bz2";

225225 locale = "nl";

226226 arch = "linux-x86_64";

227− sha256 = "5eea4e47045706a621ca398a55a76a2165d461c061ea3e410418839a9a069ca7";

227+ sha256 = "44c9ea3d19b1f4b9151b49e3b8221eec179558bfe398076f5fc5b41266f8194f";

228228 }

229− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nn-NO/thunderbird-91.8.1.tar.bz2";

229+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/nn-NO/thunderbird-91.8.0.tar.bz2";

230230 locale = "nn-NO";

231231 arch = "linux-x86_64";

232− sha256 = "a819e0ede22abce7d3e10ab1dbe3d4571889c63284e6f1c917834f766ad3c73a";

232+ sha256 = "6347f87681652379ccda8564dbd2572bab1fa04b0c487ff43e3f51f3719ac7d5";

233233 }

234− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pa-IN/thunderbird-91.8.1.tar.bz2";

234+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pa-IN/thunderbird-91.8.0.tar.bz2";

235235 locale = "pa-IN";

236236 arch = "linux-x86_64";

237− sha256 = "523f7c451f618b1f7705d0892b50700f61c0c3a12ca85957630e5e146ed7eccd";

237+ sha256 = "6db940a4482f404fa89abc36a2e9737c835fa51d7c98503055fb98484f7586c0";

238238 }

239− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pl/thunderbird-91.8.1.tar.bz2";

239+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pl/thunderbird-91.8.0.tar.bz2";

240240 locale = "pl";

241241 arch = "linux-x86_64";

242− sha256 = "45d17f737b24ab1ca34e7dc5d16493203e1673c4592a099b3dffa8559908b64b";

242+ sha256 = "dffeffd240e5ba3f1e3de024ffe7a51ebc72eb3035bb994d02bffd106203dc2b";

243243 }

244− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pt-BR/thunderbird-91.8.1.tar.bz2";

244+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pt-BR/thunderbird-91.8.0.tar.bz2";

245245 locale = "pt-BR";

246246 arch = "linux-x86_64";

247− sha256 = "d4d3cc55f0924a9eefb2b76d3cf524238e87ee0f016b5fcb4df59c28a6f8539c";

247+ sha256 = "5a05e3d9174bd26f3c9f62f82dc50e0e40965771d861bbb662bfc4cdf29ef83e";

248248 }

249− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pt-PT/thunderbird-91.8.1.tar.bz2";

249+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/pt-PT/thunderbird-91.8.0.tar.bz2";

250250 locale = "pt-PT";

251251 arch = "linux-x86_64";

252− sha256 = "1a6b22cc0fca62a1fac036b87f04a7ef2d101e8a4323e370856338ceffd3193f";

252+ sha256 = "dfe5055edaea41dba221a2b39d2fef7493a508d12e9cb39e29201a20f95afdbd";

253253 }

254− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/rm/thunderbird-91.8.1.tar.bz2";

254+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/rm/thunderbird-91.8.0.tar.bz2";

255255 locale = "rm";

256256 arch = "linux-x86_64";

257− sha256 = "cd9b4f7274a3fe1c5c29ac68377b82ac134a9d23828700399009021ae6920c1e";

257+ sha256 = "17a587c8b3eb1b548089b70bff06f379fd1d6aaa234a024b2b1c17a1f2a6f60d";

258258 }

259− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ro/thunderbird-91.8.1.tar.bz2";

259+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ro/thunderbird-91.8.0.tar.bz2";

260260 locale = "ro";

261261 arch = "linux-x86_64";

262− sha256 = "0c0dd2e9612c64eb2f70d52f32fad70af989537018d2d1457941d773e5d8200c";

262+ sha256 = "cc43a35c544bc15fb86a12538d70d20b5b22f5666b5467b7f8e87b31a12c5abe";

263263 }

264− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ru/thunderbird-91.8.1.tar.bz2";

264+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/ru/thunderbird-91.8.0.tar.bz2";

265265 locale = "ru";

266266 arch = "linux-x86_64";

267− sha256 = "4f89db6c6bff251b9e642b6525e2d6dab30fd5faddff814a8566e3db0109f895";

267+ sha256 = "82b05f1e853fdcb4cbce513dc87f9fe2784bc4bc5836274be15b1cff831a5dfc";

268268 }

269− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sk/thunderbird-91.8.1.tar.bz2";

269+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sk/thunderbird-91.8.0.tar.bz2";

270270 locale = "sk";

271271 arch = "linux-x86_64";

272− sha256 = "9b7c6e1536dd288634f1e635cf65b59bfd8953853143ad4611b66189119fe8ea";

272+ sha256 = "31ca758cacb9f5ffbdb901f4a2b59b2b63a2b4f0f0b63a35ec45c1d1b642654e";

273273 }

274− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sl/thunderbird-91.8.1.tar.bz2";

274+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sl/thunderbird-91.8.0.tar.bz2";

275275 locale = "sl";

276276 arch = "linux-x86_64";

277− sha256 = "9b55f025b7b64d57c0ae1ffb54fcfd24dfffedaf8dcfb0cff870e5023e018e22";

277+ sha256 = "8ce25c995945f164756d3b6727c5c2d49397520a0fdc1ec5b448bd04664f1314";

278278 }

279− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sq/thunderbird-91.8.1.tar.bz2";

279+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sq/thunderbird-91.8.0.tar.bz2";

280280 locale = "sq";

281281 arch = "linux-x86_64";

282− sha256 = "a7c42d3f546482eec81a021f299bc57fc05d349cfbfdd65ad3dbe46019e29851";

282+ sha256 = "db65e73da83a12d1e10713b0ace13250c127e798e91e81893ccb8f38bc635186";

283283 }

284− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sr/thunderbird-91.8.1.tar.bz2";

284+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sr/thunderbird-91.8.0.tar.bz2";

285285 locale = "sr";

286286 arch = "linux-x86_64";

287− sha256 = "c990d6f1d94f50ba0edc2683acb89fd17dc94ceb0406549309c85be3e294c43a";

287+ sha256 = "0cf912a9d51cb3ffb6cf7aa3eeaa61a54c253a617abce216c37770dcf5c36344";

288288 }

289− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sv-SE/thunderbird-91.8.1.tar.bz2";

289+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/sv-SE/thunderbird-91.8.0.tar.bz2";

290290 locale = "sv-SE";

291291 arch = "linux-x86_64";

292− sha256 = "cff7a55dd6a5ef6a3bff8757decda52e685fd500ba00ddc9f96724a6e803759e";

292+ sha256 = "86578eaf49e4ea08c0ce7573ff13c8f0c5e2a3e0d03028c04b37042ed0739b1a";

293293 }

294− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/th/thunderbird-91.8.1.tar.bz2";

294+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/th/thunderbird-91.8.0.tar.bz2";

295295 locale = "th";

296296 arch = "linux-x86_64";

297− sha256 = "e04a3b749f86f8f13b26d58c1562f7249e9d298431f348709678d6b5eb2d56c4";

297+ sha256 = "44e9e7ea1807e41e51d531b6a5badd5ea660f19b52943ab012a1868c907d7a0b";

298298 }

299− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/tr/thunderbird-91.8.1.tar.bz2";

299+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/tr/thunderbird-91.8.0.tar.bz2";

300300 locale = "tr";

301301 arch = "linux-x86_64";

302− sha256 = "f3bc44135cc943509e5f821b011b30df42ba9e44884be588130326dd123ffc13";

302+ sha256 = "d95e9d475c73d31d90d1a1b4056501850386d0b727d4941a6927b92a7e1c1d6f";

303303 }

304− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/uk/thunderbird-91.8.1.tar.bz2";

304+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/uk/thunderbird-91.8.0.tar.bz2";

305305 locale = "uk";

306306 arch = "linux-x86_64";

307− sha256 = "c93fbc4795bc051ff6e55ced73765673c347a6fcea5c0b0f12d5a2b7e4ea13f6";

307+ sha256 = "a563e3da2a8f3f58b085ed06fb4a81ec0e7c36b2cbb777aa584857ee23793dcb";

308308 }

309− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/uz/thunderbird-91.8.1.tar.bz2";

309+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/uz/thunderbird-91.8.0.tar.bz2";

310310 locale = "uz";

311311 arch = "linux-x86_64";

312− sha256 = "4737baf26dd8ae9a9fe4a52c56e75a2e76e76a976dac66cb02cc9175a432d114";

312+ sha256 = "0005df2daa394d44ab2a413fc0f58b23569bfe30dc9a0d0789f86c2072158937";

313313 }

314− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/vi/thunderbird-91.8.1.tar.bz2";

314+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/vi/thunderbird-91.8.0.tar.bz2";

315315 locale = "vi";

316316 arch = "linux-x86_64";

317− sha256 = "8962b27c70530ad685753df464c4f4c982258abb82fc9788c623eebd2bd319fd";

317+ sha256 = "7d987211388a37975dc93cb38a72e8e7e9a5a7535af5efecf5293ca5b1da6718";

318318 }

319− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/zh-CN/thunderbird-91.8.1.tar.bz2";

319+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/zh-CN/thunderbird-91.8.0.tar.bz2";

320320 locale = "zh-CN";

321321 arch = "linux-x86_64";

322− sha256 = "e9343251571b2922f5ab2f84590759e41fb0734c38541336215f9984c4fe6882";

322+ sha256 = "c043d0e5e1804090ab8cc8c740b2458c825def839c128391c0d6e71b36af4894";

323323 }

324− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/zh-TW/thunderbird-91.8.1.tar.bz2";

324+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-x86_64/zh-TW/thunderbird-91.8.0.tar.bz2";

325325 locale = "zh-TW";

326326 arch = "linux-x86_64";

327− sha256 = "efbcb13dcb468a82b0ec71d67af4addefce97addfca6befaba0b96c92617091b";

327+ sha256 = "3870ceaa2ea5c049877452a6b0c76dd7de9b85985b358076c0fc1c476d04a10c";

328328 }

329− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/af/thunderbird-91.8.1.tar.bz2";

329+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/af/thunderbird-91.8.0.tar.bz2";

330330 locale = "af";

331331 arch = "linux-i686";

332− sha256 = "d96e9de630ad5502fd86de653337ff7df4444ea5bdc22e07cb77f67f1dc4d04f";

332+ sha256 = "f004dc6825310f3f7554682816b0848e4461ca86d8d31b1f5f0287064be5af48";

333333 }

334− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ar/thunderbird-91.8.1.tar.bz2";

334+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ar/thunderbird-91.8.0.tar.bz2";

335335 locale = "ar";

336336 arch = "linux-i686";

337− sha256 = "d5273d01309d15e77a897fa25a142851470f9569b25b253e66d09dee6984d061";

337+ sha256 = "be9fae6a15d1e3d7b4da462eaaa2cfa0317162c2ecfdbff8704d2f0239278380";

338338 }

339− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ast/thunderbird-91.8.1.tar.bz2";

339+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ast/thunderbird-91.8.0.tar.bz2";

340340 locale = "ast";

341341 arch = "linux-i686";

342− sha256 = "8466aa8df2090de75cd7140b58c03856b351536f14875569c18abeaebdcb3249";

342+ sha256 = "5f92a809cf6d6a2df8477f54d1cf7a3ef65e27426fe184178bcc8c691a08487a";

343343 }

344− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/be/thunderbird-91.8.1.tar.bz2";

344+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/be/thunderbird-91.8.0.tar.bz2";

345345 locale = "be";

346346 arch = "linux-i686";

347− sha256 = "f2940433250516531cd782e5f7a2c85dbb81d5fae83b29ff2fba93450dcb14ef";

347+ sha256 = "c87c60eee9c7cb082e7a06e608835d1e29154a06a77b688c564fceab1546eaa5";

348348 }

349− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/bg/thunderbird-91.8.1.tar.bz2";

349+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/bg/thunderbird-91.8.0.tar.bz2";

350350 locale = "bg";

351351 arch = "linux-i686";

352− sha256 = "70198e5c4857d84b0c84c158fabf269d759fcd7b966d82e2f529c540d833a244";

352+ sha256 = "f07c5dab6db9aec61478942a0b7add0fea0fb078c9be150efad19e606fcf7ebc";

353353 }

354− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/br/thunderbird-91.8.1.tar.bz2";

354+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/br/thunderbird-91.8.0.tar.bz2";

355355 locale = "br";

356356 arch = "linux-i686";

357− sha256 = "02391abf4167231531b8e8490fd2d7feab36cf89ddc5cb6d072cb33a67d4520a";

357+ sha256 = "d1b5d7c7de3ecb1b0b58989a25bbac3768b105730c6ddb87d1d3072001efa313";

358358 }

359− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ca/thunderbird-91.8.1.tar.bz2";

359+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ca/thunderbird-91.8.0.tar.bz2";

360360 locale = "ca";

361361 arch = "linux-i686";

362− sha256 = "7178baf7bdc7914bb803995b8d1fc66087f9c65264b100e8876fa1be463623d2";

362+ sha256 = "1e8e7f215c8a80504eaafcf3e867c6f8090953f685fc2bc7606f77efd11bd612";

363363 }

364− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cak/thunderbird-91.8.1.tar.bz2";

364+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cak/thunderbird-91.8.0.tar.bz2";

365365 locale = "cak";

366366 arch = "linux-i686";

367− sha256 = "579bdce1b8b4a2ebf2688c95e5ee4f2e20347a983874633bcdb92c3d6c19ee8e";

367+ sha256 = "43a0355b20dbc71adc4a6c35bba3e91d717ba08547c767303828f931b7cd26e6";

368368 }

369− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cs/thunderbird-91.8.1.tar.bz2";

369+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cs/thunderbird-91.8.0.tar.bz2";

370370 locale = "cs";

371371 arch = "linux-i686";

372− sha256 = "2eccefb9c82eae0f339ec9d5291c82a873ddcdc80822a7588e686ffaa50e7763";

372+ sha256 = "987a95eadb174ac453cc619b97ab4b5dbdc474de821f16a2e9f4906483792656";

373373 }

374− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cy/thunderbird-91.8.1.tar.bz2";

374+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/cy/thunderbird-91.8.0.tar.bz2";

375375 locale = "cy";

376376 arch = "linux-i686";

377− sha256 = "0616bd3fb1baa79b4dbfddf260d013c03829edcdf761e25980b8600e63922f52";

377+ sha256 = "1ee7b2902fa1fe373dd2ae2529af1c2f87f442c91618f2a470052641a6e963a2";

378378 }

379− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/da/thunderbird-91.8.1.tar.bz2";

379+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/da/thunderbird-91.8.0.tar.bz2";

380380 locale = "da";

381381 arch = "linux-i686";

382− sha256 = "56c3cf0930c0966212d607589a32cec910d6b0a7bc7db314b317e0f717321fc6";

382+ sha256 = "09e15245d38b7d2963f1558c42ed13452737679459b9f78769dc0726cb8e42c8";

383383 }

384− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/de/thunderbird-91.8.1.tar.bz2";

384+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/de/thunderbird-91.8.0.tar.bz2";

385385 locale = "de";

386386 arch = "linux-i686";

387− sha256 = "5ef59f3d0575ec3f570f4b1d0a401ac3eaf42a901ccece9bbb46cd4bab4a61b1";

387+ sha256 = "1fcdd9e52197d1925a42fe193980bd1415d6c280afc8e0148f7ea3903fb79a7e";

388388 }

389− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/dsb/thunderbird-91.8.1.tar.bz2";

389+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/dsb/thunderbird-91.8.0.tar.bz2";

390390 locale = "dsb";

391391 arch = "linux-i686";

392− sha256 = "e4ba253ee1f3629d5e3bde8475a49b8a95fb1a0bb76c14cb62a53a6e6f545804";

392+ sha256 = "362cef9146611f09d969893c4b4c7a8ba7b3d46a1b49183cba0eb8d7d46d2db9";

393393 }

394− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/el/thunderbird-91.8.1.tar.bz2";

394+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/el/thunderbird-91.8.0.tar.bz2";

395395 locale = "el";

396396 arch = "linux-i686";

397− sha256 = "7c342ff901eb195ee06b0b67d4a52b118053ee8153d9dffae48c83e937a04be4";

397+ sha256 = "7360fcb00c20b8dfdb2434d2347e8bffadcadc7fd50773dd96bc9173b3e800a7";

398398 }

399− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-CA/thunderbird-91.8.1.tar.bz2";

399+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-CA/thunderbird-91.8.0.tar.bz2";

400400 locale = "en-CA";

401401 arch = "linux-i686";

402− sha256 = "35cc280dfa58eeb62c12d133d4bccfcd85e694121129e154770c840f6e87169d";

402+ sha256 = "86025c58c29acf2cc98ba6be305629605a3ad10304c87d6f4d55cb9948ddbb46";

403403 }

404− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-GB/thunderbird-91.8.1.tar.bz2";

404+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-GB/thunderbird-91.8.0.tar.bz2";

405405 locale = "en-GB";

406406 arch = "linux-i686";

407− sha256 = "ac393ceb36bcf7afefdaa1f6fdbdc49ef739781979878f055d623cae78cc0468";

407+ sha256 = "2535a948b23327f66c186387a50eeec44ab3eb42859be5ce9beeb660a47e1b1e";

408408 }

409− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-US/thunderbird-91.8.1.tar.bz2";

409+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/en-US/thunderbird-91.8.0.tar.bz2";

410410 locale = "en-US";

411411 arch = "linux-i686";

412− sha256 = "bac3f4695e762b67b21b399edd406340a6500a8a5bcf4973a74904b9065078c8";

412+ sha256 = "889e6f3f8d0b5b372b08ea3b85b9cc890ad62ef60d9bd41b3e4e9387e1361e7b";

413413 }

414− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/es-AR/thunderbird-91.8.1.tar.bz2";

414+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/es-AR/thunderbird-91.8.0.tar.bz2";

415415 locale = "es-AR";

416416 arch = "linux-i686";

417− sha256 = "5ec79874c0a76555e68a84aa8f41ceff5ff72877d4636301cae99ef56ea16e74";

417+ sha256 = "f99012407c06c6b913207ac706fd542da011045b5503ff3290590332da09a7a1";

418418 }

419− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/es-ES/thunderbird-91.8.1.tar.bz2";

419+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/es-ES/thunderbird-91.8.0.tar.bz2";

420420 locale = "es-ES";

421421 arch = "linux-i686";

422− sha256 = "3465df8574f3d9dcb86a458147c388ae662cd17b998176591eb3841a448c543a";

422+ sha256 = "ef8d7946c1c4475dcbe4144012630119e64bdcb3b809b4a00cebaa5d8effb5fb";

423423 }

424− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/et/thunderbird-91.8.1.tar.bz2";

424+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/et/thunderbird-91.8.0.tar.bz2";

425425 locale = "et";

426426 arch = "linux-i686";

427− sha256 = "58a1a76c81c6687a5673150ad5effa421b5a32a8825c52a7106a5a77cf4d66bf";

427+ sha256 = "5e2cefaaa8d44e3a90e7b31ac29ff62f9f3b50dff5b29ca1703bbe907a770d61";

428428 }

429− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/eu/thunderbird-91.8.1.tar.bz2";

429+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/eu/thunderbird-91.8.0.tar.bz2";

430430 locale = "eu";

431431 arch = "linux-i686";

432− sha256 = "c90e4acc10b1157d3f1009f55d5ebe70828288ebf057f01d0cfc78f306536d19";

432+ sha256 = "7c89425da0c4c46e9291b7f039d7b42aae9442538b3afff0477b490f158ee473";

433433 }

434− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fi/thunderbird-91.8.1.tar.bz2";

434+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fi/thunderbird-91.8.0.tar.bz2";

435435 locale = "fi";

436436 arch = "linux-i686";

437− sha256 = "249943c795ac7b7d94331399c7badfd2d7ea86ccbf96e7eb653985ead8d50975";

437+ sha256 = "a861e4b0763b98c8d6361c2f36cee43cd12c6e7b9fcfa49010da9f861121fbbe";

438438 }

439− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fr/thunderbird-91.8.1.tar.bz2";

439+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fr/thunderbird-91.8.0.tar.bz2";

440440 locale = "fr";

441441 arch = "linux-i686";

442− sha256 = "6464ce3e03ec947fe8752096d3049390b307ed44eaea036194c6d58750064a1d";

442+ sha256 = "0aab665a007cf87767f78a42c0ac3a767776895e9c0990a475545157878cbd87";

443443 }

444− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fy-NL/thunderbird-91.8.1.tar.bz2";

444+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/fy-NL/thunderbird-91.8.0.tar.bz2";

445445 locale = "fy-NL";

446446 arch = "linux-i686";

447− sha256 = "a45de5dd3f37b9a7c39b260ba84a03cef94b103787235cd34ad45cf4592e7ed2";

447+ sha256 = "1ed753c85bf519406001833b3ca3848262c6208eaec1899167704624a5b52701";

448448 }

449− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ga-IE/thunderbird-91.8.1.tar.bz2";

449+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ga-IE/thunderbird-91.8.0.tar.bz2";

450450 locale = "ga-IE";

451451 arch = "linux-i686";

452− sha256 = "ed509287d305e2457137d051b1842d26401b5b337a5272562a7b19922e874c2c";

452+ sha256 = "e2b75f8d236dd3a217c21461e2c0ae501fb23f0cabcc11a501aae8f0ca28175b";

453453 }

454− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/gd/thunderbird-91.8.1.tar.bz2";

454+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/gd/thunderbird-91.8.0.tar.bz2";

455455 locale = "gd";

456456 arch = "linux-i686";

457− sha256 = "2c8a2c587bb522aa2dceb3fb3d68e338f9e22b1be57745e26441c4c72257b22b";

457+ sha256 = "6517d28e08abe6ae9cffb2e0d6cfe7407b137c7e4a2bd1fffd1f2d74592db168";

458458 }

459− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/gl/thunderbird-91.8.1.tar.bz2";

459+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/gl/thunderbird-91.8.0.tar.bz2";

460460 locale = "gl";

461461 arch = "linux-i686";

462− sha256 = "4dd7eb1c72eca568c03c233f5078bbcf24da14e123106ce877096ab2b1637b61";

462+ sha256 = "4bc16ea1a9939f1c0b363a34b580a4bf6601f646fdcd9c6d686fb07b1db4951b";

463463 }

464− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/he/thunderbird-91.8.1.tar.bz2";

464+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/he/thunderbird-91.8.0.tar.bz2";

465465 locale = "he";

466466 arch = "linux-i686";

467− sha256 = "82f8168ab4eceaf92f03fd777160ec28d25f4801944469a5ac3f6df8de1773e1";

467+ sha256 = "1b60dde842257b9d9526618f5f7a13cacf6d9a8d7f9320073e9ca95a80633a32";

468468 }

469− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hr/thunderbird-91.8.1.tar.bz2";

469+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hr/thunderbird-91.8.0.tar.bz2";

470470 locale = "hr";

471471 arch = "linux-i686";

472− sha256 = "80221f2fc08812f864dd09edc4e6b7693d5966b292d8ea66c2931a51f35bfaa8";

472+ sha256 = "a11ba48e82c8a78f21c0d38f947ea699f926842c5b8665d5e6b132754d063bbc";

473473 }

474− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hsb/thunderbird-91.8.1.tar.bz2";

474+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hsb/thunderbird-91.8.0.tar.bz2";

475475 locale = "hsb";

476476 arch = "linux-i686";

477− sha256 = "9e6b7c4cd402675cbac43088328e321a6f738cd7d83406d7cd7f8ac6060b6f11";

477+ sha256 = "dfdd15a264d58454a721d7036db0659af9c920b71f1835a488338acab1540056";

478478 }

479− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hu/thunderbird-91.8.1.tar.bz2";

479+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hu/thunderbird-91.8.0.tar.bz2";

480480 locale = "hu";

481481 arch = "linux-i686";

482− sha256 = "4cea9f48504060e31006f69eecafe3c352440f54d599f637d4a1a536d48e27a3";

482+ sha256 = "126d2155fc30f15b6efa061d340d91926e0f72ff133411dad9fdfefaffa25210";

483483 }

484− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hy-AM/thunderbird-91.8.1.tar.bz2";

484+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/hy-AM/thunderbird-91.8.0.tar.bz2";

485485 locale = "hy-AM";

486486 arch = "linux-i686";

487− sha256 = "55d887cf63952b1eec43bf2449fa3eb8c543d91ee4cdeaa1e54a00cd4a009357";

487+ sha256 = "cc4d0984fe5caa81cf463a166a08af8d35bd7d68bef8a0b40b2edab4ffab3eb3";

488488 }

489− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/id/thunderbird-91.8.1.tar.bz2";

489+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/id/thunderbird-91.8.0.tar.bz2";

490490 locale = "id";

491491 arch = "linux-i686";

492− sha256 = "32dcdae28370e35f61a3f5c12085830f6263b0b4b9b272d780f2c748d1474961";

492+ sha256 = "4dc4f402a2c3fb1d9f0f3fc10f937274f87bbb99f7442fbb782e6c91b6bef1a5";

493493 }

494− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/is/thunderbird-91.8.1.tar.bz2";

494+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/is/thunderbird-91.8.0.tar.bz2";

495495 locale = "is";

496496 arch = "linux-i686";

497− sha256 = "df47af9356ee1b9bed415421f14f797499402dccc96f3aef18538d64b4b5b8b9";

497+ sha256 = "9a52dec2873649da8e11105456e8d6cbb631b754f9988404c0985f03d10001d2";

498498 }

499− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/it/thunderbird-91.8.1.tar.bz2";

499+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/it/thunderbird-91.8.0.tar.bz2";

500500 locale = "it";

501501 arch = "linux-i686";

502− sha256 = "1cf50c518e5d8137c52bf37eaeac618007e2efbc8f94deb9461a01b2787df434";

502+ sha256 = "7764c87c166229b9b25410cbd816a49afcbf6ab37dae5ee071fc2940a068fc3d";

503503 }

504− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ja/thunderbird-91.8.1.tar.bz2";

504+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ja/thunderbird-91.8.0.tar.bz2";

505505 locale = "ja";

506506 arch = "linux-i686";

507− sha256 = "031d2db07bc2dfc8dbb4c86119a993725a661ad4f6596241bd5590ebbdc01e3c";

507+ sha256 = "9e858818a36ede51a15e2cf9e3b2b2d30dd83b6fe2cd5f66188776e3351e12f5";

508508 }

509− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ka/thunderbird-91.8.1.tar.bz2";

509+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ka/thunderbird-91.8.0.tar.bz2";

510510 locale = "ka";

511511 arch = "linux-i686";

512− sha256 = "18f1b2a900381ce85cded1046e0bc10c015eb3ab5602497e93190229aea26bcd";

512+ sha256 = "2e46a4036b32b90224e555691441c6a59e8e07fc6f0d6cae3aa591af3a2b04c2";

513513 }

514− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/kab/thunderbird-91.8.1.tar.bz2";

514+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/kab/thunderbird-91.8.0.tar.bz2";

515515 locale = "kab";

516516 arch = "linux-i686";

517− sha256 = "10b42a83af77d82343297439f8c56cdb3ab85fa4ea88aa77e49aeb6a01a90c99";

517+ sha256 = "0ae98410d16a73a4c42149b7b5c6325a58dacdd02ac8df0f263c51b8aad26e57";

518518 }

519− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/kk/thunderbird-91.8.1.tar.bz2";

519+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/kk/thunderbird-91.8.0.tar.bz2";

520520 locale = "kk";

521521 arch = "linux-i686";

522− sha256 = "1e0b1740eaf8c48ecb2a41c3687f51afc07b9243c098637d60c5452259ae9192";

522+ sha256 = "b74a98dda02f144ecc4a1fb76f014689d3c5a0d95805ca2adaccc7739f397296";

523523 }

524− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ko/thunderbird-91.8.1.tar.bz2";

524+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ko/thunderbird-91.8.0.tar.bz2";

525525 locale = "ko";

526526 arch = "linux-i686";

527− sha256 = "da9a00752a4e6a3aca2f298eecae39e661435f95c723f7327ed60eeb0e75d50d";

527+ sha256 = "074f6f4ac2ebd983490f6cc42a4ac8603da13f056145aa5dc577b2fe3fa4a4da";

528528 }

529− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/lt/thunderbird-91.8.1.tar.bz2";

529+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/lt/thunderbird-91.8.0.tar.bz2";

530530 locale = "lt";

531531 arch = "linux-i686";

532− sha256 = "7ece24971b0a7b901ab165ff30c3b5239161a488be02c7f5cf5d6a2dfc6dce3e";

532+ sha256 = "afb32ea82d83808ab40f33db0fa95462479bae8f237defa0c702a3d95fcc91d5";

533533 }

534− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/lv/thunderbird-91.8.1.tar.bz2";

534+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/lv/thunderbird-91.8.0.tar.bz2";

535535 locale = "lv";

536536 arch = "linux-i686";

537− sha256 = "baf96d476ec159bbc4567e4beae29d3c61fef9683190cdc7c207163ed67797fb";

537+ sha256 = "91661ab053978137acb9bb6e820dfba0ee5007bc12b440504efaa6aa6c62f444";

538538 }

539− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ms/thunderbird-91.8.1.tar.bz2";

539+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ms/thunderbird-91.8.0.tar.bz2";

540540 locale = "ms";

541541 arch = "linux-i686";

542− sha256 = "3b356c61079130bd3d5b5023116f74961ed84595222284fadc45f3224281bbfc";

542+ sha256 = "ba06582eb17d830d0805040810098db7fef4a001f8b5f8228491c0449ccb29f5";

543543 }

544− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nb-NO/thunderbird-91.8.1.tar.bz2";

544+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nb-NO/thunderbird-91.8.0.tar.bz2";

545545 locale = "nb-NO";

546546 arch = "linux-i686";

547− sha256 = "225a885cc788b64c864efab9cb0adbb0399a7e68e747551bb98cfba903898bec";

547+ sha256 = "c2463574caf1bbf6dee227ec57fae53178a713dcfd05e866b6458d9dc0f8febd";

548548 }

549− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nl/thunderbird-91.8.1.tar.bz2";

549+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nl/thunderbird-91.8.0.tar.bz2";

550550 locale = "nl";

551551 arch = "linux-i686";

552− sha256 = "1c75e3df164a37c46f83421e0df28dd1cd4fd9e725a4e6c8d03378c800c53f04";

552+ sha256 = "2e84666be34fb7883a4ded36ab0a71ba987c554abb08c959330689ef15d3ac04";

553553 }

554− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nn-NO/thunderbird-91.8.1.tar.bz2";

554+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/nn-NO/thunderbird-91.8.0.tar.bz2";

555555 locale = "nn-NO";

556556 arch = "linux-i686";

557− sha256 = "fc154d52fa4e19ef4e727663a1bc4599da9e7c3aba0e563d823a3d4995d2632e";

557+ sha256 = "2e08edd2b0d198b1d6614af26fa86c3c6b646f6b53324aa6d7cda4629ab2dbf3";

558558 }

559− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pa-IN/thunderbird-91.8.1.tar.bz2";

559+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pa-IN/thunderbird-91.8.0.tar.bz2";

560560 locale = "pa-IN";

561561 arch = "linux-i686";

562− sha256 = "27a95c486a5a075fa8011add5c06c616ffafa7cb266afc26f7511cd510f8f403";

562+ sha256 = "9b5562cfa1a3c36b8f4f8a703ed232e5045812346cbb604f310b8c1861a99213";

563563 }

564− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pl/thunderbird-91.8.1.tar.bz2";

564+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pl/thunderbird-91.8.0.tar.bz2";

565565 locale = "pl";

566566 arch = "linux-i686";

567− sha256 = "34563d04912e27e93f122c47eca56a368f2b723406498f98f312f92459265f87";

567+ sha256 = "5ce1e65dc07f4f1d720abd18e31252aa74bdbb22f29305dfd23825fc9aec9062";

568568 }

569− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pt-BR/thunderbird-91.8.1.tar.bz2";

569+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pt-BR/thunderbird-91.8.0.tar.bz2";

570570 locale = "pt-BR";

571571 arch = "linux-i686";

572− sha256 = "6ab98477ca80c945c4b780aa704b231e7831fd2334a70c57937b2815357f3150";

572+ sha256 = "440af4305a7a2d8382e6d791b1cde11673b4a0b35973126b6f5b44f7ab236e84";

573573 }

574− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pt-PT/thunderbird-91.8.1.tar.bz2";

574+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/pt-PT/thunderbird-91.8.0.tar.bz2";

575575 locale = "pt-PT";

576576 arch = "linux-i686";

577− sha256 = "0919ca9a0125a8545de083f629a4f338e8db0f0e7a87bb7c55172f163605f8d1";

577+ sha256 = "47f456163ee3036b9a20542b3a5fb0e6997fa9c3ea431c38964c887669191c42";

578578 }

579− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/rm/thunderbird-91.8.1.tar.bz2";

579+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/rm/thunderbird-91.8.0.tar.bz2";

580580 locale = "rm";

581581 arch = "linux-i686";

582− sha256 = "31d4de40f1ad6c284e388ffd760d3758174ce99c01ca23b0ccbf9d1a4f343bab";

582+ sha256 = "7c26dd177759f7c40a3106b9189cf245ef43be2e732d187ed1cdce44ba533073";

583583 }

584− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ro/thunderbird-91.8.1.tar.bz2";

584+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ro/thunderbird-91.8.0.tar.bz2";

585585 locale = "ro";

586586 arch = "linux-i686";

587− sha256 = "3e0a763faa79aa775e29907e018f81d506fbaa025d9900516447c6081e6c31b1";

587+ sha256 = "0297de849e5f1a5400023b40682980ec886fbe54087f8db6b3a316d5cdb2d5d7";

588588 }

589− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ru/thunderbird-91.8.1.tar.bz2";

589+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/ru/thunderbird-91.8.0.tar.bz2";

590590 locale = "ru";

591591 arch = "linux-i686";

592− sha256 = "ee485a4f7287d770107d9d41d678ace5873079e1fdc726a30800b6d055f68267";

592+ sha256 = "c766d619d8bacc87fd729d3aa6b3a16741070a91181416243b389d5b25dd4829";

593593 }

594− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sk/thunderbird-91.8.1.tar.bz2";

594+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sk/thunderbird-91.8.0.tar.bz2";

595595 locale = "sk";

596596 arch = "linux-i686";

597− sha256 = "e8cc9b1a9e767ab548de614da8feb1b42213444e91e4a1382b2cdc7323872215";

597+ sha256 = "9ba8276dab20f0e7c9820f2aae046ab4bbfd8a032b07282f1fd09bab167793da";

598598 }

599− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sl/thunderbird-91.8.1.tar.bz2";

599+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sl/thunderbird-91.8.0.tar.bz2";

600600 locale = "sl";

601601 arch = "linux-i686";

602− sha256 = "271b3fa48e9f1cedfe3fbfbd72fd23b0b477e9993108996dbc897835de0750c9";

602+ sha256 = "a15a3cf75610b0acb93fe067a9fc4f2c7298bfa7654175275a96c0ee8e7fdd89";

603603 }

604− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sq/thunderbird-91.8.1.tar.bz2";

604+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sq/thunderbird-91.8.0.tar.bz2";

605605 locale = "sq";

606606 arch = "linux-i686";

607− sha256 = "7fac9e56f3e5070f0b9e038483f0b0fb97a42d947410c3f8677b7e6d8ebf3828";

607+ sha256 = "f1578326fdca0beeb09ed4bbe80178a5878a1bcac2f480a7e4155ee882f29197";

608608 }

609− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sr/thunderbird-91.8.1.tar.bz2";

609+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sr/thunderbird-91.8.0.tar.bz2";

610610 locale = "sr";

611611 arch = "linux-i686";

612− sha256 = "903c9408c4bce12a78cf5941b9413f65d946b49c5c6819c1cc1c7006373d6802";

612+ sha256 = "8fcd6be0a44a115630544bd5fb652a4dd3c4659a8233ab5aaeea7326c89d2c90";

613613 }

614− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sv-SE/thunderbird-91.8.1.tar.bz2";

614+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/sv-SE/thunderbird-91.8.0.tar.bz2";

615615 locale = "sv-SE";

616616 arch = "linux-i686";

617− sha256 = "c6ff664cd1d80bd36f1bbcffa239f3f8d7b31e5b68918001b1a26bd91ea49376";

617+ sha256 = "f4dac959ee9f29349228f055ae7409cadf2be0de9461bcaac940da4ea9f33c6c";

618618 }

619− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/th/thunderbird-91.8.1.tar.bz2";

619+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/th/thunderbird-91.8.0.tar.bz2";

620620 locale = "th";

621621 arch = "linux-i686";

622− sha256 = "ad27252f979daad7e7e842ff1144ab731fa4e588adc015f3e388ba26f2cf21de";

622+ sha256 = "a3306d06a99bd4ae38b3289e9feaef2cb3e21fb46936ca1e369a21d114d033ec";

623623 }

624− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/tr/thunderbird-91.8.1.tar.bz2";

624+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/tr/thunderbird-91.8.0.tar.bz2";

625625 locale = "tr";

626626 arch = "linux-i686";

627− sha256 = "55581a2277ea6fa27389fa4ffdda72a02a8c3f8b2c92b0b04e7deb2d24840ee4";

627+ sha256 = "03cda6244d38a28e3420028288e3768fa668fb5358d047c6ea463a644e655c53";

628628 }

629− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/uk/thunderbird-91.8.1.tar.bz2";

629+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/uk/thunderbird-91.8.0.tar.bz2";

630630 locale = "uk";

631631 arch = "linux-i686";

632− sha256 = "5b687b3839f6c4ce67c71c56965eccd85eab94063fb9bfc5d4e2f30336f3fe0d";

632+ sha256 = "29800c3dd81f9851c19ef5c54c6a7bc18fbda218ef76cf5edd22a142b2d2d791";

633633 }

634− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/uz/thunderbird-91.8.1.tar.bz2";

634+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/uz/thunderbird-91.8.0.tar.bz2";

635635 locale = "uz";

636636 arch = "linux-i686";

637− sha256 = "41344413282a295db0c33e7ba01074b46c69d6267f94b36d10200f2adb42b39e";

637+ sha256 = "bb6020331a871f28003df188628cbc157409f3b97160efd02b71127faeff67d9";

638638 }

639− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/vi/thunderbird-91.8.1.tar.bz2";

639+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/vi/thunderbird-91.8.0.tar.bz2";

640640 locale = "vi";

641641 arch = "linux-i686";

642− sha256 = "57bfaac37e13e218d631af0830cef177d342f45a64fc19f86bfc5aa9c940e632";

642+ sha256 = "8bc4c487dcda84a4a103ef287388c418b95c4ed78c80e2e5936fb654a6df3c43";

643643 }

644− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/zh-CN/thunderbird-91.8.1.tar.bz2";

644+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/zh-CN/thunderbird-91.8.0.tar.bz2";

645645 locale = "zh-CN";

646646 arch = "linux-i686";

647− sha256 = "417a2b7ca7f3981d171e453ca7ea709fbb05bc2283d874d82a4b002d8e64f816";

647+ sha256 = "a41ca9b5e47f7628721ebb397f04e5cab625c5eb297b793a08f8103d9578c45f";

648648 }

649− { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/zh-TW/thunderbird-91.8.1.tar.bz2";

649+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.0/linux-i686/zh-TW/thunderbird-91.8.0.tar.bz2";

650650 locale = "zh-TW";

651651 arch = "linux-i686";

652− sha256 = "2c92131700a89dc2c590901cf356705d308aa3520ad3f713ba866fce04edb8c7";

652+ sha256 = "22489a052fc34ab1d364ee305c26b6d495b6ef4381e038427869a85d78ffe274";

653653 }

654654 ];

655655}

pkgs/applications/networking/mailreaders/thunderbird/packages.nix+2−2

@@ -10,12 +10,12 @@ in

1010rec {

1111 thunderbird = (common rec {

1212 pname = "thunderbird";

13− version = "91.8.1";

13+ version = "91.8.0";

1414 application = "comm/mail";

1515 binaryName = pname;

1616 src = fetchurl {

1717 url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

18− sha512 = "1591f3e9c76c1f2ea7fa5e194a7d030c8657a7855a95c8a177e8067c5aa838f0d8ca2652cd049b4bc88d0c9e604285a47b0c8316c190e2ceadfc1130d1e4de6c";

18+ sha512 = "147c7ad68b0a32cc0fd4405935836af1fa77bbce6a1e367b51ef9871e7fc2a8fe908a1d200be34326f4f339d272e62f619b75680201fe82d301ddd02e23824d5";

1919 };

2020 extraPatches = [

2121 # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

pkgs/applications/networking/modem-manager-gui/default.nix−15

@@ -2,7 +2,6 @@

22, pkg-config

33, python3

44, fetchFromGitLab

5−, fetchpatch

65, gtk3

76, glib

87, gdbm

@@ -45,20 +44,6 @@ stdenv.mkDerivation rec {

4544 libayatana-appindicator-gtk3

4645 ];

4746

48− patches = [

49− # Fix missing tray icon

50− (fetchpatch {

51− url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch";

52− sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";

53− })

54− # Fix build with meson 0.61

55− # appdata/meson.build:3:5: ERROR: Function does not take positional arguments.

56− (fetchpatch {

57− url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch";

58− sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";

59− })

60− ];

61−

6247 postPatch = ''

6348 patchShebangs man/manhelper.py

6449 '';

pkgs/applications/networking/n8n/node-packages.nix+240−315

@@ -508,22 +508,22 @@ let

508508 sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";

509509 };

510510 };

511− "@types/node-12.20.50" = {

511+ "@types/node-12.20.49" = {

512512 name = "_at_types_slash_node";

513513 packageName = "@types/node";

514− version = "12.20.50";

514+ version = "12.20.49";

515515 src = fetchurl {

516− url = "https://registry.npmjs.org/@types/node/-/node-12.20.50.tgz";

517− sha512 = "+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA==";

516+ url = "https://registry.npmjs.org/@types/node/-/node-12.20.49.tgz";

517+ sha512 = "5e6QNb9bkeh4Hni4ktLqUZuUqnGTX/kou2aZkXyxtuYaHXgBm+In1SHR9V+7kDzWzjB08KC2uqt2doDi7cuAAA==";

518518 };

519519 };

520− "@types/node-17.0.31" = {

520+ "@types/node-17.0.26" = {

521521 name = "_at_types_slash_node";

522522 packageName = "@types/node";

523− version = "17.0.31";

523+ version = "17.0.26";

524524 src = fetchurl {

525− url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz";

526− sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==";

525+ url = "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz";

526+ sha512 = "z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==";

527527 };

528528 };

529529 "@types/node-fetch-2.6.1" = {

@@ -661,13 +661,13 @@ let

661661 sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA==";

662662 };

663663 };

664− "acorn-8.7.1" = {

664+ "acorn-8.7.0" = {

665665 name = "acorn";

666666 packageName = "acorn";

667− version = "8.7.1";

667+ version = "8.7.0";

668668 src = fetchurl {

669− url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz";

670− sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==";

669+ url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz";

670+ sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==";

671671 };

672672 };

673673 "acorn-walk-8.2.0" = {

@@ -940,15 +940,6 @@ let

940940 sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==";

941941 };

942942 };

943− "async-validator-1.8.5" = {

944− name = "async-validator";

945− packageName = "async-validator";

946− version = "1.8.5";

947− src = fetchurl {

948− url = "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz";

949− sha512 = "tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==";

950− };

951− };

952943 "asynckit-0.4.0" = {

953944 name = "asynckit";

954945 packageName = "asynckit";

@@ -976,13 +967,13 @@ let

976967 sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";

977968 };

978969 };

979− "aws-sdk-2.1125.0" = {

970+ "aws-sdk-2.1120.0" = {

980971 name = "aws-sdk";

981972 packageName = "aws-sdk";

982− version = "2.1125.0";

973+ version = "2.1120.0";

983974 src = fetchurl {

984− url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1125.0.tgz";

985− sha512 = "2syNkKDqDcDmB/chc61a5xx+KYzaarLs1/KshE0b1Opp2oSq2FARyUBbk59HgwKaDUB61uPF33ZG9sHiIVx2hQ==";

975+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1120.0.tgz";

976+ sha512 = "3cKXUFxC3CDBbJ/JlXEKmJZKFZhqGii7idGaLxvV5/OzqEDUstYkHGX3TCJdQRHrRwpFvRVOekXSwLxBltqXuQ==";

986977 };

987978 };

988979 "aws-sign2-0.7.0" = {

@@ -1012,31 +1003,13 @@ let

10121003 sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==";

10131004 };

10141005 };

1015− "axios-retry-3.2.5" = {

1006+ "axios-retry-3.2.4" = {

10161007 name = "axios-retry";

10171008 packageName = "axios-retry";

1018− version = "3.2.5";

1009+ version = "3.2.4";

10191010 src = fetchurl {

1020− url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.5.tgz";

1021− sha512 = "a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA==";

1022− };

1023− };

1024− "babel-helper-vue-jsx-merge-props-2.0.3" = {

1025− name = "babel-helper-vue-jsx-merge-props";

1026− packageName = "babel-helper-vue-jsx-merge-props";

1027− version = "2.0.3";

1028− src = fetchurl {

1029− url = "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz";

1030− sha512 = "gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==";

1031− };

1032− };

1033− "babel-runtime-6.26.0" = {

1034− name = "babel-runtime";

1035− packageName = "babel-runtime";

1036− version = "6.26.0";

1037− src = fetchurl {

1038− url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";

1039− sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";

1011+ url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.4.tgz";

1012+ sha512 = "Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ==";

10401013 };

10411014 };

10421015 "balanced-match-1.0.2" = {

@@ -1192,6 +1165,15 @@ let

11921165 sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";

11931166 };

11941167 };

1168+ "body-parser-1.19.2" = {

1169+ name = "body-parser";

1170+ packageName = "body-parser";

1171+ version = "1.19.2";

1172+ src = fetchurl {

1173+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz";

1174+ sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";

1175+ };

1176+ };

11951177 "body-parser-1.20.0" = {

11961178 name = "body-parser";

11971179 packageName = "body-parser";

@@ -1822,13 +1804,13 @@ let

18221804 sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";

18231805 };

18241806 };

1825− "cookie-0.5.0" = {

1807+ "cookie-0.4.2" = {

18261808 name = "cookie";

18271809 packageName = "cookie";

1828− version = "0.5.0";

1810+ version = "0.4.2";

18291811 src = fetchurl {

1830− url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz";

1831− sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==";

1812+ url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";

1813+ sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";

18321814 };

18331815 };

18341816 "cookie-parser-1.4.6" = {

@@ -1849,22 +1831,13 @@ let

18491831 sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";

18501832 };

18511833 };

1852− "core-js-2.6.12" = {

1853− name = "core-js";

1854− packageName = "core-js";

1855− version = "2.6.12";

1856− src = fetchurl {

1857− url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz";

1858− sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";

1859− };

1860− };

1861− "core-js-3.22.3" = {

1834+ "core-js-3.22.2" = {

18621835 name = "core-js";

18631836 packageName = "core-js";

1864− version = "3.22.3";

1837+ version = "3.22.2";

18651838 src = fetchurl {

1866− url = "https://registry.npmjs.org/core-js/-/core-js-3.22.3.tgz";

1867− sha512 = "1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg==";

1839+ url = "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz";

1840+ sha512 = "Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA==";

18681841 };

18691842 };

18701843 "core-util-is-1.0.2" = {

@@ -2029,15 +2002,6 @@ let

20292002 sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";

20302003 };

20312004 };

2032− "deepmerge-1.5.2" = {

2033− name = "deepmerge";

2034− packageName = "deepmerge";

2035− version = "1.5.2";

2036− src = fetchurl {

2037− url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz";

2038− sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==";

2039− };

2040− };

20412005 "deepmerge-4.2.2" = {

20422006 name = "deepmerge";

20432007 packageName = "deepmerge";

@@ -2092,6 +2056,15 @@ let

20922056 sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==";

20932057 };

20942058 };

2059+ "depd-1.1.2" = {

2060+ name = "depd";

2061+ packageName = "depd";

2062+ version = "1.1.2";

2063+ src = fetchurl {

2064+ url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";

2065+ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";

2066+ };

2067+ };

20952068 "depd-2.0.0" = {

20962069 name = "depd";

20972070 packageName = "depd";

@@ -2101,6 +2074,15 @@ let

21012074 sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";

21022075 };

21032076 };

2077+ "destroy-1.0.4" = {

2078+ name = "destroy";

2079+ packageName = "destroy";

2080+ version = "1.0.4";

2081+ src = fetchurl {

2082+ url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";

2083+ sha1 = "978857442c44749e4206613e37946205826abd80";

2084+ };

2085+ };

21042086 "destroy-1.2.0" = {

21052087 name = "destroy";

21062088 packageName = "destroy";

@@ -2254,15 +2236,6 @@ let

22542236 sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";

22552237 };

22562238 };

2257− "element-ui-2.15.8" = {

2258− name = "element-ui";

2259− packageName = "element-ui";

2260− version = "2.15.8";

2261− src = fetchurl {

2262− url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz";

2263− sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A==";

2264− };

2265− };

22662239 "emoji-regex-8.0.0" = {

22672240 name = "emoji-regex";

22682241 packageName = "emoji-regex";

@@ -2299,13 +2272,13 @@ let

22992272 sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";

23002273 };

23012274 };

2302− "encoding-japanese-2.0.0" = {

2275+ "encoding-japanese-1.0.30" = {

23032276 name = "encoding-japanese";

23042277 packageName = "encoding-japanese";

2305− version = "2.0.0";

2278+ version = "1.0.30";

23062279 src = fetchurl {

2307− url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz";

2308− sha512 = "++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==";

2280+ url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-1.0.30.tgz";

2281+ sha512 = "bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg==";

23092282 };

23102283 };

23112284 "end-of-stream-1.4.4" = {

@@ -2488,13 +2461,13 @@ let

24882461 sha1 = "97e801aa052df02454de46b02bf621642cdc8502";

24892462 };

24902463 };

2491− "express-4.18.1" = {

2464+ "express-4.17.3" = {

24922465 name = "express";

24932466 packageName = "express";

2494− version = "4.18.1";

2467+ version = "4.17.3";

24952468 src = fetchurl {

2496− url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz";

2497− sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==";

2469+ url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz";

2470+ sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==";

24982471 };

24992472 };

25002473 "extend-3.0.2" = {

@@ -2614,13 +2587,13 @@ let

26142587 sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";

26152588 };

26162589 };

2617− "finalhandler-1.2.0" = {

2590+ "finalhandler-1.1.2" = {

26182591 name = "finalhandler";

26192592 packageName = "finalhandler";

2620− version = "1.2.0";

2593+ version = "1.1.2";

26212594 src = fetchurl {

2622− url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz";

2623− sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==";

2595+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";

2596+ sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";

26242597 };

26252598 };

26262599 "flatted-3.2.5" = {

@@ -3091,13 +3064,13 @@ let

30913064 sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";

30923065 };

30933066 };

3094− "html-to-text-8.2.0" = {

3067+ "html-to-text-8.0.0" = {

30953068 name = "html-to-text";

30963069 packageName = "html-to-text";

3097− version = "8.2.0";

3070+ version = "8.0.0";

30983071 src = fetchurl {

3099− url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz";

3100− sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ==";

3072+ url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.0.0.tgz";

3073+ sha512 = "fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg==";

31013074 };

31023075 };

31033076 "htmlparser2-6.1.0" = {

@@ -3109,6 +3082,15 @@ let

31093082 sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==";

31103083 };

31113084 };

3085+ "http-errors-1.8.1" = {

3086+ name = "http-errors";

3087+ packageName = "http-errors";

3088+ version = "1.8.1";

3089+ src = fetchurl {

3090+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz";

3091+ sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==";

3092+ };

3093+ };

31123094 "http-errors-2.0.0" = {

31133095 name = "http-errors";

31143096 packageName = "http-errors";

@@ -3163,6 +3145,15 @@ let

31633145 sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==";

31643146 };

31653147 };

3148+ "iconv-lite-0.6.2" = {

3149+ name = "iconv-lite";

3150+ packageName = "iconv-lite";

3151+ version = "0.6.2";

3152+ src = fetchurl {

3153+ url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz";

3154+ sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==";

3155+ };

3156+ };

31663157 "iconv-lite-0.6.3" = {

31673158 name = "iconv-lite";

31683159 packageName = "iconv-lite";

@@ -3460,15 +3451,6 @@ let

34603451 sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==";

34613452 };

34623453 };

3463− "is-plain-object-5.0.0" = {

3464− name = "is-plain-object";

3465− packageName = "is-plain-object";

3466− version = "5.0.0";

3467− src = fetchurl {

3468− url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz";

3469− sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==";

3470− };

3471− };

34723454 "is-promise-1.0.1" = {

34733455 name = "is-promise";

34743456 packageName = "is-promise";

@@ -3838,13 +3820,13 @@ let

38383820 sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==";

38393821 };

38403822 };

3841− "libmime-5.1.0" = {

3823+ "libmime-5.0.0" = {

38423824 name = "libmime";

38433825 packageName = "libmime";

3844− version = "5.1.0";

3826+ version = "5.0.0";

38453827 src = fetchurl {

3846− url = "https://registry.npmjs.org/libmime/-/libmime-5.1.0.tgz";

3847− sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==";

3828+ url = "https://registry.npmjs.org/libmime/-/libmime-5.0.0.tgz";

3829+ sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==";

38483830 };

38493831 };

38503832 "libphonenumber-js-1.9.52" = {

@@ -3874,13 +3856,13 @@ let

38743856 sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==";

38753857 };

38763858 };

3877− "linkify-it-4.0.0" = {

3859+ "linkify-it-3.0.3" = {

38783860 name = "linkify-it";

38793861 packageName = "linkify-it";

3880− version = "4.0.0";

3862+ version = "3.0.3";

38813863 src = fetchurl {

3882− url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.0.tgz";

3883− sha512 = "QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A==";

3864+ url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz";

3865+ sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==";

38843866 };

38853867 };

38863868 "localtunnel-2.0.2" = {

@@ -4153,22 +4135,22 @@ let

41534135 sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==";

41544136 };

41554137 };

4156− "mailparser-3.5.0" = {

4138+ "mailparser-3.4.0" = {

41574139 name = "mailparser";

41584140 packageName = "mailparser";

4159− version = "3.5.0";

4141+ version = "3.4.0";

41604142 src = fetchurl {

4161− url = "https://registry.npmjs.org/mailparser/-/mailparser-3.5.0.tgz";

4162− sha512 = "mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg==";

4143+ url = "https://registry.npmjs.org/mailparser/-/mailparser-3.4.0.tgz";

4144+ sha512 = "u2pfpLg+xr7m2FKDl+ohQhy2gMok1QZ+S9E5umS9ez5DSJWttrqSmBGswyj9F68pZMVTwbhLpBt7Kd04q/W4Vw==";

41634145 };

41644146 };

4165− "mailsplit-5.3.2" = {

4147+ "mailsplit-5.3.1" = {

41664148 name = "mailsplit";

41674149 packageName = "mailsplit";

4168− version = "5.3.2";

4150+ version = "5.3.1";

41694151 src = fetchurl {

4170− url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.2.tgz";

4171− sha512 = "coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ==";

4152+ url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.1.tgz";

4153+ sha512 = "o6R6HCzqWYmI2/IYlB+v2IMPgYqC2EynmagZQICAhR7zAq0CO6fPcsO6CrYmVuYT+SSwvLAEZR5WniohBELcAA==";

41724154 };

41734155 };

41744156 "make-dir-3.1.0" = {

@@ -4504,49 +4486,49 @@ let

45044486 sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";

45054487 };

45064488 };

4507− "n8n-core-0.116.0" = {

4489+ "n8n-core-0.115.0" = {

45084490 name = "n8n-core";

45094491 packageName = "n8n-core";

4510− version = "0.116.0";

4492+ version = "0.115.0";

45114493 src = fetchurl {

4512− url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.116.0.tgz";

4513− sha512 = "D9X+D7gsUTKMacHIixEJuZpOB7DW/g42W+FBKLrj+6BUP1JMKG02G0C+Ef38e2XuNObMoLdLkI70snyvi1oq1g==";

4494+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.115.0.tgz";

4495+ sha512 = "VXmnbbAQKk9Nbw4g4kSpJ5bxKOydVsMnz6wU2Q4tmRd1ajp+jyjHLUWyJIoVMDWm6nLEC6GORh+Zsap7Jf2xjw==";

45144496 };

45154497 };

4516− "n8n-design-system-0.19.0" = {

4498+ "n8n-design-system-0.18.0" = {

45174499 name = "n8n-design-system";

45184500 packageName = "n8n-design-system";

4519− version = "0.19.0";

4501+ version = "0.18.0";

45204502 src = fetchurl {

4521− url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.19.0.tgz";

4522− sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw==";

4503+ url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.18.0.tgz";

4504+ sha512 = "TurjQwQC+TRHwoEtsFBqBVg9VRSDPBg6ghmz4rm2U6X61yqg960dLQlAIl5d+oas2jezAnhHIxL47wl+9M8V/A==";

45234505 };

45244506 };

4525− "n8n-editor-ui-0.142.0" = {

4507+ "n8n-editor-ui-0.141.0" = {

45264508 name = "n8n-editor-ui";

45274509 packageName = "n8n-editor-ui";

4528− version = "0.142.0";

4510+ version = "0.141.0";

45294511 src = fetchurl {

4530− url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.0.tgz";

4531− sha512 = "aDXm64Y+tcLicd0z9pIxhSfqCb/JjsMIAOJ7DB35HKg7riOE7TGBHkWQ6F61XEjusJLl6ZGr15V+9EoCTu+02g==";

4512+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.141.0.tgz";

4513+ sha512 = "CH1Jd9vyf+DsBukIgV9dICxGzyI1cbeHvv7XTv8qUVfMdNrsPan/OTAmyuoFl+aSuI0H8NedJTpzMytoLghvjw==";

45324514 };

45334515 };

4534− "n8n-nodes-base-0.173.0" = {

4516+ "n8n-nodes-base-0.172.0" = {

45354517 name = "n8n-nodes-base";

45364518 packageName = "n8n-nodes-base";

4537− version = "0.173.0";

4519+ version = "0.172.0";

45384520 src = fetchurl {

4539− url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.173.0.tgz";

4540− sha512 = "9ya0cgRMk6iz01m2shZHahe4KurL89/T+iGLywrUZdPdIRni7LR4ywSG51B4jko73+zsKPNYjya650BGNz7TaQ==";

4521+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.172.0.tgz";

4522+ sha512 = "/Wm9E4nxftG5bTU7AMdXrYiCRq/S/rqiZO7Cn34Nvp/fyT5MndU5C6socz0Bz/ScDrRCAmsEF5I+G1+zQwuQUA==";

45414523 };

45424524 };

4543− "n8n-workflow-0.98.0" = {

4525+ "n8n-workflow-0.97.0" = {

45444526 name = "n8n-workflow";

45454527 packageName = "n8n-workflow";

4546− version = "0.98.0";

4528+ version = "0.97.0";

45474529 src = fetchurl {

4548− url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.98.0.tgz";

4549− sha512 = "MrlEpSUueIkMc9P75h09ozXN2SQyV26qEe2PlQ9+nwRnCPYkikQQtgYZDqQI+bHVHFCMdBZOnq59fse0cMpYfQ==";

4530+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.97.0.tgz";

4531+ sha512 = "RZlUhe8rW7r5prjn/WmdE1yZfZsDrpjjT0Bk22ItmKA+BeRW1k+VonWHBZEAsg6scui0web/MfXfXdRsRDnLdQ==";

45504532 };

45514533 };

45524534 "named-placeholders-1.1.2" = {

@@ -4684,22 +4666,22 @@ let

46844666 sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d";

46854667 };

46864668 };

4687− "nodemailer-6.7.3" = {

4669+ "nodemailer-6.7.0" = {

46884670 name = "nodemailer";

46894671 packageName = "nodemailer";

4690− version = "6.7.3";

4672+ version = "6.7.0";

46914673 src = fetchurl {

4692− url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz";

4693− sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";

4674+ url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz";

4675+ sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==";

46944676 };

46954677 };

4696− "nodemailer-6.7.4" = {

4678+ "nodemailer-6.7.3" = {

46974679 name = "nodemailer";

46984680 packageName = "nodemailer";

4699− version = "6.7.4";

4681+ version = "6.7.3";

47004682 src = fetchurl {

4701− url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.4.tgz";

4702− sha512 = "TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA==";

4683+ url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz";

4684+ sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";

47034685 };

47044686 };

47054687 "nopt-5.0.0" = {

@@ -4729,15 +4711,6 @@ let

47294711 sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";

47304712 };

47314713 };

4732− "normalize-wheel-1.0.1" = {

4733− name = "normalize-wheel";

4734− packageName = "normalize-wheel";

4735− version = "1.0.1";

4736− src = fetchurl {

4737− url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz";

4738− sha1 = "aec886affdb045070d856447df62ecf86146ec45";

4739− };

4740− };

47414714 "npmlog-5.0.1" = {

47424715 name = "npmlog";

47434716 packageName = "npmlog";

@@ -4819,6 +4792,15 @@ let

48194792 sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==";

48204793 };

48214794 };

4795+ "on-finished-2.3.0" = {

4796+ name = "on-finished";

4797+ packageName = "on-finished";

4798+ version = "2.3.0";

4799+ src = fetchurl {

4800+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";

4801+ sha1 = "20f1336481b083cd75337992a16971aa2d906947";

4802+ };

4803+ };

48224804 "on-finished-2.4.1" = {

48234805 name = "on-finished";

48244806 packageName = "on-finished";

@@ -4999,15 +4981,6 @@ let

49994981 sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";

50004982 };

50014983 };

5002− "parse-srcset-1.0.2" = {

5003− name = "parse-srcset";

5004− packageName = "parse-srcset";

5005− version = "1.0.2";

5006− src = fetchurl {

5007− url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz";

5008− sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1";

5009− };

5010− };

50114984 "parse5-5.1.1" = {

50124985 name = "parse5";

50134986 packageName = "parse5";

@@ -5269,15 +5242,6 @@ let

52695242 sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==";

52705243 };

52715244 };

5272− "picocolors-1.0.0" = {

5273− name = "picocolors";

5274− packageName = "picocolors";

5275− version = "1.0.0";

5276− src = fetchurl {

5277− url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz";

5278− sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==";

5279− };

5280− };

52815245 "picomatch-2.3.1" = {

52825246 name = "picomatch";

52835247 packageName = "picomatch";

@@ -5350,15 +5314,6 @@ let

53505314 sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA==";

53515315 };

53525316 };

5353− "postcss-8.4.13" = {

5354− name = "postcss";

5355− packageName = "postcss";

5356− version = "8.4.13";

5357− src = fetchurl {

5358− url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz";

5359− sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==";

5360− };

5361− };

53625317 "postgres-array-2.0.0" = {

53635318 name = "postgres-array";

53645319 packageName = "postgres-array";

@@ -5593,6 +5548,15 @@ let

55935548 sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";

55945549 };

55955550 };

5551+ "qs-6.9.7" = {

5552+ name = "qs";

5553+ packageName = "qs";

5554+ version = "6.9.7";

5555+ src = fetchurl {

5556+ url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz";

5557+ sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==";

5558+ };

5559+ };

55965560 "querystring-0.2.0" = {

55975561 name = "querystring";

55985562 packageName = "querystring";

@@ -5674,6 +5638,15 @@ let

56745638 sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";

56755639 };

56765640 };

5641+ "raw-body-2.4.3" = {

5642+ name = "raw-body";

5643+ packageName = "raw-body";

5644+ version = "2.4.3";

5645+ src = fetchurl {

5646+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz";

5647+ sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";

5648+ };

5649+ };

56775650 "raw-body-2.5.1" = {

56785651 name = "raw-body";

56795652 packageName = "raw-body";

@@ -5773,15 +5746,6 @@ let

57735746 sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==";

57745747 };

57755748 };

5776− "regenerator-runtime-0.11.1" = {

5777− name = "regenerator-runtime";

5778− packageName = "regenerator-runtime";

5779− version = "0.11.1";

5780− src = fetchurl {

5781− url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";

5782− sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";

5783− };

5784− };

57855749 "regenerator-runtime-0.13.9" = {

57865750 name = "regenerator-runtime";

57875751 packageName = "regenerator-runtime";

@@ -5845,13 +5809,13 @@ let

58455809 sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";

58465810 };

58475811 };

5848− "requestretry-7.1.0" = {

5812+ "requestretry-7.0.2" = {

58495813 name = "requestretry";

58505814 packageName = "requestretry";

5851− version = "7.1.0";

5815+ version = "7.0.2";

58525816 src = fetchurl {

5853− url = "https://registry.npmjs.org/requestretry/-/requestretry-7.1.0.tgz";

5854− sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw==";

5817+ url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz";

5818+ sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w==";

58555819 };

58565820 };

58575821 "require-at-1.0.6" = {

@@ -5881,15 +5845,6 @@ let

58815845 sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";

58825846 };

58835847 };

5884− "resize-observer-polyfill-1.5.1" = {

5885− name = "resize-observer-polyfill";

5886− packageName = "resize-observer-polyfill";

5887− version = "1.5.1";

5888− src = fetchurl {

5889− url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz";

5890− sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==";

5891− };

5892− };

58935848 "restore-cursor-3.1.0" = {

58945849 name = "restore-cursor";

58955850 packageName = "restore-cursor";

@@ -6034,15 +5989,6 @@ let

60345989 sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";

60355990 };

60365991 };

6037− "sanitize-html-2.7.0" = {

6038− name = "sanitize-html";

6039− packageName = "sanitize-html";

6040− version = "2.7.0";

6041− src = fetchurl {

6042− url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz";

6043− sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==";

6044− };

6045− };

60465992 "sax-1.2.1" = {

60475993 name = "sax";

60485994 packageName = "sax";

@@ -6124,13 +6070,13 @@ let

61246070 sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==";

61256071 };

61266072 };

6127− "send-0.18.0" = {

6073+ "send-0.17.2" = {

61286074 name = "send";

61296075 packageName = "send";

6130− version = "0.18.0";

6076+ version = "0.17.2";

61316077 src = fetchurl {

6132− url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz";

6133− sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==";

6078+ url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz";

6079+ sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==";

61346080 };

61356081 };

61366082 "sentence-case-3.0.4" = {

@@ -6160,13 +6106,13 @@ let

61606106 sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";

61616107 };

61626108 };

6163− "serve-static-1.15.0" = {

6109+ "serve-static-1.14.2" = {

61646110 name = "serve-static";

61656111 packageName = "serve-static";

6166− version = "1.15.0";

6112+ version = "1.14.2";

61676113 src = fetchurl {

6168− url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz";

6169− sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==";

6114+ url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz";

6115+ sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==";

61706116 };

61716117 };

61726118 "servie-4.3.3" = {

@@ -6313,15 +6259,6 @@ let

63136259 sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";

63146260 };

63156261 };

6316− "source-map-js-1.0.2" = {

6317− name = "source-map-js";

6318− packageName = "source-map-js";

6319− version = "1.0.2";

6320− src = fetchurl {

6321− url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz";

6322− sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==";

6323− };

6324− };

63256262 "spex-3.2.0" = {

63266263 name = "spex";

63276264 packageName = "spex";

@@ -6367,13 +6304,13 @@ let

63676304 sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";

63686305 };

63696306 };

6370− "sqlite3-5.0.6" = {

6307+ "sqlite3-5.0.5" = {

63716308 name = "sqlite3";

63726309 packageName = "sqlite3";

6373− version = "5.0.6";

6310+ version = "5.0.5";

63746311 src = fetchurl {

6375− url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.6.tgz";

6376− sha512 = "uT1dC6N3ReF+jchY01zvl1wVFFJ5xO86wSnCpK39uA/zmAHBDm6TiAq1v876QKv8JgiijxQ7/fb5C2LPm7ZAJA==";

6312+ url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.5.tgz";

6313+ sha512 = "ZZFOMW31IOMbUeSiL23TuWSjNyS7Z83EDJ80HJxCe78OZ+5BJT6IhAwAUnQgPsUl5z+Er0DGx7VjuTP7PKPNcg==";

63776314 };

63786315 };

63796316 "sqlstring-2.3.3" = {

@@ -6403,13 +6340,13 @@ let

64036340 sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";

64046341 };

64056342 };

6406− "ssh2-1.10.0" = {

6343+ "ssh2-1.9.0" = {

64076344 name = "ssh2";

64086345 packageName = "ssh2";

6409− version = "1.10.0";

6346+ version = "1.9.0";

64106347 src = fetchurl {

6411− url = "https://registry.npmjs.org/ssh2/-/ssh2-1.10.0.tgz";

6412− sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w==";

6348+ url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz";

6349+ sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA==";

64136350 };

64146351 };

64156352 "ssh2-sftp-client-7.2.3" = {

@@ -6448,6 +6385,15 @@ let

64486385 sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==";

64496386 };

64506387 };

6388+ "statuses-1.5.0" = {

6389+ name = "statuses";

6390+ packageName = "statuses";

6391+ version = "1.5.0";

6392+ src = fetchurl {

6393+ url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";

6394+ sha1 = "161c7dac177659fd9811f43771fa99381478628c";

6395+ };

6396+ };

64516397 "statuses-2.0.1" = {

64526398 name = "statuses";

64536399 packageName = "statuses";

@@ -6655,15 +6601,6 @@ let

66556601 sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726";

66566602 };

66576603 };

6658− "throttle-debounce-1.1.0" = {

6659− name = "throttle-debounce";

6660− packageName = "throttle-debounce";

6661− version = "1.1.0";

6662− src = fetchurl {

6663− url = "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz";

6664− sha512 = "XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==";

6665− };

6666− };

66676604 "through-2.3.8" = {

66686605 name = "through";

66696606 packageName = "through";

@@ -6718,13 +6655,13 @@ let

67186655 sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==";

67196656 };

67206657 };

6721− "tlds-1.231.0" = {

6658+ "tlds-1.224.0" = {

67226659 name = "tlds";

67236660 packageName = "tlds";

6724− version = "1.231.0";

6661+ version = "1.224.0";

67256662 src = fetchurl {

6726− url = "https://registry.npmjs.org/tlds/-/tlds-1.231.0.tgz";

6727− sha512 = "L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw==";

6663+ url = "https://registry.npmjs.org/tlds/-/tlds-1.224.0.tgz";

6664+ sha512 = "Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ==";

67286665 };

67296666 };

67306667 "tmp-0.0.33" = {

@@ -7534,10 +7471,10 @@ in

75347471 n8n = nodeEnv.buildNodePackage {

75357472 name = "n8n";

75367473 packageName = "n8n";

7537− version = "0.175.0";

7474+ version = "0.174.0";

75387475 src = fetchurl {

7539− url = "https://registry.npmjs.org/n8n/-/n8n-0.175.0.tgz";

7540− sha512 = "FKIroWsEZNZ/HUdM6iQ8QY6WxYs4uQufodBoKpbcu6JJKF/ufYO4U8lpIM0nV2YCMaB+JAVvswim0SUDB6KF3A==";

7476+ url = "https://registry.npmjs.org/n8n/-/n8n-0.174.0.tgz";

7477+ sha512 = "6opUG0aQ1JSQqKRgUbK0hLnH7XIs0FjH8NoLvBA51tntxMQ6ZnK2Nck1GH/6VVKqI6a+/udmSRFvd7Ohpwqzqw==";

75417478 };

75427479 dependencies = [

75437480 (sources."@azure/abort-controller-1.0.5" // {

@@ -7657,7 +7594,7 @@ in

76577594 sources."@types/lodash-4.14.182"

76587595 sources."@types/lossless-json-1.0.1"

76597596 sources."@types/mime-1.3.2"

7660− sources."@types/node-17.0.31"

7597+ sources."@types/node-17.0.26"

76617598 (sources."@types/node-fetch-2.6.1" // {

76627599 dependencies = [

76637600 sources."form-data-3.0.1"

@@ -7677,7 +7614,7 @@ in

76777614 sources."abort-controller-3.0.0"

76787615 sources."accepts-1.3.8"

76797616 sources."access-control-1.0.1"

7680− sources."acorn-8.7.1"

7617+ sources."acorn-8.7.0"

76817618 sources."acorn-walk-8.2.0"

76827619 (sources."adal-node-0.2.3" // {

76837620 dependencies = [

@@ -7717,7 +7654,6 @@ in

77177654 sources."assert-options-0.7.0"

77187655 sources."assert-plus-1.0.0"

77197656 sources."async-2.6.4"

7720− sources."async-validator-1.8.5"

77217657 sources."asynckit-0.4.0"

77227658 (sources."auto-changelog-1.16.4" // {

77237659 dependencies = [

@@ -7725,7 +7661,7 @@ in

77257661 ];

77267662 })

77277663 sources."avsc-5.7.4"

7728− (sources."aws-sdk-2.1125.0" // {

7664+ (sources."aws-sdk-2.1120.0" // {

77297665 dependencies = [

77307666 sources."buffer-4.9.2"

77317667 sources."events-1.1.1"

@@ -7740,14 +7676,7 @@ in

77407676 sources."aws-sign2-0.7.0"

77417677 sources."aws4-1.11.0"

77427678 sources."axios-0.21.4"

7743− sources."axios-retry-3.2.5"

7744− sources."babel-helper-vue-jsx-merge-props-2.0.3"

7745− (sources."babel-runtime-6.26.0" // {

7746− dependencies = [

7747− sources."core-js-2.6.12"

7748− sources."regenerator-runtime-0.11.1"

7749− ];

7750− })

7679+ sources."axios-retry-3.2.4"

77517680 sources."balanced-match-1.0.2"

77527681 sources."base64-js-1.5.1"

77537682 (sources."basic-auth-2.0.1" // {

@@ -7902,7 +7831,7 @@ in

79027831 sources."cookie-0.4.1"

79037832 sources."cookie-parser-1.4.6"

79047833 sources."cookie-signature-1.0.6"

7905− sources."core-js-3.22.3"

7834+ sources."core-js-3.22.2"

79067835 sources."core-util-is-1.0.2"

79077836 sources."crc-32-1.2.2"

79087837 sources."cron-1.7.2"

@@ -7923,7 +7852,7 @@ in

79237852 sources."date-utils-1.2.21"

79247853 sources."debug-4.3.4"

79257854 sources."debuglog-1.0.1"

7926− sources."deepmerge-1.5.2"

7855+ sources."deepmerge-4.2.2"

79277856 sources."define-properties-1.1.4"

79287857 sources."delayed-stream-1.0.0"

79297858 sources."delegates-1.0.0"

@@ -7957,11 +7886,10 @@ in

79577886 sources."ecc-jsbn-0.1.2"

79587887 sources."ecdsa-sig-formatter-1.0.11"

79597888 sources."ee-first-1.1.1"

7960− sources."element-ui-2.15.8"

79617889 sources."emoji-regex-8.0.0"

79627890 sources."enabled-1.0.2"

79637891 sources."encodeurl-1.0.2"

7964− sources."encoding-japanese-2.0.0"

7892+ sources."encoding-japanese-1.0.30"

79657893 sources."end-of-stream-1.4.4"

79667894 sources."entities-2.2.0"

79677895 sources."env-variable-0.0.6"

@@ -7980,11 +7908,18 @@ in

79807908 sources."eventsource-1.1.0"

79817909 sources."exit-on-epipe-1.0.1"

79827910 sources."expand-tilde-2.0.2"

7983− (sources."express-4.18.1" // {

7911+ (sources."express-4.17.3" // {

79847912 dependencies = [

7985− sources."cookie-0.5.0"

7913+ sources."body-parser-1.19.2"

7914+ sources."cookie-0.4.2"

79867915 sources."debug-2.6.9"

7916+ sources."depd-1.1.2"

7917+ sources."http-errors-1.8.1"

79877918 sources."ms-2.0.0"

7919+ sources."on-finished-2.3.0"

7920+ sources."qs-6.9.7"

7921+ sources."raw-body-2.4.3"

7922+ sources."statuses-1.5.0"

79887923 ];

79897924 })

79907925 sources."extend-3.0.2"

@@ -8004,10 +7939,12 @@ in

80047939 })

80057940 sources."file-type-14.7.1"

80067941 sources."fill-range-7.0.1"

8007− (sources."finalhandler-1.2.0" // {

7942+ (sources."finalhandler-1.1.2" // {

80087943 dependencies = [

80097944 sources."debug-2.6.9"

80107945 sources."ms-2.0.0"

7946+ sources."on-finished-2.3.0"

7947+ sources."statuses-1.5.0"

80117948 ];

80127949 })

80137950 sources."flatted-3.2.5"

@@ -8078,11 +8015,7 @@ in

80788015 sources."help-me-1.1.0"

80798016 sources."highlight.js-10.7.3"

80808017 sources."homedir-polyfill-1.0.3"

8081− (sources."html-to-text-8.2.0" // {

8082− dependencies = [

8083− sources."deepmerge-4.2.2"

8084− ];

8085− })

8018+ sources."html-to-text-8.0.0"

80868019 sources."htmlparser2-6.1.0"

80878020 sources."http-errors-2.0.0"

80888021 sources."http-proxy-agent-4.0.1"

@@ -8119,7 +8052,6 @@ in

81198052 sources."is-negative-zero-2.0.2"

81208053 sources."is-number-7.0.0"

81218054 sources."is-number-object-1.0.7"

8122− sources."is-plain-object-5.0.0"

81238055 sources."is-promise-1.0.1"

81248056 sources."is-property-1.0.2"

81258057 sources."is-regex-1.1.4"

@@ -8163,15 +8095,15 @@ in

81638095 sources."kuler-1.0.1"

81648096 sources."leven-2.1.0"

81658097 sources."libbase64-1.2.1"

8166− (sources."libmime-5.1.0" // {

8098+ (sources."libmime-5.0.0" // {

81678099 dependencies = [

8168− sources."iconv-lite-0.6.3"

8100+ sources."iconv-lite-0.6.2"

81698101 ];

81708102 })

81718103 sources."libphonenumber-js-1.9.52"

81728104 sources."libqp-1.1.0"

81738105 sources."limiter-1.1.5"

8174− sources."linkify-it-4.0.0"

8106+ sources."linkify-it-3.0.3"

81758107 (sources."localtunnel-2.0.2" // {

81768108 dependencies = [

81778109 sources."debug-4.3.2"

@@ -8213,13 +8145,13 @@ in

82138145 ];

82148146 })

82158147 sources."luxon-2.3.2"

8216− (sources."mailparser-3.5.0" // {

8148+ (sources."mailparser-3.4.0" // {

82178149 dependencies = [

82188150 sources."iconv-lite-0.6.3"

8219− sources."nodemailer-6.7.3"

8151+ sources."nodemailer-6.7.0"

82208152 ];

82218153 })

8222− sources."mailsplit-5.3.2"

8154+ sources."mailsplit-5.3.1"

82238155 (sources."make-dir-3.1.0" // {

82248156 dependencies = [

82258157 sources."semver-6.3.0"

@@ -8280,15 +8212,15 @@ in

82808212 ];

82818213 })

82828214 sources."mz-2.7.0"

8283− sources."n8n-core-0.116.0"

8284− sources."n8n-design-system-0.19.0"

8285− sources."n8n-editor-ui-0.142.0"

8286− (sources."n8n-nodes-base-0.173.0" // {

8215+ sources."n8n-core-0.115.0"

8216+ sources."n8n-design-system-0.18.0"

8217+ sources."n8n-editor-ui-0.141.0"

8218+ (sources."n8n-nodes-base-0.172.0" // {

82878219 dependencies = [

82888220 sources."iconv-lite-0.6.3"

82898221 ];

82908222 })

8291− sources."n8n-workflow-0.98.0"

8223+ sources."n8n-workflow-0.97.0"

82928224 (sources."named-placeholders-1.1.2" // {

82938225 dependencies = [

82948226 sources."lru-cache-4.1.5"

@@ -8317,10 +8249,9 @@ in

83178249 sources."node-html-parser-5.3.3"

83188250 sources."node-ssh-12.0.4"

83198251 sources."nodeify-1.0.1"

8320− sources."nodemailer-6.7.4"

8252+ sources."nodemailer-6.7.3"

83218253 sources."nopt-5.0.0"

83228254 sources."normalize-path-3.0.0"

8323− sources."normalize-wheel-1.0.1"

83248255 sources."npmlog-5.0.1"

83258256 sources."nth-check-2.0.1"

83268257 sources."oauth-1.0a-2.2.6"

@@ -8361,7 +8292,6 @@ in

83618292 sources."parent-require-1.0.0"

83628293 sources."parse-github-url-1.0.2"

83638294 sources."parse-passwd-1.0.0"

8364− sources."parse-srcset-1.0.2"

83658295 sources."parse5-6.0.1"

83668296 sources."parse5-htmlparser2-tree-adapter-6.0.1"

83678297 sources."parseley-0.7.0"

@@ -8409,7 +8339,6 @@ in

84098339 sources."split2-4.1.0"

84108340 ];

84118341 })

8412− sources."picocolors-1.0.0"

84138342 sources."picomatch-2.3.1"

84148343 sources."popsicle-12.1.0"

84158344 sources."popsicle-content-encoding-1.0.0"

@@ -8418,7 +8347,6 @@ in

84188347 sources."popsicle-transport-http-1.2.1"

84198348 sources."popsicle-transport-xhr-2.0.0"

84208349 sources."popsicle-user-agent-1.0.0"

8421− sources."postcss-8.4.13"

84228350 sources."postgres-array-2.0.0"

84238351 sources."postgres-bytea-1.0.0"

84248352 sources."postgres-date-1.0.7"

@@ -8486,11 +8414,10 @@ in

84868414 sources."tough-cookie-2.5.0"

84878415 ];

84888416 })

8489− sources."requestretry-7.1.0"

8417+ sources."requestretry-7.0.2"

84908418 sources."require-at-1.0.6"

84918419 sources."require-directory-2.1.1"

84928420 sources."requires-port-1.0.0"

8493− sources."resize-observer-polyfill-1.5.1"

84948421 sources."restore-cursor-3.1.0"

84958422 sources."ret-0.1.15"

84968423 sources."retry-0.12.0"

@@ -8510,24 +8437,24 @@ in

85108437 sources."safe-buffer-5.2.1"

85118438 sources."safe-stable-stringify-2.3.1"

85128439 sources."safer-buffer-2.1.2"

8513− (sources."sanitize-html-2.7.0" // {

8514− dependencies = [

8515− sources."deepmerge-4.2.2"

8516− ];

8517− })

85188440 sources."sax-1.2.4"

85198441 sources."sb-promise-queue-2.1.0"

85208442 sources."sb-scandir-3.1.0"

85218443 sources."selderee-0.6.0"

85228444 sources."semver-7.3.7"

8523− (sources."send-0.18.0" // {

8445+ (sources."send-0.17.2" // {

85248446 dependencies = [

85258447 (sources."debug-2.6.9" // {

85268448 dependencies = [

85278449 sources."ms-2.0.0"

85288450 ];

85298451 })

8452+ sources."depd-1.1.2"

8453+ sources."destroy-1.0.4"

8454+ sources."http-errors-1.8.1"

85308455 sources."ms-2.1.3"

8456+ sources."on-finished-2.3.0"

8457+ sources."statuses-1.5.0"

85318458 ];

85328459 })

85338460 (sources."sentence-case-3.0.4" // {

@@ -8537,7 +8464,7 @@ in

85378464 })

85388465 sources."seq-queue-0.0.5"

85398466 sources."serialize-javascript-5.0.1"

8540− sources."serve-static-1.15.0"

8467+ sources."serve-static-1.14.2"

85418468 sources."servie-4.3.3"

85428469 sources."set-blocking-2.0.0"

85438470 sources."setheader-1.0.2"

@@ -8568,7 +8495,6 @@ in

85688495 ];

85698496 })

85708497 sources."source-map-0.6.1"

8571− sources."source-map-js-1.0.2"

85728498 sources."spex-3.2.0"

85738499 (sources."split2-3.2.2" // {

85748500 dependencies = [

@@ -8577,11 +8503,11 @@ in

85778503 ];

85788504 })

85798505 sources."sprintf-js-1.1.2"

8580− sources."sqlite3-5.0.6"

8506+ sources."sqlite3-5.0.5"

85818507 sources."sqlstring-2.3.3"

85828508 sources."sse-channel-3.1.1"

85838509 sources."ssf-0.11.2"

8584− sources."ssh2-1.10.0"

8510+ sources."ssh2-1.9.0"

85858511 sources."ssh2-sftp-client-7.2.3"

85868512 sources."sshpk-1.17.0"

85878513 sources."stack-trace-0.0.10"

@@ -8602,7 +8528,7 @@ in

86028528 sources."tdigest-0.1.1"

86038529 (sources."tedious-6.7.1" // {

86048530 dependencies = [

8605− sources."@types/node-12.20.50"

8531+ sources."@types/node-12.20.49"

86068532 sources."bl-3.0.1"

86078533 sources."iconv-lite-0.5.2"

86088534 sources."readable-stream-3.6.0"

@@ -8613,7 +8539,6 @@ in

86138539 sources."text-hex-1.0.0"

86148540 sources."thenify-3.3.1"

86158541 sources."thenify-all-1.6.0"

8616− sources."throttle-debounce-1.1.0"

86178542 sources."through-2.3.8"

86188543 (sources."through2-2.0.5" // {

86198544 dependencies = [

@@ -8627,7 +8552,7 @@ in

86278552 sources."throwback-4.1.0"

86288553 sources."timeago.js-4.0.2"

86298554 sources."tinycolor2-1.4.2"

8630− sources."tlds-1.231.0"

8555+ sources."tlds-1.224.0"

86318556 sources."tmp-0.0.33"

86328557 (sources."tmp-promise-3.0.3" // {

86338558 dependencies = [

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

@@ -23,11 +23,11 @@

2323

2424stdenv.mkDerivation rec {

2525 pname = "liferea";

26− version = "1.13.8";

26+ version = "1.12.9";

2727

2828 src = fetchurl {

2929 url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";

30− sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h";

30+ sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q";

3131 };

3232

3333 nativeBuildInputs = [

pkgs/applications/networking/nextcloud-client/default.nix+2−2

@@ -26,7 +26,7 @@

2626

2727mkDerivation rec {

2828 pname = "nextcloud-client";

29− version = "3.5.0";

29+ version = "3.4.4";

3030

3131 outputs = [ "out" "dev" ];

3232

@@ -34,7 +34,7 @@ mkDerivation rec {

3434 owner = "nextcloud";

3535 repo = "desktop";

3636 rev = "v${version}";

37− sha256 = "sha256-eFtBdnwHaLirzZaHDw6SRfmsqO3dmBB8Y9csJuiTf1A=";

37+ sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ=";

3838 };

3939

4040 patches = [

pkgs/applications/networking/p2p/gnunet/default.nix+2−2

@@ -7,11 +7,11 @@

77

88stdenv.mkDerivation rec {

99 pname = "gnunet";

10− version = "0.16.3";

10+ version = "0.16.0";

1111

1212 src = fetchurl {

1313 url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";

14− sha256 = "sha256-MjkFLxNTepqrqqZuxCh12+4vaDjF8Ys674VOa1Mew4o=";

14+ sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg=";

1515 };

1616

1717 enableParallelBuilding = true;

pkgs/applications/networking/p2p/twister/default.nixnew file+70

@@ -0,0 +1,70 @@

1+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2

2+, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly

3+}:

4+

5+let

6+ twisterHTML = srcOnly {

7+ name = "twister-html";

8+ src = fetchFromGitHub {

9+ owner = "miguelfreitas";

10+ repo = "twister-html";

11+ rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

12+ sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

13+ };

14+ };

15+

16+ boostPython = boost.override {

17+ enablePython = true;

18+ python = python2;

19+ };

20+

21+in stdenv.mkDerivation rec {

22+ pname = "twister";

23+ version = "2019-08-19";

24+

25+ src = fetchFromGitHub {

26+ owner = "miguelfreitas";

27+ repo = "twister-core";

28+ rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";

29+ sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";

30+ };

31+

32+ configureFlags = [

33+ "--with-libgeoip"

34+ "--with-libiconv"

35+ "--disable-deprecated-functions"

36+ "--enable-tests"

37+ "--enable-python-binding"

38+ "--with-boost-libdir=${boostPython.out}/lib"

39+ ];

40+

41+ nativeBuildInputs = [ pkg-config automake autoconf ];

42+ buildInputs = [

43+ libtool python2

44+ boostPython db openssl geoip miniupnpc libiconv

45+ ];

46+

47+ postPatch = ''

48+ sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \

49+ src/init.cpp

50+ sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \

51+ src/util.cpp

52+ '';

53+

54+ preConfigure = ''

55+ sh autotool.sh

56+ '';

57+

58+ installPhase = ''

59+ install -vD twisterd "$out/bin/twisterd"

60+ '';

61+

62+ enableParallelBuilding = true;

63+

64+ meta = {

65+ homepage = "http://www.twister.net.co/";

66+ description = "Peer-to-peer microblogging";

67+ license = lib.licenses.mit;

68+ platforms = lib.platforms.linux;

69+ };

70+}

pkgs/applications/networking/seafile-client/default.nix+3−5

@@ -4,15 +4,13 @@

44

55mkDerivation rec {

66 pname = "seafile-client";

7− version = "8.0.7";

7+ version = "8.0.6";

88

99 src = fetchFromGitHub {

1010 owner = "haiwen";

1111 repo = "seafile-client";

12− # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state

13− # that fails to link properly

14− rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";

15− sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

12+ rev = "v${version}";

13+ sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o=";

1614 };

1715

1816 nativeBuildInputs = [ pkg-config cmake ];

pkgs/applications/networking/sync/onedrive/default.nix+2−2

@@ -14,13 +14,13 @@

1414

1515stdenv.mkDerivation rec {

1616 pname = "onedrive";

17− version = "2.4.17";

17+ version = "2.4.16";

1818

1919 src = fetchFromGitHub {

2020 owner = "abraunegg";

2121 repo = pname;

2222 rev = "v${version}";

23− hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA=";

23+ sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I=";

2424 };

2525

2626 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

pkgs/applications/networking/zerobin/default.nix+1−1

@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {

4040 # relax version constraints of some dependencies

4141 substituteInPlace setup.cfg \

4242 --replace "clize==4.1.1" "clize" \

43− --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \

43+ --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \

4444 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \

4545 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"

4646 '';

pkgs/applications/office/bookworm/default.nix+2

@@ -2,6 +2,7 @@

22, stdenv

33, fetchFromGitHub

44, appstream

5+, bash

56, coreutils

67, curl

78, desktop-file-utils

@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {

3940 };

4041

4142 nativeBuildInputs = [

43+ bash

4244 meson

4345 ninja

4446 pkg-config

pkgs/applications/office/libreoffice/soffice-template.desktopdeleted−6

@@ -1,6 +0,0 @@

1−[Desktop Entry]

2−Name=LibreOffice @app@...

3−Comment=Enter LibreOffice @app@ filename:

4−Type=Link

5−URL=.source/soffice.@ext@

6−Icon=libreoffice-oasis-@type@

pkgs/applications/office/libreoffice/wrapper.nix+12−25

@@ -1,32 +1,19 @@

1−{ lib, runCommand

2−, libreoffice, dbus, bash, substituteAll

3−, dolphinTemplates ? true

4−}:

5−runCommand libreoffice.name {

6− inherit (libreoffice) jdk meta;

7− inherit dbus libreoffice bash;

8−} (''

1+{ libreoffice, runCommand, dbus, bash }:

2+let

3+ jdk = libreoffice.jdk;

4+in

5+(runCommand libreoffice.name {

6+ inherit dbus libreoffice jdk bash;

7+} ''

98 mkdir -p "$out/bin"

9+ ln -s "${libreoffice}/share" "$out/share"

1010 substituteAll "${./wrapper.sh}" "$out/bin/soffice"

1111 chmod a+x "$out/bin/soffice"

1212

1313 for i in $(ls "${libreoffice}/bin/"); do

1414 test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"

1515 done

16−

17− mkdir -p "$out/share"

18− ln -s "${libreoffice}/share"/* $out/share

19−'' + lib.optionalString dolphinTemplates ''

20− # Add templates to dolphin "Create new" menu - taken from debian

21−

22− # We need to unpack the core source since the necessary files aren't available in the libreoffice output

23− unpackFile "${libreoffice.src}"

24−

25− install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"

26−

27− cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop

28− cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop

29− cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop

30− cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop

31−'')

32−

16+'') // {

17+ inherit libreoffice dbus;

18+ meta = libreoffice.meta;

19+}

pkgs/applications/office/qownnotes/default.nix+2−2

@@ -5,13 +5,13 @@

55

66mkDerivation rec {

77 pname = "qownnotes";

8− version = "22.5.0";

8+ version = "22.4.1";

99

1010 src = fetchurl {

1111 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

1212 # Fetch the checksum of current version with curl:

1313 # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

14− sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";

14+ sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da";

1515 };

1616

1717 nativeBuildInputs = [ qmake qttools ];

pkgs/applications/office/tusk/default.nix+2−3

@@ -21,8 +21,7 @@ let

2121 };

2222

2323in appimageTools.wrapType2 rec {

24− inherit pname version;

25−

24+ name = "${pname}-v${version}";

2625 src = fetchurl {

2726 url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";

2827 sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky";

@@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {

3736 multiPkgs = null; # no 32bit needed

3837 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

3938 extraInstallCommands = ''

40− mv $out/bin/{${pname}-${version},${pname}}

39+ mv $out/bin/{${name},${pname}}

4140 mkdir "$out/share"

4241 ln -s "${desktopItem}/share/applications" "$out/share/"

4342 '';

pkgs/applications/radio/gnuradio/wrapper.nix+1−1

@@ -137,8 +137,8 @@ let

137137 self = if doWrap then

138138 stdenv.mkDerivation {

139139 inherit pname version passthru;

140− nativeBuildInputs = [ makeWrapper ];

141140 buildInputs = [

141+ makeWrapper

142142 xorg.lndir

143143 ];

144144 buildCommand = ''

pkgs/applications/science/biology/bwa/default.nix−2

@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {

1717 sed -i '/^CC/d' Makefile

1818 '';

1919

20− makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

21−

2220 # it's unclear which headers are intended to be part of the public interface

2321 # so we may find ourselves having to add more here over time

2422 installPhase = ''

pkgs/applications/science/biology/megahit/default.nix−3

@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {

1414 nativeBuildInputs = [ cmake ];

1515 buildInputs = [ zlib ];

1616

17− cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [

18− "-DSTATIC_BUILD=ON"

19− ];

2017 meta = with lib; {

2118 description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";

2219 license = licenses.gpl3;

pkgs/applications/science/biology/quast/default.nix+3−1

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, python3Packages, zlib, bash }:

1+{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }:

22

33let

44 pythonPackages = python3Packages;

@@ -16,6 +16,8 @@ pythonPackages.buildPythonApplication rec {

1616

1717 pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ];

1818

19+ nativeBuildInputs = [ coreutils ];

20+

1921 buildInputs = [ zlib ] ++ pythonPath;

2022

2123 dontConfigure = true;

pkgs/applications/science/biology/samtools/default.nix+1−8

@@ -22,15 +22,8 @@ stdenv.mkDerivation rec {

2222

2323 buildInputs = [ zlib ncurses htslib ];

2424

25− preConfigure = lib.optional stdenv.hostPlatform.isStatic ''

26− export LIBS="-lz -lbz2 -llzma"

27− '';

28− makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

29−

3025 configureFlags = [ "--with-htslib=${htslib}" ]

31− ++ lib.optional (ncurses == null) "--without-curses"

32− ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ]

33− ;

26+ ++ lib.optional (ncurses == null) "--without-curses";

3427

3528 preCheck = ''

3629 patchShebangs test/

pkgs/applications/science/biology/tebreak/default.nix+2−2

@@ -1,5 +1,5 @@

11{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa

2−, samtools }:

2+, samtools, findutils }:

33

44python3.pkgs.buildPythonApplication rec {

55 pname = "tebreak";

@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {

1212 sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";

1313 };

1414

15− nativeBuildInputs = [ python3.pkgs.cython ];

15+ nativeBuildInputs = [ findutils python3.pkgs.cython ];

1616 propagatedBuildInputs = with python3.pkgs; [

1717 pysam

1818 scipy

pkgs/applications/science/logic/easycrypt/default.nixdeleted−50

@@ -1,50 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:

2−

3−stdenv.mkDerivation rec {

4− pname = "easycrypt";

5− version = "2022.04";

6−

7− src = fetchFromGitHub {

8− owner = pname;

9− repo = pname;

10− rev = "r${version}";

11− sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";

12− };

13−

14− nativeBuildInputs = with ocamlPackages; [

15− dune_3

16− findlib

17− menhir

18− ocaml

19− ];

20− buildInputs = with ocamlPackages; [

21− batteries

22− dune-build-info

23− inifiles

24− yojson

25− zarith

26− ];

27−

28− propagatedBuildInputs = [ why3 ];

29−

30− strictDeps = true;

31−

32− postPatch = ''

33− substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})'

34− '';

35−

36− installPhase = ''

37− runHook preInstall

38− dune install --prefix $out ${pname}

39− rm $out/bin/ec-runtest

40− runHook postInstall

41− '';

42−

43− meta = {

44− license = lib.licenses.mit;

45− maintainers = [ lib.maintainers.vbgl ];

46− platforms = lib.platforms.all;

47− homepage = "https://easycrypt.info/";

48− description = "Computer-Aided Cryptographic Proofs";

49− };

50−}

pkgs/applications/science/logic/easycrypt/runtest.nixdeleted−24

@@ -1,24 +0,0 @@

1−{ python3Packages, easycrypt }:

2−

3−python3Packages.buildPythonApplication rec {

4− inherit (easycrypt) src version;

5−

6− pname = "easycrypt-runtest";

7−

8− dontConfigure = true;

9− dontBuild = true;

10− doCheck = false;

11−

12− pythonPath = with python3Packages; [ pyyaml ];

13−

14− installPhase = ''

15− runHook preInstall

16− mkdir -p $out/bin

17− cp scripts/testing/runtest $out/bin/ec-runtest

18− runHook postInstall

19− '';

20−

21− meta = easycrypt.meta // {

22− description = "Testing program for EasyCrypt formalizations";

23− };

24−}

pkgs/applications/science/misc/snakemake/default.nix+13−27

@@ -1,21 +1,10 @@

1−{ lib

2−, fetchFromGitHub

3−, python3

4−}:

1+{ lib, python3Packages, fetchFromGitHub }:

52

6−python3.pkgs.buildPythonApplication rec {

3+python3Packages.buildPythonApplication rec {

74 pname = "snakemake";

8− version = "7.6.1";

9− format = "setuptools";

5+ version = "6.15.5";

106

11− src = fetchFromGitHub {

12− owner = "snakemake";

13− repo = pname;

14− rev = "refs/tags/v${version}";

15− hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

16− };

17−

18− propagatedBuildInputs = with python3.pkgs; [

7+ propagatedBuildInputs = with python3Packages; [

198 appdirs

209 configargparse

2110 connection-pool

@@ -33,21 +22,26 @@ python3.pkgs.buildPythonApplication rec {

3322 pyyaml

3423 ratelimiter

3524 requests

36− retry

3725 smart-open

3826 stopit

3927 tabulate

4028 toposort

4129 wrapt

42− yte

4330 ];

4431

32+ src = fetchFromGitHub {

33+ owner = "snakemake";

34+ repo = pname;

35+ rev = "v${version}";

36+ sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU=";

37+ };

38+

4539 # See

4640 # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99

4741 # for the current basic test suite. Tibanna and Tes require extra

4842 # setup.

4943

50− checkInputs = with python3.pkgs; [

44+ checkInputs = with python3Packages; [

5145 pandas

5246 pytestCheckHook

5347 requests-mock

@@ -59,15 +53,7 @@ python3.pkgs.buildPythonApplication rec {

5953 "tests/test_linting.py"

6054 ];

6155

62− disabledTests = [

63− # Tests require network access

64− "test_github_issue1396"

65− "test_github_issue1460"

66− ];

67−

68− pythonImportsCheck = [

69− "snakemake"

70− ];

56+ pythonImportsCheck = [ "snakemake" ];

7157

7258 meta = with lib; {

7359 homepage = "https://snakemake.github.io";

pkgs/applications/terminal-emulators/alacritty/default.nix+2

@@ -6,6 +6,7 @@

66, nixosTests

77

88, cmake

9+, gzip

910, installShellFiles

1011, makeWrapper

1112, ncurses

@@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec {

6768

6869 nativeBuildInputs = [

6970 cmake

71+ gzip

7072 installShellFiles

7173 makeWrapper

7274 ncurses

pkgs/applications/terminal-emulators/foot/default.nix+2−3

@@ -27,7 +27,7 @@

2727}:

2828

2929let

30− version = "1.12.1";

30+ version = "1.11.0";

3131

3232 # build stimuli file for PGO build and the script to generate it

3333 # independently of the foot's build, so we can cache the result

@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {

9999 owner = "dnkl";

100100 repo = pname;

101101 rev = version;

102− sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk";

102+ sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn";

103103 };

104104

105105 depsBuildBuild = [

@@ -144,7 +144,6 @@ stdenv.mkDerivation rec {

144144 mesonBuildType = "release";

145145

146146 # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options

147− # TODO(@sternenseemann): install systemd user units

148147 mesonFlags = [

149148 # Use lto

150149 "-Db_lto=true"

pkgs/applications/terminal-emulators/wezterm/default.nix+9−17

@@ -23,13 +23,14 @@

2323, Foundation

2424, libiconv

2525, nixosTests

26−, runCommand

2726}:

2827

2928rustPlatform.buildRustPackage rec {

3029 pname = "wezterm";

3130 version = "20220408-101518-b908e2dd";

3231

32+ outputs = [ "out" "terminfo" ];

33+

3334 src = fetchFromGitHub {

3435 owner = "wez";

3536 repo = pname;

@@ -74,8 +75,10 @@ rustPlatform.buildRustPackage rec {

7475 ];

7576

7677 postInstall = ''

77− mkdir -p $out/nix-support

78− echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages

78+ # terminfo

79+ mkdir -p $terminfo/share/terminfo/w $out/nix-support

80+ tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo

81+ echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

7982

8083 # desktop icon

8184 install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png

@@ -97,20 +100,9 @@ rustPlatform.buildRustPackage rec {

97100 ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"

98101 '';

99102

100− passthru = {

101− tests = {

102− all-terminfo = nixosTests.allTerminfo;

103− terminal-emulators = nixosTests.terminal-emulators.wezterm;

104− };

105− terminfo = runCommand "wezterm-terminfo"

106− {

107− nativeBuildInputs = [

108− ncurses

109− ];

110− } ''

111− mkdir -p $out/share/terminfo $out/nix-support

112− tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo

113− '';

103+ passthru.tests = {

104+ all-terminfo = nixosTests.allTerminfo;

105+ test = nixosTests.terminal-emulators.wezterm;

114106 };

115107

116108 meta = with lib; {

pkgs/applications/version-management/git-and-tools/git/default.nix+4−6

@@ -13,7 +13,7 @@

1313, pythonSupport ? true

1414, withpcre2 ? true

1515, sendEmailSupport ? false

16−, Security, CoreServices

16+, darwin

1717, nixosTests

1818, withLibsecret ? false

1919, pkg-config, glib, libsecret

@@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport;

2626assert svnSupport -> perlSupport;

2727

2828let

29− version = "2.36.0";

29+ version = "2.35.3";

3030 svn = subversionClient.override { perlBindings = perlSupport; };

3131 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

3232in

@@ -39,7 +39,7 @@ stdenv.mkDerivation {

3939

4040 src = fetchurl {

4141 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

42− sha256 = "sha256-r16/wWWEZPXQ1For/YhMk1+2B6EMwCHZW8gHeIYcwdM=";

42+ sha256 = "sha256-FenbT5vy7Z//MMtioAxcfAkBAV9asEjNtOiwTd7gD6I=";

4343 };

4444

4545 outputs = [ "out" ] ++ lib.optional withManual "doc";

@@ -79,7 +79,7 @@ stdenv.mkDerivation {

7979 ++ lib.optionals perlSupport [ perlPackages.perl ]

8080 ++ lib.optionals guiSupport [tcl tk]

8181 ++ lib.optionals withpcre2 [ pcre2 ]

82− ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]

82+ ++ lib.optionals stdenv.isDarwin [ darwin.Security ]

8383 ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];

8484

8585 # required to support pthread_cancel()

@@ -354,8 +354,6 @@ stdenv.mkDerivation {

354354 disable_test t9902-completion

355355 # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)

356356 disable_test t5003-archive-zip

357− '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''

358− disable_test t7527-builtin-fsmonitor

359357 '' + lib.optionalString stdenv.hostPlatform.isMusl ''

360358 # Test fails (as of 2.17.0, musl 1.1.19)

361359 disable_test t3900-i18n-commit

pkgs/applications/version-management/git-and-tools/gitbatch/default.nix+10−12

@@ -1,22 +1,20 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

1+{ lib, buildGoPackage, fetchFromGitHub }:

22

3−buildGoModule rec {

4− pname = "gitbatch";

5− version = "0.6.1";

3+buildGoPackage rec {

4+ pname = "gitbatch-unstable";

5+ version = "2019-12-19";

6+

7+ goPackagePath = "github.com/isacikgoz/gitbatch";

8+

9+ goDeps = ./deps.nix;

610

711 src = fetchFromGitHub {

812 owner = "isacikgoz";

913 repo = "gitbatch";

10− rev = "v${version}";

11− sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8=";

14+ rev = "381b0df7f86056c625c0d4d2d979733c1ee5def7";

15+ sha256 = "0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q";

1216 };

1317

14− vendorSha256 = "sha256-wwpaJO5cXMsvqFXj+qGiIm4zg/SL4YCm2mNnG/qdilw=";

15−

16− ldflags = [ "-s" "-w" ];

17−

18− checkFlags = [ "-short" ];

19−

2018 meta = with lib; {

2119 description = "Running git UI commands";

2220 homepage = "https://github.com/isacikgoz/gitbatch";

pkgs/applications/version-management/git-and-tools/gitbatch/deps.nixnew file+543

@@ -0,0 +1,543 @@

1+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)

2+[

3+ {

4+ goPackagePath = "github.com/alcortesm/tgz";

5+ fetch = {

6+ type = "git";

7+ url = "https://github.com/alcortesm/tgz";

8+ rev = "9c5fe88206d7";

9+ sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5";

10+ };

11+ }

12+ {

13+ goPackagePath = "github.com/alecthomas/template";

14+ fetch = {

15+ type = "git";

16+ url = "https://github.com/alecthomas/template";

17+ rev = "a0175ee3bccc";

18+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";

19+ };

20+ }

21+ {

22+ goPackagePath = "github.com/alecthomas/units";

23+ fetch = {

24+ type = "git";

25+ url = "https://github.com/alecthomas/units";

26+ rev = "2efee857e7cf";

27+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";

28+ };

29+ }

30+ {

31+ goPackagePath = "github.com/anmitsu/go-shlex";

32+ fetch = {

33+ type = "git";

34+ url = "https://github.com/anmitsu/go-shlex";

35+ rev = "648efa622239";

36+ sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7";

37+ };

38+ }

39+ {

40+ goPackagePath = "github.com/armon/consul-api";

41+ fetch = {

42+ type = "git";

43+ url = "https://github.com/armon/consul-api";

44+ rev = "eb2c6b5be1b6";

45+ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";

46+ };

47+ }

48+ {

49+ goPackagePath = "github.com/coreos/etcd";

50+ fetch = {

51+ type = "git";

52+ url = "https://github.com/coreos/etcd";

53+ rev = "v3.3.10";

54+ sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";

55+ };

56+ }

57+ {

58+ goPackagePath = "github.com/coreos/go-etcd";

59+ fetch = {

60+ type = "git";

61+ url = "https://github.com/coreos/go-etcd";

62+ rev = "v2.0.0";

63+ sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";

64+ };

65+ }

66+ {

67+ goPackagePath = "github.com/coreos/go-semver";

68+ fetch = {

69+ type = "git";

70+ url = "https://github.com/coreos/go-semver";

71+ rev = "v0.2.0";

72+ sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";

73+ };

74+ }

75+ {

76+ goPackagePath = "github.com/davecgh/go-spew";

77+ fetch = {

78+ type = "git";

79+ url = "https://github.com/davecgh/go-spew";

80+ rev = "v1.1.1";

81+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";

82+ };

83+ }

84+ {

85+ goPackagePath = "github.com/emirpasic/gods";

86+ fetch = {

87+ type = "git";

88+ url = "https://github.com/emirpasic/gods";

89+ rev = "v1.9.0";

90+ sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf";

91+ };

92+ }

93+ {

94+ goPackagePath = "github.com/fatih/color";

95+ fetch = {

96+ type = "git";

97+ url = "https://github.com/fatih/color";

98+ rev = "v1.7.0";

99+ sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";

100+ };

101+ }

102+ {

103+ goPackagePath = "github.com/flynn/go-shlex";

104+ fetch = {

105+ type = "git";

106+ url = "https://github.com/flynn/go-shlex";

107+ rev = "3f9db97f8568";

108+ sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";

109+ };

110+ }

111+ {

112+ goPackagePath = "github.com/fsnotify/fsnotify";

113+ fetch = {

114+ type = "git";

115+ url = "https://github.com/fsnotify/fsnotify";

116+ rev = "v1.4.7";

117+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";

118+ };

119+ }

120+ {

121+ goPackagePath = "github.com/gliderlabs/ssh";

122+ fetch = {

123+ type = "git";

124+ url = "https://github.com/gliderlabs/ssh";

125+ rev = "v0.1.1";

126+ sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm";

127+ };

128+ }

129+ {

130+ goPackagePath = "github.com/google/go-cmp";

131+ fetch = {

132+ type = "git";

133+ url = "https://github.com/google/go-cmp";

134+ rev = "v0.2.0";

135+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";

136+ };

137+ }

138+ {

139+ goPackagePath = "github.com/hashicorp/hcl";

140+ fetch = {

141+ type = "git";

142+ url = "https://github.com/hashicorp/hcl";

143+ rev = "v1.0.0";

144+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";

145+ };

146+ }

147+ {

148+ goPackagePath = "github.com/jbenet/go-context";

149+ fetch = {

150+ type = "git";

151+ url = "https://github.com/jbenet/go-context";

152+ rev = "d14ea06fba99";

153+ sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";

154+ };

155+ }

156+ {

157+ goPackagePath = "github.com/jessevdk/go-flags";

158+ fetch = {

159+ type = "git";

160+ url = "https://github.com/jessevdk/go-flags";

161+ rev = "v1.4.0";

162+ sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";

163+ };

164+ }

165+ {

166+ goPackagePath = "github.com/jroimartin/gocui";

167+ fetch = {

168+ type = "git";

169+ url = "https://github.com/jroimartin/gocui";

170+ rev = "v0.4.0";

171+ sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";

172+ };

173+ }

174+ {

175+ goPackagePath = "github.com/kevinburke/ssh_config";

176+ fetch = {

177+ type = "git";

178+ url = "https://github.com/kevinburke/ssh_config";

179+ rev = "81db2a75821e";

180+ sha256 = "0hwmv2h83aa7r6l7yqwsxdyldnlhb4gbbkc3ww9nys7impjcjnsp";

181+ };

182+ }

183+ {

184+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";

185+ fetch = {

186+ type = "git";

187+ url = "https://github.com/konsorten/go-windows-terminal-sequences";

188+ rev = "v1.0.1";

189+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";

190+ };

191+ }

192+ {

193+ goPackagePath = "github.com/kr/pretty";

194+ fetch = {

195+ type = "git";

196+ url = "https://github.com/kr/pretty";

197+ rev = "v0.1.0";

198+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";

199+ };

200+ }

201+ {

202+ goPackagePath = "github.com/kr/pty";

203+ fetch = {

204+ type = "git";

205+ url = "https://github.com/kr/pty";

206+ rev = "v1.1.1";

207+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";

208+ };

209+ }

210+ {

211+ goPackagePath = "github.com/kr/text";

212+ fetch = {

213+ type = "git";

214+ url = "https://github.com/kr/text";

215+ rev = "v0.1.0";

216+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";

217+ };

218+ }

219+ {

220+ goPackagePath = "github.com/magiconair/properties";

221+ fetch = {

222+ type = "git";

223+ url = "https://github.com/magiconair/properties";

224+ rev = "v1.8.0";

225+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";

226+ };

227+ }

228+ {

229+ goPackagePath = "github.com/mattn/go-colorable";

230+ fetch = {

231+ type = "git";

232+ url = "https://github.com/mattn/go-colorable";

233+ rev = "v0.1.1";

234+ sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p";

235+ };

236+ }

237+ {

238+ goPackagePath = "github.com/mattn/go-isatty";

239+ fetch = {

240+ type = "git";

241+ url = "https://github.com/mattn/go-isatty";

242+ rev = "v0.0.7";

243+ sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";

244+ };

245+ }

246+ {

247+ goPackagePath = "github.com/mattn/go-runewidth";

248+ fetch = {

249+ type = "git";

250+ url = "https://github.com/mattn/go-runewidth";

251+ rev = "v0.0.4";

252+ sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";

253+ };

254+ }

255+ {

256+ goPackagePath = "github.com/mitchellh/go-homedir";

257+ fetch = {

258+ type = "git";

259+ url = "https://github.com/mitchellh/go-homedir";

260+ rev = "v1.0.0";

261+ sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";

262+ };

263+ }

264+ {

265+ goPackagePath = "github.com/mitchellh/mapstructure";

266+ fetch = {

267+ type = "git";

268+ url = "https://github.com/mitchellh/mapstructure";

269+ rev = "v1.1.2";

270+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";

271+ };

272+ }

273+ {

274+ goPackagePath = "github.com/nsf/termbox-go";

275+ fetch = {

276+ type = "git";

277+ url = "https://github.com/nsf/termbox-go";

278+ rev = "288510b9734e";

279+ sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4";

280+ };

281+ }

282+ {

283+ goPackagePath = "github.com/pelletier/go-buffruneio";

284+ fetch = {

285+ type = "git";

286+ url = "https://github.com/pelletier/go-buffruneio";

287+ rev = "v0.2.0";

288+ sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";

289+ };

290+ }

291+ {

292+ goPackagePath = "github.com/pelletier/go-toml";

293+ fetch = {

294+ type = "git";

295+ url = "https://github.com/pelletier/go-toml";

296+ rev = "v1.2.0";

297+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";

298+ };

299+ }

300+ {

301+ goPackagePath = "github.com/pkg/errors";

302+ fetch = {

303+ type = "git";

304+ url = "https://github.com/pkg/errors";

305+ rev = "v0.8.0";

306+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";

307+ };

308+ }

309+ {

310+ goPackagePath = "github.com/pmezard/go-difflib";

311+ fetch = {

312+ type = "git";

313+ url = "https://github.com/pmezard/go-difflib";

314+ rev = "v1.0.0";

315+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";

316+ };

317+ }

318+ {

319+ goPackagePath = "github.com/sergi/go-diff";

320+ fetch = {

321+ type = "git";

322+ url = "https://github.com/sergi/go-diff";

323+ rev = "v1.0.0";

324+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";

325+ };

326+ }

327+ {

328+ goPackagePath = "github.com/sirupsen/logrus";

329+ fetch = {

330+ type = "git";

331+ url = "https://github.com/sirupsen/logrus";

332+ rev = "v1.4.0";

333+ sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w";

334+ };

335+ }

336+ {

337+ goPackagePath = "github.com/spf13/afero";

338+ fetch = {

339+ type = "git";

340+ url = "https://github.com/spf13/afero";

341+ rev = "v1.1.2";

342+ sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";

343+ };

344+ }

345+ {

346+ goPackagePath = "github.com/spf13/cast";

347+ fetch = {

348+ type = "git";

349+ url = "https://github.com/spf13/cast";

350+ rev = "v1.3.0";

351+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";

352+ };

353+ }

354+ {

355+ goPackagePath = "github.com/spf13/jwalterweatherman";

356+ fetch = {

357+ type = "git";

358+ url = "https://github.com/spf13/jwalterweatherman";

359+ rev = "v1.0.0";

360+ sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";

361+ };

362+ }

363+ {

364+ goPackagePath = "github.com/spf13/pflag";

365+ fetch = {

366+ type = "git";

367+ url = "https://github.com/spf13/pflag";

368+ rev = "v1.0.3";

369+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";

370+ };

371+ }

372+ {

373+ goPackagePath = "github.com/spf13/viper";

374+ fetch = {

375+ type = "git";

376+ url = "https://github.com/spf13/viper";

377+ rev = "v1.3.2";

378+ sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";

379+ };

380+ }

381+ {

382+ goPackagePath = "github.com/src-d/gcfg";

383+ fetch = {

384+ type = "git";

385+ url = "https://github.com/src-d/gcfg";

386+ rev = "v1.4.0";

387+ sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r";

388+ };

389+ }

390+ {

391+ goPackagePath = "github.com/stretchr/objx";

392+ fetch = {

393+ type = "git";

394+ url = "https://github.com/stretchr/objx";

395+ rev = "v0.1.1";

396+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";

397+ };

398+ }

399+ {

400+ goPackagePath = "github.com/stretchr/testify";

401+ fetch = {

402+ type = "git";

403+ url = "https://github.com/stretchr/testify";

404+ rev = "v1.2.2";

405+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";

406+ };

407+ }

408+ {

409+ goPackagePath = "github.com/ugorji/go";

410+ fetch = {

411+ type = "git";

412+ url = "https://github.com/ugorji/go";

413+ rev = "d75b2dcb6bc8";

414+ sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";

415+ };

416+ }

417+ {

418+ goPackagePath = "github.com/xanzy/ssh-agent";

419+ fetch = {

420+ type = "git";

421+ url = "https://github.com/xanzy/ssh-agent";

422+ rev = "v0.2.0";

423+ sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy";

424+ };

425+ }

426+ {

427+ goPackagePath = "github.com/xordataexchange/crypt";

428+ fetch = {

429+ type = "git";

430+ url = "https://github.com/xordataexchange/crypt";

431+ rev = "b2862e3d0a77";

432+ sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";

433+ };

434+ }

435+ {

436+ goPackagePath = "golang.org/x/crypto";

437+ fetch = {

438+ type = "git";

439+ url = "https://go.googlesource.com/crypto";

440+ rev = "505ab145d0a9";

441+ sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s";

442+ };

443+ }

444+ {

445+ goPackagePath = "golang.org/x/net";

446+ fetch = {

447+ type = "git";

448+ url = "https://go.googlesource.com/net";

449+ rev = "161cd47e91fd";

450+ sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";

451+ };

452+ }

453+ {

454+ goPackagePath = "golang.org/x/sync";

455+ fetch = {

456+ type = "git";

457+ url = "https://go.googlesource.com/sync";

458+ rev = "e225da77a7e6";

459+ sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p";

460+ };

461+ }

462+ {

463+ goPackagePath = "golang.org/x/sys";

464+ fetch = {

465+ type = "git";

466+ url = "https://go.googlesource.com/sys";

467+ rev = "a9d3bda3a223";

468+ sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9";

469+ };

470+ }

471+ {

472+ goPackagePath = "golang.org/x/text";

473+ fetch = {

474+ type = "git";

475+ url = "https://go.googlesource.com/text";

476+ rev = "v0.3.0";

477+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";

478+ };

479+ }

480+ {

481+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";

482+ fetch = {

483+ type = "git";

484+ url = "https://gopkg.in/alecthomas/kingpin.v2";

485+ rev = "v2.2.6";

486+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";

487+ };

488+ }

489+ {

490+ goPackagePath = "gopkg.in/check.v1";

491+ fetch = {

492+ type = "git";

493+ url = "https://gopkg.in/check.v1";

494+ rev = "788fd7840127";

495+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";

496+ };

497+ }

498+ {

499+ goPackagePath = "gopkg.in/src-d/go-billy.v4";

500+ fetch = {

501+ type = "git";

502+ url = "https://gopkg.in/src-d/go-billy.v4";

503+ rev = "v4.2.1";

504+ sha256 = "1n8nc0m2hidbrlcl643cd0bdm07pjr0qji47gbfpfj99791sv1d1";

505+ };

506+ }

507+ {

508+ goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3";

509+ fetch = {

510+ type = "git";

511+ url = "https://gopkg.in/src-d/go-git-fixtures.v3";

512+ rev = "v3.1.1";

513+ sha256 = "1fq3j5chck6883jbn33gwm6dxdgzsphjq97psyn81hz9bc1ili8p";

514+ };

515+ }

516+ {

517+ goPackagePath = "gopkg.in/src-d/go-git.v4";

518+ fetch = {

519+ type = "git";

520+ url = "https://gopkg.in/src-d/go-git.v4";

521+ rev = "v4.10.0";

522+ sha256 = "18bx3m5ddvb20figd8pc3lgf9hn85pifc6xy72bb83lv2nxii2rx";

523+ };

524+ }

525+ {

526+ goPackagePath = "gopkg.in/warnings.v0";

527+ fetch = {

528+ type = "git";

529+ url = "https://gopkg.in/warnings.v0";

530+ rev = "v0.1.2";

531+ sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81";

532+ };

533+ }

534+ {

535+ goPackagePath = "gopkg.in/yaml.v2";

536+ fetch = {

537+ type = "git";

538+ url = "https://gopkg.in/yaml.v2";

539+ rev = "v2.2.2";

540+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";

541+ };

542+ }

543+]

pkgs/applications/version-management/git-repo/default.nix+2−2

@@ -4,13 +4,13 @@

44

55stdenv.mkDerivation rec {

66 pname = "git-repo";

7− version = "2.25";

7+ version = "2.24.1";

88

99 src = fetchFromGitHub {

1010 owner = "android";

1111 repo = "tools_repo";

1212 rev = "v${version}";

13− sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os=";

13+ sha256 = "sha256-mYCKmvI15a0ohQwxPIG8IuzNt4QvEs6Q35oMO+e5hbg=";

1414 };

1515

1616 # Fix 'NameError: name 'ssl' is not defined'

pkgs/applications/version-management/gitea/default.nix+2−2

@@ -16,12 +16,12 @@ with lib;

1616

1717buildGoPackage rec {

1818 pname = "gitea";

19− version = "1.16.7";

19+ version = "1.16.6";

2020

2121 # not fetching directly from the git repo, because that lacks several vendor files for the web UI

2222 src = fetchurl {

2323 url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";

24− sha256 = "sha256-UVmbFtHC4W3WF+DptdHMMUoe8UE5TVgoM9QRuczSrEg=";

24+ sha256 = "sha256-LlAnTTFuqbMa7QPf51D6+RalWuYqTKlSlxGXyt4h0aE=";

2525 };

2626

2727 unpackPhase = ''

pkgs/applications/version-management/gitlab/data.json+7−7

@@ -1,14 +1,14 @@

11{

2− "version": "14.10.1",

3− "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp",

4− "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",

2+ "version": "14.9.3",

3+ "repo_hash": "04a5z9dr8qs1vrgrdlw5sx5wjwjgqzgj7rqxy4lswycxglc8i1ad",

4+ "yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj",

55 "owner": "gitlab-org",

66 "repo": "gitlab",

7− "rev": "v14.10.1-ee",

7+ "rev": "v14.9.3-ee",

88 "passthru": {

9− "GITALY_SERVER_VERSION": "14.10.1",

9+ "GITALY_SERVER_VERSION": "14.9.3",

1010 "GITLAB_PAGES_VERSION": "1.56.1",

11− "GITLAB_SHELL_VERSION": "13.25.1",

12− "GITLAB_WORKHORSE_VERSION": "14.10.1"

11+ "GITLAB_SHELL_VERSION": "13.24.0",

12+ "GITLAB_WORKHORSE_VERSION": "14.9.3"

1313 }

1414}

pkgs/applications/version-management/gitlab/gitaly/Gemfile+1−1

@@ -3,7 +3,7 @@ source 'https://rubygems.org'

33gem 'rugged', '~> 1.2'

44gem 'github-linguist', '~> 7.12', require: 'linguist'

55gem 'gitlab-markup', '~> 1.7.1'

6−gem 'activesupport', '~> 6.1.4.7'

6+gem 'activesupport', '~> 6.1.4.6'

77gem 'rdoc', '~> 6.0'

88gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false

99gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false

pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+13−13

@@ -2,20 +2,20 @@ GEM

22 remote: https://rubygems.org/

33 specs:

44 abstract_type (0.0.7)

5− actionpack (6.1.4.7)

6− actionview (= 6.1.4.7)

7− activesupport (= 6.1.4.7)

5+ actionpack (6.1.4.6)

6+ actionview (= 6.1.4.6)

7+ activesupport (= 6.1.4.6)

88 rack (~> 2.0, >= 2.0.9)

99 rack-test (>= 0.6.3)

1010 rails-dom-testing (~> 2.0)

1111 rails-html-sanitizer (~> 1.0, >= 1.2.0)

12− actionview (6.1.4.7)

13− activesupport (= 6.1.4.7)

12+ actionview (6.1.4.6)

13+ activesupport (= 6.1.4.6)

1414 builder (~> 3.1)

1515 erubi (~> 1.4)

1616 rails-dom-testing (~> 2.0)

1717 rails-html-sanitizer (~> 1.1, >= 1.2.0)

18− activesupport (6.1.4.7)

18+ activesupport (6.1.4.6)

1919 concurrent-ruby (~> 1.0, >= 1.0.2)

2020 i18n (>= 1.6, < 2)

2121 minitest (>= 5.1)

@@ -34,7 +34,7 @@ GEM

3434 concord (0.1.5)

3535 adamantium (~> 0.2.0)

3636 equalizer (~> 0.0.9)

37− concurrent-ruby (1.1.10)

37+ concurrent-ruby (1.1.9)

3838 crass (1.0.6)

3939 diff-lcs (1.3)

4040 dotenv (2.7.6)

@@ -88,7 +88,7 @@ GEM

8888 google-protobuf (~> 3.18)

8989 googleapis-common-protos-types (~> 1.0)

9090 grpc-tools (1.42.0)

91− i18n (1.10.0)

91+ i18n (1.9.1)

9292 concurrent-ruby (~> 1.0)

9393 ice_nine (0.11.2)

9494 jaeger-client (1.1.0)

@@ -101,7 +101,7 @@ GEM

101101 reverse_markdown (~> 1.0)

102102 rugged (>= 0.24, < 2.0)

103103 thor (>= 0.19, < 2.0)

104− loofah (2.16.0)

104+ loofah (2.14.0)

105105 crass (~> 1.0.2)

106106 nokogiri (>= 1.5.9)

107107 memoizable (0.4.2)

@@ -111,12 +111,12 @@ GEM

111111 mime-types-data (~> 3.2015)

112112 mime-types-data (3.2020.1104)

113113 mini_mime (1.0.2)

114− mini_portile2 (2.8.0)

114+ mini_portile2 (2.6.1)

115115 minitest (5.15.0)

116116 msgpack (1.3.3)

117117 multipart-post (2.1.1)

118− nokogiri (1.13.3)

119− mini_portile2 (~> 2.8.0)

118+ nokogiri (1.12.5)

119+ mini_portile2 (~> 2.6.1)

120120 racc (~> 1.4)

121121 octokit (4.20.0)

122122 faraday (>= 0.9)

@@ -225,7 +225,7 @@ PLATFORMS

225225 ruby

226226

227227DEPENDENCIES

228− activesupport (~> 6.1.4.7)

228+ activesupport (~> 6.1.4.6)

229229 factory_bot

230230 faraday (~> 1.0)

231231 github-linguist (~> 7.12)

pkgs/applications/version-management/gitlab/gitaly/default.nix+4−4

@@ -11,7 +11,7 @@ let

1111 gemdir = ./.;

1212 };

1313

14− version = "14.10.1";

14+ version = "14.9.3";

1515 gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";

1616in

1717

@@ -23,10 +23,10 @@ buildGoModule {

2323 owner = "gitlab-org";

2424 repo = "gitaly";

2525 rev = "v${version}";

26− sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI=";

26+ sha256 = "sha256-D4Dgw2vqX5464ciYvTqagQG/uXt0Wm15ztdwbyJp1HM=";

2727 };

2828

29− vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";

29+ vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";

3030

3131 passthru = {

3232 inherit rubyEnv;

@@ -42,7 +42,7 @@ buildGoModule {

4242 postInstall = ''

4343 mkdir -p $ruby

4444 cp -rv $src/ruby/{bin,lib,proto} $ruby

45− mv $out/bin/gitaly-git2go-v${lib.versions.major version} $out/bin/gitaly-git2go-${version}

45+ mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}

4646 '';

4747

4848 outputs = [ "out" "ruby" ];

pkgs/applications/version-management/gitlab/gitaly/gemset.nix+16−16

@@ -13,10 +13,10 @@

1313 platforms = [];

1414 source = {

1515 remotes = ["https://rubygems.org"];

16− sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";

16+ sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";

1717 type = "gem";

1818 };

19− version = "6.1.4.7";

19+ version = "6.1.4.6";

2020 };

2121 actionview = {

2222 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

@@ -24,10 +24,10 @@

2424 platforms = [];

2525 source = {

2626 remotes = ["https://rubygems.org"];

27− sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";

27+ sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";

2828 type = "gem";

2929 };

30− version = "6.1.4.7";

30+ version = "6.1.4.6";

3131 };

3232 activesupport = {

3333 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

@@ -35,10 +35,10 @@

3535 platforms = [];

3636 source = {

3737 remotes = ["https://rubygems.org"];

38− sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";

38+ sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";

3939 type = "gem";

4040 };

41− version = "6.1.4.7";

41+ version = "6.1.4.6";

4242 };

4343 adamantium = {

4444 dependencies = ["ice_nine" "memoizable"];

@@ -122,10 +122,10 @@

122122 platforms = [];

123123 source = {

124124 remotes = ["https://rubygems.org"];

125− sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";

125+ sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";

126126 type = "gem";

127127 };

128− version = "1.1.10";

128+ version = "1.1.9";

129129 };

130130 crass = {

131131 groups = ["default"];

@@ -343,10 +343,10 @@

343343 platforms = [];

344344 source = {

345345 remotes = ["https://rubygems.org"];

346− sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";

346+ sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";

347347 type = "gem";

348348 };

349− version = "1.10.0";

349+ version = "1.9.1";

350350 };

351351 ice_nine = {

352352 source = {

@@ -394,10 +394,10 @@

394394 platforms = [];

395395 source = {

396396 remotes = ["https://rubygems.org"];

397− sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

397+ sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";

398398 type = "gem";

399399 };

400− version = "2.16.0";

400+ version = "2.14.0";

401401 };

402402 memoizable = {

403403 dependencies = ["thread_safe"];

@@ -452,10 +452,10 @@

452452 platforms = [];

453453 source = {

454454 remotes = ["https://rubygems.org"];

455− sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";

455+ sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";

456456 type = "gem";

457457 };

458− version = "2.8.0";

458+ version = "2.6.1";

459459 };

460460 minitest = {

461461 groups = ["default" "development" "test"];

@@ -493,10 +493,10 @@

493493 platforms = [];

494494 source = {

495495 remotes = ["https://rubygems.org"];

496− sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";

496+ sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";

497497 type = "gem";

498498 };

499− version = "1.13.3";

499+ version = "1.12.5";

500500 };

501501 octokit = {

502502 dependencies = ["faraday" "sawyer"];

pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+3−3

@@ -2,19 +2,19 @@

22

33buildGoModule rec {

44 pname = "gitlab-shell";

5− version = "13.25.1";

5+ version = "13.24.0";

66 src = fetchFromGitLab {

77 owner = "gitlab-org";

88 repo = "gitlab-shell";

99 rev = "v${version}";

10− sha256 = "sha256-JItk6gfpBNxabI0vsIOHIBhK7L6E1ijPgrnzhQiKPYw=";

10+ sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M=";

1111 };

1212

1313 buildInputs = [ ruby ];

1414

1515 patches = [ ./remove-hardcoded-locations.patch ];

1616

17− vendorSha256 = "sha256-S7bVQxb+p6o0LPAdx7S6dlsHLecPwMS7myjQZwYhHcU=";

17+ vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY=";

1818

1919 postInstall = ''

2020 cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2

@@ -5,7 +5,7 @@ in

55buildGoModule rec {

66 pname = "gitlab-workhorse";

77

8− version = "14.10.1";

8+ version = "14.9.3";

99

1010 src = fetchFromGitLab {

1111 owner = data.owner;

@@ -16,7 +16,7 @@ buildGoModule rec {

1616

1717 sourceRoot = "source/workhorse";

1818

19− vendorSha256 = "sha256-TNZtggUBMwIPO6ZZGk/EkRcilh7sztlAT7Hu4vhME0w=";

19+ vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw=";

2020 buildInputs = [ git ];

2121 ldflags = [ "-X main.Version=${version}" ];

2222 doCheck = false;

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+9−10

@@ -2,7 +2,7 @@

22

33source 'https://rubygems.org'

44

5−gem 'rails', '~> 6.1.4.7'

5+gem 'rails', '~> 6.1.4.6'

66

77gem 'bootsnap', '~> 1.9.1', require: false

88

@@ -41,7 +41,6 @@ gem 'omniauth-azure-activedirectory-v2', '~> 1.0'

4141gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version

4242gem 'omniauth-cas3', '~> 1.1.4'

4343gem 'omniauth-dingtalk-oauth2', '~> 1.0'

44−gem 'omniauth-alicloud', '~> 1.0.1'

4544gem 'omniauth-facebook', '~> 4.0.0'

4645gem 'omniauth-github', '~> 1.4'

4746gem 'omniauth-gitlab', '~> 1.0.2'

@@ -164,7 +163,7 @@ gem 'org-ruby', '~> 0.9.12'

164163gem 'creole', '~> 0.5.0'

165164gem 'wikicloth', '0.8.1'

166165gem 'asciidoctor', '~> 2.0.10'

167−gem 'asciidoctor-include-ext', '~> 0.4.0', require: false

166+gem 'asciidoctor-include-ext', '~> 0.3.1', require: false

168167gem 'asciidoctor-plantuml', '~> 0.0.12'

169168gem 'asciidoctor-kroki', '~> 0.5.0', require: false

170169gem 'rouge', '~> 3.27.0'

@@ -286,7 +285,7 @@ gem 'fast_blank'

286285gem 'gitlab-chronic', '~> 0.10.5'

287286gem 'gitlab_chronic_duration', '~> 0.10.6.2'

288287

289−gem 'rack-proxy', '~> 0.7.2'

288+gem 'rack-proxy', '~> 0.6.0'

290289

291290gem 'sassc-rails', '~> 2.1.0'

292291gem 'autoprefixer-rails', '10.2.5.1'

@@ -345,7 +344,7 @@ gem 'warning', '~> 1.2.0'

345344

346345group :development do

347346 gem 'lefthook', '~> 0.7.0', require: false

348− gem 'solargraph', '~> 0.44.3', require: false

347+ gem 'solargraph', '~> 0.43', require: false

349348

350349 gem 'letter_opener_web', '~> 2.0.0'

351350

@@ -390,7 +389,7 @@ group :development, :test do

390389 gem 'knapsack', '~> 1.21.1'

391390 gem 'crystalball', '~> 0.7.0', require: false

392391

393− gem 'simple_po_parser', '~> 1.1.6', require: false

392+ gem 'simple_po_parser', '~> 1.1.2', require: false

394393

395394 gem 'timecop', '~> 0.9.1'

396395

@@ -404,7 +403,7 @@ group :development, :test do

404403end

405404

406405group :development, :test, :danger do

407− gem 'gitlab-dangerfiles', '~> 3.0', require: false

406+ gem 'gitlab-dangerfiles', '~> 2.11.0', require: false

408407end

409408

410409group :development, :test, :coverage do

@@ -482,7 +481,7 @@ gem 'ssh_data', '~> 1.2'

482481gem 'spamcheck', '~> 0.1.0'

483482

484483# Gitaly GRPC protocol definitions

485−gem 'gitaly', '~> 14.10.0-rc1'

484+gem 'gitaly', '~> 14.9.0.pre.rc4'

486485

487486# KAS GRPC protocol definitions

488487gem 'kas-grpc', '~> 0.0.2'

@@ -498,7 +497,7 @@ gem 'flipper', '~> 0.21.0'

498497gem 'flipper-active_record', '~> 0.21.0'

499498gem 'flipper-active_support_cache_store', '~> 0.21.0'

500499gem 'unleash', '~> 3.2.2'

501−gem 'gitlab-experiment', '~> 0.7.1'

500+gem 'gitlab-experiment', '~> 0.7.0'

502501

503502# Structured logging

504503gem 'lograge', '~> 0.5'

@@ -543,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3'

543542

544543gem 'parslet', '~> 1.8'

545544

546−gem 'ipynbdiff', '0.4.5'

545+gem 'ipynbdiff', '0.4.4'

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+83−87

@@ -4,63 +4,63 @@ GEM

44 RedCloth (4.3.2)

55 acme-client (2.0.9)

66 faraday (>= 0.17, < 2.0.0)

7− actioncable (6.1.4.7)

8− actionpack (= 6.1.4.7)

9− activesupport (= 6.1.4.7)

7+ actioncable (6.1.4.6)

8+ actionpack (= 6.1.4.6)

9+ activesupport (= 6.1.4.6)

1010 nio4r (~> 2.0)

1111 websocket-driver (>= 0.6.1)

12− actionmailbox (6.1.4.7)

13− actionpack (= 6.1.4.7)

14− activejob (= 6.1.4.7)

15− activerecord (= 6.1.4.7)

16− activestorage (= 6.1.4.7)

17− activesupport (= 6.1.4.7)

12+ actionmailbox (6.1.4.6)

13+ actionpack (= 6.1.4.6)

14+ activejob (= 6.1.4.6)

15+ activerecord (= 6.1.4.6)

16+ activestorage (= 6.1.4.6)

17+ activesupport (= 6.1.4.6)

1818 mail (>= 2.7.1)

19− actionmailer (6.1.4.7)

20− actionpack (= 6.1.4.7)

21− actionview (= 6.1.4.7)

22− activejob (= 6.1.4.7)

23− activesupport (= 6.1.4.7)

19+ actionmailer (6.1.4.6)

20+ actionpack (= 6.1.4.6)

21+ actionview (= 6.1.4.6)

22+ activejob (= 6.1.4.6)

23+ activesupport (= 6.1.4.6)

2424 mail (~> 2.5, >= 2.5.4)

2525 rails-dom-testing (~> 2.0)

26− actionpack (6.1.4.7)

27− actionview (= 6.1.4.7)

28− activesupport (= 6.1.4.7)

26+ actionpack (6.1.4.6)

27+ actionview (= 6.1.4.6)

28+ activesupport (= 6.1.4.6)

2929 rack (~> 2.0, >= 2.0.9)

3030 rack-test (>= 0.6.3)

3131 rails-dom-testing (~> 2.0)

3232 rails-html-sanitizer (~> 1.0, >= 1.2.0)

33− actiontext (6.1.4.7)

34− actionpack (= 6.1.4.7)

35− activerecord (= 6.1.4.7)

36− activestorage (= 6.1.4.7)

37− activesupport (= 6.1.4.7)

33+ actiontext (6.1.4.6)

34+ actionpack (= 6.1.4.6)

35+ activerecord (= 6.1.4.6)

36+ activestorage (= 6.1.4.6)

37+ activesupport (= 6.1.4.6)

3838 nokogiri (>= 1.8.5)

39− actionview (6.1.4.7)

40− activesupport (= 6.1.4.7)

39+ actionview (6.1.4.6)

40+ activesupport (= 6.1.4.6)

4141 builder (~> 3.1)

4242 erubi (~> 1.4)

4343 rails-dom-testing (~> 2.0)

4444 rails-html-sanitizer (~> 1.1, >= 1.2.0)

45− activejob (6.1.4.7)

46− activesupport (= 6.1.4.7)

45+ activejob (6.1.4.6)

46+ activesupport (= 6.1.4.6)

4747 globalid (>= 0.3.6)

48− activemodel (6.1.4.7)

49− activesupport (= 6.1.4.7)

50− activerecord (6.1.4.7)

51− activemodel (= 6.1.4.7)

52− activesupport (= 6.1.4.7)

48+ activemodel (6.1.4.6)

49+ activesupport (= 6.1.4.6)

50+ activerecord (6.1.4.6)

51+ activemodel (= 6.1.4.6)

52+ activesupport (= 6.1.4.6)

5353 activerecord-explain-analyze (0.1.0)

5454 activerecord (>= 4)

5555 pg

56− activestorage (6.1.4.7)

57− actionpack (= 6.1.4.7)

58− activejob (= 6.1.4.7)

59− activerecord (= 6.1.4.7)

60− activesupport (= 6.1.4.7)

56+ activestorage (6.1.4.6)

57+ actionpack (= 6.1.4.6)

58+ activejob (= 6.1.4.6)

59+ activerecord (= 6.1.4.6)

60+ activesupport (= 6.1.4.6)

6161 marcel (~> 1.0.0)

6262 mini_mime (>= 1.1.0)

63− activesupport (6.1.4.7)

63+ activesupport (6.1.4.6)

6464 concurrent-ruby (~> 1.0, >= 1.0.2)

6565 i18n (>= 1.6, < 2)

6666 minitest (>= 5.1)

@@ -82,7 +82,7 @@ GEM

8282 faraday_middleware-multi_json (~> 0.0)

8383 oauth2 (~> 1.4)

8484 asciidoctor (2.0.15)

85− asciidoctor-include-ext (0.4.0)

85+ asciidoctor-include-ext (0.3.1)

8686 asciidoctor (>= 1.5.6, < 3.0.0)

8787 asciidoctor-kroki (0.5.0)

8888 asciidoctor (~> 2.0)

@@ -130,7 +130,7 @@ GEM

130130 base32 (0.3.2)

131131 batch-loader (2.0.1)

132132 bcrypt (3.1.16)

133− benchmark (0.2.0)

133+ benchmark (0.1.1)

134134 benchmark-ips (2.3.0)

135135 benchmark-malloc (0.2.0)

136136 benchmark-memory (0.1.2)

@@ -196,7 +196,7 @@ GEM

196196 coderay (1.1.3)

197197 colored2 (3.1.2)

198198 commonmarker (0.23.4)

199− concurrent-ruby (1.1.10)

199+ concurrent-ruby (1.1.9)

200200 connection_pool (2.2.5)

201201 contracts (0.11.0)

202202 cork (0.3.0)

@@ -217,7 +217,7 @@ GEM

217217 css_parser (1.7.0)

218218 addressable

219219 daemons (1.3.1)

220− danger (8.5.0)

220+ danger (8.4.5)

221221 claide (~> 1.0)

222222 claide-plugins (>= 0.9.2)

223223 colored2 (~> 3.1)

@@ -448,7 +448,7 @@ GEM

448448 rails (>= 3.2.0)

449449 git (1.7.0)

450450 rchardet (~> 1.8)

451− gitaly (14.10.0.pre.rc1)

451+ gitaly (14.9.0.pre.rc4)

452452 grpc (~> 1.0)

453453 github-markup (1.7.0)

454454 gitlab (4.16.1)

@@ -456,11 +456,10 @@ GEM

456456 terminal-table (~> 1.5, >= 1.5.1)

457457 gitlab-chronic (0.10.5)

458458 numerizer (~> 0.2)

459− gitlab-dangerfiles (3.0.0)

459+ gitlab-dangerfiles (2.11.0)

460460 danger (>= 8.4.5)

461461 danger-gitlab (>= 8.0.0)

462− rake

463− gitlab-experiment (0.7.1)

462+ gitlab-experiment (0.7.0)

464463 activesupport (>= 3.0)

465464 request_store (>= 1.0)

466465 gitlab-fog-azure-rm (1.2.0)

@@ -527,7 +526,7 @@ GEM

527526 signet (~> 0.12)

528527 google-cloud-env (1.5.0)

529528 faraday (>= 0.17.3, < 2.0)

530− google-protobuf (3.19.4)

529+ google-protobuf (3.19.1)

531530 googleapis-common-protos-types (1.3.0)

532531 google-protobuf (~> 3.14)

533532 googleauth (0.14.0)

@@ -648,7 +647,7 @@ GEM

648647 invisible_captcha (1.1.0)

649648 rails (>= 4.2)

650649 ipaddress (0.8.3)

651− ipynbdiff (0.4.5)

650+ ipynbdiff (0.4.4)

652651 diffy (~> 3.3)

653652 json (~> 2.5, >= 2.5.1)

654653 jaeger-client (1.1.0)

@@ -730,7 +729,7 @@ GEM

730729 activesupport (>= 4)

731730 railties (>= 4)

732731 request_store (~> 1.0)

733− loofah (2.16.0)

732+ loofah (2.12.0)

734733 crass (~> 1.0.2)

735734 nokogiri (>= 1.5.9)

736735 lru_redux (1.1.0)

@@ -749,8 +748,8 @@ GEM

749748 mime-types-data (3.2020.0512)

750749 mini_histogram (0.3.1)

751750 mini_magick (4.10.1)

752− mini_mime (1.1.2)

753− mini_portile2 (2.8.0)

751+ mini_mime (1.1.1)

752+ mini_portile2 (2.6.1)

754753 minitest (5.11.3)

755754 mixlib-cli (2.1.8)

756755 mixlib-config (3.0.9)

@@ -788,8 +787,8 @@ GEM

788787 netrc (0.11.0)

789788 nio4r (2.5.8)

790789 no_proxy_fix (0.1.2)

791− nokogiri (1.13.3)

792− mini_portile2 (~> 2.8.0)

790+ nokogiri (1.12.5)

791+ mini_portile2 (~> 2.6.1)

793792 racc (~> 1.4)

794793 notiffany (0.1.3)

795794 nenv (~> 0.1)

@@ -822,8 +821,6 @@ GEM

822821 omniauth (1.9.1)

823822 hashie (>= 3.4.6)

824823 rack (>= 1.6.2, < 3)

825− omniauth-alicloud (1.0.1)

826− omniauth-oauth2 (~> 1.7.1)

827824 omniauth-atlassian-oauth2 (0.2.0)

828825 omniauth (>= 1.1.1)

829826 omniauth-oauth2 (>= 1.5)

@@ -964,25 +961,25 @@ GEM

964961 httpclient

965962 json-jwt (>= 1.11.0)

966963 rack (>= 2.1.0)

967− rack-proxy (0.7.2)

964+ rack-proxy (0.6.0)

968965 rack

969966 rack-test (1.1.0)

970967 rack (>= 1.0, < 3)

971968 rack-timeout (0.5.2)

972− rails (6.1.4.7)

973− actioncable (= 6.1.4.7)

974− actionmailbox (= 6.1.4.7)

975− actionmailer (= 6.1.4.7)

976− actionpack (= 6.1.4.7)

977− actiontext (= 6.1.4.7)

978− actionview (= 6.1.4.7)

979− activejob (= 6.1.4.7)

980− activemodel (= 6.1.4.7)

981− activerecord (= 6.1.4.7)

982− activestorage (= 6.1.4.7)

983− activesupport (= 6.1.4.7)

969+ rails (6.1.4.6)

970+ actioncable (= 6.1.4.6)

971+ actionmailbox (= 6.1.4.6)

972+ actionmailer (= 6.1.4.6)

973+ actionpack (= 6.1.4.6)

974+ actiontext (= 6.1.4.6)

975+ actionview (= 6.1.4.6)

976+ activejob (= 6.1.4.6)

977+ activemodel (= 6.1.4.6)

978+ activerecord (= 6.1.4.6)

979+ activestorage (= 6.1.4.6)

980+ activesupport (= 6.1.4.6)

984981 bundler (>= 1.15.0)

985− railties (= 6.1.4.7)

982+ railties (= 6.1.4.6)

986983 sprockets-rails (>= 2.0.0)

987984 rails-controller-testing (1.0.5)

988985 actionpack (>= 5.0.1.rc1)

@@ -996,9 +993,9 @@ GEM

996993 rails-i18n (6.0.0)

997994 i18n (>= 0.7, < 2)

998995 railties (>= 6.0.0, < 7)

999− railties (6.1.4.7)

1000− actionpack (= 6.1.4.7)

1001− activesupport (= 6.1.4.7)

996+ railties (6.1.4.6)

997+ actionpack (= 6.1.4.6)

998+ activesupport (= 6.1.4.6)

1002999 method_source

10031000 rake (>= 0.13)

10041001 thor (~> 1.0)

@@ -1202,7 +1199,7 @@ GEM

12021199 faraday (>= 0.17.3, < 2.0)

12031200 jwt (>= 1.5, < 3.0)

12041201 multi_json (~> 1.10)

1205− simple_po_parser (1.1.6)

1202+ simple_po_parser (1.1.2)

12061203 simplecov (0.21.2)

12071204 docile (~> 1.1)

12081205 simplecov-html (~> 0.11)

@@ -1216,7 +1213,7 @@ GEM

12161213 slack-messenger (2.3.4)

12171214 snowplow-tracker (0.6.1)

12181215 contracts (~> 0.7, <= 0.11)

1219− solargraph (0.44.3)

1216+ solargraph (0.43.0)

12201217 backport (~> 1.2)

12211218 benchmark

12221219 bundler (>= 1.17.2)

@@ -1243,11 +1240,11 @@ GEM

12431240 sprockets (3.7.2)

12441241 concurrent-ruby (~> 1.0)

12451242 rack (> 1, < 3)

1246− sprockets-rails (3.4.2)

1247− actionpack (>= 5.2)

1248− activesupport (>= 5.2)

1243+ sprockets-rails (3.2.2)

1244+ actionpack (>= 4.0)

1245+ activesupport (>= 4.0)

12491246 sprockets (>= 3.0.0)

1250− sqlite3 (1.4.2)

1247+ sqlite3 (1.3.13)

12511248 ssh_data (1.2.0)

12521249 ssrf_filter (1.0.7)

12531250 stackprof (0.2.15)

@@ -1413,7 +1410,7 @@ DEPENDENCIES

14131410 apollo_upload_server (~> 2.1.0)

14141411 asana (~> 0.10.3)

14151412 asciidoctor (~> 2.0.10)

1416− asciidoctor-include-ext (~> 0.4.0)

1413+ asciidoctor-include-ext (~> 0.3.1)

14171414 asciidoctor-kroki (~> 0.5.0)

14181415 asciidoctor-plantuml (~> 0.0.12)

14191416 atlassian-jwt (~> 0.2.0)

@@ -1487,11 +1484,11 @@ DEPENDENCIES

14871484 gettext (~> 3.3)

14881485 gettext_i18n_rails (~> 1.8.0)

14891486 gettext_i18n_rails_js (~> 1.3)

1490− gitaly (~> 14.10.0.pre.rc1)

1487+ gitaly (~> 14.9.0.pre.rc4)

14911488 github-markup (~> 1.7.0)

14921489 gitlab-chronic (~> 0.10.5)

1493− gitlab-dangerfiles (~> 3.0)

1494− gitlab-experiment (~> 0.7.1)

1490+ gitlab-dangerfiles (~> 2.11.0)

1491+ gitlab-experiment (~> 0.7.0)

14951492 gitlab-fog-azure-rm (~> 1.2.0)

14961493 gitlab-labkit (~> 0.22.0)

14971494 gitlab-license (~> 2.1.0)

@@ -1531,7 +1528,7 @@ DEPENDENCIES

15311528 icalendar

15321529 invisible_captcha (~> 1.1.0)

15331530 ipaddress (~> 0.8.3)

1534− ipynbdiff (= 0.4.5)

1531+ ipynbdiff (= 0.4.4)

15351532 jira-ruby (~> 2.1.4)

15361533 js_regex (~> 3.7)

15371534 json (~> 2.5.1)

@@ -1564,7 +1561,6 @@ DEPENDENCIES

15641561 ohai (~> 16.10)

15651562 oj (~> 3.10.6)

15661563 omniauth (~> 1.8)

1567− omniauth-alicloud (~> 1.0.1)

15681564 omniauth-atlassian-oauth2 (~> 0.2.0)

15691565 omniauth-auth0 (~> 2.0.0)

15701566 omniauth-authentiq (~> 0.3.3)

@@ -1601,9 +1597,9 @@ DEPENDENCIES

16011597 rack-attack (~> 6.3.0)

16021598 rack-cors (~> 1.0.6)

16031599 rack-oauth2 (~> 1.16.0)

1604− rack-proxy (~> 0.7.2)

1600+ rack-proxy (~> 0.6.0)

16051601 rack-timeout (~> 0.5.1)

1606− rails (~> 6.1.4.7)

1602+ rails (~> 6.1.4.6)

16071603 rails-controller-testing

16081604 rails-i18n (~> 6.0)

16091605 rainbow (~> 3.0)

@@ -1648,13 +1644,13 @@ DEPENDENCIES

16481644 sidekiq (~> 6.4)

16491645 sidekiq-cron (~> 1.2)

16501646 sigdump (~> 0.2.4)

1651− simple_po_parser (~> 1.1.6)

1647+ simple_po_parser (~> 1.1.2)

16521648 simplecov (~> 0.21)

16531649 simplecov-cobertura (~> 1.3.1)

16541650 simplecov-lcov (~> 0.8.0)

16551651 slack-messenger (~> 2.3.4)

16561652 snowplow-tracker (~> 0.6.1)

1657− solargraph (~> 0.44.3)

1653+ solargraph (~> 0.43)

16581654 spamcheck (~> 0.1.0)

16591655 spring (~> 2.1.0)

16601656 spring-commands-rspec (~> 1.0.4)

pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+64−75

@@ -16,10 +16,10 @@

1616 platforms = [];

1717 source = {

1818 remotes = ["https://rubygems.org"];

19− sha256 = "0knrmrqmjl4gdzvmxk5plc9i5ipclncg7l0l0yhvy07779j3xqpd";

19+ sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp";

2020 type = "gem";

2121 };

22− version = "6.1.4.7";

22+ version = "6.1.4.6";

2323 };

2424 actionmailbox = {

2525 dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];

@@ -27,10 +27,10 @@

2727 platforms = [];

2828 source = {

2929 remotes = ["https://rubygems.org"];

30− sha256 = "1ksps8lzmggdhbr0d45qyp2s70kfapx1x0j77xmacw9c749y5jxd";

30+ sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw";

3131 type = "gem";

3232 };

33− version = "6.1.4.7";

33+ version = "6.1.4.6";

3434 };

3535 actionmailer = {

3636 dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];

@@ -38,10 +38,10 @@

3838 platforms = [];

3939 source = {

4040 remotes = ["https://rubygems.org"];

41− sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa";

41+ sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8";

4242 type = "gem";

4343 };

44− version = "6.1.4.7";

44+ version = "6.1.4.6";

4545 };

4646 actionpack = {

4747 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

@@ -49,10 +49,10 @@

4949 platforms = [];

5050 source = {

5151 remotes = ["https://rubygems.org"];

52− sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814";

52+ sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";

5353 type = "gem";

5454 };

55− version = "6.1.4.7";

55+ version = "6.1.4.6";

5656 };

5757 actiontext = {

5858 dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];

@@ -60,10 +60,10 @@

6060 platforms = [];

6161 source = {

6262 remotes = ["https://rubygems.org"];

63− sha256 = "0dwinzhsfcysz9khk137z92qr5kx6aw5f2ybkdjk1yqml8avv1wd";

63+ sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p";

6464 type = "gem";

6565 };

66− version = "6.1.4.7";

66+ version = "6.1.4.6";

6767 };

6868 actionview = {

6969 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

@@ -71,10 +71,10 @@

7171 platforms = [];

7272 source = {

7373 remotes = ["https://rubygems.org"];

74− sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac";

74+ sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";

7575 type = "gem";

7676 };

77− version = "6.1.4.7";

77+ version = "6.1.4.6";

7878 };

7979 activejob = {

8080 dependencies = ["activesupport" "globalid"];

@@ -82,10 +82,10 @@

8282 platforms = [];

8383 source = {

8484 remotes = ["https://rubygems.org"];

85− sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj";

85+ sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l";

8686 type = "gem";

8787 };

88− version = "6.1.4.7";

88+ version = "6.1.4.6";

8989 };

9090 activemodel = {

9191 dependencies = ["activesupport"];

@@ -93,10 +93,10 @@

9393 platforms = [];

9494 source = {

9595 remotes = ["https://rubygems.org"];

96− sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv";

96+ sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv";

9797 type = "gem";

9898 };

99− version = "6.1.4.7";

99+ version = "6.1.4.6";

100100 };

101101 activerecord = {

102102 dependencies = ["activemodel" "activesupport"];

@@ -104,10 +104,10 @@

104104 platforms = [];

105105 source = {

106106 remotes = ["https://rubygems.org"];

107− sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l";

107+ sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss";

108108 type = "gem";

109109 };

110− version = "6.1.4.7";

110+ version = "6.1.4.6";

111111 };

112112 activerecord-explain-analyze = {

113113 dependencies = ["activerecord" "pg"];

@@ -126,10 +126,10 @@

126126 platforms = [];

127127 source = {

128128 remotes = ["https://rubygems.org"];

129− sha256 = "18gxckrydsyciaiq5j981sf522kfqpq74yvf405dgn688y5927il";

129+ sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430";

130130 type = "gem";

131131 };

132− version = "6.1.4.7";

132+ version = "6.1.4.6";

133133 };

134134 activesupport = {

135135 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

@@ -137,10 +137,10 @@

137137 platforms = [];

138138 source = {

139139 remotes = ["https://rubygems.org"];

140− sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9";

140+ sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";

141141 type = "gem";

142142 };

143− version = "6.1.4.7";

143+ version = "6.1.4.6";

144144 };

145145 acts-as-taggable-on = {

146146 dependencies = ["activerecord"];

@@ -232,10 +232,10 @@

232232 platforms = [];

233233 source = {

234234 remotes = ["https://rubygems.org"];

235− sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0";

235+ sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d";

236236 type = "gem";

237237 };

238− version = "0.4.0";

238+ version = "0.3.1";

239239 };

240240 asciidoctor-kroki = {

241241 dependencies = ["asciidoctor"];

@@ -484,10 +484,10 @@

484484 platforms = [];

485485 source = {

486486 remotes = ["https://rubygems.org"];

487− sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z";

487+ sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6";

488488 type = "gem";

489489 };

490− version = "0.2.0";

490+ version = "0.1.1";

491491 };

492492 benchmark-ips = {

493493 groups = ["development" "test"];

@@ -824,10 +824,10 @@

824824 platforms = [];

825825 source = {

826826 remotes = ["https://rubygems.org"];

827− sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";

827+ sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";

828828 type = "gem";

829829 };

830− version = "1.1.10";

830+ version = "1.1.9";

831831 };

832832 connection_pool = {

833833 groups = ["default"];

@@ -951,10 +951,10 @@

951951 platforms = [];

952952 source = {

953953 remotes = ["https://rubygems.org"];

954− sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg";

954+ sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl";

955955 type = "gem";

956956 };

957− version = "8.5.0";

957+ version = "8.4.5";

958958 };

959959 danger-gitlab = {

960960 dependencies = ["danger" "gitlab"];

@@ -1916,10 +1916,10 @@

19161916 platforms = [];

19171917 source = {

19181918 remotes = ["https://rubygems.org"];

1919− sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di";

1919+ sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716";

19201920 type = "gem";

19211921 };

1922− version = "14.10.0.pre.rc1";

1922+ version = "14.9.0.pre.rc4";

19231923 };

19241924 github-markup = {

19251925 groups = ["default"];

@@ -1954,15 +1954,15 @@

19541954 version = "0.10.5";

19551955 };

19561956 gitlab-dangerfiles = {

1957− dependencies = ["danger" "danger-gitlab" "rake"];

1957+ dependencies = ["danger" "danger-gitlab"];

19581958 groups = ["danger" "development" "test"];

19591959 platforms = [];

19601960 source = {

19611961 remotes = ["https://rubygems.org"];

1962− sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i";

1962+ sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24";

19631963 type = "gem";

19641964 };

1965− version = "3.0.0";

1965+ version = "2.11.0";

19661966 };

19671967 gitlab-experiment = {

19681968 dependencies = ["activesupport" "request_store"];

@@ -1970,10 +1970,10 @@

19701970 platforms = [];

19711971 source = {

19721972 remotes = ["https://rubygems.org"];

1973− sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n";

1973+ sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx";

19741974 type = "gem";

19751975 };

1976− version = "0.7.1";

1976+ version = "0.7.0";

19771977 };

19781978 gitlab-fog-azure-rm = {

19791979 dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];

@@ -2152,10 +2152,10 @@

21522152 platforms = [];

21532153 source = {

21542154 remotes = ["https://rubygems.org"];

2155− sha256 = "1q0aknwpr8k1v92qcm1rz1zyrgdpf1i1b9mxa1gi48y0aawlnb7j";

2155+ sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53";

21562156 type = "gem";

21572157 };

2158− version = "3.19.4";

2158+ version = "3.19.1";

21592159 };

21602160 googleapis-common-protos-types = {

21612161 dependencies = ["google-protobuf"];

@@ -2623,10 +2623,10 @@

26232623 platforms = [];

26242624 source = {

26252625 remotes = ["https://rubygems.org"];

2626− sha256 = "1r1pl4imiqi75bksh17r2j3w74x561z4bx1mpgv6cin1fcrzw9zy";

2626+ sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2";

26272627 type = "gem";

26282628 };

2629− version = "0.4.5";

2629+ version = "0.4.4";

26302630 };

26312631 jaeger-client = {

26322632 dependencies = ["opentracing" "thrift"];

@@ -2944,10 +2944,10 @@

29442944 platforms = [];

29452945 source = {

29462946 remotes = ["https://rubygems.org"];

2947− sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

2947+ sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw";

29482948 type = "gem";

29492949 };

2950− version = "2.16.0";

2950+ version = "2.12.0";

29512951 };

29522952 lru_redux = {

29532953 groups = ["default"];

@@ -3081,20 +3081,20 @@

30813081 platforms = [];

30823082 source = {

30833083 remotes = ["https://rubygems.org"];

3084− sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";

3084+ sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl";

30853085 type = "gem";

30863086 };

3087− version = "1.1.2";

3087+ version = "1.1.1";

30883088 };

30893089 mini_portile2 = {

30903090 groups = ["default" "development" "test"];

30913091 platforms = [];

30923092 source = {

30933093 remotes = ["https://rubygems.org"];

3094− sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";

3094+ sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";

30953095 type = "gem";

30963096 };

3097− version = "2.8.0";

3097+ version = "2.6.1";

30983098 };

30993099 minitest = {

31003100 groups = ["development" "test"];

@@ -3350,10 +3350,10 @@

33503350 platforms = [];

33513351 source = {

33523352 remotes = ["https://rubygems.org"];

3353− sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";

3353+ sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";

33543354 type = "gem";

33553355 };

3356− version = "1.13.3";

3356+ version = "1.12.5";

33573357 };

33583358 notiffany = {

33593359 dependencies = ["nenv" "shellany"];

@@ -3440,17 +3440,6 @@

34403440 };

34413441 version = "1.9.1";

34423442 };

3443− omniauth-alicloud = {

3444− dependencies = ["omniauth-oauth2"];

3445− groups = ["default"];

3446− platforms = [];

3447− source = {

3448− remotes = ["https://rubygems.org"];

3449− sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g";

3450− type = "gem";

3451− };

3452− version = "1.0.1";

3453− };

34543443 omniauth-atlassian-oauth2 = {

34553444 dependencies = ["omniauth" "omniauth-oauth2"];

34563445 groups = ["default"];

@@ -4092,10 +4081,10 @@

40924081 platforms = [];

40934082 source = {

40944083 remotes = ["https://rubygems.org"];

4095− sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9";

4084+ sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";

40964085 type = "gem";

40974086 };

4098− version = "0.7.2";

4087+ version = "0.6.0";

40994088 };

41004089 rack-test = {

41014090 dependencies = ["rack"];

@@ -4124,10 +4113,10 @@

41244113 platforms = [];

41254114 source = {

41264115 remotes = ["https://rubygems.org"];

4127− sha256 = "0kwpw06ylmjbfldqjzhy5m6chr6q6g0gm6p6h98sbjj8awri72n5";

4116+ sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za";

41284117 type = "gem";

41294118 };

4130− version = "6.1.4.7";

4119+ version = "6.1.4.6";

41314120 };

41324121 rails-controller-testing = {

41334122 dependencies = ["actionpack" "actionview" "activesupport"];

@@ -4179,10 +4168,10 @@

41794168 platforms = [];

41804169 source = {

41814170 remotes = ["https://rubygems.org"];

4182− sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd";

4171+ sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb";

41834172 type = "gem";

41844173 };

4185− version = "6.1.4.7";

4174+ version = "6.1.4.6";

41864175 };

41874176 rainbow = {

41884177 groups = ["default" "development" "test"];

@@ -5112,10 +5101,10 @@

51125101 platforms = [];

51135102 source = {

51145103 remotes = ["https://rubygems.org"];

5115− sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj";

5104+ sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";

51165105 type = "gem";

51175106 };

5118− version = "1.1.6";

5107+ version = "1.1.2";

51195108 };

51205109 simplecov = {

51215110 dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];

@@ -5206,10 +5195,10 @@

52065195 platforms = [];

52075196 source = {

52085197 remotes = ["https://rubygems.org"];

5209− sha256 = "1h3i4fkn028ylhgbqac0bgpbbikjcd5ks7id8wm94ahnq89z4mh8";

5198+ sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg";

52105199 type = "gem";

52115200 };

5212− version = "0.44.3";

5201+ version = "0.43.0";

52135202 };

52145203 sorted_set = {

52155204 dependencies = ["rbtree" "set"];

@@ -5281,20 +5270,20 @@

52815270 platforms = [];

52825271 source = {

52835272 remotes = ["https://rubygems.org"];

5284− sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min";

5273+ sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2";

52855274 type = "gem";

52865275 };

5287− version = "3.4.2";

5276+ version = "3.2.2";

52885277 };

52895278 sqlite3 = {

5290− groups = ["default" "test"];

5279+ groups = ["default" "development" "test"];

52915280 platforms = [];

52925281 source = {

52935282 remotes = ["https://rubygems.org"];

5294− sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";

5283+ sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";

52955284 type = "gem";

52965285 };

5297− version = "1.4.2";

5286+ version = "1.3.13";

52985287 };

52995288 ssh_data = {

53005289 groups = ["default"];

pkgs/applications/video/clickshare-csc1/default.nix+2

@@ -4,6 +4,7 @@

44, alsa-lib

55, autoPatchelfHook

66, binutils-unwrapped

7+, gnutar

78, libav_0_8

89, libnotify

910, libresample

@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {

3435 nativeBuildInputs = [

3536 autoPatchelfHook

3637 binutils-unwrapped

38+ gnutar

3739 rpmextract

3840 unzip

3941 ];

pkgs/applications/video/kodi/unwrapped.nix+2−2

@@ -1,5 +1,5 @@

11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper

2−, pkg-config, cmake, yasm, python3Packages

2+, pkg-config, cmake, gnumake, yasm, python3Packages

33, libgcrypt, libgpg-error, libunistring

44, boost, avahi, lame

55, gettext, pcre-cpp, yajl, fribidi, which

@@ -169,7 +169,7 @@ in stdenv.mkDerivation {

169169 doxygen

170170 makeWrapper

171171 which

172− pkg-config

172+ pkg-config gnumake

173173 autoconf automake libtool # still needed for some components. Check if that is the case with 19.0

174174 jre_headless yasm gettext python3Packages.python flatbuffers

175175

pkgs/applications/video/mkvtoolnix/default.nix+2−2

@@ -47,13 +47,13 @@ let

4747in

4848stdenv.mkDerivation rec {

4949 pname = "mkvtoolnix";

50− version = "67.0.0";

50+ version = "66.0.0";

5151

5252 src = fetchFromGitLab {

5353 owner = "mbunkus";

5454 repo = "mkvtoolnix";

5555 rev = "release-${version}";

56− sha256 = "0gyjgp5iyr9kvgpgl064w025ji1w8dy0cnw4fmbp71wis7qp7yl1";

56+ sha256 = "sha256-JTPayZhV3Z+o1v+TbHp9SGMAZk1oEzMdNhk67BYB75A=";

5757 };

5858

5959 nativeBuildInputs = [

pkgs/applications/video/peek/default.nix+2

@@ -10,6 +10,7 @@

1010, appstream-glib

1111, pkg-config

1212, txt2man

13+, gzip

1314, vala

1415, wrapGAppsHook

1516, gsettings-desktop-schemas

@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {

4950 appstream-glib

5051 desktop-file-utils

5152 gettext

53+ gzip

5254 meson

5355 ninja

5456 libxml2

pkgs/applications/video/vdr/plugins.nix+80−5

@@ -238,19 +238,94 @@ in {

238238 };

239239 };

240240

241− fritzbox = stdenv.mkDerivation rec {

241+ fritzbox = let

242+ libconvpp = stdenv.mkDerivation {

243+ name = "jowi24-libconv++-20130216";

244+ propagatedBuildInputs = [ libiconv ];

245+ CXXFLAGS = "-std=gnu++11 -Os";

246+ src = fetchFromGitHub {

247+ owner = "jowi24";

248+ repo = "libconvpp";

249+ rev = "90769b2216bc66c5ea5e41a929236c20d367c63b";

250+ sha256 = "0bf0dwxrzd42l84p8nxcsjdk1gvzlhad93nsbn97z6kr61n4cr33";

251+ };

252+ installPhase = ''

253+ mkdir -p $out/lib $out/include/libconv++

254+ cp source.a $out/lib/libconv++.a

255+ cp *.h $out/include/libconv++

256+ '';

257+ };

258+

259+ liblogpp = stdenv.mkDerivation {

260+ name = "jowi24-liblogpp-20130216";

261+ CXXFLAGS = "-std=gnu++11 -Os";

262+ src = fetchFromGitHub {

263+ owner = "jowi24";

264+ repo = "liblogpp";

265+ rev = "eee4046d2ae440974bcc8ceec00b069f0a2c62b9";

266+ sha256 = "01aqvwmwh5kk3mncqpim8llwha9gj5qq0c4cvqfn4h8wqi3d9l3p";

267+ };

268+ installPhase = ''

269+ mkdir -p $out/lib $out/include/liblog++

270+ cp source.a $out/lib/liblog++.a

271+ cp *.h $out/include/liblog++

272+ '';

273+ };

274+

275+ libnetpp = stdenv.mkDerivation {

276+ name = "jowi24-libnet++-20180628";

277+ CXXFLAGS = "-std=gnu++11 -Os";

278+ src = fetchFromGitHub {

279+ owner = "jowi24";

280+ repo = "libnetpp";

281+ rev = "212847f0efaeffee8422059b8e202d844174aaf3";

282+ sha256 = "0vjl6ld6aj25rzxm26yjv3h2gy7gp7qnbinpw6sf1shg2xim9x0b";

283+ };

284+ installPhase = ''

285+ mkdir -p $out/lib $out/include/libnet++

286+ cp source.a $out/lib/libnet++.a

287+ cp *.h $out/include/libnet++

288+ '';

289+ buildInputs = [ boost liblogpp libconvpp ];

290+ };

291+

292+ libfritzpp = stdenv.mkDerivation {

293+ name = "jowi24-libfritzpp-20131201";

294+ CXXFLAGS = "-std=gnu++11 -Os";

295+ src = fetchFromGitHub {

296+ owner = "jowi24";

297+ repo = "libfritzpp";

298+ rev = "ca19013c9451cbac7a90155b486ea9959ced0f67";

299+ sha256 = "0jk93zm3qzl9z96gfs6xl1c8ip8lckgbzibf7jay7dbgkg9kyjfg";

300+ };

301+ installPhase = ''

302+ mkdir -p $out/lib $out/include/libfritz++

303+ cp source.a $out/lib/libfritz++.a

304+ cp *.h $out/include/libfritz++

305+ '';

306+ propagatedBuildInputs = [ libgcrypt ];

307+ buildInputs = [ boost liblogpp libconvpp libnetpp ];

308+ };

309+

310+ in stdenv.mkDerivation rec {

242311 pname = "vdr-fritzbox";

243− version = "1.5.4";

312+ version = "1.5.3";

244313

245314 src = fetchFromGitHub {

246315 owner = "jowi24";

247316 repo = "vdr-fritz";

248317 rev = version;

249− sha256 = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o=";

250− fetchSubmodules = true;

318+ sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8";

251319 };

252320

253− buildInputs = [ vdr boost libgcrypt ];

321+ postUnpack = ''

322+ cp ${libfritzpp}/lib/* $sourceRoot/libfritz++

323+ cp ${liblogpp}/lib/* $sourceRoot/liblog++

324+ cp ${libnetpp}/lib/* $sourceRoot/libnet++

325+ cp ${libconvpp}/lib/* $sourceRoot/libconv++

326+ '';

327+

328+ buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ];

254329

255330 installFlags = [ "DESTDIR=$(out)" ];

256331

pkgs/applications/video/vlc/default.nix+2−2

@@ -82,11 +82,11 @@ let

8282in

8383stdenv.mkDerivation rec {

8484 pname = "${optionalString onlyLibVLC "lib"}vlc";

85− version = "3.0.17.3";

85+ version = "3.0.17";

8686

8787 src = fetchurl {

8888 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

89− sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ=";

89+ sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";

9090 };

9191

9292 # VLC uses a *ton* of libraries for various pieces of functionality, many of

pkgs/applications/virtualization/containerd/default.nix+2−2

@@ -10,13 +10,13 @@

1010

1111buildGoModule rec {

1212 pname = "containerd";

13− version = "1.6.4";

13+ version = "1.6.3";

1414

1515 src = fetchFromGitHub {

1616 owner = "containerd";

1717 repo = "containerd";

1818 rev = "v${version}";

19− sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";

19+ sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA=";

2020 };

2121

2222 vendorSha256 = null;

pkgs/applications/virtualization/podman/default.nix−1

@@ -88,7 +88,6 @@ buildGoModule rec {

8888 podman-tls-ghostunnel

8989 podman-dnsname

9090 ;

91− oci-containers-podman = nixosTests.oci-containers.podman;

9291 };

9392

9493 meta = with lib; {

pkgs/applications/virtualization/vmware-workstation/default.nixdeleted−341

@@ -1,341 +0,0 @@

1−{ stdenv

2−, buildFHSUserEnv

3−, fetchurl

4−, lib

5−, zlib

6−, gdbm

7−, bzip2

8−, libxslt

9−, libxml2

10−, libuuid

11−, readline

12−, xz

13−, cups

14−, glibc

15−, libaio

16−, vulkan-loader

17−, alsa-lib

18−, libpulseaudio

19−, libGL

20−, numactl

21−, libX11

22−, libXi

23−, kmod

24−, python3

25−, autoPatchelfHook

26−, makeWrapper

27−, sqlite

28−, enableInstaller ? false

29−}:

30−

31−let

32− vmware-unpack-env = buildFHSUserEnv rec {

33− name = "vmware-unpack-env";

34− targetPkgs = pkgs: [ zlib ];

35− };

36− gdbm3 = gdbm.overrideAttrs (old: rec {

37− version = "1.8.3";

38−

39− src = fetchurl {

40− url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz";

41− sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=";

42− };

43−

44− installPhase = ''

45− mkdir -p $out/lib

46− cp .libs/libgdbm*.so* $out/lib/

47− '';

48− });

49−in

50−stdenv.mkDerivation rec {

51− pname = "vmware-workstation";

52− version = "16.2.3";

53− build = "19376536";

54−

55− buildInputs = [

56− libxslt

57− libxml2

58− libuuid

59− gdbm3

60− readline

61− xz

62− cups

63− glibc

64− libaio

65− vulkan-loader

66− alsa-lib

67− libpulseaudio

68− libGL

69− numactl

70− libX11

71− libXi

72− kmod

73− ];

74−

75− nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ]

76− ++ lib.optionals enableInstaller [ sqlite bzip2 ];

77−

78− src = fetchurl {

79− url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";

80− sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM=";

81− };

82−

83− unpackPhase = ''

84− ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked"

85− '';

86−

87− installPhase = ''

88− mkdir -p \

89− $out/bin \

90− $out/etc/vmware \

91− $out/etc/init.d \

92− $out/lib/vmware \

93− $out/share/doc

94−

95− #### Replicate vmware-installer's order but VMX first because of appLoader

96− ${lib.optionalString enableInstaller ''

97− ## VMware installer

98− echo "Installing VMware Installer"

99− unpacked="unpacked/vmware-installer"

100− vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=<version>)[^<]+")

101− dest="$out/lib/vmware-installer/$vmware_installer_version"

102−

103− mkdir -p $dest

104− cp -r $unpacked/vmis* $dest/

105− cp -r $unpacked/sopython $dest/

106− cp -r $unpacked/python $dest/

107− cp -r $unpacked/cdsHelper $dest/

108− cp -r $unpacked/vmware* $dest/

109− cp -r $unpacked/bin $dest/

110− cp -r $unpacked/lib $dest/

111−

112− chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-*

113− ln -s $dest/vmware-installer $out/bin/vmware-installer

114−

115− mkdir -p $out/etc/vmware-installer

116− cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap

117− sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap

118− sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap

119− sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap

120−

121− # create database of vmware guest tools (avoids vmware fetching them later)

122− mkdir -p $out/etc/vmware-installer/components

123− database_filename=$out/etc/vmware-installer/database

124− touch $database_filename

125− sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);"

126− sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');"

127− sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);"

128− for folder in unpacked/**/.installer ; do

129− component="$(basename $(dirname $folder))"

130− component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=<version>)[^<]+")

131− component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1")

132− type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1")

133− sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);"

134− mkdir -p $out/etc/vmware-installer/components/$component

135− cp -r $folder/* $out/etc/vmware-installer/components/$component

136− done

137− ''}

138−

139− ## VMware Bootstrap

140− echo "Installing VMware Bootstrap"

141− cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap

142− sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap

143−

144− ## VMware Config

145− echo "Installing VMware Config"

146− cp ${./vmware-config} $out/etc/vmware/config

147− sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config

148− sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config

149− sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config

150−

151− ## VMware VMX

152− echo "Installing VMware VMX"

153− unpacked="unpacked/vmware-vmx"

154− cp -r $unpacked/bin/* $out/bin/

155− cp -r $unpacked/etc/modprobe.d $out/etc/

156− cp -r $unpacked/etc/init.d/* $out/etc/init.d/

157− cp -r $unpacked/roms $out/lib/vmware/

158− cp -r $unpacked/sbin/* $out/bin/

159−

160− cp -r $unpacked/lib/libconf $out/lib/vmware/

161− cp -r $unpacked/lib/bin $out/lib/vmware/

162− cp -r $unpacked/lib/lib $out/lib/vmware/

163− cp -r $unpacked/lib/scripts $out/lib/vmware/

164− cp -r $unpacked/lib/icu $out/lib/vmware/

165− cp -r $unpacked/lib/share $out/lib/vmware/

166− cp -r $unpacked/lib/modules $out/lib/vmware/

167− cp -r $unpacked/lib/include $out/lib/vmware/

168−

169− cp -r $unpacked/extra/checkvm $out/bin/

170− cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/

171−

172− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse

173− ln -s $out/lib/vmware/icu $out/etc/vmware/icu

174−

175− # Replace vmware-modconfig with simple error dialog

176− cp ${./vmware-modconfig} $out/bin/vmware-modconfig

177− sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig

178−

179− # Patch dynamic libs in

180− for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats"

181− do

182− patchelf \

183− --add-needed ${libaio}/lib/libaio.so.1 \

184− --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \

185− --add-needed ${alsa-lib}/lib/libasound.so \

186− --add-needed ${libpulseaudio}/lib/libpulse.so.0 \

187− --add-needed ${libGL}/lib/libEGL.so.1 \

188− --add-needed ${numactl}/lib/libnuma.so.1 \

189− --add-needed ${libX11}/lib/libX11.so.6 \

190− --add-needed ${libXi}/lib/libXi.so.6 \

191− --add-needed ${libGL}/lib/libGL.so.1 \

192− $out/lib/vmware/bin/$binary

193− done

194−

195− ## VMware USB Arbitrator

196− echo "Installing VMware USB Arbitrator"

197− unpacked="unpacked/vmware-usbarbitrator"

198− cp -r $unpacked/etc/init.d/* $out/etc/init.d/

199− cp -r $unpacked/bin/* $out/bin/

200− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator

201−

202− ## VMware Player Setup

203− echo "Installing VMware Player Setup"

204− unpacked="unpacked/vmware-player-setup"

205− mkdir -p $out/lib/vmware/setup

206− cp $unpacked/vmware-config $out/lib/vmware/setup/

207−

208− ## VMware Network Editor

209− echo "Installing VMware Network Editor"

210− unpacked="unpacked/vmware-network-editor"

211− cp -r $unpacked/lib $out/lib/vmware/

212−

213− ## VMware Tools + Virtual Printer

214− echo "Installing VMware Tools + Virtual Printer"

215− mkdir -p $out/lib/vmware/isoimages/

216− cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \

217− unpacked/vmware-tools-windows/windows.iso \

218− unpacked/vmware-tools-winPreVista/winPreVista.iso \

219− unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \

220− unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \

221− unpacked/vmware-tools-winPre2k/winPre2k.iso \

222− unpacked/vmware-tools-linux/linux.iso \

223− unpacked/vmware-tools-netware/netware.iso \

224− unpacked/vmware-tools-solaris/solaris.iso \

225− $out/lib/vmware/isoimages/

226−

227− ## VMware Player Application

228− echo "Installing VMware Player Application"

229− unpacked="unpacked/vmware-player-app"

230− cp -r $unpacked/lib/* $out/lib/vmware/

231− cp -r $unpacked/etc/* $out/etc/

232− cp -r $unpacked/share/* $out/share/

233− cp -r $unpacked/bin/* $out/bin/

234− cp -r $unpacked/doc/* $out/share/doc/ # Licences

235−

236− mkdir -p $out/etc/thnuclnt

237− cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/

238−

239− mkdir -p $out/lib/cups/filter

240− cp -r $unpacked/extras/thnucups $out/lib/cups/filter/

241−

242− for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity"

243− do

244− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target

245− done

246−

247− ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount

248− ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI

249− ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest

250−

251− # Patch vmplayer

252− sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer

253− sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer

254− sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop

255−

256− ## VMware OVF Tool compoment

257− echo "Installing VMware OVF Tool for Linux"

258− unpacked="unpacked/vmware-ovftool"

259− mkdir -p $out/lib/vmware-ovftool/

260−

261− cp -r $unpacked/* $out/lib/vmware-ovftool/

262− chmod 755 $out/lib/vmware-ovftool/ovftool*

263− makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool"

264−

265− ## VMware Network Editor User Interface

266− echo "Installing VMware Network Editor User Interface"

267− unpacked="unpacked/vmware-network-editor-ui"

268− cp -r $unpacked/share/* $out/share/

269−

270− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg

271− ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg

272−

273− # Patch network editor ui

274−

275− sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop

276−

277− ## VMware VIX Core Library

278− echo "Installing VMware VIX Core Library"

279− unpacked="unpacked/vmware-vix-core"

280− mkdir -p $out/lib/vmware-vix

281− cp -r $unpacked/lib/* $out/lib/vmware-vix/

282− cp -r $unpacked/bin/* $out/bin/

283− cp $unpacked/*.txt $out/lib/vmware-vix/

284−

285− mkdir -p $out/share/doc/vmware-vix/

286− cp -r $unpacked/doc/* $out/share/doc/vmware-vix/

287−

288− mkdir -p $out/include/

289− cp -r $unpacked/include/* $out/include/

290−

291− ## VMware VIX Workstation-16.0.0 Library

292− echo "Installing VMware VIX Workstation-16.0.0 Library"

293− unpacked="unpacked/vmware-vix-lib-Workstation1600"

294− cp -r $unpacked/lib/* $out/lib/vmware-vix/

295−

296− ## VMware VProbes component for Linux

297− echo "Installing VMware VProbes component for Linux"

298− unpacked="unpacked/vmware-vprobe"

299− cp -r $unpacked/bin/* $out/bin/

300− cp -r $unpacked/lib/* $out/lib/vmware/

301−

302− ## VMware Workstation

303− echo "Installing VMware Workstation"

304− unpacked="unpacked/vmware-workstation"

305− cp -r $unpacked/bin/* $out/bin/

306− cp -r $unpacked/lib/* $out/lib/vmware/

307− cp -r $unpacked/share/* $out/share/

308− cp -r $unpacked/man $out/share/

309− cp -r $unpacked/doc $out/share/

310−

311− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware

312− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray

313− ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe

314−

315− # Patch vmware

316− sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware

317− sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware

318− sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop

319−

320− chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/*

321−

322− # Harcoded pkexec hack

323− for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so"

324− do

325− sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib"

326− done

327−

328− # SUID hack

329− wrapProgram $out/lib/vmware/bin/vmware-vmx

330− rm $out/lib/vmware/bin/vmware-vmx

331− ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx

332− '';

333−

334− meta = with lib; {

335− description = "Industry standard desktop hypervisor for x86-64 architecture";

336− homepage = "https://www.vmware.com/products/workstation-pro.html";

337− license = licenses.unfree;

338− platforms = [ "x86_64-linux" ];

339− maintainers = with maintainers; [ deinferno ];

340− };

341−}

pkgs/applications/virtualization/vmware-workstation/vmware-bootstrapdeleted−11

@@ -1,11 +0,0 @@

1−PREFIX="@@PREFIXDIR@@"

2−BINDIR="@@PREFIXDIR@@/bin"

3−SBINDIR="@@PREFIXDIR@@/sbin"

4−LIBDIR="@@PREFIXDIR@@/lib"

5−DATADIR="@@PREFIXDIR@@/share"

6−SYSCONFDIR="@@PREFIXDIR@@/etc"

7−DOCDIR="@@PREFIXDIR@@/share/doc"

8−MANDIR="@@PREFIXDIR@@/share/man"

9−INCLUDEDIR="@@PREFIXDIR@@/include"

10−INITDIR="@@PREFIXDIR@@/etc"

11−INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d"

pkgs/applications/virtualization/vmware-workstation/vmware-configdeleted−21

@@ -1,21 +0,0 @@

1−.encoding = "UTF-8"

2−product.name = "VMware Workstation"

3−product.version = "@@VERSION@@"

4−product.buildNumber = "@@BUILD@@"

5−workstation.product.version = "@@VERSION@@"

6−player.product.version = "@@VERSION@@"

7−vix.config.version = "1"

8−bindir = "@@PREFIXDIR@@/bin"

9−libdir = "@@PREFIXDIR@@/lib/vmware"

10−vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix"

11−initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts"

12−vmware.fullpath = "@@PREFIXDIR@@/bin/vmware"

13−authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd"

14−gksu.rootMethod = "su"

15−NETWORKING = "yes"

16−installerDefaults.autoSoftwareUpdateEnabled = "no"

17−installerDefaults.dataCollectionEnabled = "no"

18−installerDefaults.componentDownloadEnabled = "no"

19−installerDefaults.transferVersion = "1"

20−acceptOVFEULA = "yes"

21−acceptEULA = "yes"

pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrapdeleted−5

@@ -1,5 +0,0 @@

1−VMWARE_INSTALLER="@@INSTALLERDIR@@"

2−VERSION="@@IVERSION@@" # For backwards compability

3−VMISVERSION="@@IVERSION@@"

4−VMISBUILDNUM="@@BUILD@@"

5−VMISPYVERSION="39"

pkgs/applications/virtualization/vmware-workstation/vmware-modconfigdeleted−8

@@ -1,8 +0,0 @@

1−#!/bin/bash

2−

3−set -e

4−

5−ETCDIR=/etc/vmware

6−. $ETCDIR/bootstrap

7−

8−exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)"

pkgs/applications/window-managers/wmfs/default.nix+5−1

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub,

1+{ lib, stdenv, fetchFromGitHub, gnumake,

22 libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:

33stdenv.mkDerivation {

44 pname = "wmfs";

@@ -12,6 +12,10 @@ stdenv.mkDerivation {

1212 rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";

1313 };

1414

15+ nativeBuildInputs = [

16+ gnumake

17+ ];

18+

1519 buildInputs = [

1620 imlib2

1721 libX11

pkgs/build-support/docker/default.nix+2−1

@@ -8,6 +8,7 @@

88, fakechroot

99, fakeNss

1010, fakeroot

11+, findutils

1112, go

1213, jq

1314, jshon

@@ -555,7 +556,7 @@ rec {

555556 };

556557 result = runCommand "docker-image-${baseName}.tar.gz"

557558 {

558− nativeBuildInputs = [ jshon pigz jq moreutils ];

559+ nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ];

559560 # Image name must be lowercase

560561 imageName = lib.toLower name;

561562 imageTag = if tag == null then "" else tag;

pkgs/build-support/dotnet/build-dotnet-module/default.nix+5−10

@@ -74,16 +74,13 @@ let

7474 inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType;

7575 }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook;

7676

77− localDeps = if (projectReferences != [])

78− then linkFarmFromDrvs "${name}-project-references" projectReferences

79− else null;

80−

81− _nugetDeps = mkNugetDeps { inherit name; nugetDeps = import nugetDeps; };

77+ _nugetDeps = mkNugetDeps { name = "${name}-nuget-deps"; nugetDeps = import nugetDeps; };

78+ _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences;

8279

8380 nuget-source = mkNugetSource {

84− name = "${name}-nuget-source";

85− description = "A Nuget source with the dependencies for ${name}";

86− deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps;

81+ name = "${args.pname}-nuget-source";

82+ description = "A Nuget source with the dependencies for ${args.pname}";

83+ deps = [ _nugetDeps _localDeps ];

8784 };

8885

8986in stdenvNoCC.mkDerivation (args // {

@@ -106,8 +103,6 @@ in stdenvNoCC.mkDerivation (args // {

106103 dontWrapGApps = args.dontWrapGApps or true;

107104

108105 passthru = {

109− inherit nuget-source;

110−

111106 fetch-deps = writeScript "fetch-${pname}-deps" ''

112107 set -euo pipefail

113108 cd "$(dirname "''${BASH_SOURCE[0]}")"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh+1−2

@@ -1,5 +1,4 @@

1−# inherit arguments from derivation

2−dotnetBuildFlags=( ${dotnetBuildFlags[@]-} )

1+declare -a projectFile testProjectFile dotnetBuildFlags dotnetFlags

32

43dotnetBuildHook() {

54 echo "Executing dotnetBuildHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh+1−2

@@ -1,5 +1,4 @@

1−# inherit arguments from derivation

2−dotnetTestFlags=( ${dotnetTestFlags[@]-} )

1+declare -a testProjectFile dotnetTestFlags dotnetFlags

32

43dotnetCheckHook() {

54 echo "Executing dotnetCheckHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh+1−5

@@ -1,8 +1,4 @@

1−declare -a projectFile testProjectFile

2−

3−# inherit arguments from derivation

4−dotnetFlags=( ${dotnetFlags[@]-} )

5−dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} )

1+declare -a projectFile testProjectFile dotnetRestoreFlags dotnetFlags

62

73dotnetConfigureHook() {

84 echo "Executing dotnetConfigureHook"

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh+4−5

@@ -1,5 +1,4 @@

1−# Inherit arguments from the derivation

2−makeWrapperArgs=( ${makeWrapperArgs-} )

1+declare -a makeWrapperArgs gappsWrapperArgs

32

43# First argument is the executable you want to wrap,

54# the second is the destination for the wrapper.

@@ -16,9 +15,9 @@ wrapDotnetProgram() {

1615dotnetFixupHook() {

1716 echo "Executing dotnetFixupPhase"

1817

19− if [ "${executables}" ]; then

18+ if [ "${executables-}" ]; then

2019 for executable in ${executables[@]}; do

21− execPath="$out/lib/${pname}/$executable"

20+ execPath="$out/lib/${pname-}/$executable"

2221

2322 if [[ -f "$execPath" && -x "$execPath" ]]; then

2423 wrapDotnetProgram "$execPath" "$out/bin/$(basename "$executable")"

@@ -28,7 +27,7 @@ dotnetFixupHook() {

2827 fi

2928 done

3029 else

31− for executable in $out/lib/${pname}/*; do

30+ for executable in $out/lib/${pname-}/*; do

3231 if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then

3332 wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")"

3433 fi

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh+1−2

@@ -1,5 +1,4 @@

1−# inherit arguments from derivation

2−dotnetInstallFlags=( ${dotnetInstallFlags[@]-} )

1+declare -a projectFile dotnetInstallFlags dotnetFlags

32

43dotnetInstallHook() {

54 echo "Executing dotnetInstallHook"

pkgs/build-support/dotnet/make-nuget-source/default.nix+18−26

@@ -1,38 +1,30 @@

11{ dotnetPackages, lib, xml2, stdenvNoCC }:

2−

3−{ name

4−, description ? ""

5−, deps ? []

6−}:

7−

2+{ name, description ? "", deps ? [] }:

83let

9− nuget-source = stdenvNoCC.mkDerivation rec {

4+ _nuget-source = stdenvNoCC.mkDerivation rec {

105 inherit name;

11−

126 meta.description = description;

13− nativeBuildInputs = [ dotnetPackages.Nuget xml2 ];

147

8+ nativeBuildInputs = [ dotnetPackages.Nuget xml2 ];

159 buildCommand = ''

1610 export HOME=$(mktemp -d)

1711 mkdir -p $out/{lib,share}

1812

19− ${lib.concatMapStringsSep "\n" (dep: ''

20− nuget init "${dep}" "$out/lib"

21− '') deps}

13+ nuget sources Add -Name nixos -Source "$out/lib"

14+ ${ lib.concatMapStringsSep "\n" (dep:

15+ ''nuget init "${dep}" "$out/lib"''

16+ ) deps }

2217

23− # Generates a list of all licenses' spdx ids, if available.

24− # Note that this currently ignores any license provided in plain text (e.g. "LICENSE.txt")

18+ # Generates a list of all unique licenses' spdx ids.

2519 find "$out/lib" -name "*.nuspec" -exec sh -c \

26− "NUSPEC=\$(xml2 < {}) && echo "\$NUSPEC" | grep license/@type=expression | tr -s \ '\n' | grep "license=" | cut -d'=' -f2" \

27− \; | sort -u > $out/share/licenses

20+ "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses

2821 '';

29− } // { # We need data from `$out` for `meta`, so we have to use overrides as to not hit infinite recursion.

30− meta.licence = let

31− depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");

32− in (lib.flatten (lib.forEach depLicenses (spdx:

33− if (spdx != "")

34− then lib.getLicenseFromSpdxId spdx

35− else []

36− )));

37− };

38−in nuget-source

22+} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion.

23+ meta.licence = let

24+ depLicenses = lib.splitString "\n" (builtins.readFile "${_nuget-source}/share/licenses");

25+ getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses);

26+ in (lib.flatten (lib.forEach depLicenses (spdx:

27+ if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx

28+ )));

29+};

30+in _nuget-source

pkgs/build-support/dotnet/nuget-to-nix/default.nix+3−25

@@ -1,27 +1,5 @@

1−{ lib

2−, runCommandLocal

3−, runtimeShell

4−, substituteAll

5−, nix

6−, coreutils

7−, findutils

8−, gnused

9−}:

1+{ runCommand }:

102

11−runCommandLocal "nuget-to-nix" {

12− script = substituteAll {

13− src = ./nuget-to-nix.sh;

14− inherit runtimeShell;

15−

16− binPath = lib.makeBinPath [

17− nix

18− coreutils

19− findutils

20− gnused

21− ];

22− };

23−

24− meta.description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";

25−} ''

26− install -Dm755 $script $out/bin/nuget-to-nix

3+runCommand "nuget-to-nix" { preferLocalBuild = true; } ''

4+ install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix

275''

pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh+1−3

@@ -1,9 +1,7 @@

1−#!@runtimeShell@

1+#!/usr/bin/env bash

22

33set -euo pipefail

44

5−export PATH="@binPath@"

6−

75if [ $# -eq 0 ]; then

86 >&2 echo "Usage: $0 [packages directory] > deps.nix"

97 exit 1

pkgs/build-support/fetchfirefoxaddon/default.nix+2−2

@@ -1,4 +1,4 @@

1−{stdenv, unzip, jq, zip, fetchurl,writeScript, ...}:

1+{stdenv, lib, coreutils, unzip, jq, zip, fetchurl,writeScript, ...}:

22

33{

44 name

@@ -40,5 +40,5 @@ stdenv.mkDerivation {

4040 zip -r -q -FS "$out/$UUID.xpi" *

4141 rm -r "$out/$UUID"

4242 '';

43− nativeBuildInputs = [ unzip zip jq ];

43+ nativeBuildInputs = [ coreutils unzip zip jq ];

4444}

pkgs/build-support/fetchnextcloudapp/default.nix+6−1

@@ -1,4 +1,4 @@

1−{ stdenv, fetchurl, ... }:

1+{ stdenv, gnutar, findutils, fetchurl, ... }:

22{ name

33, url

44, version

@@ -13,6 +13,11 @@ stdenv.mkDerivation {

1313 inherit url sha256;

1414 };

1515

16+ nativeBuildInputs = [

17+ gnutar

18+ findutils

19+ ];

20+

1621 unpackPhase = ''

1722 tar -xzpf $src

1823 '';

pkgs/build-support/kernel/make-initrd-ng-tool.nix+1−8

@@ -1,4 +1,4 @@

1−{ rustPlatform, lib, makeWrapper, patchelf, glibc, binutils }:

1+{ rustPlatform }:

22

33rustPlatform.buildRustPackage {

44 pname = "make-initrd-ng";

@@ -6,11 +6,4 @@ rustPlatform.buildRustPackage {

66

77 src = ./make-initrd-ng;

88 cargoLock.lockFile = ./make-initrd-ng/Cargo.lock;

9−

10− nativeBuildInputs = [ makeWrapper ];

11−

12− postInstall = ''

13− wrapProgram $out/bin/make-initrd-ng \

14− --prefix PATH : ${lib.makeBinPath [ patchelf glibc binutils ]}

15− '';

169}

pkgs/build-support/kernel/make-initrd-ng.nix+2−2

@@ -8,7 +8,7 @@ let

88 # compression type and filename extension.

99 compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;

1010in

11−{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand

11+{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand, glibc

1212# Name of the derivation (not of the resulting file!)

1313, name ? "initrd"

1414

@@ -72,7 +72,7 @@ in

7272 passAsFile = ["contents"];

7373 contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n";

7474

75− nativeBuildInputs = [makeInitrdNGTool patchelf cpio] ++ lib.optional makeUInitrd ubootTools;

75+ nativeBuildInputs = [makeInitrdNGTool patchelf glibc cpio] ++ lib.optional makeUInitrd ubootTools;

7676} ''

7777 mkdir ./root

7878 make-initrd-ng "$contentsPath" ./root

pkgs/build-support/kernel/make-initrd-ng/src/main.rs+7−15

@@ -6,7 +6,7 @@ use std::hash::Hash;

66use std::io::{BufReader, BufRead, Error, ErrorKind};

77use std::os::unix;

88use std::path::{Component, Path, PathBuf};

9−use std::process::Command;

9+use std::process::{Command, Stdio};

1010

1111struct NonRepeatingQueue<T> {

1212 queue: VecDeque<T>,

@@ -42,6 +42,7 @@ fn patch_elf<S: AsRef<OsStr>, P: AsRef<OsStr>>(mode: S, path: P) -> Result<Strin

4242 let output = Command::new("patchelf")

4343 .arg(&mode)

4444 .arg(&path)

45+ .stderr(Stdio::inherit())

4546 .output()?;

4647 if output.status.success() {

4748 Ok(String::from_utf8(output.stdout).expect("Failed to parse output"))

@@ -50,15 +51,16 @@ fn patch_elf<S: AsRef<OsStr>, P: AsRef<OsStr>>(mode: S, path: P) -> Result<Strin

5051 }

5152}

5253

53−fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(

54+fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path>>(

5455 source: P,

5556 target: S,

5657 queue: &mut NonRepeatingQueue<Box<Path>>,

5758) -> Result<(), Error> {

58− fs::copy(&source, &target)?;

59+ fs::copy(&source, target)?;

5960

6061 if !Command::new("ldd").arg(&source).output()?.status.success() {

61− // Not dynamically linked - no need to recurse

62+ //stdout(Stdio::inherit()).stderr(Stdio::inherit()).

63+ println!("{:?} is not dynamically linked. Not recursing.", OsStr::new(&source));

6264 return Ok(());

6365 }

6466

@@ -89,17 +91,6 @@ fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(

8991 }

9092 }

9193

92− // Make file writable to strip it

93− let mut permissions = fs::metadata(&target)?.permissions();

94− permissions.set_readonly(false);

95− fs::set_permissions(&target, permissions)?;

96−

97− // Strip further than normal

98− if !Command::new("strip").arg("--strip-all").arg(OsStr::new(&target)).output()?.status.success() {

99− println!("{:?} was not successfully stripped.", OsStr::new(&target));

100− }

101−

102−

10394 Ok(())

10495}

10596

@@ -209,6 +200,7 @@ fn main() -> Result<(), Error> {

209200 }

210201 }

211202 while let Some(obj) = queue.pop_front() {

203+ println!("{:?}", obj);

212204 handle_path(out_path, &*obj, &mut queue)?;

213205 }

214206

pkgs/build-support/rust/build-rust-crate/build-crate.nix+2−3

@@ -4,15 +4,14 @@

44 crateFeatures, crateRenames, libName, release, libPath,

55 crateType, metadata, crateBin, hasCrateBin,

66 extraRustcOpts, verbose, colors,

7− buildTests,

8− codegenUnits

7+ buildTests

98}:

109

1110 let

1211 baseRustcOpts =

1312 [

1413 (if release then "-C opt-level=3" else "-C debuginfo=2")

15− "-C codegen-units=${toString codegenUnits}"

14+ "-C codegen-units=$NIX_BUILD_CORES"

1615 "--remap-path-prefix=$NIX_BUILD_TOP=/"

1716 (mkRustcDepArgs dependencies crateRenames)

1817 (mkRustcFeatureArgs crateFeatures)

pkgs/build-support/rust/build-rust-crate/configure-crate.nix+1−2

@@ -2,7 +2,6 @@

22{

33 build

44, buildDependencies

5−, codegenUnits

65, colors

76, completeBuildDeps

87, completeDeps

@@ -25,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion;

2524 version = lib.splitVersion (lib.head version_);

2625 rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)

2726 (if release then "-C opt-level=3" else "-C debuginfo=2")

28− (["-C codegen-units=${toString codegenUnits}"] ++ extraRustcOptsForBuildRs);

27+ (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOptsForBuildRs);

2928 buildDeps = mkRustcDepArgs buildDependencies crateRenames;

3029 authors = lib.concatStringsSep ":" crateAuthors;

3130 optLevel = if release then 3 else 0;

pkgs/build-support/rust/build-rust-crate/default.nix+2−4

@@ -228,7 +228,6 @@ crate_: lib.makeOverridable

228228 "colors"

229229 "edition"

230230 "buildTests"

231− "codegenUnits"

232231 ];

233232 extraDerivationAttrs = builtins.removeAttrs crate processedAttrs;

234233 nativeBuildInputs_ = nativeBuildInputs;

@@ -316,7 +315,6 @@ crate_: lib.makeOverridable

316315 colors = lib.attrByPath [ "colors" ] "always" crate;

317316 extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or [ ]);

318317 edition = crate.edition or null;

319− codegenUnits = if crate ? codegenUnits then crate.codegenUnits else 1;

320318 extraRustcOpts =

321319 lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts

322320 ++ extraRustcOpts_

@@ -331,13 +329,13 @@ crate_: lib.makeOverridable

331329 inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription

332330 crateFeatures crateRenames libName build workspace_member release libPath crateVersion

333331 extraLinkFlags extraRustcOptsForBuildRs

334− crateAuthors crateHomepage verbose colors codegenUnits;

332+ crateAuthors crateHomepage verbose colors;

335333 };

336334 buildPhase = buildCrate {

337335 inherit crateName dependencies

338336 crateFeatures crateRenames libName release libPath crateType

339337 metadata hasCrateBin crateBin verbose colors

340− extraRustcOpts buildTests codegenUnits;

338+ extraRustcOpts buildTests;

341339 };

342340 installPhase = installCrate crateName metadata buildTests;

343341

pkgs/build-support/writers/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:

1+{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:

22

33let

44 aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};

@@ -205,7 +205,7 @@ let

205205 writeNginxConfig = name: text: pkgs.runCommandLocal name {

206206 inherit text;

207207 passAsFile = [ "text" ];

208− nativeBuildInputs = [ gixy ];

208+ nativeBuildInputs = [ gawk gnused gixy ];

209209 } /* sh */ ''

210210 # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16

211211 awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out

pkgs/data/fonts/iosevka/bin.nix+1−1

@@ -11,7 +11,7 @@ let

1111 (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));

1212in stdenv.mkDerivation rec {

1313 pname = "${name}-bin";

14− version = "15.2.0";

14+ version = "15.1.0";

1515

1616 src = fetchurl {

1717 url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

pkgs/data/fonts/iosevka/variants.nix+92−92

@@ -1,95 +1,95 @@

11# This file was autogenerated. DO NOT EDIT!

22{

3− iosevka = "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv";

4− iosevka-aile = "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq";

5− iosevka-curly = "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq";

6− iosevka-curly-slab = "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq";

7− iosevka-etoile = "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08";

8− iosevka-slab = "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb";

9− iosevka-ss01 = "1k451iv9fvp86arw0z685xyixlkpnsg3mxl6k9s47xxf9r82ab2a";

10− iosevka-ss02 = "066l1jamvlnksl1jn4l5qqll4wi19w0jr9x7bw0lpdic9478cs8g";

11− iosevka-ss03 = "0qh5ds9s7rghmar90ymxvcninmcm2hc05f83ixjadjfg9a27sff7";

12− iosevka-ss04 = "1zl2m68wqync8n93n06yj49r6n652yakrvdcsdvqm3agajnz0wnk";

13− iosevka-ss05 = "0rxakr04kwrwjfq7a6y2vdyjfgn162d8353pn7nc9wsfyrjbqpc2";

14− iosevka-ss06 = "0lfv6cvqy1mcn7zds7c6w68ky4y3clmvxcrg5knilm7sfql1jis1";

15− iosevka-ss07 = "1cc15rnnq2vzp22p8ld94jl2lyn6k8bra5792yqvyg23lf493jk2";

16− iosevka-ss08 = "0ysrq40kpvgfiapk1x9nzvvd81r0kyl1jlywwhmm3f4qca86a3ja";

17− iosevka-ss09 = "1535y8gmlkd1nqywcbmp7x9y9ahmskmwgs138baaj642jbq85l1b";

18− iosevka-ss10 = "01z7nwyqqda6jw819ajr9cd691yxd0b3irj4amdwnl6b46a278q7";

19− iosevka-ss11 = "0zi2n6h7jqf4vbg6r5vjzk0y8fj1lfjifsa1s3j0dmgs05m2bzc8";

20− iosevka-ss12 = "1h5bw4fp6kgszzwd9dpi461yf3mnkm0b5cgpaliyl2qpd8jivmm1";

21− iosevka-ss13 = "06v5angxqnbz9a53358ls0w78ib1d57g3svnfyplw7ynd0rrvw93";

22− iosevka-ss14 = "0ic0hh6xh1pl1jzkmp1ddbzhvfzislimlgwsdcnimzxk6ga5k44j";

23− iosevka-ss15 = "1mg363g47j90z00dpha81jk0n2ck59ca172g165m7cmz1bb425iq";

24− iosevka-ss16 = "0bs3rhwgnv9cwzgmsgzgjgv6awz5igxcvq64xpycw0dp17wbfl1z";

25− iosevka-ss17 = "0ssi56j8jdkhpsq7acczy3z9v8q3amr6a6jxv49rd4473fxzh3zc";

26− iosevka-ss18 = "13s77f1ki09szpa64qb00421kj2n5q2lv0vb2ahnlvphsbgik1j6";

27− sgr-iosevka = "0pqhpm13q23f82lkcimk8pinm41j6xmdlqxmfzg1y7m50gzdm10r";

28− sgr-iosevka-aile = "1malyfkc9dd552p04vq2b2nlv613pjzw84q8gnlpy8bycgx5np3s";

29− sgr-iosevka-curly = "0b8gnk8hsily9wp91hi66xjyj5hwqcab7j64x1xzzdc7fnfaz0qq";

30− sgr-iosevka-curly-slab = "0i9k38a7fb9z6jwds92kz3pgf1ryjz1m12ad1mslwq82kwy00h3f";

31− sgr-iosevka-etoile = "0rw4dhivxf3yls28zs34xia56dzx1w2as2j619ji36dpmh1v3ljn";

32− sgr-iosevka-fixed = "1zcr7zcpca5bhgaisjjlbn7zn1ih6mz6k4nj27y4ya8hnasfqxlh";

33− sgr-iosevka-fixed-curly = "17jvx2rvfqx6ip8h8srr6iwy55nnwvkrrflr4hxdyv8ggi8d8y7d";

34− sgr-iosevka-fixed-curly-slab = "01s3wz0r2wmybws96s1mcplx7zrbciqabsgaa5jy4kwn8rg0ajpi";

35− sgr-iosevka-fixed-slab = "1xbsrywi413r6gkmwc11yw8pkrc6hkf5309dfr25qwnn6c8wvqiy";

36− sgr-iosevka-fixed-ss01 = "17776y4lv7vyqhcanmayvksh85v0907vys4f3hpxjbw86497f4zj";

37− sgr-iosevka-fixed-ss02 = "0cwz8bfj05vr2800r35nd8d7r05hr4fd2wbx26dga3qnddawcgbp";

38− sgr-iosevka-fixed-ss03 = "1df1aigpy5g46g68l9fln2af4fafl9fs197nz49biw66ndraym4c";

39− sgr-iosevka-fixed-ss04 = "02g22kfd4nw8cvfkcjw9mixvw2abfzpbalcwcqidyn8qd3s51x1v";

40− sgr-iosevka-fixed-ss05 = "12zwmzh0ilclkpw18lqkp4dpawngwf21ah90ywi3spzl9whqk5wc";

41− sgr-iosevka-fixed-ss06 = "01ajn8gwqljx8da9fv9dlawwafcnqvf9pld9h8lygrg67kf3p1j6";

42− sgr-iosevka-fixed-ss07 = "000sk29gfp9z7690880kixmk08swnwpp8zs89idgpg5qhs5479qm";

43− sgr-iosevka-fixed-ss08 = "1fcw4wmz12ar5hy3r5hmagwss46yjsckk4hxhjfphbapznmyw2dx";

44− sgr-iosevka-fixed-ss09 = "0jxpf854njzjw7r1q1jaizbfhaal7idhs9v5l64c03q40s2cycxr";

45− sgr-iosevka-fixed-ss10 = "0n40gl7ygcc03n6673rkjdfqshd6fx7f0a831fz007s61c38rdl9";

46− sgr-iosevka-fixed-ss11 = "0r0wlmpa5nmgwx92f6x2jimgyh5x05id39wsmxpyhjfrl4dchkgm";

47− sgr-iosevka-fixed-ss12 = "02dvkr2vim8zyd1gngjk41bbg5ncjr6yfxigy5l9gjm64x6q2szz";

48− sgr-iosevka-fixed-ss13 = "14vz894yxw5252krpwh9981hmslwmyxdgp96kpq37lp35w7bhkc0";

49− sgr-iosevka-fixed-ss14 = "0jaz1g89dj27s3xgcginxx4s3kr7114x7wqqda96jyc1zrg79am4";

50− sgr-iosevka-fixed-ss15 = "1h12kcik341vp3yra8izcbj3490payjqy8b0y739s4bj6zmx7zb3";

51− sgr-iosevka-fixed-ss16 = "0yiyxbi1snd33ys8ip29xprwm0876j818g3fr2g6d955lp94crkp";

52− sgr-iosevka-fixed-ss17 = "1sv4zf5w7amhd591cjky7z2fc90hiiwj1g987scwcbvc0fb5gj86";

53− sgr-iosevka-fixed-ss18 = "09yh76152ar2lkw1gavd9x5i6a6vswhw9qyic0zixzr2rmcm2j35";

54− sgr-iosevka-slab = "0xdljj5bh4jsbwjgicpbi91hkjqvzxis9asd4g0vy3qqdr393i9k";

55− sgr-iosevka-ss01 = "0fllywsy23d6nfvgpb98af76cwbq8pizjvcah0p8j4qql6353d5y";

56− sgr-iosevka-ss02 = "0mlp4l3bbm2rm9gjb4pa8k730x3yb85qck7a1n5wdfz881mz6z59";

57− sgr-iosevka-ss03 = "0kcimy2i28a82s74987f6dxkdxzr06fzsi6rb7wz5v4rn5v7vmm9";

58− sgr-iosevka-ss04 = "0ynrq7di10349lfqm34vzr6z9z5hx6lz4q2z73ri91si224qsgih";

59− sgr-iosevka-ss05 = "1p2062x9wd5kkas3j5aqkx7r4asm2727i0sjf207w4lh3r37k9by";

60− sgr-iosevka-ss06 = "0zcpnw5mk3js5rc0cgpn5fncqqwf5s032z04xbaagzsmp7f3f1p9";

61− sgr-iosevka-ss07 = "09h686i2jq2p9i0684kjmsfgdpfwkbncbg3zxhz4m1x4wpfblhk8";

62− sgr-iosevka-ss08 = "0jbzr6saijbmbj1dkc4djawr75agp2c8krsnwskqr9dhisrmnjfk";

63− sgr-iosevka-ss09 = "10ffzi57gibz6w7yn4ign8vn6cagc680jrv81aqdkgav2bx71z9g";

64− sgr-iosevka-ss10 = "0d0wn7564zyvfk79hfqgnm3aa94k8xbddgmmxpq5jk918a1m6614";

65− sgr-iosevka-ss11 = "1zmbnhr1jz53yhighcn8dkj72s4y66ma61qjf5y3z64j7ql99kxi";

66− sgr-iosevka-ss12 = "06czjy90yx7pv958agwwnwn2vpfv1ha2j90bmcjg2c6shvnz5hsr";

67− sgr-iosevka-ss13 = "19k47hb167l6jsymznivdy6mgz228vcc4r5mzjjcszy4ba6n5qvg";

68− sgr-iosevka-ss14 = "0nkj7jmpbwfq7pl7s3ih30zs0szqf7xsbjn70w5i5x2g8fc3sffj";

69− sgr-iosevka-ss15 = "18l78cg3vxibngdbx2ikqhgz1v499ihf7bmdd5w92wrkkjgd0q8m";

70− sgr-iosevka-ss16 = "00mn81r50aw3ymp3mnwb8j6z6n98y03z0g5b8jfybpah65rgsrra";

71− sgr-iosevka-ss17 = "07vpvldkph4wn50vj5179h6zrw7vaf9mylksscw4wyqalinhiiqk";

72− sgr-iosevka-ss18 = "1h0jq8d2lbh0lfsmqcwbw6q9fbhbfrnn3c58xnknr9ys32xc88l2";

73− sgr-iosevka-term = "1j7sv5k4pbrq278nwfxshw23f7hdigy90w82a11s8nkq5b7f81wd";

74− sgr-iosevka-term-curly = "1v3vcvq6p4a3y1alkg45l2jipf0mwsv4x57yxl0dd41fb30araxw";

75− sgr-iosevka-term-curly-slab = "05is4yw7v32yf1h3b5j86wmz0x9fgbp5q99jw2zgn5lmv8x71dgh";

76− sgr-iosevka-term-slab = "1a0fn07ykx93y2myxdmg4xnz67dwmdl66n8la8x1h502b4hacqpl";

77− sgr-iosevka-term-ss01 = "1bwnyd6g0c185ny3d34pza1szc8pzkj15hk76g7s3jancgyajcj8";

78− sgr-iosevka-term-ss02 = "17srbkd4pbr2wwzcw6ycm1c4n5jlk4p5wlm1baqfzvffldbp609k";

79− sgr-iosevka-term-ss03 = "1w9ydkm0lsd0chyhi3b24n6syns55jwgnxkbnn7z7hh9llglplsj";

80− sgr-iosevka-term-ss04 = "1znabmm2plb5w5f8qj61shzm4v6kdqdak547j64w768g6pgc61hh";

81− sgr-iosevka-term-ss05 = "0pg3zannb29pxbfcjarj39my2lhwnid3yr7sbhk5i6sxy8klwjdv";

82− sgr-iosevka-term-ss06 = "0n25hc5gfi4zcc2zr0r5zh0q8v16z8ak2iphh5406pdgj3n9lmi9";

83− sgr-iosevka-term-ss07 = "0kmv8p689wf3mpiaq3749a3361nsckg0v4hsaw2mlshvhp4159h4";

84− sgr-iosevka-term-ss08 = "04g0q2pgimj73hgxr9nv8qmbc6n6fsadhy5x3l3cwcw7wh7s0g37";

85− sgr-iosevka-term-ss09 = "19qssfrmkvdq7bl0bg3a9v6sgnn2hg93kq0qh4j9chr7ffxnlmb2";

86− sgr-iosevka-term-ss10 = "1qc3cfw9f959h1gafhsddrlw2cbvazv17yllsj6rw4rff3bqscaq";

87− sgr-iosevka-term-ss11 = "1jbz5qg2vgrqmhbz8yvmampv7zkmksilvd7y2zrz4h5s2jbr32sg";

88− sgr-iosevka-term-ss12 = "0afcjcpb4dw4d3dggm82yls09rl71x4jqavbil4z7br96vgipdg9";

89− sgr-iosevka-term-ss13 = "04zbhi5mpycb9c6gf5ci1h6pbghy8vmajmzifcpg8d0fb9vyz370";

90− sgr-iosevka-term-ss14 = "0bps3zgarjdq5xn92rgdasnhcqlrmxwpa4bv9wr40df7zxhlvkr4";

91− sgr-iosevka-term-ss15 = "0ylxgmrsl596zdlph2f2lcfy9a37wi0x7418y53g43bdd33kcpxp";

92− sgr-iosevka-term-ss16 = "1ql8x3r19sa36424wijrzxnl3mfz7rjnwlavd0bz8qinfdvjvdsf";

93− sgr-iosevka-term-ss17 = "0plhqk7j64wfs61snly0m49lghk4srmribfqlzdk9xrvnv9h7zv1";

94− sgr-iosevka-term-ss18 = "1h7z1cnd4ia1pbyj5sq1718z8n747cq8kdy97c4vdmw6gjl8wp5x";

3+ iosevka = "0654wkgdr5gy0s9gr4llyqkvngxrqfn6hfvm5akz0zwq3xwfjc0p";

4+ iosevka-aile = "0hkgb7p22ayzsjw7idzl47djcpglsjzyi8rkz39vb9w4w3dvxbn5";

5+ iosevka-curly = "04kkvbl0jz3ykdc30wvagh7f49nqxr6vz0wjcq93ajdc2pm4i5k4";

6+ iosevka-curly-slab = "189w0xszks8msg7wis0gck3r2cp1rdimkii44dlj8l4p4qjxg8va";

7+ iosevka-etoile = "1i8p8knl3hr8gj7nhbd93jh31rbj11pvjwhvjxy1djgipmdn3257";

8+ iosevka-slab = "049j6p5v4f50yvmw8ab01pzcf18i326741rsg0kgsxw36yidmd1d";

9+ iosevka-ss01 = "1h5s0nlgl5g0w08ii77jg671nwrmpan22ddgxaq941lznhmkv27k";

10+ iosevka-ss02 = "03ps2a2z2x1d42mqnal1dr32949ra04hd8igwl93lflijlbww1xh";

11+ iosevka-ss03 = "134kzw6ys3rnfw8wv7gfbvjx5im21647n1gvj68bayry41y3xisp";

12+ iosevka-ss04 = "03kqg6n4p5m27szkjpfpyr4jgyigvj40rm1nmvv4dfd3cs9rg326";

13+ iosevka-ss05 = "1xzvim04d2z152ml9av2zsgyla1n7wa0rja4j9bvi22rh1qb8kwv";

14+ iosevka-ss06 = "1r8bj27rfsz732gw6qwqj6hx4babpm5cqm4i7f37spkw1dmvcrkx";

15+ iosevka-ss07 = "16ndzr6abacy8m3bf4smfy9yw8w2i51pkv3d7klfflz9jimx540y";

16+ iosevka-ss08 = "0kn4q2n1nyn3ds2gajc42b2mi8n67mlgz4rhbbn01nd8miz6lasw";

17+ iosevka-ss09 = "1wajl1cng698dk0w81j2n54gcb7lygfj645s3gf2k4ywsmfd17rr";

18+ iosevka-ss10 = "1cx44l69z8y2b0dcxw43msppgl030cvihf40asfsj036zab36n71";

19+ iosevka-ss11 = "0jk3777bx4ibr7na9qraqhaldbaini9qyjw4lpqnszqxryx5p9ms";

20+ iosevka-ss12 = "19w5wmq5q1rwn0yw9q74kfkbqaxbbv1ak7ikdi95qa06c1sz4z73";

21+ iosevka-ss13 = "0llhdh641l8hqrpzs663ry3mr1fxh42g7vv1dknyh7lp32qdrh8h";

22+ iosevka-ss14 = "1rfi157f3fln2ww3q945ych34lc9fxjx2spv6zrjg6j6k841ld76";

23+ iosevka-ss15 = "12qpgbg4d2h8kqlc3xhpg1j3ic6wnffn4af1kr05kdln6av9sfjn";

24+ iosevka-ss16 = "1ry923xky52fylhnya3yay3wh0cxwwqy64vq74a8wls1vnfpq7md";

25+ iosevka-ss17 = "0d152px48gh8axqaw8myy81h9mff5vkikdqqv1mqcqy5yb50g550";

26+ iosevka-ss18 = "1q9j0rp8a29yazgp9a3jgp54xjih0ffqfm5ii85sl0dxrval5vkq";

27+ sgr-iosevka = "1khq3vqma1zc588x2rcnqv6lc2ajxkvs711w8zrjb7x9aaysly66";

28+ sgr-iosevka-aile = "0cryvq204hadx28raldjp901zvvv7iywah8pcn09qwrhpkbk1r92";

29+ sgr-iosevka-curly = "1mqybxgc9pdn5ww5zy9ki6apiv0vbdmspz2glmcrz4vfxylbydqb";

30+ sgr-iosevka-curly-slab = "0v7y5ld3ccyb4y7nz391pxljcmxczll319lj6znxj9p9pgykw6gy";

31+ sgr-iosevka-etoile = "03vcxnkb766l8i0r9rpd08ylazhxhv2avb3mszpirgs7ax979jqm";

32+ sgr-iosevka-fixed = "12b2n3yjz3r67p757dmrdzayjidrlmb16mjlzdc2rrnijd41qyn7";

33+ sgr-iosevka-fixed-curly = "12l7d0472m524jx52libsxc5ffjsnki3ah07vfg6lj7w8lam1vq1";

34+ sgr-iosevka-fixed-curly-slab = "1lyvjvl5gsx16vfy6s0qgvkw50xvariqp6xvfzz68sg7hm1s3jqp";

35+ sgr-iosevka-fixed-slab = "1080269ykl7xpjkp120rm46j3yhj3sd3rpygf79ny2svq0jn99y2";

36+ sgr-iosevka-fixed-ss01 = "0g04xlr1jarnmj427gdvskgy7hmbxi5hs2ppjfj71qv75kyvlvyk";

37+ sgr-iosevka-fixed-ss02 = "1gh3grq87ibibryl6h0z3z4r55k0wv7w4mvg63jfrbvdc7z2rkhz";

38+ sgr-iosevka-fixed-ss03 = "1aa8nyaccx1ryfrdmwjdrfcwcr7vh3f28ygh3m1cmakmji6gr63z";

39+ sgr-iosevka-fixed-ss04 = "0qv3pk1pwiciqw15lanljk2j8g667rn6514b16xf9lmmmpczlz2m";

40+ sgr-iosevka-fixed-ss05 = "0pjmzrq836xw0nxr1j6hgphwya20k00v29mpbrxrmcg5ii4ph82h";

41+ sgr-iosevka-fixed-ss06 = "0wxis8mg9jm38caf2rjsfyc1g83r7yayp415cwzl1pm6sdkxar9g";

42+ sgr-iosevka-fixed-ss07 = "0r4rvlk67p8s02i54lpgarw75lhfr2w4an8z34n7689arl2a03bv";

43+ sgr-iosevka-fixed-ss08 = "0rd1dglhqzbaib104hh7i89m4br8kg2shd0221kvshkjwbpbpr1r";

44+ sgr-iosevka-fixed-ss09 = "02jaykc43c35i0n34gi3ds66gglcdycq9nalidqcldbxcpgciiiz";

45+ sgr-iosevka-fixed-ss10 = "046s8iv5yv9vbaf9nv1kr0lpvxa0yb125hjzw3sm8fvihpwks0m7";

46+ sgr-iosevka-fixed-ss11 = "19rq860q79cl5b6p7q5phsnb89xxsv4h5dqyn1qkc7axwvx9yj9v";

47+ sgr-iosevka-fixed-ss12 = "1gscgqrc9b8liwr00c2h5zbi3xq2nkfwfbfv6adv8wjprfw2ri3d";

48+ sgr-iosevka-fixed-ss13 = "0px3zvxbis70b24xzgnrs3rh2pacdqlkdkwb5gwngans2alnq5bw";

49+ sgr-iosevka-fixed-ss14 = "1n6pn1jv0diikbhp9kngxnakjkhjc414qzccfrinml6fg7cr8kz8";

50+ sgr-iosevka-fixed-ss15 = "00w67v49iqxcrqrqv7fcncdly6cswlzp4x8650hq48dxmc279wmj";

51+ sgr-iosevka-fixed-ss16 = "1dxfn2lzgdcdzq5p35q0cafyrq15zmfn5gf8iw4g9xjl4hyyzi29";

52+ sgr-iosevka-fixed-ss17 = "0zaxqaxng61gwr2zywq7b4m0aaiqwkb3khpadzcnvd1i4ggx9n7l";

53+ sgr-iosevka-fixed-ss18 = "150ialpsvkmnhisv73x9w5dlmvh2a3496zrpyk03xqz9vzxmxw84";

54+ sgr-iosevka-slab = "12i3fgr0pj0mp9mcwfd221f6lj6fbf4cj77wq173hzjkjn8l7gbj";

55+ sgr-iosevka-ss01 = "1bdba7693iszm1y2zs0c3rsz8wwsgvf9zj9l93fjgnhmxfigkwlx";

56+ sgr-iosevka-ss02 = "13pdpg1rhvv86y2wplswri95dpfsly4x37bpflyd1n60rzcgp4d1";

57+ sgr-iosevka-ss03 = "199nvbfvwfbn7qfdxzibb38avbwx6476c3iwd93q21d49zk4xfrk";

58+ sgr-iosevka-ss04 = "17kv8039g5xdwqmg8ywjnfk95742izrdj5dxkzwq2s3kpqz4yikz";

59+ sgr-iosevka-ss05 = "1xg4ds6gfa5h90lggs8sbx2icz7rklq4rgzbrk9x1z3mnmmprm3r";

60+ sgr-iosevka-ss06 = "00mrcklg9ijyqhsq848xlqi1s66alkcv7h73qnqjqvsd4a0q6lww";

61+ sgr-iosevka-ss07 = "0p0x3974kwlw5m3wn0ngk5ik7apd94hyp2a9b1rw6ndv864h0j5y";

62+ sgr-iosevka-ss08 = "12fywxdmsaqbq8xaxgbigjj89g2c0y2brps31mkdz0l1ba329192";

63+ sgr-iosevka-ss09 = "0pjl8h2bf6v0llqjs52k9gq3mm31jl80phzcqsz5vx17p5gn7wnn";

64+ sgr-iosevka-ss10 = "1cww7ing7is6r6naj3nwaq24v3gqsk0pj9d8r167a5mr8zhx7pqb";

65+ sgr-iosevka-ss11 = "1rl13qmxqc8ajshc9ylbb29w8kx5ad5bz71xjw7j646k30hsl8fc";

66+ sgr-iosevka-ss12 = "1zyhz1k1a534hq04prw9f8rjm4yrxmc30c65jpx1d94ckzbzj1qm";

67+ sgr-iosevka-ss13 = "0rh9w9jdbhi56dcwf51api3v8gqfpzjz91ccnikikrg413b3r2qs";

68+ sgr-iosevka-ss14 = "0s2sqdmfnlqzz07spvkhyxg5fj4r4bx2ik2mglqzbawc0fmp6ajn";

69+ sgr-iosevka-ss15 = "1kya4lyvcph6d80zbgr1b3189yqa4cngx5bzgp09437pb84k7lv3";

70+ sgr-iosevka-ss16 = "1d453qf4arvzxyivj789y9dd87sqg392fl1xshwh56h7rx4qbv4q";

71+ sgr-iosevka-ss17 = "1qbvr1307gkqyxgx2sqvc6jvv4x0pibcsxbmp7ih96pk9sryfw06";

72+ sgr-iosevka-ss18 = "0lqcjymaxxh2p3irqmyfsq15339amwdnyizi71lh0p16sypcc14f";

73+ sgr-iosevka-term = "04fwjyc44kmwaaqm4f47az24vrl502hi8mqjhm3mjhpm7a7ysywx";

74+ sgr-iosevka-term-curly = "1h0g2jhv2qirlrqjs7w72db00xvm99agwddb9mngmsg5m97dywmm";

75+ sgr-iosevka-term-curly-slab = "0m641zbd4232vpnc92phvsxvzpl33xvrkrm22hxysmwwm6b4sb68";

76+ sgr-iosevka-term-slab = "0k8pijigr6i0y2d91c9irkm4xcw8pqwqyv1dpn2y4q6nbrm1jvcs";

77+ sgr-iosevka-term-ss01 = "1vv1japj1dxp36smvs4lb9hqlcrkvxandrknjswd343acwf9pr6y";

78+ sgr-iosevka-term-ss02 = "11s5zidgx2rdvpix32h9j1d1in35s7acwwfxzf78ba3zlsmkslis";

79+ sgr-iosevka-term-ss03 = "179wrslzrji05d2pgcjrspgqmmym6r9ihcjqq8fci7y0nwn2pbzm";

80+ sgr-iosevka-term-ss04 = "1g64fviviykl8mwdsd4cjwjcsfjnskjmcxm8kfq22xlh0s9h6p1k";

81+ sgr-iosevka-term-ss05 = "15s3q5yv5qv5h6lrw9mjw97csaiql1lqsf8sb0v7is0qk28qld78";

82+ sgr-iosevka-term-ss06 = "1i8jb8is2xmdz2m1wh51708861rfvkia28qic9c30xq50a49n4ls";

83+ sgr-iosevka-term-ss07 = "15mbhilmv72f824sqks4vkqkh46zs5z46sbibw7vfgz6b5wyknl0";

84+ sgr-iosevka-term-ss08 = "02a9ws0fnzrdc4p54sb5x85z46i2071lq24i4676l8q42szf0xal";

85+ sgr-iosevka-term-ss09 = "0kakm3fszw6gxr2294fi8pm52drjdihb0sg2ickq5jf22pbknswy";

86+ sgr-iosevka-term-ss10 = "1c8jahi1ilny09gm5lvjm1fgqvcfjb9g9hn9f2q7b3cb5m1p3iya";

87+ sgr-iosevka-term-ss11 = "1y67g39x2lyw0j7xx3ga4sncrh7q6fciyl26ql2c9jvm9fs6yywh";

88+ sgr-iosevka-term-ss12 = "1zg4459v8m21dip5lbfxvp57x64h3js7lzb675m5nhqgyw01phxf";

89+ sgr-iosevka-term-ss13 = "0fqc1gpxw8bd0023vvp7js9q1wxinz7j3n6q9c0amq8niw7572d5";

90+ sgr-iosevka-term-ss14 = "04q6kq0d0bzarxa976gnq4xvk28r0q2s9wji5av6nivj7df85zl0";

91+ sgr-iosevka-term-ss15 = "1ccvb520vfmhsgp9ra1yysc5c93a2d3nasb45f9ppsqbjf3slrz0";

92+ sgr-iosevka-term-ss16 = "1spdadjssjnxp63wp04vncnfpyrkjlfkxrsyf8wbarg81c8zz1b3";

93+ sgr-iosevka-term-ss17 = "1vm1nkk3arpyk92x4pjccs1d2b5zqqa1pzv0vavnchhri8q6csrd";

94+ sgr-iosevka-term-ss18 = "0rpc7hcyc0dv174zk9crdz152bd342d1zinc1xsdm10qnf72ssbr";

9595}

pkgs/data/fonts/lao/default.nixdeleted−22

@@ -1,22 +0,0 @@

1−{ fetchzip, lib }:

2−

3−let

4− version = "0.0.20060226";

5−in

6−fetchzip {

7− name = "lao-${version}";

8− url = "mirror://debian/pool/main/f/fonts-lao/fonts-lao_${version}.orig.tar.xz";

9− sha256 = "sha256-Ti3DNOgLR5VBJ1mSe8M+qs4UYbCR7qOPgqxRfmHa+jY=";

10−

11− postFetch = ''

12− mkdir -p $out/share/fonts

13− tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lao-${version}/Phetsarath_OT.ttf

14− '';

15−

16− meta = with lib; {

17− description = "TrueType font for Lao language";

18− license = licenses.gpl2Plus;

19− maintainers = with lib.maintainers; [ serge ];

20− platforms = platforms.all;

21− };

22−}

pkgs/data/fonts/uni-vga/default.nix+6−4

@@ -2,6 +2,8 @@

22, libfaketime, fonttosfnt, mkfontscale

33}:

44

5+with lib;

6+

57stdenv.mkDerivation {

68 name = "uni-vga";

79

@@ -13,7 +15,7 @@ stdenv.mkDerivation {

1315 nativeBuildInputs =

1416 [ bdftopcf libfaketime

1517 fonttosfnt mkfontscale

16− ] ++ lib.optionals stdenv.isLinux [ perl kbd ];

18+ ] ++ optionals stdenv.isLinux [ perl kbd ];

1719

1820 postPatch = "patchShebangs .";

1921

@@ -24,7 +26,7 @@ stdenv.mkDerivation {

2426 # convert bdf font to otb

2527 faketime -f "1970-01-01 00:00:01" \

2628 fonttosfnt -v -o u_vga16.otb u_vga16.bdf

27− '' + lib.optionalString stdenv.isLinux ''

29+ '' + optionalString stdenv.isLinux ''

2830 # convert font to compressed psf

2931 ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \

3032 | psfaddtable - UniCyrX.sfm - \

@@ -40,14 +42,14 @@ stdenv.mkDerivation {

4042 install -m 644 -D *.bdf -t "$bdf/share/fonts"

4143 mkfontdir "$bdf/share/fonts"

4244

43− '' + lib.optionalString stdenv.isLinux ''

45+ '' + optionalString stdenv.isLinux ''

4446 # install psf (for linux virtual terminal)

4547 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"

4648 '';

4749

4850 outputs = [ "out" "bdf" ];

4951

50− meta = with lib; {

52+ meta = {

5153 description = "Unicode VGA font";

5254 maintainers = [ maintainers.ftrvxmtrx ];

5355 homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";

pkgs/data/misc/hackage/pin.json+4−4

@@ -1,6 +1,6 @@

11{

2− "commit": "762464dcc5ce93f1c6a9a746feb6bd1bd0c47006",

3− "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/762464dcc5ce93f1c6a9a746feb6bd1bd0c47006.tar.gz",

4− "sha256": "0k1qp34lsc08a99p669v8n0fxs6mdzwc2bz87v0hdah4qagi4z4g",

5− "msg": "Update from Hackage at 2022-04-20T23:34:08Z"

2+ "commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a",

3+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz",

4+ "sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j",

5+ "msg": "Update from Hackage at 2022-04-09T11:23:17Z"

66}

pkgs/data/themes/orchis-theme/default.nix+2−2

@@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) ''

2121stdenvNoCC.mkDerivation

2222rec {

2323 pname = "orchis-theme";

24− version = "2022-05-01";

24+ version = "2022-02-18";

2525

2626 src = fetchFromGitHub {

2727 repo = "Orchis-theme";

2828 owner = "vinceliuice";

2929 rev = version;

30− sha256 = "sha256-OYB/TnVm8AOQTdF+rGiY5tQjUjkSSpMrqFo0+TXSHzA=";

30+ sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes=";

3131 };

3232

3333 nativeBuildInputs = [ gtk3 sassc ];

pkgs/data/themes/vimix/default.nix+4−12

@@ -4,24 +4,21 @@

44, gnome-shell

55, gtk-engine-murrine

66, gtk_engines

7−, sassc

8−, gitUpdater

97}:

108

119stdenv.mkDerivation rec {

1210 pname = "vimix-gtk-themes";

13− version = "2022-04-24";

11+ version = "2021-08-17";

1412

1513 src = fetchFromGitHub {

1614 owner = "vinceliuice";

1715 repo = pname;

1816 rev = version;

19− sha256 = "0q0ahm060qvr7r9j3x9lxidjnwf032c2g1pcqw9mz93iy7vfn358";

17+ sha256 = "1pn737w99j4ij8qkgw0rrzhbcqzni73z5wnkfqgqqbhj38rafbpv";

2018 };

2119

2220 nativeBuildInputs = [

2321 gnome-shell # needed to determine the gnome-shell version

24− sassc

2522 ];

2623

2724 buildInputs = [

@@ -32,20 +29,15 @@ stdenv.mkDerivation rec {

3229 gtk-engine-murrine

3330 ];

3431

35− postPatch = ''

36− patchShebangs install.sh

37− '';

38−

3932 installPhase = ''

4033 runHook preInstall

34+ patchShebangs .

4135 mkdir -p $out/share/themes

42− name= HOME="$TMPDIR" ./install.sh --all --dest $out/share/themes

36+ name= ./install.sh --all --dest $out/share/themes

4337 rm $out/share/themes/*/{AUTHORS,LICENSE}

4438 runHook postInstall

4539 '';

4640

47− passthru.updateScript = gitUpdater {inherit pname version; };

48−

4941 meta = with lib; {

5042 description = "Flat Material Design theme for GTK based desktop environments";

5143 homepage = "https://github.com/vinceliuice/vimix-gtk-themes";

pkgs/desktops/cdesktopenv/default.nix+2−2

@@ -3,7 +3,7 @@

33, xorgproto, libX11, bison, ksh, perl, gnum4

44, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps

55, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf

6−, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales

6+, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk

77, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot

88, rpcsvc-proto }:

99

@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {

4343 libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh

4444 ];

4545 nativeBuildInputs = [

46− bison ncompress autoPatchelfHook makeWrapper fakeroot

46+ bison ncompress gawk autoPatchelfHook makeWrapper fakeroot

4747 rpcsvc-proto

4848 ];

4949 # build fails otherwise

pkgs/desktops/enlightenment/econnman/default.nix+4−4

@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {

1919 wrapPythonPrograms

2020 '';

2121

22− meta = with lib; {

22+ meta = {

2323 description = "A user interface for the connman network connection manager";

2424 homepage = "https://enlightenment.org/";

25− license = licenses.lgpl3;

26− platforms = platforms.linux;

27− maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;

25+ license = lib.licenses.lgpl3;

26+ platforms = lib.platforms.linux;

27+ maintainers = with lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ];

2828 };

2929}

pkgs/desktops/enlightenment/ecrire/default.nix+1−1

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {

3131 homepage = "https://www.enlightenment.org/";

3232 license = licenses.gpl3Only;

3333 platforms = platforms.linux;

34− maintainers = teams.enlightenment.members;

34+ maintainers = with maintainers; [ romildo ];

3535 };

3636}

pkgs/desktops/enlightenment/efl/default.nix+1−1

@@ -208,6 +208,6 @@ stdenv.mkDerivation rec {

208208 homepage = "https://enlightenment.org/";

209209 license = with licenses; [ bsd2 lgpl2Only licenses.zlib ];

210210 platforms = platforms.linux;

211− maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;

211+ maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];

212212 };

213213}

pkgs/desktops/enlightenment/enlightenment/default.nix+1−1

@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {

7575 homepage = "https://www.enlightenment.org";

7676 license = licenses.bsd2;

7777 platforms = platforms.linux;

78− maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;

78+ maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];

7979 };

8080}

pkgs/desktops/enlightenment/ephoto/default.nix+1−1

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {

3131 homepage = "https://www.smhouston.us/ephoto/";

3232 license = licenses.bsd2;

3333 platforms = platforms.linux;

34− maintainers = teams.enlightenment.members;

34+ maintainers = with maintainers; [ romildo ];

3535 };

3636}

pkgs/desktops/enlightenment/evisum/default.nix+1−1

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {

3131 homepage = "https://www.enlightenment.org";

3232 license = with licenses; [ isc ];

3333 platforms = platforms.linux;

34− maintainers = teams.enlightenment.members;

34+ maintainers = with maintainers; [ romildo ];

3535 };

3636}

pkgs/desktops/enlightenment/rage/default.nix+1−1

@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {

3939 homepage = "https://enlightenment.org/";

4040 license = licenses.bsd2;

4141 platforms = platforms.linux;

42− maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members;

42+ maintainers = with maintainers; [ matejc ftrvxmtrx romildo ];

4343 };

4444}

pkgs/desktops/enlightenment/terminology/default.nix+1−1

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {

3131 homepage = "https://www.enlightenment.org/about-terminology";

3232 license = licenses.bsd2;

3333 platforms = platforms.linux;

34− maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ] ++ teams.enlightenment.members;

34+ maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ];

3535 };

3636}

pkgs/desktops/gnome-2/platform/libglade/default.nix+5−2

@@ -1,4 +1,6 @@

1−{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, gettext }:

1+{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:

2+

3+assert withLibgladeConvert -> python2 != null;

24

35stdenv.mkDerivation rec {

46 pname = "libglade";

@@ -12,7 +14,8 @@ stdenv.mkDerivation rec {

1214 outputs = [ "out" "dev" ];

1315

1416 nativeBuildInputs = [ pkg-config ];

15− buildInputs = [ gtk2 gettext ];

17+ buildInputs = [ gtk2 gettext ]

18+ ++ lib.optional withLibgladeConvert python2;

1619

1720 NIX_LDFLAGS = "-lgmodule-2.0";

1821

pkgs/desktops/lumina/lumina-calculator/default.nix+1−1

@@ -27,6 +27,6 @@ mkDerivation rec {

2727 homepage = "https://github.com/lumina-desktop/lumina-calculator";

2828 license = licenses.bsd3;

2929 platforms = platforms.unix;

30− maintainers = teams.lumina.members;

30+ maintainers = [ maintainers.romildo ];

3131 };

3232}

pkgs/desktops/lumina/lumina-pdf/default.nix+1−1

@@ -33,6 +33,6 @@ mkDerivation rec {

3333 homepage = "https://github.com/lumina-desktop/lumina-pdf";

3434 license = licenses.bsd3;

3535 platforms = platforms.unix;

36− maintainers = teams.lumina.members;

36+ maintainers = [ maintainers.romildo ];

3737 };

3838}

pkgs/desktops/lumina/lumina/default.nix+1−1

@@ -108,6 +108,6 @@ mkDerivation rec {

108108 homepage = "https://lumina-desktop.org";

109109 license = licenses.bsd3;

110110 platforms = platforms.unix;

111− maintainers = teams.lumina.members;

111+ maintainers = [ maintainers.romildo ];

112112 };

113113}

pkgs/desktops/lxqt/compton-conf/default.nix+1−1

@@ -44,6 +44,6 @@ mkDerivation rec {

4444 description = "GUI configuration tool for compton X composite manager";

4545 license = licenses.lgpl21Plus;

4646 platforms = with platforms; unix;

47− maintainers = teams.lxqt.members;

47+ maintainers = with maintainers; [ romildo ];

4848 };

4949}

pkgs/desktops/lxqt/libfm-qt/default.nix+1−1

@@ -50,6 +50,6 @@ mkDerivation rec {

5050 description = "Core library of PCManFM-Qt (Qt binding for libfm)";

5151 license = licenses.lgpl21Plus;

5252 platforms = with platforms; unix;

53− maintainers = teams.lxqt.members;

53+ maintainers = with maintainers; [ romildo ];

5454 };

5555}

pkgs/desktops/lxqt/liblxqt/default.nix+1−1

@@ -57,6 +57,6 @@ mkDerivation rec {

5757 homepage = "https://github.com/lxqt/liblxqt";

5858 license = licenses.lgpl21Plus;

5959 platforms = platforms.linux;

60− maintainers = teams.lxqt.members;

60+ maintainers = with maintainers; [ romildo ];

6161 };

6262}

pkgs/desktops/lxqt/libqtxdg/default.nix+1−1

@@ -44,6 +44,6 @@ mkDerivation rec {

4444 description = "Qt implementation of freedesktop.org xdg specs";

4545 license = licenses.lgpl21Plus;

4646 platforms = platforms.linux;

47− maintainers = teams.lxqt.members;

47+ maintainers = with maintainers; [ romildo ];

4848 };

4949}

pkgs/desktops/lxqt/libsysstat/default.nix+1−1

@@ -34,6 +34,6 @@ mkDerivation rec {

3434 homepage = "https://github.com/lxqt/libsysstat";

3535 license = licenses.lgpl21Plus;

3636 platforms = with platforms; unix;

37− maintainers = teams.lxqt.members;

37+ maintainers = with maintainers; [ romildo ];

3838 };

3939}

pkgs/desktops/lxqt/lximage-qt/default.nix+1−1

@@ -49,6 +49,6 @@ mkDerivation rec {

4949 description = "The image viewer and screenshot tool for lxqt";

5050 license = licenses.gpl2Plus;

5151 platforms = with platforms; unix;

52− maintainers = teams.lxqt.members;

52+ maintainers = with maintainers; [ romildo ];

5353 };

5454}

pkgs/desktops/lxqt/lxqt-about/default.nix+1−1

@@ -44,6 +44,6 @@ mkDerivation rec {

4444 description = "Dialogue window providing information about LXQt and the system it's running on";

4545 license = licenses.lgpl21Plus;

4646 platforms = platforms.linux;

47− maintainers = teams.lxqt.members;

47+ maintainers = with maintainers; [ romildo ];

4848 };

4949}

pkgs/desktops/lxqt/lxqt-admin/default.nix+1−1

@@ -54,6 +54,6 @@ mkDerivation rec {

5454 description = "LXQt system administration tool";

5555 license = licenses.lgpl21Plus;

5656 platforms = platforms.linux;

57− maintainers = teams.lxqt.members;

57+ maintainers = with maintainers; [ romildo ];

5858 };

5959}

pkgs/desktops/lxqt/lxqt-archiver/default.nix+1−1

@@ -46,6 +46,6 @@ mkDerivation rec {

4646 description = "Archive tool for the LXQt desktop environment";

4747 license = licenses.gpl2Plus;

4848 platforms = with platforms; unix;

49− maintainers = with maintainers; [ jchw ] ++ teams.lxqt.members;

49+ maintainers = with maintainers; [ jchw ];

5050 };

5151}

pkgs/desktops/lxqt/lxqt-build-tools/default.nix+1−1

@@ -66,6 +66,6 @@ mkDerivation rec {

6666 description = "Various packaging tools and scripts for LXQt applications";

6767 license = licenses.lgpl21Plus;

6868 platforms = with platforms; unix;

69− maintainers = teams.lxqt.members;

69+ maintainers = with maintainers; [ romildo ];

7070 };

7171}

pkgs/desktops/lxqt/lxqt-config/default.nix+1−1

@@ -71,7 +71,7 @@ mkDerivation rec {

7171 description = "Tools to configure LXQt and the underlying operating system";

7272 license = licenses.lgpl21Plus;

7373 platforms = platforms.linux;

74− maintainers = teams.lxqt.members;

74+ maintainers = with maintainers; [ romildo ];

7575 };

7676

7777}

pkgs/desktops/lxqt/lxqt-globalkeys/default.nix+1−1

@@ -46,6 +46,6 @@ mkDerivation rec {

4646 description = "LXQt service for global keyboard shortcuts registration";

4747 license = licenses.lgpl21Plus;

4848 platforms = platforms.linux;

49− maintainers = teams.lxqt.members;

49+ maintainers = with maintainers; [ romildo ];

5050 };

5151}

pkgs/desktops/lxqt/lxqt-notificationd/default.nix+1−1

@@ -46,6 +46,6 @@ mkDerivation rec {

4646 description = "The LXQt notification daemon";

4747 license = licenses.lgpl21Plus;

4848 platforms = platforms.linux;

49− maintainers = teams.lxqt.members;

49+ maintainers = with maintainers; [ romildo ];

5050 };

5151}

pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix+1−1

@@ -46,6 +46,6 @@ mkDerivation rec {

4646 description = "GUI to query passwords on behalf of SSH agents";

4747 license = licenses.lgpl21Plus;

4848 platforms = platforms.linux;

49− maintainers = teams.lxqt.members;

49+ maintainers = with maintainers; [ romildo ];

5050 };

5151}

pkgs/desktops/lxqt/lxqt-panel/default.nix+1−1

@@ -78,6 +78,6 @@ mkDerivation rec {

7878 description = "The LXQt desktop panel";

7979 license = licenses.lgpl21Plus;

8080 platforms = platforms.linux;

81− maintainers = teams.lxqt.members;

81+ maintainers = with maintainers; [ romildo ];

8282 };

8383}

pkgs/desktops/lxqt/lxqt-policykit/default.nix+1−1

@@ -54,6 +54,6 @@ mkDerivation rec {

5454 description = "The LXQt PolicyKit agent";

5555 license = licenses.lgpl21Plus;

5656 platforms = platforms.linux;

57− maintainers = teams.lxqt.members;

57+ maintainers = with maintainers; [ romildo ];

5858 };

5959}

pkgs/desktops/lxqt/lxqt-powermanagement/default.nix+1−1

@@ -52,6 +52,6 @@ mkDerivation rec {

5252 description = "Power management module for LXQt";

5353 license = licenses.lgpl21Plus;

5454 platforms = platforms.linux;

55− maintainers = teams.lxqt.members;

55+ maintainers = with maintainers; [ romildo ];

5656 };

5757}

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix+1−1

@@ -51,6 +51,6 @@ mkDerivation rec {

5151 description = "LXQt Qt platform integration plugin";

5252 license = licenses.lgpl21Plus;

5353 platforms = platforms.linux;

54− maintainers = teams.lxqt.members;

54+ maintainers = with maintainers; [ romildo ];

5555 };

5656}

pkgs/desktops/lxqt/lxqt-runner/default.nix+1−1

@@ -56,6 +56,6 @@ mkDerivation rec {

5656 description = "Tool used to launch programs quickly by typing their names";

5757 license = licenses.lgpl21Plus;

5858 platforms = platforms.linux;

59− maintainers = teams.lxqt.members;

59+ maintainers = with maintainers; [ romildo ];

6060 };

6161}

pkgs/desktops/lxqt/lxqt-session/default.nix+1−1

@@ -55,6 +55,6 @@ mkDerivation rec {

5555 description = "An alternative session manager ported from the original razor-session";

5656 license = licenses.lgpl21Plus;

5757 platforms = platforms.linux;

58− maintainers = teams.lxqt.members;

58+ maintainers = with maintainers; [ romildo ];

5959 };

6060}

pkgs/desktops/lxqt/lxqt-sudo/default.nix+1−1

@@ -48,6 +48,6 @@ mkDerivation rec {

4848 description = "GUI frontend for sudo/su";

4949 license = licenses.lgpl21Plus;

5050 platforms = platforms.linux;

51− maintainers = teams.lxqt.members;

51+ maintainers = with maintainers; [ romildo ];

5252 };

5353}

pkgs/desktops/lxqt/lxqt-themes/default.nix+1−1

@@ -29,6 +29,6 @@ mkDerivation rec {

2929 description = "Themes, graphics and icons for LXQt";

3030 license = licenses.lgpl21Plus;

3131 platforms = platforms.linux;

32− maintainers = teams.lxqt.members;

32+ maintainers = with maintainers; [ romildo ];

3333 };

3434}

pkgs/desktops/lxqt/obconf-qt/default.nix+1−1

@@ -48,6 +48,6 @@ mkDerivation rec {

4848 description = "The Qt port of obconf, the Openbox configuration tool";

4949 license = licenses.gpl2Plus;

5050 platforms = with platforms; unix;

51− maintainers = teams.lxqt.members;

51+ maintainers = with maintainers; [ romildo ];

5252 };

5353}

pkgs/desktops/lxqt/pavucontrol-qt/default.nix+1−1

@@ -43,6 +43,6 @@ mkDerivation rec {

4343 description = "A Pulseaudio mixer in Qt (port of pavucontrol)";

4444 license = licenses.gpl2Plus;

4545 platforms = with platforms; linux;

46− maintainers = teams.lxqt.members;

46+ maintainers = with maintainers; [ romildo ];

4747 };

4848}

pkgs/desktops/lxqt/pcmanfm-qt/default.nix+1−1

@@ -51,6 +51,6 @@ mkDerivation rec {

5151 description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";

5252 license = licenses.gpl2Plus;

5353 platforms = with platforms; unix;

54− maintainers = teams.lxqt.members;

54+ maintainers = with maintainers; [ romildo ];

5555 };

5656}

pkgs/desktops/lxqt/qlipper/default.nix+1−1

@@ -34,6 +34,6 @@ mkDerivation rec {

3434 homepage = "https://github.com/pvanek/qlipper";

3535 license = licenses.gpl2Plus;

3636 platforms = with platforms; unix;

37− maintainers = teams.lxqt.members;

37+ maintainers = with maintainers; [ romildo ];

3838 };

3939}

pkgs/desktops/lxqt/qps/default.nix+1−1

@@ -44,6 +44,6 @@ mkDerivation rec {

4444 description = "Qt based process manager";

4545 license = licenses.gpl2Plus;

4646 platforms = with platforms; linux; # does not build on darwin

47− maintainers = teams.lxqt.members;

47+ maintainers = with maintainers; [ romildo ];

4848 };

4949}

pkgs/desktops/lxqt/qterminal/default.nix+1−1

@@ -43,6 +43,6 @@ mkDerivation rec {

4343 description = "A lightweight Qt-based terminal emulator";

4444 license = licenses.gpl2Plus;

4545 platforms = with platforms; unix;

46− maintainers = with maintainers; [ globin ] ++ teams.lxqt.members;

46+ maintainers = with maintainers; [ romildo globin ];

4747 };

4848}

pkgs/desktops/lxqt/qtermwidget/default.nix+1−1

@@ -36,6 +36,6 @@ mkDerivation rec {

3636 description = "A terminal emulator widget for Qt 5";

3737 license = licenses.gpl2Plus;

3838 platforms = with platforms; unix;

39− maintainers = teams.lxqt.members;

39+ maintainers = with maintainers; [ romildo ];

4040 };

4141}

pkgs/desktops/lxqt/screengrab/default.nix+1−1

@@ -51,6 +51,6 @@ mkDerivation rec {

5151 description = "Crossplatform tool for fast making screenshots";

5252 license = licenses.gpl2Plus;

5353 platforms = platforms.linux;

54− maintainers = teams.lxqt.members;

54+ maintainers = with maintainers; [ romildo ];

5555 };

5656}

pkgs/desktops/pantheon/apps/switchboard/default.nix+15−2

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -17,13 +18,13 @@

1718

1819stdenv.mkDerivation rec {

1920 pname = "switchboard";

20− version = "6.0.1";

21+ version = "6.0.0";

2122

2223 src = fetchFromGitHub {

2324 owner = "elementary";

2425 repo = pname;

2526 rev = version;

26− sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M=";

27+ sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";

2728 };

2829

2930 nativeBuildInputs = [

@@ -45,6 +46,18 @@ stdenv.mkDerivation rec {

4546

4647 patches = [

4748 ./plugs-path-env.patch

49+ # Upstream code not respecting our localedir

50+ # https://github.com/elementary/switchboard/pull/214

51+ (fetchpatch {

52+ url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch";

53+ sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc";

54+ })

55+ # Fix build with meson 0.61

56+ # https://github.com/elementary/switchboard/pull/226

57+ (fetchpatch {

58+ url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch";

59+ sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0=";

60+ })

4861 ];

4962

5063 postPatch = ''

pkgs/desktops/pantheon/default.nix−2

@@ -121,8 +121,6 @@ lib.makeScope pkgs.newScope (self: with self; {

121121

122122 granite = callPackage ./granite { };

123123

124− granite7 = callPackage ./granite/7 { };

125−

126124 #### SERVICES

127125

128126 contractor = callPackage ./services/contractor { };

pkgs/desktops/pantheon/granite/7/default.nixdeleted−73

@@ -1,73 +0,0 @@

1−{ lib

2−, stdenv

3−, fetchFromGitHub

4−, nix-update-script

5−, python3

6−, meson

7−, ninja

8−, vala

9−, pkg-config

10−, libgee

11−, gtk4

12−, glib

13−, gettext

14−, gsettings-desktop-schemas

15−, gobject-introspection

16−, wrapGAppsHook4

17−}:

18−

19−stdenv.mkDerivation rec {

20− pname = "granite";

21− version = "7.0.0";

22−

23− outputs = [ "out" "dev" ];

24−

25− src = fetchFromGitHub {

26− owner = "elementary";

27− repo = pname;

28− rev = version;

29− sha256 = "sha256-fuyjQDH3C8qRYuAfQDDeW3aSWVTLtGzMAjcuAHCB1Zw=";

30− };

31−

32− nativeBuildInputs = [

33− gettext

34− gobject-introspection

35− meson

36− ninja

37− pkg-config

38− python3

39− vala

40− wrapGAppsHook4

41− ];

42−

43− propagatedBuildInputs = [

44− glib

45− gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format"

46− gtk4

47− libgee

48− ];

49−

50− postPatch = ''

51− chmod +x meson/post_install.py

52− patchShebangs meson/post_install.py

53− '';

54−

55− passthru = {

56− updateScript = nix-update-script {

57− attrPath = "pantheon.granite7";

58− };

59− };

60−

61− meta = with lib; {

62− description = "An extension to GTK used by elementary OS";

63− longDescription = ''

64− Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions

65− designed for use in apps built for elementary OS.

66− '';

67− homepage = "https://github.com/elementary/granite";

68− license = licenses.lgpl3Plus;

69− platforms = platforms.linux;

70− maintainers = teams.pantheon.members;

71− mainProgram = "granite-7-demo";

72− };

73−}

pkgs/development/beam-modules/erlang-ls/default.nix+2−2

@@ -1,7 +1,7 @@

11{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper

22, stdenv, writeScript, lib }:

33let

4− version = "0.31.0";

4+ version = "0.30.0";

55 owner = "erlang-ls";

66 repo = "erlang_ls";

77 deps = import ./rebar-deps.nix {

@@ -19,7 +19,7 @@ rebar3Relx {

1919 inherit version;

2020 src = fetchFromGitHub {

2121 inherit owner repo;

22− sha256 = "sha256-tpJUCHrSFNEzNrln7nKwav0GSBW+4fwjSB3WI1MKW9A=";

22+ sha256 = "sha256-Dqkp0d6U8U5HbyBq6q0WmKODVIQx3DVE8yofD0JhAHM=";

2323 rev = version;

2424 };

2525 releaseType = "escript";

pkgs/development/compilers/abcl/default.nix+1−6

@@ -18,18 +18,13 @@ stdenv.mkDerivation rec {

1818 buildPhase = ''

1919 ant

2020 '';

21− # Fix for https://github.com/armedbear/abcl/issues/484

22− javaOpts =

23− lib.optionalString

24− (lib.versionAtLeast jre.version "17")

25− "--add-opens=java.base/java.util.jar=ALL-UNNAMED";

2621 installPhase = ''

2722 mkdir -p "$out"/{bin,share/doc/abcl,lib/abcl}

2823 cp -r README COPYING CHANGES examples/ "$out/share/doc/abcl/"

2924 cp -r dist/*.jar contrib/ "$out/lib/abcl/"

3025

3126 echo "#! ${stdenv.shell}" >> "$out/bin/abcl"

32− echo "${jre}/bin/java $javaOpts -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"

27+ echo "${jre}/bin/java -cp \"$out/lib/abcl/abcl.jar:$out/lib/abcl/abcl-contrib.jar:\$CLASSPATH\" org.armedbear.lisp.Main \"\$@\"" >> "$out/bin/abcl"

3328 chmod a+x "$out"/bin/*

3429 '';

3530 buildInputs = [jre ant jdk jre];

pkgs/development/compilers/bupc/default.nix+1

@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {

1616 # Used during the configure phase

1717 ENVCMD = "${coreutils}/bin/env";

1818

19+ nativeBuildInputs = [ coreutils ];

1920 buildInputs = [ perl ];

2021

2122 meta = with lib; {

pkgs/development/compilers/chez/default.nix+3−3

@@ -5,17 +5,17 @@

55

66stdenv.mkDerivation rec {

77 pname = "chez-scheme";

8− version = "9.5.8";

8+ version = "9.5.6";

99

1010 src = fetchFromGitHub {

1111 owner = "cisco";

1212 repo = "ChezScheme";

1313 rev = "refs/tags/v${version}";

14− sha256 = "sha256-esCWEzny/I+Ors6+upKlt4h13oN0bRLWN9OTKuSqdl8=";

14+ sha256 = "sha256-1C5fEbVIpFXlDQ5wFmYZ2nrDUq9jBmvnku/7f0MH7vc=";

1515 fetchSubmodules = true;

1616 };

1717

18− nativeBuildInputs = lib.optional stdenv.isDarwin cctools;

18+ nativeBuildInputs = [ coreutils ] ++ lib.optional stdenv.isDarwin cctools;

1919 buildInputs = [ ncurses libiconv libX11 libuuid ];

2020

2121 enableParallelBuilding = true;

pkgs/development/compilers/chicken/5/eggs.nix−414

@@ -2,38 +2,6 @@

22rec {

33 inherit (pkgs) eggDerivation fetchegg;

44

5− address-info = eggDerivation {

6− name = "address-info-1.0.5";

7−

8− src = fetchegg {

9− name = "address-info";

10− version = "1.0.5";

11− sha256 = "1nv87ghfv8szmi2l0rybrgrds6fs5w6jxafqslnzw0mw5sfj6jyk";

12− };

13−

14− buildInputs = [

15− srfi-1

16− ];

17− };

18−

19− apropos = eggDerivation {

20− name = "apropos-3.6.0";

21−

22− src = fetchegg {

23− name = "apropos";

24− version = "3.6.0";

25− sha256 = "0jq5d4zijbf5dw2vsfn89smp7zjpgp82y5hs10xkysf831x7l551";

26− };

27−

28− buildInputs = [

29− srfi-1

30− srfi-13

31− check-errors

32− string-utils

33− symbol-utils

34− ];

35− };

36−

375 args = eggDerivation {

386 name = "args-1.6.0";

397

@@ -50,125 +18,6 @@ rec {

5018 ];

5119 };

5220

53− base64 = eggDerivation {

54− name = "base64-1.0";

55−

56− src = fetchegg {

57− name = "base64";

58− version = "1.0";

59− sha256 = "01lid9wxf94nr7gmskamxlfngack1hyxig8rl9swwgnbmz9qgysi";

60− };

61−

62− buildInputs = [

63− srfi-13

64− ];

65− };

66−

67− check-errors = eggDerivation {

68− name = "check-errors-3.2.0";

69−

70− src = fetchegg {

71− name = "check-errors";

72− version = "3.2.0";

73− sha256 = "0d0hpq1nmwyvbg162bqzgk62f70rin0pxsr5a3pgx6xin5i3ngah";

74− };

75−

76− buildInputs = [

77−

78− ];

79− };

80−

81− defstruct = eggDerivation {

82− name = "defstruct-2.0";

83−

84− src = fetchegg {

85− name = "defstruct";

86− version = "2.0";

87− sha256 = "0q1v1gdwqlpmwcsa4jnqldfqky9k7kvb83qgkhdyqym52bm5aln8";

88− };

89−

90− buildInputs = [

91− srfi-1

92− ];

93− };

94−

95− feature-test = eggDerivation {

96− name = "feature-test-0.2.0";

97−

98− src = fetchegg {

99− name = "feature-test";

100− version = "0.2.0";

101− sha256 = "1dxdisv64d8alg6r45cwxf5gmdpcvql1hvlq808lgwphd7kvfpgr";

102− };

103−

104− buildInputs = [

105−

106− ];

107− };

108−

109− foreigners = eggDerivation {

110− name = "foreigners-1.5";

111−

112− src = fetchegg {

113− name = "foreigners";

114− version = "1.5";

115− sha256 = "1mm91y61nlawgb7iqdrkz2fi9sc3fic07f5m1ig541b2hbscfiqy";

116− };

117−

118− buildInputs = [

119− matchable

120− ];

121− };

122−

123− intarweb = eggDerivation {

124− name = "intarweb-2.0.1";

125−

126− src = fetchegg {

127− name = "intarweb";

128− version = "2.0.1";

129− sha256 = "0md226jikqhj993cw17588ipmnz0v7l34zrvylamyrs6zbvj3scm";

130− };

131−

132− buildInputs = [

133− srfi-1

134− srfi-13

135− srfi-14

136− defstruct

137− uri-common

138− base64

139− ];

140− };

141−

142− iset = eggDerivation {

143− name = "iset-2.2";

144−

145− src = fetchegg {

146− name = "iset";

147− version = "2.2";

148− sha256 = "0yfkcd07cw6xnnqfbbvjy81x0vc54k40vdjp2m7gwxx64is6m3rz";

149− };

150−

151− buildInputs = [

152−

153− ];

154− };

155−

156− json = eggDerivation {

157− name = "json-1.6";

158−

159− src = fetchegg {

160− name = "json";

161− version = "1.6";

162− sha256 = "0sb8285dqrm27c8zaqfzc0gixvfmvf0cq2nbza8c4z7j5snxzs2w";

163− };

164−

165− buildInputs = [

166− packrat

167− srfi-1

168− srfi-69

169− ];

170− };

171−

17221 matchable = eggDerivation {

17322 name = "matchable-1.1";

17423

@@ -199,142 +48,6 @@ rec {

19948 ];

20049 };

20150

202− memory-mapped-files = eggDerivation {

203− name = "memory-mapped-files-0.4";

204−

205− src = fetchegg {

206− name = "memory-mapped-files";

207− version = "0.4";

208− sha256 = "0by3r18bj9fs0bs9w5czx84vssmr58br3x7pz1m3myb4mns3mpsc";

209− };

210−

211− buildInputs = [

212−

213− ];

214− };

215−

216− message-digest-primitive = eggDerivation {

217− name = "message-digest-primitive-4.3.2";

218−

219− src = fetchegg {

220− name = "message-digest-primitive";

221− version = "4.3.2";

222− sha256 = "1wfmyyp1fv0sz70m0rgzbhkiqgzjc15ppz7fwmpnxg12rvfzdvq0";

223− };

224−

225− buildInputs = [

226− check-errors

227− ];

228− };

229−

230− miscmacros = eggDerivation {

231− name = "miscmacros-1.0";

232−

233− src = fetchegg {

234− name = "miscmacros";

235− version = "1.0";

236− sha256 = "0n2ia4ib4f18hcbkm5byph07ncyx61pcpfp2qr5zijf8ykp8nbvr";

237− };

238−

239− buildInputs = [

240−

241− ];

242− };

243−

244− packrat = eggDerivation {

245− name = "packrat-1.5";

246−

247− src = fetchegg {

248− name = "packrat";

249− version = "1.5";

250− sha256 = "0hfnh57a8yga3byrk8522al5wdj7dyz48lixvvcgnsn3vdy333hq";

251− };

252−

253− buildInputs = [

254− srfi-1

255− ];

256− };

257−

258− regex = eggDerivation {

259− name = "regex-2.0";

260−

261− src = fetchegg {

262− name = "regex";

263− version = "2.0";

264− sha256 = "0qgqrrdr95yqggw8xyvb693nhizwqvf1fp9cjx9p3z80c4ih8j4j";

265− };

266−

267− buildInputs = [

268−

269− ];

270− };

271−

272− sendfile = eggDerivation {

273− name = "sendfile-1.8.3";

274−

275− src = fetchegg {

276− name = "sendfile";

277− version = "1.8.3";

278− sha256 = "0acmydjxlrbq7bdspmrzv9q9l3gh4xxnbpi5g1d5mz1g2mjwgm63";

279− };

280−

281− buildInputs = [

282− memory-mapped-files

283− ];

284− };

285−

286− sha2 = eggDerivation {

287− name = "sha2-4.0.5";

288−

289− src = fetchegg {

290− name = "sha2";

291− version = "4.0.5";

292− sha256 = "020yc41gkpg2s48v5n1nnq02dii340yly2y1zsi71bbfbkai2vcs";

293− };

294−

295− buildInputs = [

296− message-digest-primitive

297− ];

298− };

299−

300− socket = eggDerivation {

301− name = "socket-0.3.3";

302−

303− src = fetchegg {

304− name = "socket";

305− version = "0.3.3";

306− sha256 = "04wfxrwjizvf1jdpfqp3r7381rp9lscrm3z21ihq2dc2lfzjgrxw";

307− };

308−

309− buildInputs = [

310− srfi-13

311− srfi-18

312− foreigners

313− feature-test

314− ];

315− };

316−

317− spiffy = eggDerivation {

318− name = "spiffy-6.3";

319−

320− src = fetchegg {

321− name = "spiffy";

322− version = "6.3";

323− sha256 = "0f22gfdyysgbm3q6cjibn1z1yavks3imxi1mxcyfmms3x91k5k3c";

324− };

325−

326− buildInputs = [

327− intarweb

328− uri-common

329− uri-generic

330− sendfile

331− srfi-1

332− srfi-13

333− srfi-14

334− srfi-18

335− ];

336− };

337−

33851 srfi-1 = eggDerivation {

33952 name = "srfi-1-0.5.1";

34053

@@ -407,20 +120,6 @@ rec {

407120 ];

408121 };

409122

410− srfi-18 = eggDerivation {

411− name = "srfi-18-0.1.6";

412−

413− src = fetchegg {

414− name = "srfi-18";

415− version = "0.1.6";

416− sha256 = "00lykm5lqbrcxl3dab9dqwimpgm36v4ys2957k3vdlg4xdb1abfa";

417− };

418−

419− buildInputs = [

420−

421− ];

422− };

423−

424123 srfi-37 = eggDerivation {

425124 name = "srfi-37-1.4";

426125

@@ -434,118 +133,5 @@ rec {

434133

435134 ];

436135 };

437−

438− srfi-69 = eggDerivation {

439− name = "srfi-69-0.4.1";

440−

441− src = fetchegg {

442− name = "srfi-69";

443− version = "0.4.1";

444− sha256 = "1l102kppncz27acsr4jyi46q0r7g2lb6gdbkd6p3h1xmvwcnk2hl";

445− };

446−

447− buildInputs = [

448−

449− ];

450− };

451−

452− string-utils = eggDerivation {

453− name = "string-utils-2.4.0";

454−

455− src = fetchegg {

456− name = "string-utils";

457− version = "2.4.0";

458− sha256 = "09m3s0p199r2nmvc8qnqvbxjbq967gvwqrzp236wsw3hdcil6p8v";

459− };

460−

461− buildInputs = [

462− srfi-1

463− srfi-13

464− srfi-69

465− miscmacros

466− check-errors

467− utf8

468− ];

469− };

470−

471− symbol-utils = eggDerivation {

472− name = "symbol-utils-2.1.0";

473−

474− src = fetchegg {

475− name = "symbol-utils";

476− version = "2.1.0";

477− sha256 = "17nq8bj18f3bbf3mdfx1m8agy97izn1xcl8ymvgvvd5g384b2xil";

478− };

479−

480− buildInputs = [

481− check-errors

482− ];

483− };

484−

485− tcp6 = eggDerivation {

486− name = "tcp6-0.2.1";

487−

488− src = fetchegg {

489− name = "tcp6";

490− version = "0.2.1";

491− sha256 = "14dynnjgac28f46v781hi6kam326q6rh57pf0pvl0chdva4hlf3q";

492− };

493−

494− buildInputs = [

495− socket

496− srfi-1

497− ];

498− };

499−

500− uri-common = eggDerivation {

501− name = "uri-common-2.0";

502−

503− src = fetchegg {

504− name = "uri-common";

505− version = "2.0";

506− sha256 = "07rq7ppkyk3i85vqspc048pnj6gmjhj236z00chslli9xybqkgrd";

507− };

508−

509− buildInputs = [

510− uri-generic

511− defstruct

512− matchable

513− srfi-1

514− srfi-13

515− srfi-14

516− ];

517− };

518−

519− uri-generic = eggDerivation {

520− name = "uri-generic-3.2";

521−

522− src = fetchegg {

523− name = "uri-generic";

524− version = "3.2";

525− sha256 = "1lpvnk1mnhmrga149km7ygpy7fkq7z2pvw0mvpx2aql03l8gpdsj";

526− };

527−

528− buildInputs = [

529− matchable

530− srfi-1

531− srfi-14

532− ];

533− };

534−

535− utf8 = eggDerivation {

536− name = "utf8-3.6.2";

537−

538− src = fetchegg {

539− name = "utf8";

540− version = "3.6.2";

541− sha256 = "10wzp3qmwik4gx3hhaqm2n83wza0rllgy57363h5ccv8fga5nnm6";

542− };

543−

544− buildInputs = [

545− srfi-69

546− iset

547− regex

548− ];

549− };

550136}

551137

pkgs/development/compilers/chicken/5/eggs.scm−5

@@ -1,11 +1,6 @@

11;; Eggs used by egg2nix

22args

33matchable

4−apropos

5−spiffy

6−json

7−tcp6

8−sha2

94

105;; other eggs to include in nixpkgs

116srfi-189

pkgs/development/compilers/ghc/8.10.2-binary.nix−14

@@ -272,20 +272,6 @@ stdenv.mkDerivation rec {

272272 lib.optionalString stdenv.isLinux ''

273273 find . -type f -executable -exec patchelf \

274274 --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;

275− '' +

276− # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path

277− # substitution. Which can break the build if the store path / prefix happens

278− # to contain this string. This will be fixed with 9.4 bindists.

279− # https://gitlab.haskell.org/ghc/ghc/-/issues/21402

280− ''

281− # Detect hadrian Makefile by checking for the target that has the problem

282− if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then

283− echo Hadrian bindist, applying workaround for xxx path substitution.

284− # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch

285− substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'

286− else

287− echo Not a hadrian bindist, not applying xxx path workaround.

288− fi

289275 '';

290276

291277 # fix for `configure: error: Your linker is affected by binutils #16177`

pkgs/development/compilers/ghc/8.10.7-binary.nix−14

@@ -270,20 +270,6 @@ stdenv.mkDerivation rec {

270270 lib.optionalString stdenv.isLinux ''

271271 find . -type f -executable -exec patchelf \

272272 --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;

273− '' +

274− # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path

275− # substitution. Which can break the build if the store path / prefix happens

276− # to contain this string. This will be fixed with 9.4 bindists.

277− # https://gitlab.haskell.org/ghc/ghc/-/issues/21402

278− ''

279− # Detect hadrian Makefile by checking for the target that has the problem

280− if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then

281− echo Hadrian bindist, applying workaround for xxx path substitution.

282− # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch

283− substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'

284− else

285− echo Not a hadrian bindist, not applying xxx path workaround.

286− fi

287273 '';

288274

289275 # fix for `configure: error: Your linker is affected by binutils #16177`

pkgs/development/compilers/hare/config-template.mkdeleted−27

@@ -1,27 +0,0 @@

1−## Template to generate config.mk via substitute-all

2−

3−# set PREFIX externally

4−BINDIR = $(PREFIX)/bin

5−MANDIR = $(PREFIX)/share/man

6−SRCDIR = $(PREFIX)/src

7−STDLIB = $(SRCDIR)/hare/stdlib

8−

9−HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party

10−

11−## Build configuration

12−

13−# Platform to build for

14−PLATFORM = @platform@

15−ARCH = @arch@

16−

17−# External tools and flags

18−HAREC = harec

19−HAREFLAGS = @hareflags@

20−QBE = qbe

21−AS = as

22−LD = ld

23−AR = ar

24−SCDOC = scdoc

25−

26−# Where to store build artifacts

27−# set HARECACHE externally

pkgs/development/compilers/hare/hare.nixdeleted−93

@@ -1,93 +0,0 @@

1−{ lib

2−, stdenv

3−, fetchFromSourcehut

4−, binutils-unwrapped

5−, harec

6−, makeWrapper

7−, qbe

8−, scdoc

9−, substituteAll

10−}:

11−

12−stdenv.mkDerivation rec {

13− pname = "hare";

14− version = "0.pre+date=2022-04-27";

15−

16− src = fetchFromSourcehut {

17− name = pname + "-src";

18− owner = "~sircmpwn";

19− repo = pname;

20− rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0";

21− hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU=";

22− };

23−

24− nativeBuildInputs = [

25− binutils-unwrapped

26− harec

27− makeWrapper

28− qbe

29− scdoc

30− ];

31−

32− buildInputs = [

33− binutils-unwrapped

34− harec

35− qbe

36− ];

37−

38− strictDeps = true;

39−

40− configurePhase =

41− let

42− # https://harelang.org/platforms/

43− arch =

44− if stdenv.isx86_64 then "x86_64"

45− else if stdenv.isAarch64 then "aarch64"

46− else if stdenv.isRiscV64 then "riscv64"

47− else "unsupported";

48− platform =

49− if stdenv.isLinux then "linux"

50− else if stdenv.isFreeBSD then "freebsd"

51− else "unsupported";

52− hareflags = "";

53− config-file = substituteAll {

54− src = ./config-template.mk;

55− inherit arch platform hareflags;

56− };

57− in

58− ''

59− runHook preConfigure

60−

61− export HARECACHE="$NIX_BUILD_TOP/.harecache"

62− cat ${config-file} > config.mk

63−

64− runHook postConfigure

65− '';

66−

67− makeFlags = [

68− "PREFIX=${placeholder "out"}"

69− ];

70−

71− doCheck = true;

72−

73− postInstall =

74− let

75− binPath = lib.makeBinPath [

76− binutils-unwrapped

77− harec

78− qbe

79− ];

80− in

81− ''

82− wrapProgram $out/bin/hare --prefix PATH : ${binPath}

83− '';

84−

85− meta = with lib; {

86− homepage = "http://harelang.org/";

87− description =

88− "A systems programming language designed to be simple, stable, and robust";

89− license = licenses.gpl3Only;

90− maintainers = with maintainers; [ AndersonTorres ];

91− inherit (harec.meta) platforms badPlatforms;

92− };

93−}

pkgs/development/compilers/hare/harec.nixdeleted−45

@@ -1,45 +0,0 @@

1−{ lib

2−, stdenv

3−, fetchFromSourcehut

4−, qbe

5−}:

6−

7−stdenv.mkDerivation rec {

8− pname = "harec";

9− version = "0.pre+date=2022-04-26";

10−

11− src = fetchFromSourcehut {

12− name = pname + "-src";

13− owner = "~sircmpwn";

14− repo = pname;

15− rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0";

16− hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18=";

17− };

18−

19− nativeBuildInputs = [

20− qbe

21− ];

22−

23− buildInputs = [

24− qbe

25− ];

26−

27− # TODO: report upstream

28− hardeningDisable = [ "fortify" ];

29−

30− strictDeps = true;

31−

32− doCheck = true;

33−

34− meta = with lib; {

35− homepage = "http://harelang.org/";

36− description = "Bootstrapping Hare compiler written in C for POSIX systems";

37− license = licenses.gpl3Only;

38− maintainers = with maintainers; [ AndersonTorres ];

39− # The upstream developers do not like proprietary operating systems; see

40− # https://harelang.org/platforms/

41− platforms = with platforms;

42− lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);

43− badPlatforms = with platforms; darwin;

44− };

45−}

pkgs/development/compilers/open-watcom/v2.nix+3−3

@@ -12,14 +12,14 @@

1212

1313stdenv.mkDerivation rec {

1414 pname = "open-watcom-v2";

15− version = "unstable-2022-04-29";

15+ version = "unstable-2022-04-24";

1616 name = "${pname}-unwrapped-${version}";

1717

1818 src = fetchFromGitHub {

1919 owner = "open-watcom";

2020 repo = "open-watcom-v2";

21− rev = "520d9d7025b46b926123257b029b3dbce9a96065";

22− sha256 = "aACkkTzOH8F82GPyySjtb7CGozR8OjgzqZVRiNTiS10=";

21+ rev = "13fcf849005f8e2f1c072ad727721eeb52d17b39";

22+ sha256 = "Wz9Lbwz00xwes4yiko4RA95QdKOkRHUitAFsCNWhfkw=";

2323 };

2424

2525 postPatch = ''

pkgs/development/compilers/opendylan/bin.nix+2−2

@@ -1,6 +1,6 @@

11# Binaries provided by Open Dylan to be used to bootstrap from source.

22# The binaries can also be used as is.

3−{lib, stdenv, fetchurl, patchelf, boehmgc, gcc, makeWrapper}:

3+{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:

44

55stdenv.mkDerivation rec {

66 pname = "opendylan";

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 }

1717 else throw "platform ${stdenv.hostPlatform.system} not supported.";

1818

19− nativeBuildInputs = [ patchelf boehmgc makeWrapper ];

19+ nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ];

2020

2121 buildCommand = ''

2222 mkdir -p "$out"

pkgs/development/compilers/ponyc/default.nix+2−2

@@ -3,13 +3,13 @@

33

44stdenv.mkDerivation (rec {

55 pname = "ponyc";

6− version = "0.50.0";

6+ version = "0.49.0";

77

88 src = fetchFromGitHub {

99 owner = "ponylang";

1010 repo = pname;

1111 rev = version;

12− sha256 = "sha256-FnzlFTiJrqoUfnys+q9is6OH9yit5ExDiRszQ679QbY=";

12+ sha256 = "sha256-WS3/POC+2vdx6bA8314sjkdWCIWGu9lJG4kbKMWfnX8=";

1313

1414 fetchSubmodules = true;

1515 };

pkgs/development/compilers/purescript/purescript/default.nix+7−5

@@ -1,4 +1,4 @@

1−{ stdenv, pkgs, fetchurl, zlib, gmp, lib }:

1+{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }:

22

33# from justinwoo/easy-purescript-nix

44# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

@@ -18,7 +18,7 @@ let

1818

1919in stdenv.mkDerivation rec {

2020 pname = "purescript";

21− version = "0.15.0";

21+ version = "0.14.7";

2222

2323 # These hashes can be updated automatically by running the ./update.sh script.

2424 src =

@@ -26,16 +26,18 @@ in stdenv.mkDerivation rec {

2626 then

2727 fetchurl {

2828 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";

29− sha256 = "09d9pwba6fzc08m3nkc7xni29yr12gw5fj00aa77n9kxmsba0fkb";

29+ sha256 = "0pc07xv5h7jgiy04rcrnsjb97nk5zs7jrvcsqggn0izlnrcyi8rc";

3030 }

3131 else

3232 fetchurl {

3333 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";

34− sha256 = "1ygp6wvbgl3y15wq1q41j9kg2ndaxr32rpgbzfzyd9zb8n9z8lpx";

34+ sha256 = "0vcjxb1v76wg4hmisnw0pp6wl0pwp4fa19cw08zdhgy62w06mqfa";

3535 };

3636

3737

38− buildInputs = [ zlib gmp ];

38+ buildInputs = [ zlib

39+ gmp

40+ ncurses5 ];

3941 libPath = lib.makeLibraryPath buildInputs;

4042 dontStrip = true;

4143

pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js+1−1

@@ -1,6 +1,6 @@

11"use strict"

22

3−export const log = function (s) {

3+exports.log = function (s) {

44 return function () {

55 console.log(s);

66 return {};

pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix+2−2

@@ -3,9 +3,9 @@

33runCommand "purescript-test-minimal-module" {} ''

44 ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs

55

6− echo 'import {main} from "./output/Main/index.js"; main()' > node.mjs

6+ echo 'require("./output/Main/index.js").main()' > node.js

77

8− ${nodejs}/bin/node node.mjs | grep "hello world" || (echo "did not output hello world"; exit 1)

8+ ${nodejs}/bin/node node.js | grep "hello world" || echo "did not output hello world"

99

1010 touch $out

1111''

pkgs/development/compilers/sbcl/2.2.4.nixdeleted−4

@@ -1,4 +0,0 @@

1−import ./common.nix {

2− version = "2.2.4";

3− sha256 = "sha256-/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI=";

4−}

pkgs/development/compilers/solc/default.nix+11−34

@@ -1,5 +1,4 @@

11{ lib, gccStdenv, fetchzip

2−, pkgs

32, boost

43, cmake

54, coreutils

@@ -42,17 +41,9 @@ let

4241 sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";

4342 };

4443

45− pname = "solc";

46− version = "0.8.13";

47− meta = with lib; {

48− description = "Compiler for Ethereum smart contract language Solidity";

49− homepage = "https://github.com/ethereum/solidity";

50− license = licenses.gpl3;

51− maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];

52− };

53−

54− solc = if gccStdenv.isLinux then gccStdenv.mkDerivation rec {

55− inherit pname version meta;

44+ solc = gccStdenv.mkDerivation rec {

45+ pname = "solc";

46+ version = "0.8.13";

5647

5748 # upstream suggests avoid using archive generated by github

5849 src = fetchzip {

@@ -71,12 +62,9 @@ let

7162

7263 cmakeFlags = [

7364 "-DBoost_USE_STATIC_LIBS=OFF"

74−

75− ] ++ (if z3Support then [

76− "-DSTRICT_Z3_VERSION=OFF"

77− ] else [

65+ ] ++ lib.optionals (!z3Support) [

7866 "-DUSE_Z3=OFF"

79− ]) ++ lib.optionals (!cvc4Support) [

67+ ] ++ lib.optionals (!cvc4Support) [

8068 "-DUSE_CVC4=OFF"

8169 ];

8270

@@ -102,7 +90,7 @@ let

10290 for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do

10391 patchShebangs "$i"

10492 done

105− TERM=xterm ./scripts/tests.sh ${if z3Support then "--no-smt" else ""}

93+ TERM=xterm ./scripts/tests.sh

10694 popd

10795 '';

10896

@@ -114,24 +102,13 @@ let

114102 passthru.tests = {

115103 solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });

116104 };

117− } else gccStdenv.mkDerivation rec {

118− inherit pname version meta;

119105

120− src = pkgs.fetchurl {

121− url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";

122− sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o=";

106+ meta = with lib; {

107+ description = "Compiler for Ethereum smart contract language Solidity";

108+ homepage = "https://github.com/ethereum/solidity";

109+ license = licenses.gpl3;

110+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];

123111 };

124− dontUnpack = true;

125−

126− installPhase = ''

127− runHook preInstall

128−

129− mkdir -p $out/bin

130− cp ${src} $out/bin/solc

131− chmod +x $out/bin/solc

132−

133− runHook postInstall

134− '';

135112 };

136113in

137114 solc

pkgs/development/compilers/squeak/default.nix+3−1

@@ -1,5 +1,5 @@

11{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip

2−, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl

2+, autoconf, automake, autoreconfHook, bash, clang, dos2unix, file, gzip, perl

33, pkg-config

44, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool

55, libuuid, openssl, pango, xorg

@@ -75,9 +75,11 @@ in stdenv.mkDerivation {

7575 autoconf

7676 automake

7777 autoreconfHook

78+ bash

7879 clang

7980 dos2unix

8081 file

82+ gzip

8183 perl

8284 pkg-config

8385 ];

pkgs/development/compilers/swift/default.nix+6

@@ -10,6 +10,7 @@

1010, pkg-config

1111, sqlite

1212, swig

13+, bash

1314, libxml2

1415, clang_10

1516, python3

@@ -28,6 +29,7 @@

2829, libgit2

2930, fetchFromGitHub

3031, fetchpatch

32+, findutils

3133, makeWrapper

3234, gnumake

3335, file

@@ -186,8 +188,12 @@ stdenv.mkDerivation {

186188 nativeBuildInputs = [

187189 autoconf

188190 automake

191+ bash

189192 cmake

193+ coreutils

194+ findutils

190195 git

196+ gnumake

191197 libtool

192198 makeWrapper

193199 ninja

pkgs/development/coq-modules/flocq/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, which, autoconf, automake,

1+{ lib, bash, which, autoconf, automake,

22 mkCoqDerivation, coq, version ? null }:

33

44with lib; mkCoqDerivation {

@@ -16,7 +16,7 @@ with lib; mkCoqDerivation {

1616 release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";

1717 releaseRev = v: "flocq-${v}";

1818

19− nativeBuildInputs = [ which autoconf ];

19+ nativeBuildInputs = [ bash which autoconf ];

2020 mlPlugin = true;

2121 useMelquiondRemake.logpath = "Flocq";

2222

pkgs/development/coq-modules/metacoq/default.nixdeleted−76

@@ -1,76 +0,0 @@

1−{ lib, which, fetchzip,

2− mkCoqDerivation, recurseIntoAttrs, single ? false,

3− coqPackages, coq, equations, version ? null }@args:

4−with builtins // lib;

5−let

6− repo = "metacoq";

7− owner = "MetaCoq";

8− defaultVersion = with versions; switch coq.coq-version [

9− { case = "8.11"; out = "1.0-beta2-8.11"; }

10− { case = "8.12"; out = "1.0-beta2-8.12"; }

11− # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3)

12− # { case = "8.13"; out = "1.0-beta2-8.13"; }

13− ] null;

14− release = {

15− "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";

16− "1.0-beta2-8.12".sha256 = "sha256-I8gpmU9rUQJh0qfp5KOgDNscVvCybm5zX4TINxO1TVA=";

17− "1.0-beta2-8.13".sha256 = "sha256-IC56/lEDaAylUbMCfG/3cqOBZniEQk8jmI053DBO5l8=";

18− };

19− releaseRev = v: "v${v}";

20−

21− # list of core metacoq packages sorted by dependency order

22− packages = [ "template-coq" "pcuic" "safechecker" "erasure" "all" ];

23−

24− template-coq = metacoq_ "template-coq";

25−

26− metacoq_ = package: let

27− metacoq-deps = if package == "single" then []

28− else map metacoq_ (head (splitList (pred.equal package) packages));

29− pkgpath = if package == "single" then "./" else "./${package}";

30− pname = if package == "all" then "metacoq" else "metacoq-${package}";

31− pkgallMake = ''

32− mkdir all

33− echo "all:" > all/Makefile

34− echo "install:" >> all/Makefile

35− '' ;

36− derivation = mkCoqDerivation ({

37− inherit version pname defaultVersion release releaseRev repo owner;

38−

39− extraNativeBuildInputs = [ which ];

40− mlPlugin = true;

41− extraBuildInputs = [ coq.ocamlPackages.zarith ];

42− propagatedBuildInputs = [ equations ] ++ metacoq-deps;

43−

44− patchPhase = ''

45− patchShebangs ./configure.sh

46− patchShebangs ./template-coq/update_plugin.sh

47− patchShebangs ./template-coq/gen-src/to-lower.sh

48− patchShebangs ./pcuic/clean_extraction.sh

49− patchShebangs ./safechecker/clean_extraction.sh

50− patchShebangs ./erasure/clean_extraction.sh

51− echo "CAMLFLAGS+=-w -60 # Unused module" >> ./safechecker/Makefile.plugin.local

52− sed -i -e 's/mv $i $newi;/mv $i tmp; mv tmp $newi;/' ./template-coq/gen-src/to-lower.sh ./pcuic/clean_extraction.sh ./safechecker/clean_extraction.sh ./erasure/clean_extraction.sh

53− '' ;

54−

55− configurePhase = optionalString (package == "all") pkgallMake + ''

56− touch ${pkgpath}/metacoq-config

57− '' + optionalString (elem package ["safechecker" "erasure"]) ''

58− echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config

59− '' + optionalString (package == "single") ''

60− ./configure.sh local

61− '';

62−

63− preBuild = ''

64− cd ${pkgpath}

65− '' ;

66−

67− meta = {

68− homepage = "https://metacoq.github.io/";

69− license = licenses.mit;

70− maintainers = with maintainers; [ cohencyril ];

71− };

72− } // optionalAttrs (package != "single")

73− { passthru = genAttrs packages metacoq_; });

74− in derivation;

75−in

76−metacoq_ (if single then "single" else "all")

pkgs/development/embedded/fpga/apio/default.nix+4−5

@@ -15,20 +15,19 @@

1515

1616buildPythonApplication rec {

1717 pname = "apio";

18− version = "0.8.1";

18+ version = "0.8.0";

1919 format = "flit";

2020

2121 src = fetchFromGitHub {

2222 owner = "FPGAwars";

2323 repo = "apio";

2424 rev = "v${version}";

25− sha256 = "sha256-04qAGTzusMT3GsaRxDoXNJK1Mslzxu+ugQclBJx8xzE=";

25+ sha256 = "sha256-nOZI+FHdZRnkJF/No8z0mZ4Q5aHFnF7c20ajTPI00N4=";

2626 };

2727

2828 postPatch = ''

29− substituteInPlace pyproject.toml \

30− --replace 'scons==4.2.0' 'scons' \

31− --replace '==' '>='

29+ substituteInPlace pyproject.toml --replace \

30+ 'scons==4.2.0' 'scons'

3231

3332 substituteInPlace apio/managers/scons.py --replace \

3433 'return "tinyprog --libusb --program"' \

pkgs/development/haskell-modules/configuration-common.nix+12−22

@@ -687,6 +687,9 @@ self: super: {

687687 # https://github.com/pxqr/base32-bytestring/issues/4

688688 base32-bytestring = dontCheck super.base32-bytestring;

689689

690+ # 2022-03-24: Strict aeson bound: https://github.com/berberman/nvfetcher/pull/63

691+ nvfetcher = throwIfNot (super.nvfetcher.version == "0.4.0.0") "nvfetcher: remove jailbreak after update" doJailbreak super.nvfetcher;

692+

690693 # 2022-03-24: Strict aeson bound:

691694 arch-web = throwIfNot (super.arch-web.version == "0.1.0") "arch-web: remove jailbreak after update" doJailbreak super.arch-web;

692695

@@ -851,18 +854,6 @@ self: super: {

851854 # test suite requires git and does a bunch of git operations

852855 restless-git = dontCheck super.restless-git;

853856

854− # requires git at test-time *and* runtime, but we'll just rely on users to

855− # bring their own git at runtime

856− sensei = overrideCabal (drv: {

857− testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];

858− testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];

859− }) (super.sensei.overrideScope (self: super: {

860− hspec-meta = self.hspec-meta_2_9_3;

861− hspec = self.hspec_2_9_7;

862− hspec-core = dontCheck self.hspec-core_2_9_7;

863− hspec-discover = self.hspec-discover_2_9_7;

864− }));

865−

866857 # Depends on broken fluid.

867858 fluid-idl-http-client = markBroken super.fluid-idl-http-client;

868859 fluid-idl-scotty = markBroken super.fluid-idl-scotty;

@@ -1163,16 +1154,6 @@ self: super: {

11631154 # https://github.com/danfran/cabal-macosx/issues/13

11641155 cabal-macosx = dontCheck super.cabal-macosx;

11651156

1166− # Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites

1167− # https://github.com/typeable/generic-arbitrary/issues/14

1168− generic-arbitrary = appendPatches [

1169− (pkgs.fetchpatch {

1170− name = "generic-arbitrary-no-negative-resize.patch";

1171− url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";

1172− sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";

1173− })

1174− ] super.generic-arbitrary;

1175−

11761157 # https://github.com/DanielG/cabal-helper/pull/123

11771158 cabal-helper = doJailbreak super.cabal-helper;

11781159

@@ -2603,6 +2584,15 @@ self: super: {

26032584 # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15

26042585 base-noprelude = doJailbreak super.base-noprelude;

26052586

2587+ # Manually upgrade cryptostore to work around

2588+ # https://github.com/ocheron/cryptostore/issues/7

2589+ cryptostore = assert super.cryptostore.version == "0.2.1.0"; overrideCabal {

2590+ version = "0.2.2.0";

2591+ sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx";

2592+ revision = null;

2593+ editedCabalFile = null;

2594+ } super.cryptostore;

2595+

26062596 # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10

26072597 dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans;

26082598

pkgs/development/haskell-modules/configuration-darwin.nix+7−6

@@ -251,6 +251,13 @@ self: super: ({

251251 # Otherwise impure gcc is used, which is Apple's weird wrapper

252252 c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;

253253

254+ # streamly depends on Cocoa starting with 0.8.0

255+ streamly_0_8_1_1 = overrideCabal (drv: {

256+ libraryFrameworkDepends = [

257+ darwin.apple_sdk.frameworks.Cocoa

258+ ] ++ (drv.libraryFrameworkDepends or []);

259+ }) super.streamly_0_8_1_1;

260+

254261 http-client-tls = overrideCabal (drv: {

255262 postPatch = ''

256263 # This comment has been inserted, so the derivation hash changes, forcing

@@ -283,10 +290,4 @@ self: super: ({

283290

284291 # https://github.com/haskell-crypto/cryptonite/issues/360

285292 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite;

286−

287−} // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin

288−

289− # tests appear to be failing to link or something:

290− # https://hydra.nixos.org/build/174540882/nixlog/9

291− regex-rure = dontCheck super.regex-rure;

292293})

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix−7

@@ -130,11 +130,4 @@ self: super: {

130130

131131 # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)

132132 inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;

133−

134− # Depends on OneTuple for GHC < 9.0

135− universe-base = addBuildDepends [ self.OneTuple ] super.universe-base;

136−

137− # Not possible to build in the main GHC 9.0 package set

138− # https://github.com/awakesecurity/spectacle/issues/49

139− spectacle = doDistribute (markUnbroken super.spectacle);

140133}

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix−3

@@ -162,7 +162,4 @@ self: super: {

162162

163163 # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)

164164 inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;

165−

166− # Depends on OneTuple for GHC < 9.0

167− universe-base = addBuildDepends [ self.OneTuple ] super.universe-base;

168165}

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+1−2

@@ -80,7 +80,6 @@ self: super: {

8080 constraints = doJailbreak super.constraints;

8181 cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;

8282 data-fix = doJailbreak super.data-fix;

83− dbus = super.dbus_1_2_24;

8483 dec = doJailbreak super.dec;

8584 ed25519 = doJailbreak super.ed25519;

8685 ghc-byteorder = doJailbreak super.ghc-byteorder;

@@ -171,7 +170,7 @@ self: super: {

171170 ];

172171

173172 # lens >= 5.1 supports 9.2.1

174− lens = doDistribute self.lens_5_1;

173+ lens = super.lens_5_1;

175174

176175 # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760

177176 alex = dontCheck super.alex;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+5−10

@@ -357,6 +357,7 @@ broken-packages:

357357 - binary-communicator

358358 - binary-derive

359359 - binary-ext

360+ - binary-generic-combinators

360361 - binary-indexed-tree

361362 - binary-protocol

362363 - binary-tree

@@ -668,8 +669,6 @@ broken-packages:

668669 - citeproc-hs

669670 - cjk

670671 - cj-token

671− - cl3-hmatrix-interface

672− - cl3-linear-interface

673672 - clang-compilation-database

674673 - clang-pure

675674 - clanki

@@ -1049,7 +1048,6 @@ broken-packages:

10491048 - dense-int-set

10501049 - dependent-hashmap

10511050 - dependent-monoidal-map

1052− - dep-t

10531051 - dep-t-dynamic

10541052 - deptrack-core

10551053 - derangement

@@ -1210,7 +1208,6 @@ broken-packages:

12101208 - dynamic-object

12111209 - dynamic-pipeline

12121210 - DynamicTimeWarp

1213− - dyna-processing

12141211 - dynloader

12151212 - DysFRP

12161213 - dywapitchtrack

@@ -1603,7 +1600,6 @@ broken-packages:

16031600 - gegl

16041601 - gelatin

16051602 - gemcap

1606− - gemini-exports

16071603 - gemstone

16081604 - gencheck

16091605 - gender

@@ -1740,7 +1736,6 @@ broken-packages:

17401736 - gli

17411737 - glicko

17421738 - glider-nlp

1743− - glirc

17441739 - GLMatrix

17451740 - global-variables

17461741 - glob-posix

@@ -1779,7 +1774,6 @@ broken-packages:

17791774 - gpah

17801775 - GPipe

17811776 - GPipe-GLFW4

1782− - gpmf

17831777 - gpx-conduit

17841778 - graceful

17851779 - grafana

@@ -1896,7 +1890,6 @@ broken-packages:

18961890 - hakyll-typescript

18971891 - HaLeX

18981892 - halfs

1899− - half-space

19001893 - halipeto

19011894 - halive

19021895 - halma

@@ -2110,7 +2103,6 @@ broken-packages:

21102103 - hedgehog-checkers

21112104 - hedgehog-generic

21122105 - hedgehog-golden

2113− - hedgehog-lens

21142106 - hedgehog-servant

21152107 - hedis-config

21162108 - hedis-namespace

@@ -2902,7 +2894,6 @@ broken-packages:

29022894 - lazify

29032895 - lazyarray

29042896 - lazyboy

2905− - lazy-bracket

29062897 - lazy-priority-queue

29072898 - lazyset

29082899 - LazyVault

@@ -3343,6 +3334,7 @@ broken-packages:

33433334 - msgpack

33443335 - msgpack-binary

33453336 - msgpack-persist

3337+ - msgpack-types

33463338 - msh

33473339 - msi-kb-backlit

33483340 - MTGBuilder

@@ -3608,6 +3600,7 @@ broken-packages:

36083600 - open-signals

36093601 - opensoundcontrol-ht

36103602 - openssh-protocol

3603+ - opentelemetry-extra

36113604 - opentelemetry-http-client

36123605 - opentheory-char

36133606 - opentok

@@ -4344,6 +4337,7 @@ broken-packages:

43444337 - robin

43454338 - robots-txt

43464339 - roc-cluster

4340+ - roc-id

43474341 - roku-api

43484342 - rollbar-client

43494343 - rollbar-hs

@@ -4473,6 +4467,7 @@ broken-packages:

44734467 - semigroups-actions

44744468 - sendgrid-haskell

44754469 - sendgrid-v3

4470+ - sensei

44764471 - sensu-run

44774472 - sentry

44784473 - separated

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml−4

@@ -251,8 +251,6 @@ package-maintainers:

251251 - mattermost-api

252252 - mattermost-api-qc

253253 - Unique

254− libjared:

255− - sensei

256254 maralorn:

257255 - cabal-fmt

258256 - ema

@@ -465,7 +463,6 @@ unsupported-platforms:

465463 libmodbus: [ x86_64-darwin, aarch64-darwin ]

466464 libsystemd-journal: [ x86_64-darwin, aarch64-darwin ]

467465 libtelnet: [ x86_64-darwin, aarch64-darwin ]

468− libvirt-hs: [ x86_64-darwin ] # spidermonkey is not supported on darwin

469466 libzfs: [ x86_64-darwin, aarch64-darwin ]

470467 linearEqSolver: [ aarch64-linux ]

471468 linux-evdev: [ x86_64-darwin, aarch64-darwin ]

@@ -508,7 +505,6 @@ unsupported-platforms:

508505 scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8

509506 sdl2-mixer: [ x86_64-darwin, aarch64-darwin ]

510507 sdl2-ttf: [ x86_64-darwin, aarch64-darwin ]

511− sensei: [ x86_64-darwin ]

512508 synthesizer-alsa: [ x86_64-darwin, aarch64-darwin ]

513509 taffybar: [ x86_64-darwin, aarch64-darwin ]

514510 termonad: [ x86_64-darwin, aarch64-darwin ]

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml+15−47

@@ -1,4 +1,4 @@

1−# Stackage LTS 19.4

1+# Stackage LTS 19.3

22# This file is auto-generated by

33# maintainers/scripts/haskell/update-stackage.sh

44default-package-overrides:

@@ -24,7 +24,6 @@ default-package-overrides:

2424 - aeson-casing ==0.2.0.0

2525 - aeson-commit ==1.4

2626 - aeson-compat ==0.3.10

27− - aeson-diff ==1.1.0.12

2827 - aeson-extra ==0.5.1

2928 - aeson-generic-compat ==0.0.1.3

3029 - aeson-optics ==1.1.1

@@ -118,9 +117,6 @@ default-package-overrides:

118117 - autoexporter ==2.0.0.1

119118 - auto-update ==0.1.6

120119 - aws-cloudfront-signed-cookies ==0.2.0.10

121− - aws-xray-client ==0.1.0.2

122− - aws-xray-client-persistent ==0.1.0.5

123− - aws-xray-client-wai ==0.1.0.2

124120 - backtracking ==0.1.0

125121 - bank-holidays-england ==0.2.0.7

126122 - barbies ==2.0.3.1

@@ -395,7 +391,6 @@ default-package-overrides:

395391 - conduino ==0.2.2.0

396392 - conduit ==1.3.4.2

397393 - conduit-aeson ==0.1.0.1

398− - conduit-algorithms ==0.0.12.0

399394 - conduit-combinators ==1.3.0

400395 - conduit-concurrent-map ==0.1.1

401396 - conduit-connection ==0.1.0.5

@@ -427,9 +422,9 @@ default-package-overrides:

427422 - convertible ==1.1.1.0

428423 - cookie ==0.4.5

429424 - copr-api ==0.1.0

430− - core-data ==0.3.2.1

425+ - core-data ==0.3.1.1

431426 - core-program ==0.4.5.1

432− - core-telemetry ==0.1.9.3

427+ - core-telemetry ==0.1.9.2

433428 - core-text ==0.3.5.0

434429 - countable ==1.0

435430 - covariance ==0.1.0.6

@@ -461,7 +456,7 @@ default-package-overrides:

461456 - crypto-pubkey-types ==0.4.3

462457 - crypto-random ==0.0.9

463458 - crypto-random-api ==0.2.0

464− - cryptostore ==0.2.2.0

459+ - cryptostore ==0.2.1.0

465460 - crypt-sha512 ==0

466461 - csp ==1.4.0

467462 - css-text ==0.1.3.0

@@ -510,7 +505,6 @@ default-package-overrides:

510505 - data-default-instances-unordered-containers ==0.0.1

511506 - data-default-instances-vector ==0.0.1

512507 - data-diverse ==4.7.0.0

513− - datadog ==0.3.0.0

514508 - data-dword ==0.3.2.1

515509 - data-endian ==0.1.1

516510 - data-fix ==0.3.2

@@ -686,7 +680,7 @@ default-package-overrides:

686680 - errors ==2.3.0

687681 - errors-ext ==0.4.2

688682 - ersatz ==0.4.10

689− - esqueleto ==3.5.4.1

683+ - esqueleto ==3.5.4.0

690684 - essence-of-live-coding ==0.2.6

691685 - essence-of-live-coding-gloss ==0.2.6

692686 - essence-of-live-coding-pulse ==0.2.6

@@ -1004,7 +998,7 @@ default-package-overrides:

1004998 - haskell-src-meta ==0.8.9

1005999 - haskey-btree ==0.3.0.1

10061000 - haskintex ==0.8.0.0

1007− - haskoin-core ==0.21.2

1001+ - haskoin-core ==0.21.1

10081002 - hasktags ==0.72.0

10091003 - hasql ==1.5.0.2

10101004 - hasql-migration ==0.3.0

@@ -1017,7 +1011,7 @@ default-package-overrides:

10171011 - has-transformers ==0.1.0.4

10181012 - hasty-hamiltonian ==1.3.4

10191013 - HaTeX ==3.22.3.1

1020− - HaXml ==1.25.9

1014+ - HaXml ==1.25.8

10211015 - haxr ==3000.11.4.1

10221016 - HCodecs ==0.5.2

10231017 - hdaemonize ==0.5.6

@@ -1543,7 +1537,7 @@ default-package-overrides:

15431537 - mmark-cli ==0.0.5.1

15441538 - mmark-ext ==0.2.1.5

15451539 - mmorph ==1.1.5

1546− - mnist-idx ==0.1.3.1

1540+ - mnist-idx ==0.1.3.0

15471541 - mnist-idx-conduit ==0.4.0.0

15481542 - mockery ==0.3.5

15491543 - mock-time ==0.1.0

@@ -1753,7 +1747,7 @@ default-package-overrides:

17531747 - pandoc-plot ==1.4.1

17541748 - pandoc-throw ==0.1.0.0

17551749 - pandoc-types ==1.22.2

1756− - pantry ==0.5.5

1750+ - pantry ==0.5.4

17571751 - parallel ==3.2.2.0

17581752 - parallel-io ==0.3.5

17591753 - parameterized ==0.5.0.0

@@ -1803,7 +1797,7 @@ default-package-overrides:

18031797 - perf ==0.9.0

18041798 - perfect-hash-generator ==0.2.0.6

18051799 - persist ==0.1.1.5

1806− - persistent ==2.13.3.5

1800+ - persistent ==2.13.3.4

18071801 - persistent-discover ==0.1.0.5

18081802 - persistent-documentation ==0.1.0.4

18091803 - persistent-mongoDB ==2.13.0.1

@@ -1977,7 +1971,7 @@ default-package-overrides:

19771971 - quickcheck-unicode ==1.0.1.0

19781972 - quicklz ==1.5.0.11

19791973 - quiet ==0.2

1980− - quote-quot ==0.2.1.0

1974+ - quote-quot ==0.2.0.0

19811975 - radius ==0.7.1.0

19821976 - rainbow ==0.34.2.2

19831977 - rainbox ==0.26.0.0

@@ -2056,7 +2050,7 @@ default-package-overrides:

20562050 - repa ==3.4.1.5

20572051 - repa-io ==3.4.1.2

20582052 - replace-attoparsec ==1.4.5.0

2059− - replace-megaparsec ==1.4.5.0

2053+ - replace-megaparsec ==1.4.4.0

20602054 - repline ==0.4.0.0

20612055 - req ==3.10.0

20622056 - req-conduit ==1.0.1

@@ -2122,7 +2116,7 @@ default-package-overrides:

21222116 - sandwich-quickcheck ==0.1.0.6

21232117 - sandwich-slack ==0.1.0.6

21242118 - say ==0.1.0.1

2125− - sbp ==4.1.6

2119+ - sbp ==4.1.5

21262120 - sbv ==8.17

21272121 - scalpel ==0.6.2

21282122 - scalpel-core ==0.6.2

@@ -2467,7 +2461,7 @@ default-package-overrides:

24672461 - text-ansi ==0.1.1

24682462 - text-binary ==0.2.1.1

24692463 - text-builder ==0.6.6.5

2470− - text-builder-dev ==0.2.1

2464+ - text-builder-dev ==0.2.0.1

24712465 - text-conversions ==0.3.1

24722466 - text-icu ==0.7.1.0

24732467 - text-latin1 ==0.3.1

@@ -2849,34 +2843,8 @@ default-package-overrides:

28492843 - yesod-newsfeed ==1.7.0.0

28502844 - yesod-page-cursor ==2.0.0.10

28512845 - yesod-paginator ==1.1.2.1

2852− - yesod-persistent ==1.6.0.8

2846+ - yesod-persistent ==1.6.0.7

28532847 - yesod-recaptcha2 ==1.0.2

28542848 - yesod-routes-flow ==3.0.0.2

28552849 - yesod-sitemap ==1.6.0

2856− - yesod-static ==1.6.1.0

2857− - yesod-test ==1.6.12

2858− - yesod-websockets ==0.3.0.3

28592850 - yes-precure5-command ==5.5.3

2860− - yi-rope ==0.11

2861− - yjsvg ==0.2.0.1

2862− - yjtools ==0.9.18

2863− - yoga ==0.0.0.5

2864− - youtube ==0.2.1.1

2865− - zenacy-html ==2.0.4

2866− - zenacy-unicode ==1.0.1

2867− - zero ==0.1.5

2868− - zeromq4-haskell ==0.8.0

2869− - zeromq4-patterns ==0.3.1.0

2870− - zim-parser ==0.2.1.0

2871− - zio ==0.1.0.2

2872− - zip ==1.7.2

2873− - zip-archive ==0.4.2.1

2874− - zipper-extra ==0.1.3.2

2875− - zippers ==0.3.2

2876− - zip-stream ==0.2.1.0

2877− - zlib ==0.6.2.3

2878− - zlib-bindings ==0.1.1.5

2879− - zlib-lens ==0.1.2.1

2880− - zot ==0.0.3

2881− - zstd ==0.1.3.0

2882− - ztail ==1.2.0.3

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+4−7

@@ -663,7 +663,6 @@ dont-distribute-packages:

663663 - ascii

664664 - ascii-cows

665665 - ascii-table

666− - ascii_1_2_0_0

667666 - asic

668667 - asif

669668 - assert4hs-hspec

@@ -1204,8 +1203,6 @@ dont-distribute-packages:

12041203 - delimiter-separated

12051204 - delta

12061205 - delta-h

1207− - dep-t-advice

1208− - dep-t-value

12091206 - dependent-literals-plugin

12101207 - dependent-state

12111208 - depends

@@ -2814,9 +2811,11 @@ dont-distribute-packages:

28142811 - mptcp-pm

28152812 - mptcpanalyzer

28162813 - msgpack-aeson

2814+ - msgpack-arbitrary

28172815 - msgpack-idl

28182816 - msgpack-rpc

28192817 - msgpack-rpc-conduit

2818+ - msgpack-testsuite

28202819 - mtgoxapi

28212820 - mu-avro

28222821 - mu-graphql

@@ -2968,6 +2967,8 @@ dont-distribute-packages:

29682967 - openpgp-Crypto

29692968 - openpgp-crypto-api

29702969 - openssh-github-keys

2970+ - opentelemetry-lightstep

2971+ - opentelemetry-lightstep_0_8_0

29712972 - optima-for-hasql

29722973 - optimal-blocks

29732974 - optimusprime

@@ -3324,7 +3325,6 @@ dont-distribute-packages:

33243325 - regions-mtl

33253326 - registry-hedgehog

33263327 - registry-hedgehog-aeson

3327− - registry-messagepack

33283328 - regular-extras

33293329 - regular-web

33303330 - regular-xmlpickler

@@ -3764,9 +3764,6 @@ dont-distribute-packages:

37643764 - sydtest-servant

37653765 - sydtest-typed-process

37663766 - sydtest-wai

3767− - sydtest-webdriver

3768− - sydtest-webdriver-screenshot

3769− - sydtest-webdriver-yesod

37703767 - sydtest-yesod

37713768 - sylvia

37723769 - sym-plot

pkgs/development/haskell-modules/hackage-packages.nix+365−1178

This diff is too big to show here.

pkgs/development/interpreters/alda/default.nix+3−3

This diff is too big to show here.

pkgs/development/interpreters/guile/1.8.nix+1

This diff is too big to show here.

pkgs/development/interpreters/guile/2.0.nix+1

This diff is too big to show here.

pkgs/development/interpreters/guile/2.2.nix+1

This diff is too big to show here.

pkgs/development/interpreters/guile/3.0.nix+1

This diff is too big to show here.

pkgs/development/interpreters/pixie/default.nixnew file+94

This diff is too big to show here.

pkgs/development/interpreters/pixie/dust.nixnew file+46

This diff is too big to show here.

pkgs/development/interpreters/pixie/load_paths.patchnew file+25

This diff is too big to show here.

pkgs/development/interpreters/pixie/make-paths-configurable.patchnew file+119

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/default.nix−6

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh−3

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/sphinx-hook.shdeleted−57

This diff is too big to show here.

pkgs/development/interpreters/python/wrapper.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/racket/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/racket/minimal.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/at-spi2-core/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dbus/default.nix−7

This diff is too big to show here.

pkgs/development/libraries/docopt_cpp/default.nix+2−10

This diff is too big to show here.

pkgs/development/libraries/doctest/default.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/duckdb/default.nix+3−36

This diff is too big to show here.

pkgs/development/libraries/fcft/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gdal/2.4.nix+2−11

This diff is too big to show here.

pkgs/development/libraries/gecode/3.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/glib/default.nix+10−2

This diff is too big to show here.

pkgs/development/libraries/glibc/default.nix+7−4

This diff is too big to show here.

pkgs/development/libraries/glibmm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/goocanvas/2.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/bad/default.nix+3−5

This diff is too big to show here.

pkgs/development/libraries/gstreamer/base/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/core/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/devtools/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ges/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/good/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/libav/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ugly/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/htmlcxx/c++17.patchdeleted−24

This diff is too big to show here.

pkgs/development/libraries/htmlcxx/default.nix+4−7

This diff is too big to show here.

pkgs/development/libraries/hyperscan/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/inih/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/java/commons/daemon/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/kpmcore/default.nix+18−10

This diff is too big to show here.

pkgs/development/libraries/libarchive/default.nix+7−20

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch → pkgs/development/libraries/libdeltachat/darwin-dylib.patchrenamed

The content is the same.

pkgs/development/libraries/libdeltachat/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/libinjection/default.nix+4−12

This diff is too big to show here.

pkgs/development/libraries/libinput/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libpqxx/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libvdpau/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libxcrypt/default.nix−4

This diff is too big to show here.

pkgs/development/libraries/libxsmm/default.nix+3−1

This diff is too big to show here.

pkgs/development/libraries/mesa/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/nss/85_security_load_3.77+.patchdeleted−76

This diff is too big to show here.

pkgs/development/libraries/nss/generic.nix+1−5

This diff is too big to show here.

pkgs/development/libraries/nss/latest.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openssl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/physics/cernlib/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/proj/default.nix−2

This diff is too big to show here.

pkgs/development/libraries/ptex/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebengine.nix+3−18

This diff is too big to show here.

pkgs/development/libraries/science/biology/htslib/default.nix+2−18

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/default.nixnew file+151

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patchnew file+46

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patchnew file+55

This diff is too big to show here.

pkgs/development/libraries/science/math/liblapack/default.nix+11−2

This diff is too big to show here.

pkgs/development/libraries/slang/default.nix−7

This diff is too big to show here.

pkgs/development/libraries/snack/default.nixnew file+36

This diff is too big to show here.

pkgs/development/libraries/vulkan-loader/default.nix+1−2

This diff is too big to show here.

pkgs/development/libraries/wolfssl/default.nix+2−2

This diff is too big to show here.

pkgs/development/lua-modules/generated-packages.nix+9−42

This diff is too big to show here.

pkgs/development/lua-modules/luaexpat.patchnew file+36

This diff is too big to show here.

pkgs/development/lua-modules/overrides.nix+3−6

This diff is too big to show here.

pkgs/development/node-packages/composition.nix+1−1

This diff is too big to show here.

pkgs/development/node-packages/default.nix+37−7

This diff is too big to show here.

pkgs/development/node-packages/node-env.nix+11−21

This diff is too big to show here.

pkgs/development/node-packages/node-packages.json+2−1

This diff is too big to show here.

pkgs/development/node-packages/node-packages.nix+3701−3279

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-action-plugin/default.nix−4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-glob/default.nix−4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-private-libs/default.nix−4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-rpc/default.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-site/default.nix−4

This diff is too big to show here.

pkgs/development/ocaml-modules/fiber/default.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/default.nix+8−7

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix+4−8

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix+5−25

This diff is too big to show here.

pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix+3−15

This diff is too big to show here.

pkgs/development/ocaml-modules/stdune/default.nix+2−6

This diff is too big to show here.

pkgs/development/ocaml-modules/uuuu/default.nix+9−6

This diff is too big to show here.

pkgs/development/ocaml-modules/xdg/default.nixdeleted−17

This diff is too big to show here.

pkgs/development/php-packages/openswoole/default.nixdeleted−22

This diff is too big to show here.

pkgs/development/php-packages/pdepend/default.nixdeleted−41

This diff is too big to show here.

pkgs/development/python-modules/Nikola/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/XlsxWriter/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/afsapi/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/aioairzone/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aiooncue/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aioslimproto/default.nix+4−11

This diff is too big to show here.

pkgs/development/python-modules/androidtv/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ansible-doctor/default.nix+25−25

This diff is too big to show here.

pkgs/development/python-modules/ansible-later/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ansible/default.nix+2−3

This diff is too big to show here.

pkgs/development/python-modules/apispec/default.nix+9−13

This diff is too big to show here.

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/beautifulsoup4/default.nix−3

This diff is too big to show here.

pkgs/development/python-modules/bleach/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/bpython/default.nix+2−16

This diff is too big to show here.

pkgs/development/python-modules/breezy/default.nix+5−20

This diff is too big to show here.

pkgs/development/python-modules/canonicaljson/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/cert-chain-resolver/default.nix+7−22

This diff is too big to show here.

pkgs/development/python-modules/commoncode/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/deltachat/default.nix+3−7

This diff is too big to show here.

pkgs/development/python-modules/devito/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/django-taggit/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/dropbox/default.nix−3

This diff is too big to show here.

pkgs/development/python-modules/duckdb-engine/default.nixdeleted−40

This diff is too big to show here.

pkgs/development/python-modules/dungeon-eos/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/elkm1-lib/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/envs/default.nix+11−15

This diff is too big to show here.

pkgs/development/python-modules/exceptiongroup/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/fastbencode/default.nixdeleted−26

This diff is too big to show here.

pkgs/development/python-modules/fastjsonschema/default.nix+14−3

This diff is too big to show here.

pkgs/development/python-modules/filetype/default.nix+6−26

This diff is too big to show here.

pkgs/development/python-modules/flake8-debugger/default.nix+14−23

This diff is too big to show here.

pkgs/development/python-modules/flask-jwt-extended/default.nix+10−31

This diff is too big to show here.

pkgs/development/python-modules/flask-login/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/fontmake/default.nixdeleted−42

This diff is too big to show here.

pkgs/development/python-modules/fonttools/default.nix+3−7

This diff is too big to show here.

pkgs/development/python-modules/fqdn/default.nixdeleted−36

This diff is too big to show here.

pkgs/development/python-modules/gbulb/default.nixdeleted−43

This diff is too big to show here.

pkgs/development/python-modules/gcal-sync/default.nixdeleted−46

This diff is too big to show here.

pkgs/development/python-modules/gehomesdk/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/gensim/default.nix+20−37

This diff is too big to show here.

pkgs/development/python-modules/ghp-import/default.nix+4−12

This diff is too big to show here.

pkgs/development/python-modules/glances-api/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/glyphslib/default.nixdeleted−59

This diff is too big to show here.

pkgs/development/python-modules/gradient/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/gtts/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/hahomematic/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/howdoi/default.nix+2−16

This diff is too big to show here.

pkgs/development/python-modules/ibis-framework/default.nix+47−34

This diff is too big to show here.

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixdeleted−26

This diff is too big to show here.

pkgs/development/python-modules/ipython-sql/default.nixdeleted−58

This diff is too big to show here.

pkgs/development/python-modules/isoduration/default.nixdeleted−50

This diff is too big to show here.

pkgs/development/python-modules/jedi-language-server/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/jsonrpc-async/default.nix+4−25

This diff is too big to show here.

pkgs/development/python-modules/jsonrpc-base/default.nix+1−9

This diff is too big to show here.

pkgs/development/python-modules/jug/default.nix+18−31

This diff is too big to show here.

pkgs/development/python-modules/jwcrypto/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/lektor/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/loopy/default.nix → pkgs/development/python-modules/loo-py/default.nixrenamed+24−28

This diff is too big to show here.

pkgs/development/python-modules/luxtronik/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mat2/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/meater-python/default.nixdeleted−37

This diff is too big to show here.

pkgs/development/python-modules/monty/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/murmurhash/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mypy-boto3-s3/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/namedlist/default.nix+9−30

This diff is too big to show here.

pkgs/development/python-modules/nbclient/default.nix+10−33

This diff is too big to show here.

pkgs/development/python-modules/nbconvert/default.nix+7−8

This diff is too big to show here.

pkgs/development/python-modules/netutils/default.nixdeleted−66

This diff is too big to show here.

pkgs/development/python-modules/nvchecker/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/openstep-plist/default.nixdeleted−31

This diff is too big to show here.

pkgs/development/python-modules/pandas/default.nix−2

This diff is too big to show here.

pkgs/development/python-modules/pathy/default.nix+14−37

This diff is too big to show here.

pkgs/development/python-modules/peaqevcore/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pims/default.nix+19−42

This diff is too big to show here.

pkgs/development/python-modules/poetry-dynamic-versioning/default.nixdeleted−58

This diff is too big to show here.

pkgs/development/python-modules/preprocess-cancellation/default.nix+6−36

This diff is too big to show here.

pkgs/development/python-modules/preprocess-cancellation/pep-621.patchdeleted−20

This diff is too big to show here.

pkgs/development/python-modules/proton-client/0001-OpenSSL-path-fix.patchdeleted−41

This diff is too big to show here.

pkgs/development/python-modules/proton-client/default.nix+8−18

This diff is too big to show here.

pkgs/development/python-modules/py-desmume/default.nix+14−3

This diff is too big to show here.

pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pybind11/default.nix+2−3

This diff is too big to show here.

pkgs/development/python-modules/pychromecast/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pydantic/default.nix−2

This diff is too big to show here.

pkgs/development/python-modules/pydeconz/default.nix+4−6

This diff is too big to show here.

pkgs/development/python-modules/pydeps/default.nixdeleted−60

This diff is too big to show here.

pkgs/development/python-modules/pyeapi/default.nix+8−36

This diff is too big to show here.

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyhiveapi/default.nix+2−4

This diff is too big to show here.

pkgs/development/python-modules/pyinfra/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyinsteon/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pykulersky/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pymyq/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pync/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/pynetgear/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pynws/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyomo/default.nix+22−34

This diff is too big to show here.

pkgs/development/python-modules/pyqtwebengine/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/pyrogram/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pysensibo/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyshp/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pytenable/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pytest-datafiles/default.nix+8−33

This diff is too big to show here.

pkgs/development/python-modules/python-efl/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/python-smarttub/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/python-sql/default.nix+8−24

This diff is too big to show here.

pkgs/development/python-modules/pytomorrowio/default.nix+2−4

This diff is too big to show here.

pkgs/development/python-modules/pytorch-pfn-extras/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pytrafikverket/default.nix+4−11

This diff is too big to show here.

pkgs/development/python-modules/pywinrm/default.nix+12−28

This diff is too big to show here.

pkgs/development/python-modules/ratelimiter/default.nix+13−21

This diff is too big to show here.

pkgs/development/python-modules/ropper/default.nix+15−26

This diff is too big to show here.

pkgs/development/python-modules/s3-credentials/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/scikit-survival/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/scmrepo/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/secretstorage/default.nix+6−17

This diff is too big to show here.

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/signedjson/default.nix+18−31

This diff is too big to show here.

pkgs/development/python-modules/simplisafe-python/default.nix+2−6

This diff is too big to show here.

pkgs/development/python-modules/skia-pathops/default.nixdeleted−43

This diff is too big to show here.

pkgs/development/python-modules/skytemple-files/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/skytemple-rust/default.nix+6−15

This diff is too big to show here.

pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/slack-sdk/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/slixmpp/0001-xep_0030-allow-extra-args-in-get_info_from_domain.patchdeleted−36

This diff is too big to show here.

pkgs/development/python-modules/slixmpp/default.nix−2

This diff is too big to show here.

pkgs/development/python-modules/smart-open/default.nix+26−8

This diff is too big to show here.

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/snowflake-sqlalchemy/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/spacy-transformers/default.nix+6−8

This diff is too big to show here.

pkgs/development/python-modules/spacy/default.nix+21−26

This diff is too big to show here.

pkgs/development/python-modules/sphinxcontrib-spelling/default.nix+7−21

This diff is too big to show here.

pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/sqlmap/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/stripe/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/superqt/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/svdtools/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/tern/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/teslajsonpy/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/textual/default.nix+13−16

This diff is too big to show here.

pkgs/development/python-modules/timetagger/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/total-connect-client/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/twitch-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-paramiko/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-requests/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/typical/default.nix+9−10

This diff is too big to show here.

pkgs/development/python-modules/ufo2ft/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ufoLib2/default.nix−3

This diff is too big to show here.

pkgs/development/python-modules/voluptuous/default.nix+11−15

This diff is too big to show here.

pkgs/development/python-modules/wandb/default.nix+12−20

This diff is too big to show here.

pkgs/development/python-modules/webssh/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/xknx/default.nix+4−9

This diff is too big to show here.

pkgs/development/python-modules/youtube-search-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/yte/default.nixdeleted−57

This diff is too big to show here.

pkgs/development/python-modules/zeroconf/default.nix+2−4

This diff is too big to show here.

pkgs/development/python-modules/zigpy-deconz/default.nix+3−6

This diff is too big to show here.

pkgs/development/python-modules/zigpy/default.nix+2−4

This diff is too big to show here.

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/quickemu/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/checkov/default.nix+2−3

This diff is too big to show here.

pkgs/development/tools/analysis/codeql/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/cvehound/default.nix+12−17

This diff is too big to show here.

pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+3

This diff is too big to show here.

pkgs/development/tools/build-managers/bazel/bazel_5/default.nix+3

This diff is too big to show here.

pkgs/development/tools/build-managers/bloop/default.nix+46−16

This diff is too big to show here.

pkgs/development/tools/build-managers/meson/default.nix−7

This diff is too big to show here.

pkgs/development/tools/build-managers/redo-apenwarr/default.nix+2−1

This diff is too big to show here.

pkgs/development/tools/build-managers/scala-cli/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/build-managers/tup/default.nix−2

This diff is too big to show here.

pkgs/development/tools/build-managers/tup/fusermount-setuid.patchdeleted−31

This diff is too big to show here.

pkgs/development/tools/continuous-integration/github-runner/default.nix−2

This diff is too big to show here.

pkgs/development/tools/database/liquibase/default.nix+1−1

This diff is too big to show here.

pkgs/development/tools/ddosify/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/dive/default.nix+2

This diff is too big to show here.

pkgs/development/tools/fq/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/go-motion/default.nix+13−10

This diff is too big to show here.

pkgs/development/tools/go-toml/default.nix+6−8

This diff is too big to show here.

pkgs/development/tools/gosec/default.nix+2

This diff is too big to show here.

pkgs/development/tools/hjson-go/default.nix+12−14

This diff is too big to show here.

pkgs/development/tools/jdt-language-server/default.nixdeleted−103

This diff is too big to show here.

pkgs/development/tools/just/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/kdash/default.nixdeleted−34

This diff is too big to show here.

pkgs/development/tools/krankerl/default.nix+2

This diff is too big to show here.

pkgs/development/tools/metals/default.nix+11−6

This diff is too big to show here.

pkgs/development/tools/misc/clojure-lsp/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/misc/saleae-logic-2/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/misc/universal-ctags/default.nix+1−1

This diff is too big to show here.

pkgs/development/tools/mustache-go/default.nix+6−9

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+2−10

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+5−153

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+4−98

This diff is too big to show here.

pkgs/development/tools/protoc-gen-entgrpc/default.nixdeleted−28

This diff is too big to show here.

pkgs/development/tools/purescript/spago/spago.nix+3−3

This diff is too big to show here.

pkgs/development/tools/reflex/default.nix+7−8

This diff is too big to show here.

pkgs/development/tools/rust/cargo-sync-readme/default.nix+3−4

This diff is too big to show here.

pkgs/development/tools/rust/cbindgen/default.nix+4−4

This diff is too big to show here.

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/scalafix/default.nix+7−10

This diff is too big to show here.

pkgs/development/tools/tracy/default.nix+4−6

This diff is too big to show here.

pkgs/development/tools/unityhub/default.nix+6−5

This diff is too big to show here.

pkgs/development/tools/vala-language-server/default.nix+2

This diff is too big to show here.

pkgs/development/tools/vulkan-validation-layers/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/wails/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js+1−2

This diff is too big to show here.

pkgs/development/web/nodejs/nodejs.nix+2−2

This diff is too big to show here.

pkgs/development/web/nodejs/v14.nix+2−2

This diff is too big to show here.

pkgs/development/web/nodejs/v18.nix+2−2

This diff is too big to show here.

pkgs/games/7kaa/default.nix+10−7

This diff is too big to show here.

pkgs/games/hedgewars/default.nix−5

This diff is too big to show here.

pkgs/games/mindustry/default.nix+9−11

This diff is too big to show here.

pkgs/games/quake2/yquake2/default.nix+27−19

This diff is too big to show here.

pkgs/games/quake2/yquake2/games.nix+4−2

This diff is too big to show here.

pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix+2−2

This diff is too big to show here.

pkgs/misc/drivers/pantum-driver/default.nixdeleted−52

This diff is too big to show here.

pkgs/misc/openrussian-cli/default.nix+2−2

This diff is too big to show here.

pkgs/misc/platformsh/default.nix+4−4

This diff is too big to show here.

pkgs/misc/rich-cli/default.nix+8−18

This diff is too big to show here.

pkgs/os-specific/linux/apparmor/default.nix+1

This diff is too big to show here.

pkgs/os-specific/linux/bionic-prebuilt/default.nix+6−10

This diff is too big to show here.

pkgs/os-specific/linux/device-tree/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ell/default.nix+3−4

This diff is too big to show here.

pkgs/os-specific/linux/evdi/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel-headers/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+4−3

This diff is too big to show here.

pkgs/os-specific/linux/kernel/manual-config.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/libcap-ng/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/multipath-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/nftables/default.nix+9−7

This diff is too big to show here.

pkgs/os-specific/linux/sysstat/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/vmware/default.nixdeleted−47

This diff is too big to show here.

pkgs/servers/calibre-web/default.nix+7−10

This diff is too big to show here.

pkgs/servers/dict/wiktionary/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/pdns/default.nix+2−2

This diff is too big to show here.

pkgs/servers/foundationdb/vsmake.nix+2−2

This diff is too big to show here.

pkgs/servers/gpm/default.nix+26−13

This diff is too big to show here.

pkgs/servers/home-assistant/component-packages.nix+14−35

This diff is too big to show here.

pkgs/servers/home-assistant/default.nix+4−15

This diff is too big to show here.

pkgs/servers/home-assistant/frontend.nix+2−2

This diff is too big to show here.

pkgs/servers/hqplayerd/default.nix+27−30

This diff is too big to show here.

pkgs/servers/http/unit/default.nix+3

This diff is too big to show here.

pkgs/servers/irc/inspircd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/keycloak/default.nix+4−4

This diff is too big to show here.

pkgs/servers/mastodon/default.nix+1−1

This diff is too big to show here.

pkgs/servers/mastodon/gemset.nix+72−72

This diff is too big to show here.

pkgs/servers/mastodon/source.nix+2−2

This diff is too big to show here.

pkgs/servers/mastodon/version.nix+1−1

This diff is too big to show here.

pkgs/servers/matrix-synapse/default.nix+2−2

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+7−7

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4

This diff is too big to show here.

pkgs/servers/mattermost/matterircd.nix+5−7

This diff is too big to show here.

pkgs/servers/monitoring/net-snmp/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/haproxy-exporter.nix+7−9

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/bower-packages.nixnew file+25

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/default.nixnew file+53

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/src.nixnew file+4

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/update.shnew file+42

This diff is too big to show here.

pkgs/servers/moonraker/default.nix+3−3

This diff is too big to show here.

pkgs/servers/nosql/cassandra/generic.nix+2−1

This diff is too big to show here.

pkgs/servers/nosql/redis/default.nix+2−8

This diff is too big to show here.

pkgs/servers/openvscode-server/default.nix+14−11

This diff is too big to show here.

pkgs/servers/openvscode-server/remove-node-download.patch+7−9

This diff is too big to show here.

pkgs/servers/pulseaudio/default.nix+3−10

This diff is too big to show here.

pkgs/servers/redpanda/default.nixdeleted−35

This diff is too big to show here.

pkgs/servers/roon-server/default.nix+2−2

This diff is too big to show here.

pkgs/servers/unifi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/nifi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/sogo/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/wallabag/default.nix+1−3

This diff is too big to show here.

pkgs/servers/wishlist/default.nixdeleted−27

This diff is too big to show here.

pkgs/servers/xmpp/prosody/default.nix+22−9

This diff is too big to show here.

pkgs/servers/zookeeper/default.nix+2−5

This diff is too big to show here.

pkgs/stdenv/generic/check-meta.nix+15−40

This diff is too big to show here.

pkgs/stdenv/generic/make-derivation.nix+4−69

This diff is too big to show here.

pkgs/tools/X11/opentabletdriver/default.nix+2−2

This diff is too big to show here.

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

This diff is too big to show here.

pkgs/tools/admin/aws-google-auth/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/cli53/default.nix+8−17

This diff is too big to show here.

pkgs/tools/admin/colmena/default.nix+5−10

This diff is too big to show here.

pkgs/tools/admin/lxd/default.nix−1

This diff is too big to show here.

pkgs/tools/admin/pgadmin/default.nix+54−87

This diff is too big to show here.

pkgs/tools/admin/pgadmin/package.json+4−7

This diff is too big to show here.

pkgs/tools/admin/pgadmin/yarn.lock+22−231

This diff is too big to show here.

pkgs/tools/admin/pgadmin/yarn.nix+18−226

This diff is too big to show here.

pkgs/tools/admin/pulumi/data.nix+73−73

This diff is too big to show here.

pkgs/tools/admin/pulumi/update.sh+2−4

This diff is too big to show here.

pkgs/tools/admin/ssh-import-id/default.nix+1−7

This diff is too big to show here.

pkgs/tools/admin/syft/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/winbox/default.nix+1−1

This diff is too big to show here.

pkgs/tools/cd-dvd/ventoy-bin/default.nix+6−11

This diff is too big to show here.

pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktopdeleted−10

This diff is too big to show here.

pkgs/tools/filesystems/bcachefs-tools/default.nix+3−3

This diff is too big to show here.

pkgs/tools/filesystems/ceph/default.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/fuse-7z-ng/default.nix+1−1

This diff is too big to show here.

pkgs/tools/filesystems/irods/common.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/irods/default.nix+3−2

This diff is too big to show here.

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/zkfuse/default.nix+2−1

This diff is too big to show here.

pkgs/tools/graphics/feedgnuplot/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/gnuplot/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/graphviz/default.nix+14−3

This diff is too big to show here.

pkgs/tools/graphics/vulkan-tools/default.nix+3−3

This diff is too big to show here.

pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patchdeleted−18

This diff is too big to show here.

pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix−2

This diff is too big to show here.

pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix+2−5

This diff is too big to show here.

pkgs/tools/inputmethods/lisgd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/antimicrox/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/bat-extras/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/calamares-nixos-extensions/default.nixdeleted−30

This diff is too big to show here.

pkgs/tools/misc/calamares/default.nix+14−52

This diff is too big to show here.

pkgs/tools/misc/calamares/nixos-extensions-paths.patchdeleted−46

This diff is too big to show here.

pkgs/tools/misc/calamares/nonroot.patchdeleted−105

This diff is too big to show here.

pkgs/tools/misc/calamares/packagechooserq.patchdeleted−136

This diff is too big to show here.

pkgs/tools/misc/calamares/partitions.patchdeleted−28

This diff is too big to show here.

pkgs/tools/misc/calamares/uimod.patchdeleted−85

This diff is too big to show here.

pkgs/tools/misc/calamares/unfreeq.patchdeleted−109

This diff is too big to show here.

pkgs/tools/misc/calamares/userjob.patchdeleted−31

This diff is too big to show here.

pkgs/tools/misc/chezmoi/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/cht.sh/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/fclones/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/fortune/default.nix−5

This diff is too big to show here.

pkgs/tools/misc/idutils/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/lookatme/default.nixnew file+67

This diff is too big to show here.

pkgs/tools/misc/man-db/default.nix+18−7

This diff is too big to show here.

pkgs/tools/misc/partition-manager/default.nix+5−5

This diff is too big to show here.

pkgs/tools/misc/pferd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/phoronix-test-suite/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/pouf/default.nix+3−5

This diff is too big to show here.

pkgs/tools/misc/rust-motd/default.nix+3−5

This diff is too big to show here.

pkgs/tools/misc/tlp/default.nix+1−1

This diff is too big to show here.

pkgs/tools/misc/yle-dl/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/ytarchive/default.nix+4−10

This diff is too big to show here.

pkgs/tools/misc/yubico-piv-tool/default.nix+4−13

This diff is too big to show here.

pkgs/tools/misc/zellij/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/bore-cli/default.nix+4−14

This diff is too big to show here.

pkgs/tools/networking/corerad/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/curl/default.nix+5−6

This diff is too big to show here.

pkgs/tools/networking/globalprotect-openconnect/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/godns/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/gof5/default.nixdeleted−30

This diff is too big to show here.

pkgs/tools/networking/magic-wormhole-rs/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/mqttui/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/networkmanager/l2tp/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/ntopng/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/ooniprobe-cli/default.nixdeleted−27

This diff is too big to show here.

pkgs/tools/networking/pssh/default.nix+4−7

This diff is too big to show here.

pkgs/tools/networking/slirp4netns/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/urlwatch/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/nix/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/adreaper/default.nixdeleted−33

This diff is too big to show here.

pkgs/tools/security/cryptomator/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/fulcio/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/gopass/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/grype/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/jadx/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/john/default.nix+7−17

This diff is too big to show here.

pkgs/tools/security/jwt-cli/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/munge/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/nmap/default.nix+18−6

This diff is too big to show here.

pkgs/tools/security/oath-toolkit/update.sh+1−1

This diff is too big to show here.

pkgs/tools/security/pass/extensions/otp.nix+3−3

This diff is too big to show here.

pkgs/tools/security/plasma-pass/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/rage/default.nix+6−15

This diff is too big to show here.

pkgs/tools/security/sigma-cli/default.nix+3−4

This diff is too big to show here.

pkgs/tools/security/tor/default.nix+5−9

This diff is too big to show here.

pkgs/tools/security/vault/vault-bin.nix+6−6

This diff is too big to show here.

pkgs/tools/security/wprecon/default.nix+4−8

This diff is too big to show here.

pkgs/tools/system/freeipmi/default.nix+1−6

This diff is too big to show here.

pkgs/tools/system/htop/default.nix+13−11

This diff is too big to show here.

pkgs/tools/system/runitor/default.nixdeleted−52

This diff is too big to show here.

pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patchdeleted−25

This diff is too big to show here.

pkgs/tools/text/bashblog/default.nixdeleted−59

This diff is too big to show here.

pkgs/tools/text/cmigemo/default.nix+2−2

This diff is too big to show here.

pkgs/tools/text/groff/default.nix+2−10

This diff is too big to show here.

pkgs/tools/text/vale/default.nix+4−4

This diff is too big to show here.

pkgs/tools/text/xml/xpf/default.nixnew file+21

This diff is too big to show here.

pkgs/tools/virtualization/lxd-image-server/default.nix−3

This diff is too big to show here.

pkgs/top-level/aliases.nix+1−13

This diff is too big to show here.

pkgs/top-level/all-packages.nix+55−83

This diff is too big to show here.

pkgs/top-level/config.nix−51

This diff is too big to show here.

pkgs/top-level/coq-packages.nix−1

This diff is too big to show here.

pkgs/top-level/linux-kernels.nix−2

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix−6

This diff is too big to show here.

pkgs/top-level/perl-packages.nix+1

This diff is too big to show here.

pkgs/top-level/php-packages.nix−2

This diff is too big to show here.

pkgs/top-level/python-aliases.nix−1

This diff is too big to show here.

pkgs/top-level/python-packages.nix+3−49

This diff is too big to show here.

pkgs/top-level/release-haskell.nix+11−12

This diff is too big to show here.

pkgs/top-level/release-lib.nix+1−1

This diff is too big to show here.