master..e4dfaba · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

414 files changed+3951−7744

unifiedsplit

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}

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.

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

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.

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

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

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.

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}

3−To start a development environment, run:

3+To start a development environment do

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}

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.

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.

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_.

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 @@

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

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:

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.

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).

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

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`).

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:

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}

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.

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 @@

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

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).

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

55- `fzf` : `fzf-share`

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:

99```bash

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

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

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

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

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.

77Nix problems and constraints:

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.

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

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

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}

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

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/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.

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}

maintainers/maintainer-list.nix−18

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

14091409 githubId = 164148;

14101410 name = "Ben Darwin";

14111411 };

1412− bdd = {

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

1414− github = "bdd";

1415− githubId = 11135;

1416− name = "Berk D. Demir";

1417− };

14181412 bdesham = {

14191413 email = "benjamin@esham.io";

14201414 github = "bdesham";

@@ -13294,12 +13288,6 @@

1329413288 githubId = 1771332;

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

1329613290 };

13297− vlinkz = {

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

13299− github = "vlinkz";

13300− githubId = 20145996;

13301− name = "Victor Fuentes";

13302− };

1330313291 vlstill = {

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

1330513293 github = "vlstill";

@@ -14211,12 +14199,6 @@

1421114199 github = "deifactor";

1421214200 githubId = 30192992;

1421314201 };

14214− deinferno = {

14215− name = "deinferno";

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

14217− github = "deinferno";

14218− githubId = 14363193;

14219− };

1422014202 fzakaria = {

1422114203 name = "Farid Zakaria";

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

maintainers/scripts/luarocks-packages.csv−1

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

6464luasql-sqlite3,,,,,,vyp

6565luassert,,,,,,

6666luasystem,,,,,,

67−luaunbound,,,,,

6867luautf8,,,,,,pstn

6968luazip,,,,,,

7069lua-yajl,,,,,,pstn

maintainers/scripts/pluginupdate.py+6−12

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

311311

312312 return plugins

313313

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−

324314class Editor:

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

326316

@@ -343,9 +333,13 @@ class Editor:

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

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

345335

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

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

347337 """To fill the cache"""

348− data = run_nix_expr(self.get_plugins)

338+ with CleanEnvironment():

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

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

341+ out = subprocess.check_output(cmd)

342+ data = json.loads(out)

349343 plugins = []

350344 for name, attr in data.items():

351345 print("get_current_plugins: name %s" % name)

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+2−67

@@ -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

@@ -101,20 +74,8 @@

10174 </para>

10275 </listitem>

10376 <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>

77+<literallayout>Pulseaudio has been upgraded to version 15.0 and now optionally <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports additional Bluetooth audio codecs</link> like aptX or LDAC, with codec switching support being available in <literal>pavucontrol</literal>. This feature is disabled by default but can be enabled by using <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>.

78+Existing 3rd party modules that provided similar functionality, like <literal>pulseaudio-modules-bt</literal> or <literal>pulseaudio-hsphfpd</literal> are deprecated and have been removed.</literallayout>

11879 </listitem>

11980 <listitem>

12081 <para>

@@ -151,14 +112,6 @@

151112 default.

152113 </para>

153114 </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>

162115 </itemizedlist>

163116 </section>

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

@@ -544,19 +497,6 @@

544497 <literal>/etc/containers</literal>.

545498 </para>

546499 </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>"22.05"</literal> set

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

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

557− <quote>docker</quote>.

558− </para>

559− </listitem>

560500 <listitem>

561501 <para>

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

@@ -877,11 +817,6 @@

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

878818 updated.

879819 </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>

885820 </listitem>

886821 <listitem>

887822 <para>

nixos/doc/manual/release-notes/rl-2205.section.md+1−23

@@ -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,7 +27,7 @@ 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;`.

30+- 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;`.

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

4732

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

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

5338

5439- 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.

5540

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−

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

5942

6043- [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 +164,6 @@ In addition to numerous new and upgraded packages, this release has the followin

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

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

183166

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−

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

188168 by systemd since Linux 3.5.

189169

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

362342 `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

363343 location if the `stateVersion` is updated.

364344

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−

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

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

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

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.

3−{ ... }:

3+{ lib, ... }:

5+with lib;

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.

4−{ pkgs, ... }:

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

6+with lib;

68{

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

nixos/modules/module-list.nix−1

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

12561256 ./virtualisation/virtualbox-guest.nix

12571257 ./virtualisation/virtualbox-host.nix

12581258 ./virtualisation/vmware-guest.nix

1259− ./virtualisation/vmware-host.nix

12601259 ./virtualisation/waydroid.nix

12611260 ./virtualisation/xen-dom0.nix

12621261 ./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;

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

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/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/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/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/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/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, ...} :

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

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+94−40

@@ -1,18 +1,79 @@

1−import ./make-test-python.nix ({ pkgs, lib, ... } :

1+import ./make-test-python.nix ({ pkgs, ...} :

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-x86 = pkgs.fetchurl {

10+ url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11+ hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12+ };

13+ alpine-meta-for = arch: pkgs.stdenv.mkDerivation {

14+ name = "alpine-meta-${arch}";

15+ version = "3.12";

16+ unpackPhase = "true";

17+ buildPhase = ''

18+ runHook preBuild

819

9− # Our tests require `grep` & friends:

10− environment.systemPackages = with pkgs; [ busybox ];

11− };

20+ tar xvf ${alpine-meta-x86}

21+ sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml

22+

23+ runHook postBuild

24+ '';

25+ installPhase = ''

26+ runHook preInstall

27+

28+ tar czRf $out *

29+

30+ runHook postInstall

31+ '';

1232 };

1333

14− lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

15− lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

34+ alpine-meta = {

35+ x86_64-linux = alpine-meta-x86;

36+ aarch64-linux = alpine-meta-for "aarch64";

37+ }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

38+

39+ alpine-rootfs = {

40+ x86_64-linux = pkgs.fetchurl {

41+ url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

42+ hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

43+ };

44+ aarch64-linux = pkgs.fetchurl {

45+ url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz";

46+ hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us=";

47+ };

48+ }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

49+

50+ lxd-config = pkgs.writeText "config.yaml" ''

51+ storage_pools:

52+ - name: default

53+ driver: dir

54+ config:

55+ source: /var/lxd-pool

56+

57+ networks:

58+ - name: lxdbr0

59+ type: bridge

60+ config:

61+ ipv4.address: auto

62+ ipv6.address: none

63+

64+ profiles:

65+ - name: default

66+ devices:

67+ eth0:

68+ name: eth0

69+ network: lxdbr0

70+ type: nic

71+ root:

72+ path: /

73+ pool: default

74+ type: disk

75+ '';

76+

1677

1778in {

1879 name = "lxd";

@@ -23,8 +84,6 @@ in {

2384

2485 nodes.machine = { lib, ... }: {

2586 virtualisation = {

26− diskSize = 2048;

27−

2887 # Since we're testing `limits.cpu`, we've gotta have a known number of

2988 # cores to lean on

3089 cores = 2;

@@ -49,66 +108,61 @@ in {

49108 machine.succeed("mkdir /var/lxd-pool")

50109

51110 machine.succeed(

52− "cat ${./common/lxd/config.yaml} | lxd init --preseed"

111+ "cat ${lxd-config} | lxd init --preseed"

53112 )

54113

55114 machine.succeed(

56− "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

115+ "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

57116 )

58117

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")

118+ with subtest("Containers can be launched and destroyed"):

119+ machine.succeed("lxc launch alpine test")

120+ machine.succeed("lxc exec test true")

121+ machine.succeed("lxc delete -f test")

65122

66− with subtest("Container is mounted with lxcfs inside"):

67− machine.succeed("lxc launch nixos container")

68− machine.sleep(5)

123+ with subtest("Containers are being mounted with lxcfs inside"):

124+ machine.succeed("lxc launch alpine test")

69125

70126 ## ---------- ##

71127 ## limits.cpu ##

72128

73− machine.succeed("lxc config set container limits.cpu 1")

74− machine.succeed("lxc restart container")

75− machine.sleep(5)

129+ machine.succeed("lxc config set test limits.cpu 1")

130+ machine.succeed("lxc restart test")

76131

132+ # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort

133+ # to the primal methods

77134 assert (

78135 "1"

79− == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

136+ == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

80137 )

81138

82− machine.succeed("lxc config set container limits.cpu 2")

83− machine.succeed("lxc restart container")

84− machine.sleep(5)

139+ machine.succeed("lxc config set test limits.cpu 2")

140+ machine.succeed("lxc restart test")

85141

86142 assert (

87143 "2"

88− == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

144+ == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

89145 )

90146

91147 ## ------------- ##

92148 ## limits.memory ##

93149

94− machine.succeed("lxc config set container limits.memory 64MB")

95− machine.succeed("lxc restart container")

96− machine.sleep(5)

150+ machine.succeed("lxc config set test limits.memory 64MB")

151+ machine.succeed("lxc restart test")

97152

98153 assert (

99154 "MemTotal: 62500 kB"

100− == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

155+ == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

101156 )

102157

103− machine.succeed("lxc config set container limits.memory 128MB")

104− machine.succeed("lxc restart container")

105− machine.sleep(5)

158+ machine.succeed("lxc config set test limits.memory 128MB")

159+ machine.succeed("lxc restart test")

106160

107161 assert (

108162 "MemTotal: 125000 kB"

109− == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

163+ == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

110164 )

111165

112− machine.succeed("lxc delete -f container")

166+ machine.succeed("lxc delete -f test")

113167 '';

114168})

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";

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/greg/default.nix+3−3

@@ -2,15 +2,15 @@

33with pythonPackages; buildPythonApplication rec {

44 pname = "greg";

5− version = "0.4.8";

5+ version = "0.4.7";

77 disabled = !isPy3k;

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/plexamp/default.nix+3−3

@@ -2,12 +2,12 @@

33let

44 pname = "plexamp";

5− version = "4.2.1";

5+ version = "4.2.0";

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/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 }:

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/vim/plugins/default.nix+1−3

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

44let

6− inherit (vimUtils.override {inherit vim;})

7− buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

6+ inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

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 }:

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/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/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/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}:

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/kiln/default.nix+3−3

@@ -2,18 +2,18 @@

33buildGoModule rec {

44 pname = "kiln";

5− version = "0.3.0";

5+ version = "0.2.1";

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/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/skytemple/default.nix+2−5

@@ -2,13 +2,13 @@

33python3Packages.buildPythonApplication rec {

44 pname = "skytemple";

5− version = "1.3.10";

5+ version = "1.3.2";

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/tut/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "tut";

5− version = "0.0.46";

5+ version = "0.0.42";

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 @@

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 @@

33rustPlatform.buildRustPackage rec {

44 pname = "xplr";

5− version = "0.17.6";

5+ version = "0.17.3";

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/browsers/brave/default.nix+5−8

@@ -49,9 +49,6 @@

4949, pulseSupport ? stdenv.isLinux

5050, libpulseaudio

5151

52−# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)

53−, libGL

54−

5552# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)

5653, libvaSupport ? stdenv.isLinux

5754, libva

@@ -69,7 +66,7 @@ let

6966

7067 deps = [

7168 alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat

72− fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL

69+ fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11

7370 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

7471 libXext libXfixes libXi libXrandr libXrender libxshmfence

7572 libXtst libuuid mesa nspr nss pango pipewire udev wayland

@@ -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

@@ -173,10 +170,10 @@ stdenv.mkDerivation rec {

173170 ${optionalString (disableFeatures != []) ''

174171 --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"

175172 ''}

173+ --add-flags ${escapeShellArg commandLineArgs}

176174 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"

177175 ${optionalString vulkanSupport ''

178176 --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"

179− --add-flags ${escapeShellArg commandLineArgs}

180177 ''}

181178 )

182179 '';

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+9

@@ -19,6 +19,7 @@

1919

2020{ lib

2121, stdenv

22+, fetchpatch

2223

2324# build time

2425, autoconf

@@ -177,6 +178,14 @@ buildStdenv.mkDerivation ({

177178 ];

178179

179180 patches = [

181+ (fetchpatch {

182+ # RDD Sandbox paths for NixOS, remove with Firefox>=100

183+ # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14

184+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692

185+ name = "mozbz-1761692-rdd-sandbox-paths.patch";

186+ url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";

187+ hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";

188+ })

180189 ]

181190 ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

182191 ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch

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/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/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/cloudflared/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2022.5.0";

5+ version = "2022.4.1";

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 }:

33let

4− version = "0.30.2";

5− sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";

6− manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";

4+ version = "0.29.5";

5+ sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";

6+ manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";

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/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/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 @@

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/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/teams/default.nix+1−1

@@ -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/irc/senpai/default.nix+4−4

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "senpai";

5− version = "unstable-2022-04-29";

5+ version = "unstable-2021-12-14";

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/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/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/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+}:

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+1−3

@@ -9,9 +9,7 @@ mkDerivation rec {

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";

12+ rev = "v${version}";

1513 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

1614 };

1715

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/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 @@

66mkDerivation rec {

77 pname = "qownnotes";

8− version = "22.5.0";

8+ version = "22.4.1";

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/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/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/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+3−3

@@ -5,14 +5,14 @@

66python3.pkgs.buildPythonApplication rec {

77 pname = "snakemake";

8− version = "7.6.1";

8+ version = "7.5.0";

99 format = "setuptools";

1010

1111 src = fetchFromGitHub {

1212 owner = "snakemake";

1313 repo = pname;

14− rev = "refs/tags/v${version}";

15− hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

14+ rev = "v${version}";

15+ hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE=";

1616 };

1717

1818 propagatedBuildInputs = with python3.pkgs; [

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/version-management/git-repo/default.nix+2−2

@@ -4,13 +4,13 @@

55stdenv.mkDerivation rec {

66 pname = "git-repo";

7− version = "2.25";

7+ version = "2.24.1";

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/gitlab/data.json+5−5

@@ -1,14 +1,14 @@

11{

2− "version": "14.10.1",

3− "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp",

2+ "version": "14.10.0",

3+ "repo_hash": "0j4dx32d4i8b44zfmqshkc19g3g9a2c2rg1r8mifjv67p7hvacnx",

44 "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",

55 "owner": "gitlab-org",

66 "repo": "gitlab",

7− "rev": "v14.10.1-ee",

7+ "rev": "v14.10.0-ee",

88 "passthru": {

9− "GITALY_SERVER_VERSION": "14.10.1",

9+ "GITALY_SERVER_VERSION": "14.10.0",

1010 "GITLAB_PAGES_VERSION": "1.56.1",

1111 "GITLAB_SHELL_VERSION": "13.25.1",

12− "GITLAB_WORKHORSE_VERSION": "14.10.1"

12+ "GITLAB_WORKHORSE_VERSION": "14.10.0"

1313 }

1414}

pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2

@@ -11,7 +11,7 @@ let

1111 gemdir = ./.;

1212 };

1313

14− version = "14.10.1";

14+ version = "14.10.0";

1515 gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";

1616in

1717

@@ -23,7 +23,7 @@ buildGoModule {

2323 owner = "gitlab-org";

2424 repo = "gitaly";

2525 rev = "v${version}";

26− sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI=";

26+ sha256 = "sha256-E0tIbcm/yI1oSn4CD8oZo8WfZVJNAZBUw2QRlhAujTI=";

2727 };

2828

2929 vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+1−1

@@ -5,7 +5,7 @@ in

55buildGoModule rec {

66 pname = "gitlab-workhorse";

8− version = "14.10.1";

8+ version = "14.10.0";

1010 src = fetchFromGitLab {

1111 owner = data.owner;

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/build-support/kernel/make-initrd-ng-tool.nix+1−8

@@ -1,4 +1,4 @@

1−{ rustPlatform, lib, makeWrapper, patchelf, glibc, binutils }:

1+{ rustPlatform }:

33rustPlatform.buildRustPackage {

44 pname = "make-initrd-ng";

@@ -6,11 +6,4 @@ rustPlatform.buildRustPackage {

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/data/fonts/uni-vga/default.nix+6−4

@@ -2,6 +2,8 @@

22, libfaketime, fonttosfnt, mkfontscale

33}:

5+with lib;

57stdenv.mkDerivation {

68 name = "uni-vga";

@@ -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/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/development/compilers/chicken/5/eggs.nix−414

@@ -2,38 +2,6 @@

22rec {

33 inherit (pkgs) eggDerivation fetchegg;

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

105;; other eggs to include in nixpkgs

116srfi-189

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/purescript/purescript/default.nix+4−2

@@ -1,4 +1,4 @@

1−{ stdenv, pkgs, fetchurl, zlib, gmp, lib }:

1+{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }:

33# from justinwoo/easy-purescript-nix

44# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

@@ -35,7 +35,9 @@ in stdenv.mkDerivation rec {

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/solc/default.nix+8−28

@@ -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 {

@@ -114,24 +105,13 @@ let

114105 passthru.tests = {

115106 solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });

116107 };

117− } else gccStdenv.mkDerivation rec {

118− inherit pname version meta;

119108

120− src = pkgs.fetchurl {

121− url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";

122− sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o=";

109+ meta = with lib; {

110+ description = "Compiler for Ethereum smart contract language Solidity";

111+ homepage = "https://github.com/ethereum/solidity";

112+ license = licenses.gpl3;

113+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];

123114 };

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− '';

135115 };

136116in

137117 solc

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/haskell-modules/configuration-darwin.nix+7

@@ -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

pkgs/development/interpreters/pixie/default.nixnew file+94

@@ -0,0 +1,94 @@

1+{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,

2+ pypy, libffi, libedit, libuv, boost, zlib,

3+ variant ? "jit", buildWithPypy ? false }:

5+let

6+ commit-count = "1364";

7+ common-flags = "--thread --gcrootfinder=shadowstack --continuation";

8+ variants = {

9+ jit = { flags = "--opt=jit"; target = "target.py"; };

10+ jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };

11+ no-jit = { flags = ""; target = "target.py"; };

12+ no-jit-preload = { flags = ""; target = "target_preload.py"; };

13+ };

14+ pixie-src = fetchFromGitHub {

15+ owner = "pixie-lang";

16+ repo = "pixie";

17+ rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";

18+ sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";

19+ };

20+ pypy-tag = "91db1a9";

21+ pypy-src = fetchurl {

22+ name = "pypy-src-${pypy-tag}";

23+ url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";

24+ sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";

25+ };

26+ libs = [ libffi libedit libuv boost.dev boost.out zlib ];

27+ include-path = lib.concatStringsSep ":"

28+ (map (p: "${p}/include") libs);

29+ library-path = lib.concatStringsSep ":"

30+ (map (p: "${p}/lib") libs);

31+ bin-path = lib.concatStringsSep ":"

32+ (map (p: "${p}/bin") [ gcc ]);

33+ build = {flags, target}: stdenv.mkDerivation rec {

34+ pname = "pixie";

35+ version = "0-r${commit-count}-${variant}";

36+ nativeBuildInputs = [ makeWrapper pkg-config ];

37+ buildInputs = libs;

38+ PYTHON = if buildWithPypy

39+ then "${pypy}/pypy-c/pypy-c"

40+ else python2.interpreter;

41+ unpackPhase = ''

42+ cp -R ${pixie-src} pixie-src

43+ mkdir pypy-src

44+ (cd pypy-src

45+ tar --strip-components=1 -xjf ${pypy-src})

46+ chmod -R +w pypy-src pixie-src

47+ '';

48+ patchPhase = ''

49+ (cd pixie-src

50+ patch -p1 < ${./load_paths.patch}

51+ libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'

52+ export libraryPaths

53+ substituteAllInPlace ./pixie/ffi-infer.pxi)

54+ '';

55+ buildPhase = ''(

56+ PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";

57+ RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";

58+ cd pixie-src

59+ $PYTHON $RPYTHON ${common-flags} ${target}

60+ find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;

61+ )'';

62+ LD_LIBRARY_PATH = library-path;

63+ C_INCLUDE_PATH = include-path;

64+ LIBRARY_PATH = library-path;

65+ PATH = bin-path;

66+ installPhase = ''

67+ mkdir -p $out/share $out/bin

68+ cp pixie-src/pixie-vm $out/share/pixie-vm

69+ cp -R pixie-src/pixie $out/share/pixie

70+ makeWrapper $out/share/pixie-vm $out/bin/pixie \

71+ --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \

72+ --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \

73+ --prefix LIBRARY_PATH : ${LIBRARY_PATH} \

74+ --prefix PATH : ${PATH}

75+ '';

76+ doCheck = true;

77+ checkPhase = ''

78+ RES=$(./pixie-src/pixie-vm -e "(print :ok)")

79+ if [ "$RES" != ":ok" ]; then

80+ echo "ERROR Unexpected output: '$RES'"

81+ return 1

82+ else

83+ echo "$RES"

84+ fi

85+ '';

86+ meta = {

87+ description = "A clojure-like lisp, built with the pypy vm toolkit";

88+ homepage = "https://github.com/pixie-lang/pixie";

89+ license = lib.licenses.lgpl3;

90+ platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];

91+ maintainers = with lib.maintainers; [ bendlas ];

92+ };

93+ };

94+in build (builtins.getAttr variant variants)

pkgs/development/interpreters/pixie/dust.nixnew file+46

@@ -0,0 +1,46 @@

1+{ lib, stdenv, fetchFromGitHub

2+, pixie, rlwrap

3+}:

5+stdenv.mkDerivation rec {

6+ pname = "dust";

7+ version = "0-91";

9+ src = fetchFromGitHub {

10+ owner = "pixie-lang";

11+ repo = "dust";

12+ rev = "efe469661e749a71e86858fd006f61464810575a";

13+ sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";

14+ };

15+

16+ buildInputs = [ pixie ];

17+

18+ patches = [ ./make-paths-configurable.patch ];

19+

20+ configurePhase = ''

21+ pixiePath="${pixie}/bin/pixie" \

22+ basePath="$out/share/dust" \

23+ rlwrapPath="${rlwrap}/bin/rlwrap" \

24+ substituteAll dust.in dust

25+ chmod +x dust

26+ '';

27+

28+ # FIXME: AOT for dust

29+ # buildPhase = ''

30+ # find . -name "*.pxi" -exec pixie-vm -c {} \;

31+ # '';

32+

33+ installPhase = ''

34+ mkdir -p $out/bin $out/share/dust

35+ cp -a src/ run.pxi $out/share/dust

36+ mv dust $out/bin/dust

37+ '';

38+

39+ meta = with lib; {

40+ description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";

41+ homepage = src.meta.homepage;

42+ maintainers = with maintainers; [ ];

43+ license = licenses.lgpl3;

44+ platforms = platforms.unix;

45+ };

46+}

pkgs/development/interpreters/pixie/load_paths.patchnew file+25

@@ -0,0 +1,25 @@

1+diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi

2+index 9f13ac7..74301c2 100644

3+--- a/pixie/ffi-infer.pxi

4++++ b/pixie/ffi-infer.pxi

5+@@ -1,15 +1,12 @@

6+ (ns pixie.ffi-infer

7+ (:require [pixie.io-blocking :as io]))

9++(defn -add-library-path [p]

10++ (swap! load-paths conj (str p "/include"))

11++ (swap! load-paths conj (str p "/lib")))

12+

13+-(defn -add-rel-path [rel]

14+- (swap! load-paths conj (str (first @load-paths) "/" rel)))

15+-

16+-(-add-rel-path "lib")

17+-(-add-rel-path "include")

18+-(-add-rel-path "../lib")

19+-(-add-rel-path "../include")

20+-

21++(doseq [lp @libraryPaths@]

22++ (-add-library-path lp))

23+

24+ (def *config* nil)

25+ (set-dynamic! (var *config*))

pkgs/development/interpreters/pixie/make-paths-configurable.patchnew file+119

@@ -0,0 +1,119 @@

1+From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001

2+From: Herwig Hochleitner <herwig@bendlas.net>

3+Date: Sun, 28 Feb 2016 16:34:14 +0100

4+Subject: [PATCH] make paths configurable

6+---

7+ dust | 52 ----------------------------------------------------

8+ dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++

9+ 2 files changed, 43 insertions(+), 52 deletions(-)

10+ delete mode 100755 dust

11+ create mode 100755 dust.in

12+

13+diff --git a/dust b/dust

14+deleted file mode 100755

15+index ffced9b..0000000

16+--- a/dust

17++++ /dev/null

18+@@ -1,52 +0,0 @@

19+-#!/usr/bin/env bash

20+-

21+-base_path=$0

22+-if [ -L "$base_path" ]; then

23+- base_path=`readlink $base_path`

24+-fi

25+-base_path=`dirname $base_path`

26+-

27+-pixie_path=`which pixie-vm`

28+-if [ -z "$pixie_path" ]; then

29+- echo "Error: 'pixie-vm' must be on your PATH"

30+- exit 1

31+-fi

32+-

33+-function set_load_path() {

34+- load_path=""

35+- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

36+- load_path="`cat .load-path`"

37+- fi

38+-}

39+-

40+-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

41+- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

42+- echo "To start you can run the following command:"

43+- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

44+- echo

45+-fi

46+-

47+-set_load_path

48+-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

49+-

50+-case $1 in

51+- ""|"repl")

52+- rlwrap_cmd=""

53+- if [ -n "`which rlwrap`" ]; then

54+- rlwrap_cmd="rlwrap -aignored -n"

55+- fi

56+- $rlwrap_cmd $pixie_path $load_path

57+- ;;

58+- "run")

59+- shift

60+- file=$1

61+- shift

62+- $pixie_path $load_path $file $@

63+- ;;

64+- -h|--help)

65+- $run_dust help

66+- ;;

67+- *)

68+- $run_dust $@

69+- ;;

70+-esac

71+diff --git a/dust.in b/dust.in

72+new file mode 100755

73+index 0000000..44a7fbd

74+--- /dev/null

75++++ b/dust.in

76+@@ -0,0 +1,40 @@

77++#!/usr/bin/env bash

78++

79++base_path=@basePath@

80++pixie_path=@pixiePath@

81++rlwrap_cmd=@rlwrapPath@

82++

83++function set_load_path() {

84++ load_path=""

85++ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

86++ load_path="`cat .load-path`"

87++ fi

88++}

89++

90++if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

91++ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

92++ echo "To start you can run the following command:"

93++ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

94++ echo

95++fi

96++

97++set_load_path

98++run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

99++

100++case $1 in

101++ ""|"repl")

102++ $rlwrap_cmd -aignored -n $pixie_path $load_path

103++ ;;

104++ "run")

105++ shift

106++ file=$1

107++ shift

108++ $pixie_path $load_path $file $@

109++ ;;

110++ -h|--help)

111++ $run_dust help

112++ ;;

113++ *)

114++ $run_dust $@

115++ ;;

116++esac

117+--

118+2.7.1

119+

pkgs/development/interpreters/python/hooks/default.nix−6

@@ -169,10 +169,4 @@ in rec {

169169 name = "wheel-unpack-hook.sh";

170170 deps = [ wheel ];

171171 } ./wheel-unpack-hook.sh) {};

172−

173− sphinxHook = callPackage ({ sphinx }:

174− makeSetupHook {

175− name = "python${python.pythonVersion}-sphinx-hook";

176− deps = [ sphinx ];

177− } ./sphinx-hook.sh) {};

178172}

pkgs/development/interpreters/python/hooks/sphinx-hook.shdeleted−57

@@ -1,57 +0,0 @@

1−# This hook automatically finds Sphinx documentation, builds it in html format

2−# and installs it.

3−#

4−# This hook knows about several popular locations in which subdirectory

5−# documentation may be, but in very unusual cases $sphinxRoot directory can be

6−# set explicitly.

7−#

8−# Name of the directory relative to ${doc:-$out}/share/doc is normally also

9−# deduced automatically, but can be overridden with $sphinxOutdir variable.

10−#

11−# Sphinx build system can depend on arbitrary amount of python modules, client

12−# code is responsible for ensuring that all dependencies are present.

13−

14−buildSphinxPhase() {

15− local __sphinxRoot="" o

16−

17− runHook preBuildSphinx

18− if [[ -n "${sphinxRoot:-}" ]] ; then # explicit root

19− if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then

20− echo 2>&1 "$sphinxRoot/conf.py: no such file"

21− exit 1

22− fi

23− __sphinxRoot=$sphinxRoot

24− else

25− for o in doc docs doc/source docs/source ; do

26− if [[ -f "$o/conf.py" ]] ; then

27− echo "Sphinx documentation found in $o"

28− __sphinxRoot=$o

29− break

30− fi

31− done

32− fi

33−

34− if [[ -z "${__sphinxRoot}" ]] ; then

35− echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable"

36− exit 1

37− fi

38− sphinx-build -M html "${__sphinxRoot}" ".sphinx/html" -v

39−

40− runHook postBuildSphinx

41−}

42−

43−installSphinxPhase() {

44− local docdir=""

45− runHook preInstallSphinx

46−

47− docdir="${doc:-$out}/share/doc/${sphinxOutdir:-$name}"

48− mkdir -p "$docdir"

49−

50− cp -r .sphinx/html/html "$docdir/"

51− rm -fr "${docdir}/html/_sources" "${docdir}/html/.buildinfo"

52−

53− runHook postInstallSphinx

54−}

55−

56−preBuildPhases+=" buildSphinxPhase"

57−postPhases+=" installSphinxPhase"

pkgs/development/libraries/docopt_cpp/default.nix+2−10

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }:

1+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:

33stdenv.mkDerivation rec {

44 version = "0.6.3";

@@ -11,15 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

1212 };

1313

14− patches = [

15− (fetchpatch {

16− name = "python3-for-tests";

17− url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch";

18− hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o=";

19− })

20− ];

21−

22− nativeBuildInputs = [ cmake python3 ];

14+ nativeBuildInputs = [ cmake python2 ];

2315

2416 cmakeFlags = ["-DWITH_TESTS=ON"];

2517

pkgs/development/libraries/doctest/default.nix+5−5

@@ -2,19 +2,19 @@

33stdenv.mkDerivation rec {

44 pname = "doctest";

5− version = "2.4.8";

5+ version = "2.4.7";

77 src = fetchFromGitHub {

8− owner = "doctest";

8+ owner = "onqtam";

99 repo = "doctest";

10− rev = "v${version}";

11− sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ=";

10+ rev = version;

11+ sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0=";

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

1515

1616 meta = with lib; {

17− homepage = "https://github.com/doctest/doctest";

17+ homepage = "https://github.com/onqtam/doctest";

1818 description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";

1919 platforms = platforms.all;

2020 license = licenses.mit;

pkgs/development/libraries/fcft/default.nix+2−2

@@ -20,14 +20,14 @@ in

2020

2121stdenv.mkDerivation rec {

2222 pname = "fcft";

23− version = "3.1.1";

23+ version = "3.0.1";

2424

2525 src = fetchFromGitea {

2626 domain = "codeberg.org";

2727 owner = "dnkl";

2828 repo = "fcft";

2929 rev = version;

30− sha256 = "1b43sqp5hah374ns62pcrmbiriqsdisb60hp1nwqz3ny3rfjvn15";

30+ sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx";

3131 };

3232

3333 depsBuildBuild = [ pkg-config ];

pkgs/development/libraries/glibmm/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 pname = "glibmm";

5− version = "2.66.3";

5+ version = "2.66.2";

77 src = fetchurl {

88 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

9− sha256 = "sha256-r7liAkkUhdP0QQLZghmhctotP563j848+5JVm6SW5Jk=";

9+ sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0=";

1010 };

1111

1212 outputs = [ "out" "dev" ];

pkgs/development/libraries/goocanvas/2.x.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }:

1+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }:

33stdenv.mkDerivation rec {

44 pname = "goocanvas";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";

1212 };

1313

14− nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];

14+ nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];

1515 buildInputs = [ gtk3 cairo glib gobject-introspection ];

1616

1717 configureFlags = [

pkgs/development/libraries/htmlcxx/c++17.patchdeleted−24

@@ -1,24 +0,0 @@

1−diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc

2−--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000

3−+++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100

4−@@ -7,7 +7,7 @@

5− using namespace std;

6− using namespace htmlcxx;

7−

8−-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)

9−+CharsetConverter::CharsetConverter(const string &from, const string &to)

10− {

11− mIconvDescriptor = iconv_open(to.c_str(), from.c_str());

12− if (mIconvDescriptor == (iconv_t)(-1))

13−diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h

14−--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000

15−+++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100

16−@@ -17,7 +17,7 @@

17− : std::runtime_error(arg) {}

18− };

19−

20−- CharsetConverter(const std::string &from, const std::string &to) throw (Exception);

21−+ CharsetConverter(const std::string &from, const std::string &to);

22− ~CharsetConverter();

23−

24− std::string convert(const std::string &input);

pkgs/development/libraries/htmlcxx/default.nix+4−7

@@ -2,18 +2,15 @@

33stdenv.mkDerivation rec {

44 pname = "htmlcxx";

5− version = "0.87";

5+ version = "0.86";

77 src = fetchurl {

8− url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz";

9− sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";

8+ url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";

9+ sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";

1010 };

1111

1212 buildInputs = [ libiconv ];

13− patches = [

14− ./ptrdiff.patch

15− ./c++17.patch

16− ];

13+ patches = [ ./ptrdiff.patch ];

1714

1815 meta = with lib; {

1916 homepage = "http://htmlcxx.sourceforge.net/";

pkgs/development/libraries/inih/default.nix+3−3

@@ -2,12 +2,12 @@

33stdenv.mkDerivation rec {

44 pname = "inih";

5− version = "53";

5+ version = "r53";

77 src = fetchFromGitHub {

88 owner = "benhoyt";

99 repo = pname;

10− rev = "r${version}";

10+ rev = version;

1111 sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6";

1212 };

1313

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 meta = with lib; {

1717 description = "Simple .INI file parser in C, good for embedded systems";

1818 homepage = "https://github.com/benhoyt/inih";

19− changelog = "https://github.com/benhoyt/inih/releases/tag/r${version}";

19+ changelog = "https://github.com/benhoyt/inih/releases/tag/${version}";

2020 license = licenses.bsd3;

2121 maintainers = with maintainers; [ TredwellGit ];

2222 platforms = platforms.all;

pkgs/development/libraries/kpmcore/default.nix+18−10

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, extra-cmake-modules

1+{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules

22, qca-qt5, kauth, kio, polkit-qt, qtbase

33, util-linux

44}:

@@ -6,14 +6,25 @@

66stdenv.mkDerivation rec {

77 pname = "kpmcore";

88 # NOTE: When changing this version, also change the version of `partition-manager`.

9− version = "22.04.0";

9+ version = "4.2.0";

1010

1111 src = fetchurl {

12− url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

13− hash = "sha256-sO8WUJL6072H1ghMZd7j0xNMwEn4bJF5PXMhfEb2jbs=";

12+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

13+ hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54=";

1414 };

1515

16− nativeBuildInputs = [ extra-cmake-modules ];

16+ patches = [

17+ # Fix build with `kcoreaddons` >= 5.77.0

18+ (fetchpatch {

19+ url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch";

20+ sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s=";

21+ })

22+ # Fix crash when `fstab` omits mount options.

23+ (fetchpatch {

24+ url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch";

25+ sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0=";

26+ })

27+ ];

1728

1829 buildInputs = [

1930 qca-qt5

@@ -24,12 +35,9 @@ stdenv.mkDerivation rec {

2435 util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)

2536 ];

2637

27− dontWrapQtApps = true;

38+ nativeBuildInputs = [ extra-cmake-modules ];

2839

29− preConfigure = ''

30− substituteInPlace src/util/CMakeLists.txt \

31− --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions

32− '';

40+ dontWrapQtApps = true;

3341

3442 meta = with lib; {

3543 description = "KDE Partition Manager core library";

pkgs/development/libraries/libdeltachat/default.nix+3−3

@@ -16,13 +16,13 @@

1616

1717stdenv.mkDerivation rec {

1818 pname = "libdeltachat";

19− version = "1.79.0";

19+ version = "1.78.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "deltachat";

2323 repo = "deltachat-core-rust";

2424 rev = version;

25− hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ=";

25+ hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";

2626 };

2727

2828 patches = [

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232 cargoDeps = rustPlatform.fetchCargoTarball {

3333 inherit src;

3434 name = "${pname}-${version}";

35− hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU=";

35+ hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";

3636 };

3737

3838 nativeBuildInputs = [

pkgs/development/libraries/libinjection/default.nix+4−12

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

1−{ lib, stdenv, fetchFromGitHub, fetchpatch

2−, python3

1+{ lib, stdenv, fetchFromGitHub

2+, python2

33}:

55stdenv.mkDerivation rec {

@@ -13,19 +13,11 @@ stdenv.mkDerivation rec {

1313 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

1414 };

1515

16− nativeBuildInputs = [ python3 ];

16+ nativeBuildInputs = [ python2 ];

1717

1818 strictDeps = true;

1919

20− patches = [

21− (fetchpatch {

22− name = "support-python3-for-building";

23− url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff";

24− hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM=";

25− })

26− ];

27−

28− postPatch = ''

20+ patchPhase = ''

2921 patchShebangs src

3022 substituteInPlace src/Makefile \

3123 --replace /usr/local $out

pkgs/development/libraries/nss/85_security_load_3.77+.patchdeleted−76

@@ -1,76 +0,0 @@

1−diff --git nss/cmd/shlibsign/shlibsign.c nss/cmd/shlibsign/shlibsign.c

2−index ad8f3b84e..74676d039 100644

3−--- nss/cmd/shlibsign/shlibsign.c

4−+++ nss/cmd/shlibsign/shlibsign.c

5−@@ -875,6 +875,8 @@ main(int argc, char **argv)

6− goto cleanup;

7− }

8− lib = PR_LoadLibrary(libname);

9−+ if (!lib)

10−+ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");

11− assert(lib != NULL);

12− if (!lib) {

13− PR_fprintf(PR_STDERR, "loading softokn3 failed");

14−diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c

15−index 119c8c512..720d39ccc 100644

16−--- nss/lib/pk11wrap/pk11load.c

17−+++ nss/lib/pk11wrap/pk11load.c

18−@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule)

19− #else

20− library = PR_LoadLibrary(mod->dllName);

21− #endif // defined(_WIN32)

22−+#ifndef NSS_STATIC_SOFTOKEN

23−+ if ((library == NULL) &&

24−+ !rindex(mod->dllName, PR_GetDirectorySeparator())) {

25−+ library = PORT_LoadLibraryFromOrigin(my_shlib_name,

26−+ (PRFuncPtr) &softoken_LoadDSO,

27−+ mod->dllName);

28−+ }

29−+#endif

30−+

31− mod->library = (void *)library;

32−

33− if (library == NULL) {

34−diff --git nss/lib/util/secload.c nss/lib/util/secload.c

35−index 12efd2f75..8b74478f6 100644

36−--- nss/lib/util/secload.c

37−+++ nss/lib/util/secload.c

38−@@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)

39−

40− /* Remove the trailing filename from referencePath and add the new one */

41− c = strrchr(referencePath, PR_GetDirectorySeparator());

42−+ if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]

43−+ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */

44−+ referencePath = NIX_NSS_LIBDIR;

45−+ c = (char*) &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */

46−+ }

47− if (c) {

48− size_t referencePathSize = 1 + c - referencePath;

49−- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1);

50−+ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);

51− if (fullName) {

52− memcpy(fullName, referencePath, referencePathSize);

53− strcpy(fullName + referencePathSize, name);

54−@@ -82,6 +87,11 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)

55− #endif

56− libSpec.type = PR_LibSpec_Pathname;

57− libSpec.value.pathname = fullName;

58−+ if ((referencePathSize >= 4) &&

59−+ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {

60−+ memcpy(fullName + referencePathSize -4, "lib", 3);

61−+ }

62−+ strcpy(fullName + referencePathSize, name);

63− dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL

64− #ifdef PR_LD_ALT_SEARCH_PATH

65− /* allow library's dependencies to be found in the same directory

66−@@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name)

67− | PR_LD_ALT_SEARCH_PATH

68− #endif

69− );

70−+ if (! dlh) {

71−+ strcpy(fullName + referencePathSize, name);

72−+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);

73−+ }

74− PORT_Free(fullName);

75− }

76− }

pkgs/development/libraries/nss/generic.nix+1−5

@@ -62,11 +62,7 @@ stdenv.mkDerivation rec {

6262

6363 patches = [

6464 # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch

65− (if (lib.versionOlder version "3.77") then

66− ./85_security_load.patch

67− else

68− ./85_security_load_3.77+.patch

69− )

65+ ./85_security_load.patch

7066 ./ckpem.patch

7167 ./fix-cross-compilation.patch

7268 ];

pkgs/development/libraries/nss/latest.nix+2−2

@@ -5,6 +5,6 @@

55# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

77import ./generic.nix {

8− version = "3.78";

9− sha256 = "sha256-9FXzQeeHwRZzKOgKhPd7mlV9WVBm3aZIahh01y2miAA=";

8+ version = "3.76.1";

9+ sha256 = "0ai37ncg50n4s5243bfvsip8isqq1y6w2swg1n4xgqg2fk1h8cg1";

1010}

pkgs/development/libraries/openssl/default.nix+2−2

@@ -193,8 +193,8 @@ in {

193193 };

194194

195195 openssl_3_0 = common {

196− version = "3.0.3";

197− sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs=";

196+ version = "3.0.2";

197+ sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M=";

198198 patches = [

199199 ./3.0/nix-ssl-cert-file.patch

200200

pkgs/development/libraries/science/biology/htslib/default.nix+2−18

@@ -14,25 +14,9 @@ stdenv.mkDerivation rec {

1414

1515 buildInputs = [ zlib bzip2 xz curl ];

1616

17− configureFlags = if ! stdenv.hostPlatform.isStatic

18− then [ "--enable-libcurl" ] # optional but strongly recommended

19− else [ "--disable-libcurl" "--disable-plugins" ];

17+ configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended

2018

21−

22− # In the case of static builds, we need to replace the build and install phases

23− buildPhase = lib.optional stdenv.hostPlatform.isStatic ''

24− make AR=$AR lib-static

25− make LDFLAGS=-static bgzip htsfile tabix

26− '';

27−

28− installPhase = lib.optional stdenv.hostPlatform.isStatic ''

29− install -d $out/bin

30− install -d $out/lib

31− install -d $out/include/htslib

32− install -D libhts.a $out/lib

33− install -m644 htslib/*h $out/include/htslib

34− install -D bgzip htsfile tabix $out/bin

35− '';

19+ installFlags = [ "prefix=$(out)" ];

3620

3721 preCheck = ''

3822 patchShebangs test/

pkgs/development/libraries/science/math/caffe2/default.nixnew file+151

@@ -0,0 +1,151 @@

1+{ stdenv, lib, config, fetchFromGitHub

2+, cmake

3+, glog, gflags, gtest

4+, protobuf, snappy

5+, python, future, six, python-protobuf, numpy, pydot

6+, eigen

7+, doxygen

8+, useCuda ? (config.cudaSupport or false), cudaPackages ? {}

9+, useCudnn ? (config.cudnnSupport or false)

10+, useOpenmp ? false, openmp ? null

11+, useOpencv3 ? true, opencv3 ? null

12+, useLeveldb ? false, leveldb ? null

13+, useLmdb ? true, lmdb ? null

14+, useRocksdb ? false, rocksdb ? null

15+, useZeromq ? false, zeromq ? null

16+, useMpi ? false, mpi ? null

17+# TODO: distributed computations

18+#, useGloo ? false

19+#, useNccl ? false

20+#, useNnpack ? false

21+}:

22+

23+let

24+ inherit (cudaPackages) cudatoolkit cudnn;

25+in

26+

27+assert useCuda -> cudatoolkit != null;

28+assert useCudnn -> (useCuda && cudnn != null);

29+assert useOpencv3 -> opencv3 != null;

30+assert useLeveldb -> leveldb != null;

31+assert useLmdb -> lmdb != null;

32+assert useRocksdb -> rocksdb != null;

33+assert useZeromq -> zeromq != null;

34+assert useMpi -> mpi != null;

35+

36+let

37+ # Third party modules that caffe2 holds as git submodules.

38+ # Download them and create symlinks from caffe2/third_party.

39+ installExtraSrc = extra: ''

40+ rmdir "third_party/${extra.dst}"

41+ ln -s "${extra.src}" "third_party/${extra.dst}"

42+ '';

43+

44+ cub = {

45+ src = fetchFromGitHub {

46+ owner = "NVlabs";

47+ repo = "cub";

48+ rev = "v1.7.4";

49+ sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";

50+ };

51+ dst = "cub";

52+ };

53+

54+ pybind11 = {

55+ src = fetchFromGitHub {

56+ owner = "pybind";

57+ repo = "pybind11";

58+ rev = "86e2ad4f77442c3350f9a2476650da6bee253c52";

59+ sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz";

60+ };

61+ dst = "pybind11";

62+ };

63+

64+ ccVersion = lib.getVersion stdenv.cc;

65+in

66+

67+stdenv.mkDerivation rec {

68+ pname = "caffe2";

69+ version = "0.8.1";

70+ src = fetchFromGitHub {

71+ owner = "caffe2";

72+ repo = "caffe2";

73+ rev = "v${version}";

74+ sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8";

75+ };

76+

77+ nativeBuildInputs = [ cmake doxygen gtest ];

78+ outputs = [ "bin" "out" ];

79+ propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle

80+

81+ buildInputs = [ glog gflags protobuf snappy eigen ]

82+ ++ lib.optional useCuda cudatoolkit

83+ ++ lib.optional useCudnn cudnn

84+ ++ lib.optional useOpenmp openmp

85+ ++ lib.optional useOpencv3 opencv3

86+ ++ lib.optional useLeveldb leveldb

87+ ++ lib.optional useLmdb lmdb

88+ ++ lib.optional useRocksdb rocksdb

89+ ++ lib.optional useZeromq zeromq

90+ ;

91+ propagatedBuildInputs = [ numpy future six python-protobuf pydot ];

92+

93+ patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [

94+ ./fix_compilation_on_gcc7.patch

95+ ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];

96+

97+ cmakeFlags = [ "-DBUILD_TEST=OFF"

98+ "-DBUILD_PYTHON=ON"

99+ ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}''

100+ ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}''

101+ ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}''

102+ ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}''

103+ ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}''

104+ ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}''

105+ ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}''

106+ ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}''

107+ "-DUSE_GLOO=OFF"

108+ "-DUSE_NNPACK=OFF"

109+ "-DUSE_NCCL=OFF"

110+ "-DUSE_REDIS=OFF"

111+ "-DUSE_FFMPEG=OFF"

112+ ]

113+ ++ lib.optional useCuda [

114+ "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}"

115+ "-DCUDA_FAST_MATH=ON"

116+ "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"

117+ ];

118+

119+ preConfigure = ''

120+ ${installExtraSrc cub}

121+ ${installExtraSrc pybind11}

122+ # XXX hack

123+ export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE"

124+ '';

125+

126+ postInstall = ''

127+ moveToOutput "bin" "$bin"

128+ mkdir -p $out/lib/${python.libPrefix}

129+ ln -s $out/ $out/${python.sitePackages}

130+ '';

131+

132+ doCheck = false;

133+

134+ meta = {

135+ homepage = "https://caffe2.ai/";

136+ description = "A new lightweight, modular, and scalable deep learning framework";

137+ longDescription = ''

138+ Caffe2 aims to provide an easy and straightforward way for you to experiment

139+ with deep learning and leverage community contributions of new models and

140+ algorithms. You can bring your creations to scale using the power of GPUs in the

141+ cloud or to the masses on mobile with Caffe2's cross-platform libraries.

142+ '';

143+ platforms = with lib.platforms; linux;

144+ license = lib.licenses.asl20;

145+ maintainers = with lib.maintainers; [ yuriaisaka ];

146+ # fails to compile with

147+ # error: invalid conversion from 'const char*' to 'char*'

148+ # TODO: Remove usage of python2, protobuf overwrite

149+ broken = true;

150+ };

151+}

pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patchnew file+46

@@ -0,0 +1,46 @@

1+diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc

2+index dd4fded..5995e8a 100644

3+--- a/caffe2/operators/recurrent_network_op.cc

4++++ b/caffe2/operators/recurrent_network_op.cc

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

6+-#include "recurrent_network_op.h"

7++#include "caffe2/operators/recurrent_network_op.h"

8+ #include "caffe2/core/workspace.h"

10+ namespace caffe2 {

11+diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h

12+index 55328e5..ea898bc 100644

13+--- a/caffe2/operators/recurrent_network_op.h

14++++ b/caffe2/operators/recurrent_network_op.h

15+@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> {

16+ USE_OPERATOR_CONTEXT_FUNCTIONS;

17+

18+ bool RunOnDevice() override {

19+- const auto t =

20+- OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0];

21++ const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0);

22++ const auto t = t0.template data<int32_t>()[0];

23+ auto& og = Input(1);

24+ auto* g = Output(0);

25+

26+diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h

27+index f2c0a33..642343f 100644

28+--- a/caffe2/queue/queue_ops.h

29++++ b/caffe2/queue/queue_ops.h

30+@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> {

31+ name(operator_def.output().Get(0)) {}

32+

33+ bool RunOnDevice() override {

34+- const auto capacity =

35+- OperatorBase::template GetSingleArgument<int>("capacity", 1);

36+- const auto numBlobs =

37+- OperatorBase::template GetSingleArgument<int>("num_blobs", 1);

38++ const auto capacity = GetSingleArgument("capacity", 1);

39++ const auto numBlobs = GetSingleArgument("num_blobs", 1);

40+ const auto enforceUniqueName =

41+- OperatorBase::template GetSingleArgument<int>(

42+- "enforce_unique_name", false);

43++ GetSingleArgument("enforce_unique_name", false);

44+ const auto fieldNames =

45+ OperatorBase::template GetRepeatedArgument<std::string>("field_names");

46+ CAFFE_ENFORCE_EQ(this->OutputSize(), 1);

pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patchnew file+55

@@ -0,0 +1,55 @@

1+diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h

2+index bd06681..00172b7 100644

3+--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h

4++++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h

5+@@ -1,10 +1,36 @@

6++/**

8++ *

9++ * Licensed under the Apache License, Version 2.0 (the "License");

10++ * you may not use this file except in compliance with the License.

11++ * You may obtain a copy of the License at

12++ *

13++ * http://www.apache.org/licenses/LICENSE-2.0

14++ *

15++ * Unless required by applicable law or agreed to in writing, software

16++ * distributed under the License is distributed on an "AS IS" BASIS,

17++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

18++ * See the License for the specific language governing permissions and

19++ * limitations under the License.

20++ */

21++

22+ #pragma once

23+

24+-#if defined(__APPLE__) && (__clang_major__ < 8)

25++// Apple clang was fixed in 8.1

26++#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))

27++#define __APPLE_NEED_FIX 1

28++#endif

29++

30++// Regular clang was fixed in 3.9

31++#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9)

32++#define __CLANG_NEED_FIX 1

33++#endif

34++

35++#if __APPLE_NEED_FIX || __CLANG_NEED_FIX

36+

37+ #include <emmintrin.h>

38+

39+-// This version of apple clang has a bug that _cvtsh_ss is not defined, see

40++// This version of clang has a bug that _cvtsh_ss is not defined, see

41+ // https://reviews.llvm.org/D16177

42+ static __inline float

43+ __attribute__((__always_inline__, __nodebug__, __target__("f16c")))

44+@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a)

45+ return r[0];

46+ }

47+

48+-#endif // defined(__APPLE__) && (__clang_major__ < 8)

49++#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX

50++

51++#undef __APPLE_NEED_FIX

52++#undef __CLANG_NEED_FIX

53+

54+ #ifdef _MSC_VER

55+

pkgs/development/libraries/vulkan-loader/default.nix+1−2

@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {

2121

2222 cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]

2323 ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"

24− ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"

25− ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";

24+ ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";

2625

2726 outputs = [ "out" "dev" ];

2827

pkgs/development/libraries/wolfssl/default.nix+2−2

@@ -7,13 +7,13 @@

88stdenv.mkDerivation rec {

99 pname = "wolfssl";

10− version = "5.3.0";

10+ version = "5.2.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "wolfSSL";

1414 repo = "wolfssl";

1515 rev = "v${version}-stable";

16− sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA=";

16+ sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k";

1717 };

1818

1919 postPatch = ''

pkgs/development/lua-modules/generated-packages.nix−25

@@ -1952,31 +1952,6 @@ buildLuarocksPackage {

19521952 };

19531953}) {};

19541954

1955−luaunbound = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

1956−, fetchurl, lua

1957−}:

1958−buildLuarocksPackage {

1959− pname = "luaunbound";

1960− version = "1.0.0-1";

1961− knownRockspec = (fetchurl {

1962− url = "https://luarocks.org/luaunbound-1.0.0-1.rockspec";

1963− sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn";

1964− }).outPath;

1965− src = fetchurl {

1966− url = "https://code.zash.se/dl/luaunbound/luaunbound-1.0.0.tar.gz";

1967− sha256 = "1lsh0ylp5xskygxl5qdv6mhkm1x8xp0vfd5prk5hxkr19jk5mr3d";

1968− };

1969−

1970− disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5");

1971− propagatedBuildInputs = [ lua ];

1972−

1973− meta = {

1974− homepage = "https://www.zash.se/luaunbound.html";

1975− description = "A binding to libunbound";

1976− license.fullName = "MIT";

1977− };

1978−}) {};

1979−

19801955luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

19811956, fetchurl, lua

19821957}:

pkgs/development/lua-modules/overrides.nix−6

@@ -254,12 +254,6 @@ with prev;

254254 ];

255255 });

256256

257− luaunbound = prev.lib.overrideLuarocks prev.luaunbound(drv: {

258− externalDeps = [

259− { name = "libunbound"; dep = pkgs.unbound; }

260− ];

261− });

262−

263257 luuid = (prev.lib.overrideLuarocks prev.luuid (drv: {

264258 externalDeps = [

265259 { name = "LIBUUID"; dep = pkgs.libuuid; }

pkgs/development/ocaml-modules/uuuu/default.nix+9−6

@@ -1,19 +1,20 @@

11{ angstrom

22, buildDunePackage

3−, fetchurl

3+, fetchzip

44, findlib

55, lib

6+, menhir

67, ocaml

78, re

89}:

910

1011buildDunePackage rec {

1112 pname = "uuuu";

12− version = "0.3.0";

13+ version = "0.2.0";

1314

14− src = fetchurl {

15− url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-${version}.tbz";

16− sha256 = "sha256:19n39yc7spgzpk9i70r0nhkwsb0bfbvbgpf8d863p0a3wgryhzkb";

15+ src = fetchzip {

16+ url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-v${version}.tbz";

17+ sha256 = "0457qcxvakbbc56frsh8a5v4y4l0raj9p4zz7jx3brn9255j1mw3";

1718 };

1819

1920 postPatch = ''

@@ -21,7 +22,9 @@ buildDunePackage rec {

2122 'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '

2223 '';

2324

24− nativeBuildInputs = [ findlib ];

25+ useDune2 = true;

26+

27+ nativeBuildInputs = [ menhir findlib ];

2528

2629 buildInputs = [ angstrom ];

2730

pkgs/development/php-packages/openswoole/default.nixdeleted−22

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

1−{ lib, stdenv, buildPecl, php, valgrind, pcre2 }:

2−let

3− pname = "openswoole";

4− version = "4.11.1";

5−in

6−buildPecl {

7− inherit pname version;

8−

9− sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg=";

10−

11− buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];

12− internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];

13−

14− meta = with lib; {

15− changelog = "https://pecl.php.net/package/openswoole/${version}";

16− description = "Coroutine-based concurrency library and high performance programmatic server for PHP";

17− homepage = "https://www.openswoole.com/";

18− license = licenses.asl20;

19− longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.";

20− maintainers = teams.php.members;

21− };

22−}

pkgs/development/php-packages/pdepend/default.nixdeleted−41

@@ -1,41 +0,0 @@

1−{ stdenv, fetchurl, makeWrapper, lib, php }:

2−

3−let

4− pname = "pdepend";

5− version = "2.10.3";

6−in

7−stdenv.mkDerivation {

8− inherit pname version;

9−

10− src = fetchurl {

11− url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";

12− sha256 = "I5+n8+a3rHRgW4OM6FbVcf3T1wu9zBrTSb5sGq7ArH4=";

13− };

14−

15− dontUnpack = true;

16−

17− nativeBuildInputs = [ makeWrapper ];

18−

19− installPhase = ''

20− runHook preInstall

21− mkdir -p $out/bin

22− install -D $src $out/libexec/pdepend/pdepend.phar

23− makeWrapper ${php}/bin/php $out/bin/pdepend \

24− --add-flags "$out/libexec/pdepend/pdepend.phar"

25− runHook postInstall

26− '';

27−

28− meta = with lib; {

29− description = "An adaptation of JDepend for PHP";

30− homepage = "https://github.com/pdepend/pdepend";

31− license = licenses.bsd3;

32− longDescription = "

33− PHP Depend is an adaptation of the established Java

34− development tool JDepend. This tool shows you the quality

35− of your design in terms of extensibility, reusability and

36− maintainability.

37− ";

38− maintainers = teams.php.members;

39− platforms = platforms.all;

40− };

41−}

pkgs/development/python-modules/afsapi/default.nix+3−3

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "afsapi";

14− version = "0.2.4";

14+ version = "0.2.3";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.8";

@@ -19,8 +19,8 @@ buildPythonPackage rec {

1919 src = fetchFromGitHub {

2020 owner = "wlcrs";

2121 repo = "python-afsapi";

22− rev = "refs/tags/${version}";

23− hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U=";

22+ rev = version;

23+ hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY=";

2424 };

2525

2626 SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/aioairzone/default.nix+2−2

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

88buildPythonPackage rec {

99 pname = "aioairzone";

10− version = "0.4.2";

10+ version = "0.3.4";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.8";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "Noltari";

1717 repo = pname;

1818 rev = "refs/tags/${version}";

19− hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";

19+ hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/aiooncue/default.nix+2−2

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

88buildPythonPackage rec {

99 pname = "aiooncue";

10− version = "0.3.4";

10+ version = "0.3.3";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "bdraco";

1717 repo = pname;

1818 rev = version;

19− hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg=";

19+ hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/aioslimproto/default.nix+4−11

@@ -1,13 +1,12 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4−, pytestCheckHook

54, pythonOlder

65}:

87buildPythonPackage rec {

98 pname = "aioslimproto";

10− version = "2.0.1";

9+ version = "1.0.1";

1110 format = "setuptools";

1211

1312 disabled = pythonOlder "3.9";

@@ -16,17 +15,11 @@ buildPythonPackage rec {

1615 owner = "home-assistant-libs";

1716 repo = pname;

1817 rev = version;

19− hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";

18+ hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E=";

2019 };

2120

22− checkInputs = [

23− pytestCheckHook

24− ];

25−

26− disabledTests = [

27− # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']

28− "test_msg_instantiation"

29− ];

21+ # Module has no tests

22+ doCheck = false;

3023

3124 pythonImportsCheck = [

3225 "aioslimproto"

pkgs/development/python-modules/androidtv/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "androidtv";

14− version = "0.0.67";

14+ version = "0.0.66";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.7";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "JeffLIrion";

2121 repo = "python-androidtv";

2222 rev = "v${version}";

23− hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";

23+ hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/ansible-later/default.nix+2−2

@@ -21,7 +21,7 @@

2121

2222buildPythonPackage rec {

2323 pname = "ansible-later";

24− version = "2.0.12";

24+ version = "2.0.11";

2525 format = "pyproject";

2626

2727 disabled = pythonOlder "3.8";

@@ -30,7 +30,7 @@ buildPythonPackage rec {

3030 owner = "thegeeklab";

3131 repo = pname;

3232 rev = "refs/tags/v${version}";

33− hash = "sha256-0N/BER7tV8Hv1pvHaf/46BKnzZfHBGuEaPPex/CDQe0=";

33+ hash = "sha256-K4GResTKKWXQ0OHpBwqTLnptQ8ipuQ9iaGZDlPqRUaI=";

3434 };

3535

3636 nativeBuildInputs = [

pkgs/development/python-modules/ansible/default.nix+2−3

@@ -20,7 +20,7 @@

2020

2121let

2222 pname = "ansible";

23− version = "5.7.1";

23+ version = "5.7.0";

2424in

2525buildPythonPackage {

2626 inherit pname version;

@@ -30,7 +30,7 @@ buildPythonPackage {

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";

33+ sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y=";

3434 };

3535

3636 postPatch = ''

@@ -78,7 +78,6 @@ buildPythonPackage {

7878 meta = with lib; {

7979 description = "Radically simple IT automation";

8080 homepage = "https://www.ansible.com";

81− changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";

8281 license = licenses.gpl3Plus;

8382 maintainers = with maintainers; [ hexa ];

8483 };

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "async-upnp-client";

17− version = "0.29.0";

17+ version = "0.28.0";

1818 format = "setuptools";

1919

2020 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "StevenLooman";

2424 repo = "async_upnp_client";

2525 rev = version;

26− sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";

26+ sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "aws-lambda-builders";

13− version = "1.15.0";

13+ version = "1.14.0";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.7";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

1818 src = fetchFromGitHub {

1919 owner = "awslabs";

2020 repo = "aws-lambda-builders";

21− rev = "refs/tags/v${version}";

22− sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk=";

21+ rev = "v${version}";

22+ sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/python-modules/beautifulsoup4/default.nix−3

@@ -6,14 +6,12 @@

66, pytestCheckHook

77, pythonOlder

88, soupsieve

9−, sphinxHook

109}:

1110

1211buildPythonPackage rec {

1312 pname = "beautifulsoup4";

1413 version = "4.11.1";

1514 format = "setuptools";

16− outputs = ["out" "doc"];

1715

1816 disabled = pythonOlder "3.6";

1917

@@ -31,7 +29,6 @@ buildPythonPackage rec {

3129 checkInputs = [

3230 pytestCheckHook

3331 ];

34− nativeBuildInputs = [ sphinxHook ];

3532

3633 pythonImportsCheck = [

3734 "bs4"

pkgs/development/python-modules/bleach/default.nix+2−2

@@ -11,12 +11,12 @@

1111

1212buildPythonPackage rec {

1313 pname = "bleach";

14− version = "5.0.0";

14+ version = "4.1.0";

1515 disabled = pythonOlder "3.6";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";

19+ sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/bpython/default.nix+2−16

@@ -3,12 +3,10 @@

33, fetchPypi

44, curtsies

55, cwcwidth

6−, dataclasses

76, greenlet

87, jedi

98, pygments

109, pytestCheckHook

11−, pythonOlder

1210, pyperclip

1311, pyxdg

1412, requests

@@ -21,13 +19,10 @@

2119buildPythonPackage rec {

2220 pname = "bpython";

2321 version = "0.22.1";

24− format = "setuptools";

25−

26− disabled = pythonOlder "3.6";

2722

2823 src = fetchPypi {

2924 inherit pname version;

30− hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA=";

25+ sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200";

3126 };

3227

3328 propagatedBuildInputs = [

@@ -42,8 +37,6 @@ buildPythonPackage rec {

4237 typing-extensions

4338 urwid

4439 watchdog

45− ] ++ lib.optionals (pythonOlder "3.7") [

46− dataclasses

4740 ];

4841

4942 postInstall = ''

@@ -55,14 +48,7 @@ buildPythonPackage rec {

5548 pytestCheckHook

5649 ];

5750

58− pythonImportsCheck = [

59− "bpython"

60− ];

61−

62− disabledTests = [

63− # Check for syntax error ends with an AssertionError

64− "test_syntaxerror"

65− ];

51+ pythonImportsCheck = [ "bpython" ];

6652

6753 meta = with lib; {

6854 description = "A fancy curses interface to the Python interactive interpreter";

pkgs/development/python-modules/breezy/default.nix+5−20

@@ -3,36 +3,23 @@

33, fetchPypi

44, configobj

55, patiencediff

6−, fastbencode

6+, six

77, fastimport

88, dulwich

99, launchpadlib

1010, testtools

11−, pythonOlder

12−, installShellFiles

1311}:

1412

1513buildPythonPackage rec {

1614 pname = "breezy";

17− version = "3.2.2";

18−

19− disabled = pythonOlder "3.5";

15+ version = "3.2.1";

2016

2117 src = fetchPypi {

2218 inherit pname version;

23− sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";

19+ sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";

2420 };

2521

26− nativeBuildInputs = [ installShellFiles ];

27−

28− propagatedBuildInputs = [

29− configobj

30− fastbencode

31− patiencediff

32− fastimport

33− dulwich

34− launchpadlib

35− ];

22+ propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

3623

3724 checkInputs = [ testtools ];

3825

@@ -42,8 +29,6 @@ buildPythonPackage rec {

4229 # symlink for bazaar compatibility

4330 postInstall = ''

4431 ln -s "$out/bin/brz" "$out/bin/bzr"

45−

46− installShellCompletion --cmd brz --bash contrib/bash/brz

4732 '';

4833

4934 pythonImportsCheck = [ "breezy" ];

@@ -51,7 +36,7 @@ buildPythonPackage rec {

5136 meta = with lib; {

5237 description = "Friendly distributed version control system";

5338 homepage = "https://www.breezy-vcs.org/";

54− license = licenses.gpl2Only;

39+ license = licenses.gpl2;

5540 maintainers = [ maintainers.marsam ];

5641 };

5742}

pkgs/development/python-modules/canonicaljson/default.nix+3−3

@@ -9,14 +9,14 @@

1010buildPythonPackage rec {

1111 pname = "canonicaljson";

12− version = "1.6.1";

12+ version = "1.6.0";

1313 format = "setuptools";

1414

15− disabled = pythonOlder "3.7";

15+ disabled = pythonOlder "3.6";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− hash = "sha256-qTZk9phVbb1Lq5w/xPs1g0zyU12h6gC2t3WNj+K7uCQ=";

19+ hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/cert-chain-resolver/default.nix+7−22

@@ -1,50 +1,35 @@

11{ lib

2−, buildPythonPackage

3−, cryptography

42, fetchFromGitHub

3+, buildPythonPackage

54, pytestCheckHook

65, pytest-mock

7−, pythonOlder

8−, six

6+, cryptography

97}:

108

119buildPythonPackage rec {

1210 pname = "cert-chain-resolver";

1311 version = "1.0.1";

14− format = "setuptools";

15−

16− disabled = pythonOlder "3.7";

1712

1813 src = fetchFromGitHub {

1914 owner = "rkoopmans";

2015 repo = "python-certificate-chain-resolver";

2116 rev = version;

22− hash = "sha256-NLTRx6J6pjs7lyschHN5KtgrnpQpEyvZ2zz0pSd5sc4=";

17+ sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l";

2318 };

2419

25− propagatedBuildInputs = [

26− cryptography

27− ];

20+ propagatedBuildInputs = [ cryptography ];

2821

29− checkInputs = [

30− pytestCheckHook

31− pytest-mock

32− six

33− ];

22+ checkInputs = [ pytestCheckHook pytest-mock ];

3423

24+ # online tests

3525 disabledTests = [

36− # Tests require network access

3726 "test_cert_returns_completed_chain"

3827 "test_display_flag_is_properly_formatted"

3928 ];

4029

41− pythonImportsCheck = [

42− "cert_chain_resolver"

43− ];

44−

4530 meta = with lib; {

46− description = "Resolve / obtain the certificate intermediates of a x509 certificate";

4731 homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver";

32+ description = "Resolve / obtain the certificate intermediates of a x509 certificate";

4833 license = licenses.mit;

4934 maintainers = with maintainers; [ veehaitch ];

5035 };

pkgs/development/python-modules/dropbox/default.nix−3

@@ -8,7 +8,6 @@

88, mock

99, pytest-mock

1010, pytestCheckHook

11−, sphinxHook

1211}:

1312

1413buildPythonPackage rec {

@@ -17,7 +16,6 @@ buildPythonPackage rec {

1716 format = "setuptools";

1817

1918 disabled = pythonOlder "3.7";

20− outputs = ["out" "doc"];

2119

2220 src = fetchFromGitHub {

2321 owner = "dropbox";

@@ -48,7 +46,6 @@ buildPythonPackage rec {

4846 pythonImportsCheck = [

4947 "dropbox"

5048 ];

51− nativeBuildInputs = [ sphinxHook ];

5249

5350 # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.

5451 disabledTests = [

pkgs/development/python-modules/dungeon-eos/default.nix+2−2

@@ -2,13 +2,13 @@

33buildPythonPackage rec {

44 pname = "dungeon-eos";

5− version = "0.0.5";

5+ version = "0.0.4";

77 src = fetchFromGitHub {

88 owner = "SkyTemple";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";

11+ sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";

1212 };

1313

1414 doCheck = false; # there are no tests

pkgs/development/python-modules/envs/default.nix+11−15

@@ -1,29 +1,29 @@

11{ lib

22, buildPythonPackage

3−, click

43, fetchPypi

4+, fetchpatch

5+, click

56, jinja2

7+, terminaltables

68, mock

79, nose

8−, poetry-core

9−, pythonOlder

10−, terminaltables

1110}:

1211

1312buildPythonPackage rec {

1413 pname = "envs";

15− version = "1.4";

16− format = "pyproject";

17−

18− disabled = pythonOlder "3.7";

14+ version = "1.3";

1915

2016 src = fetchPypi {

2117 inherit pname version;

22− hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g=";

18+ sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42";

2319 };

2420

25− nativeBuildInputs = [

26− poetry-core

21+ patches = [

22+ # https://github.com/capless/envs/pull/19

23+ (fetchpatch {

24+ url = "https://github.com/capless/envs/commit/6947043fa9120a7b17094fd43ee0e1edf808f42b.patch";

25+ sha256 = "0zswg8kp2g922mkc7x34ps37qli1d1mjwna2jfrbnsq2fg4mk818";

26+ })

2727 ];

2828

2929 propagatedBuildInputs = [

@@ -45,10 +45,6 @@ buildPythonPackage rec {

4545 runHook postCheck

4646 '';

4747

48− pythonImportsCheck = [

49− "envs"

50− ];

51−

5248 meta = with lib; {

5349 description = "Easy access to environment variables from Python";

5450 homepage = "https://github.com/capless/envs";

pkgs/development/python-modules/exceptiongroup/default.nix+2−2

@@ -8,14 +8,14 @@

99buildPythonPackage rec {

1010 pname = "exceptiongroup";

11− version = "1.0.0rc5";

11+ version = "1.0.0rc2";

1212 format = "flit";

1313

1414 disabled = pythonOlder "3.7";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4=";

18+ hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM=";

1919 };

2020

2121 nativeBuildInputs = [

pkgs/development/python-modules/fastbencode/default.nixdeleted−26

@@ -1,26 +0,0 @@

1−{ lib, buildPythonPackage, fetchPypi, python, cython }:

2−

3−buildPythonPackage rec {

4− pname = "fastbencode";

5− version = "0.0.7";

6−

7− src = fetchPypi {

8− inherit pname version;

9− sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ=";

10− };

11−

12− nativeBuildInputs = [ cython ];

13−

14− pythonImportsCheck = [ "fastbencode" ];

15−

16− checkPhase = ''

17− ${python.interpreter} -m unittest fastbencode.tests.test_suite

18− '';

19−

20− meta = with lib; {

21− description = "Fast implementation of bencode";

22− homepage = "https://github.com/breezy-team/fastbencode";

23− license = licenses.gpl2Only;

24− maintainers = [ maintainers.marsam ];

25− };

26−}

pkgs/development/python-modules/filetype/default.nix+6−26

@@ -1,41 +1,21 @@

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, pytestCheckHook

5−, pythonOlder

4+, python

65}:

87buildPythonPackage rec {

98 pname = "filetype";

10− version = "1.0.13";

11− format = "setuptools";

12−

13− disabled = pythonOlder "3.7";

9+ version = "1.0.10";

1410

1511 src = fetchPypi {

1612 inherit pname version;

17− hash = "sha256-ahBHYv6T11XJYqqWyz2TCkj5GgdhBHEmxe6tIVPjOwM=";

13+ sha256 = "sha256-MjoTUAcxtsZaJTvDkwu86aVt+6cekLYP/ZaKtp2a6Tc=";

1814 };

1915

20− checkInputs = [

21− pytestCheckHook

22− ];

23−

24− pythonImportsCheck = [

25− "filetype"

26− ];

27−

28− disabledTests = [

29− # https://github.com/h2non/filetype.py/issues/119

30− "test_guess_memoryview"

31− "test_guess_extension_memoryview"

32− "test_guess_mime_memoryview"

33− ];

34−

35− disabledTestPaths = [

36− # We don't care about benchmarks

37− "tests/test_benchmark.py"

38− ];

16+ checkPhase = ''

17+ ${python.interpreter} -m unittest discover

18+ '';

3919

4020 meta = with lib; {

4121 description = "Infer file type and MIME type of any file/buffer";

pkgs/development/python-modules/flask-jwt-extended/default.nix+10−31

@@ -1,41 +1,20 @@

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−, flask

5−, pyjwt

6−, pytestCheckHook

7−, python-dateutil

8−, pythonOlder

9−, werkzeug

10−}:

1+{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }:

112

123buildPythonPackage rec {

13− pname = "flask-jwt-extended";

14− version = "4.4.0";

15− format = "setuptools";

16−

17− disabled = pythonOlder "3.7";

4+ pname = "Flask-JWT-Extended";

5+ version = "4.3.1";

186

197 src = fetchPypi {

20− pname = "Flask-JWT-Extended";

21− inherit version;

22− hash = "sha256-P+gVBL3JGtjxy5db0tlexgElHzG94YQRXjn8fm7SPqY=";

8+ inherit pname version;

9+ sha256 = "ad6977b07c54e51c13b5981afc246868b9901a46715d9b9827898bfd916aae88";

2310 };

2411

25− propagatedBuildInputs = [

26− flask

27− pyjwt

28− python-dateutil

29− werkzeug

30− ];

31−

32− checkInputs = [

33− pytestCheckHook

34− ];

12+ propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ];

13+ checkInputs = [ pytest ];

3514

36− pythonImportsCheck = [

37− "flask_jwt_extended"

38− ];

15+ checkPhase = ''

16+ pytest tests/

17+ '';

3918

4019 meta = with lib; {

4120 description = "JWT extension for Flask";

pkgs/development/python-modules/fontmake/default.nixdeleted−42

@@ -1,42 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−, glyphslib

5−, setuptools-scm

6−, ufo2ft

7−, fonttools

8−, fontmath

9−, lxml

10−, setuptools

11−}:

12−

13−buildPythonPackage rec {

14− pname = "fontmake";

15− version = "3.3.0";

16−

17− src = fetchPypi {

18− inherit pname version;

19− sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE=";

20− extension = "zip";

21− };

22−

23− nativeBuildInputs = [ setuptools-scm ];

24−

25− propagatedBuildInputs = [

26− glyphslib

27− ufo2ft

28− fonttools

29− fontmath

30− lxml

31− setuptools

32− ];

33−

34− pythonImportsCheck = [ "fontmake" ];

35−

36− meta = {

37− description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)";

38− homepage = "https://github.com/googlefonts/fontmake";

39− license = lib.licenses.asl20;

40− maintainers = [ lib.maintainers.BarinovMaxim ];

41− };

42−}

pkgs/development/python-modules/fonttools/default.nix+3−7

@@ -13,12 +13,11 @@

1313, sphinx

1414, pytestCheckHook

1515, glibcLocales

16−, setuptools-scm

1716}:

1817

1918buildPythonPackage rec {

2019 pname = "fonttools";

21− version = "4.33.3";

20+ version = "4.30.0";

2221

2322 disabled = pythonOlder "3.7";

2423

@@ -26,11 +25,9 @@ buildPythonPackage rec {

2625 owner = pname;

2726 repo = pname;

2827 rev = version;

29− sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM=";

28+ sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9";

3029 };

3130

32− nativeBuildInputs = [ setuptools-scm ];

33−

3431 # all dependencies are optional, but

3532 # we run the checks with them

3633

@@ -54,8 +51,6 @@ buildPythonPackage rec {

5451 unicodedata2

5552 ];

5653

57− pythonImportsCheck = [ "fontTools" ];

58−

5954 preCheck = ''

6055 # tests want to execute the "fonttools" executable from $PATH

6156 export PATH="$out/bin:$PATH"

@@ -77,6 +72,7 @@ buildPythonPackage rec {

7772 "Tests/ufoLib"

7873 ];

7974

75+

8076 meta = with lib; {

8177 homepage = "https://github.com/fonttools/fonttools";

8278 description = "A library to manipulate font files from Python";

pkgs/development/python-modules/gbulb/default.nixdeleted−43

@@ -1,43 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, fetchFromGitHub

4−, pygobject3

5−, pytestCheckHook

6−, gtk3

7−, gobject-introspection

8−}:

9−

10−buildPythonPackage rec {

11− pname = "gbulb";

12− version = "0.6.3";

13−

14− src = fetchFromGitHub {

15− owner = "beeware";

16− repo = "gbulb";

17− rev = "v${version}";

18− sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ=";

19− };

20−

21− propagatedBuildInputs = [

22− pygobject3

23− ];

24−

25− checkInputs = [

26− pytestCheckHook

27− gtk3

28− gobject-introspection

29− ];

30−

31− disabledTests = [

32− "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing

33− ];

34−

35− pythonImportsCheck = [ "gbulb" ];

36−

37− meta = with lib; {

38− description = "GLib implementation of PEP 3156";

39− homepage = "https://github.com/beeware/gbulb";

40− license = licenses.asl20;

41− maintainers = with maintainers; [ marius851000 ];

42− };

43−}

pkgs/development/python-modules/gcal-sync/default.nixdeleted−46

@@ -1,46 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, pythonOlder

4−, fetchFromGitHub

5−, aiohttp

6−, pydantic

7−, freezegun

8−, pytest-aiohttp

9−, pytest-asyncio

10−, pytestCheckHook

11−}:

12−

13−buildPythonPackage rec {

14− pname = "gcal-sync";

15− version = "0.7.1";

16−

17− disabled = pythonOlder "3.9";

18−

19− src = fetchFromGitHub {

20− owner = "allenporter";

21− repo = "gcal_sync";

22− rev = version;

23− hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M=";

24− };

25−

26− propagatedBuildInputs = [

27− aiohttp

28− pydantic

29− ];

30−

31− checkInputs = [

32− freezegun

33− pytest-aiohttp

34− pytest-asyncio

35− pytestCheckHook

36− ];

37−

38− pythonImportsCheck = [ "gcal_sync" ];

39−

40− meta = {

41− description = "Python library for syncing Google Calendar to local storage";

42− homepage = "https://github.com/allenporter/gcal_sync";

43− license = lib.licenses.asl20;

44− maintainers = with lib.maintainers; [ dotlambda ];

45− };

46−}

pkgs/development/python-modules/glances-api/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "glances-api";

14− version = "0.3.5";

14+ version = "0.3.4";

1515 format = "pyproject";

1616

1717 disabled = pythonOlder "3.8";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "home-assistant-ecosystem";

2121 repo = "python-glances-api";

2222 rev = version;

23− sha256 = "sha256-8NWrsiiKevIMeD++C2weRdG0FPm5T4fHMUSJM4J+AOo=";

23+ sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o=";

2424 };

2525

2626 nativeBuildInputs = [

pkgs/development/python-modules/glyphslib/default.nixdeleted−59

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

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−, fonttools

5−, openstep-plist

6−, ufoLib2

7−, pytestCheckHook

8−, unicodedata2

9−, setuptools-scm

10−, ufonormalizer

11−, xmldiff

12−, defcon

13−, ufo2ft

14−, skia-pathops

15−}:

16−

17−buildPythonPackage rec {

18− pname = "glyphslib";

19− version = "6.0.4";

20−

21− format = "pyproject";

22−

23− src = fetchPypi {

24− pname = "glyphsLib";

25− inherit version;

26− sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI=";

27− };

28−

29− nativeBuildInputs = [ setuptools-scm ];

30−

31− checkInputs = [ pytestCheckHook ];

32−

33− pythonImportsCheck = [ "glyphsLib" ];

34−

35− propagatedBuildInputs = [

36− fonttools

37− openstep-plist

38− ufoLib2

39− unicodedata2

40− ufonormalizer

41− xmldiff

42− defcon

43− ufo2ft

44− skia-pathops

45− ];

46−

47− disabledTestPaths = [

48− "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif"

49− "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made

50− ];

51−

52− meta = {

53− description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";

54− homepage = "https://github.com/googlefonts/glyphsLib";

55− license = lib.licenses.asl20;

56− maintainers = [ lib.maintainers.BarinovMaxim ];

57− };

58−}

59−

pkgs/development/python-modules/hahomematic/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "hahomematic";

17− version = "1.2.2";

17+ version = "1.2.1";

1818 format = "pyproject";

1919

2020 disabled = pythonOlder "3.9";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "danielperna84";

2424 repo = pname;

2525 rev = "refs/tags/${version}";

26− sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ=";

26+ sha256 = "sha256-INhw7d+hbVCfeB7vr9QhCgaLOpIl0OHhgrYN6o6E1YI=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/howdoi/default.nix+2−16

@@ -10,21 +10,17 @@

1010, pyquery

1111, requests

1212, pytestCheckHook

13−, pythonOlder

1413}:

1514

1615buildPythonPackage rec {

1716 pname = "howdoi";

1817 version = "2.0.19";

19− format = "setuptools";

20−

21− disabled = pythonOlder "3.7";

2218

2319 src = fetchFromGitHub {

2420 owner = "gleitz";

2521 repo = pname;

2622 rev = "v${version}";

27− hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I=";

23+ sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";

2824 };

2925

3026 propagatedBuildInputs = [

@@ -50,16 +46,6 @@ buildPythonPackage rec {

5046 # AssertionError: "The...

5147 "test_get_text_with_one_link"

5248 "test_get_text_without_links"

53− # Those tests are failing in the sandbox

54− # OSError: [Errno 24] Too many open files

55− "test_answers"

56− "test_answers_bing"

57− "test_colorize"

58− "test_json_output"

59− "test_missing_pre_or_code_query"

60− "test_multiple_answers"

61− "test_position"

62− "test_unicode_answer"

6349 ];

6450

6551 pythonImportsCheck = [

@@ -68,7 +54,7 @@ buildPythonPackage rec {

6854

6955 meta = with lib; {

7056 description = "Instant coding answers via the command line";

71− homepage = "https://github.com/gleitz/howdoi";

57+ homepage = "https://pypi.python.org/pypi/howdoi";

7258 license = licenses.mit;

7359 maintainers = with maintainers; [ costrouc ];

7460 };

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixdeleted−26

@@ -1,26 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−}:

5−

6−buildPythonPackage rec {

7− pname = "insteon-frontend-home-assistant";

8− version = "0.1.0";

9−

10− src = fetchPypi {

11− inherit pname version;

12− sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf";

13− };

14−

15− # upstream has no tests

16− doCheck = false;

17−

18− pythonImportsCheck = [ "insteon_frontend" ];

19−

20− meta = {

21− description = "The Insteon frontend for Home Assistant";

22− homepage = "https://github.com/teharris1/insteon-panel";

23− license = lib.licenses.mit;

24− maintainers = with lib.maintainers; [ dotlambda ];

25− };

26−}

pkgs/development/python-modules/jug/default.nix+18−31

@@ -1,46 +1,33 @@

1−{ lib

2−, bottle

3−, buildPythonPackage

4−, fetchPypi

5−, numpy

6−, pytestCheckHook

7−, pythonOlder

8−, pyyaml

9−, redis

10−}:

1+{ lib, buildPythonPackage, fetchPypi, nose, numpy

2+, bottle, pyyaml, redis, six

3+, zlib

4+, pytestCheckHook }:

115

126buildPythonPackage rec {

13− pname = "jug";

14− version = "2.2.0";

15− format = "setuptools";

16−

17− disabled = pythonOlder "3.7";

18−

19− src = fetchPypi {

20− pname = "Jug";

21− inherit version;

22− hash = "sha256-2Y9xRr5DyV9UqG6tiq9rYET2Z7LaPXfzwYKKGwR3OSs=";

23− };

24−

7+ pname = "Jug";

8+ version = "2.1.1";

9+ buildInputs = [ nose numpy ];

2510 propagatedBuildInputs = [

2611 bottle

27− ];

28−

29− checkInputs = [

30− numpy

31− pytestCheckHook

3212 pyyaml

3313 redis

34− ];

14+ six

3515

36− pythonImportsCheck = [

37− "jug"

16+ zlib

3817 ];

3918

19+ src = fetchPypi {

20+ inherit pname version;

21+ sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1";

22+ };

23+

24+ checkInputs = [ pytestCheckHook ];

25+ pythonImportsCheck = [ "jug" ];

26+

4027 meta = with lib; {

4128 description = "A Task-Based Parallelization Framework";

42− homepage = "https://jug.readthedocs.io/";

4329 license = licenses.mit;

30+ homepage = "https://jug.readthedocs.io/";

4431 maintainers = with maintainers; [ luispedro ];

4532 };

4633}

pkgs/development/python-modules/lektor/default.nix+2−2

@@ -27,7 +27,7 @@

2727

2828buildPythonPackage rec {

2929 pname = "lektor";

30− version = "3.3.4";

30+ version = "3.3.3";

3131 format = "pyproject";

3232

3333 disabled = pythonOlder "3.7";

@@ -36,7 +36,7 @@ buildPythonPackage rec {

3636 owner = "lektor";

3737 repo = pname;

3838 rev = "refs/tags/v${version}";

39− hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw=";

39+ hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";

4040 };

4141

4242 propagatedBuildInputs = [

pkgs/development/python-modules/loopy/default.nix → pkgs/development/python-modules/loo-py/default.nixrenamed+24−28

@@ -1,55 +1,51 @@

11{ lib

22, buildPythonPackage

3−, codepy

4−, cgen

5−, colorama

6−, fetchFromGitHub

3+, fetchPypi

4+, pytools

5+, pymbolic

76, genpy

7+, cgen

88, islpy

9+, six

10+, colorama

911, mako

10−, numpy

11−, pymbolic

1212, pyopencl

13−, pyrsistent

14−, pythonOlder

15−, pytools

13+, pytest

1614}:

1715

1816buildPythonPackage rec {

19− pname = "loopy";

20− version = "2020.2.1";

21− format = "setuptools";

22−

23− disabled = pythonOlder "3.7";

17+ pname = "loo-py";

18+ version = "2020.2";

2419

25− src = fetchFromGitHub {

26− owner = "inducer";

27− repo = pname;

28− rev = "v${version}";

29− hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g=";

20+ src = fetchPypi {

21+ pname = "loo.py";

22+ inherit version;

23+ sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f";

3024 };

3125

26+ checkInputs = [ pytest ];

3227 propagatedBuildInputs = [

33− codepy

34− cgen

35− colorama

28+ pytools

29+ pymbolic

3630 genpy

31+ cgen

3732 islpy

33+ six

34+ colorama

3835 mako

39− numpy

40− pymbolic

4136 pyopencl

42− pyrsistent

43− pytools

4437 ];

4538

4639 # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR

4740 doCheck = false;

41+ checkPhase = ''

42+ HOME=$(mktemp -d) pytest test

43+ '';

4844

4945 meta = with lib; {

5046 description = "A code generator for array-based code on CPUs and GPUs";

51− homepage = "https://github.com/inducer/loopy";

47+ homepage = "https://mathema.tician.de/software/loopy";

5248 license = licenses.mit;

53− maintainers = with maintainers; [ costrouc ];

49+ maintainers = [ maintainers.costrouc ];

5450 };

5551}

pkgs/development/python-modules/luxtronik/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "luxtronik";

11− version = "0.3.13";

11+ version = "0.3.12";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "Bouni";

1818 repo = "python-luxtronik";

1919 rev = version;

20− sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY=";

20+ sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY=";

2121 };

2222

2323 # Project has no tests

pkgs/development/python-modules/mat2/default.nix+2−2

@@ -22,7 +22,7 @@

2222

2323buildPythonPackage rec {

2424 pname = "mat2";

25− version = "0.12.4";

25+ version = "0.12.3";

2626

2727 disabled = pythonOlder "3.5";

2828

@@ -31,7 +31,7 @@ buildPythonPackage rec {

3131 owner = "jvoisin";

3232 repo = "mat2";

3333 rev = version;

34− hash = "sha256-HjPr4pb0x2Sdq8ALaZeQRnGHmNAoEV8XUGbhOjY00jc=";

34+ hash = "sha256-TW+FwlZ+J1tanPL5WuwXtZJmtYB9LaimeIaPlN/jzqo=";

3535 };

3636

3737 patches = [

pkgs/development/python-modules/meater-python/default.nixdeleted−37

@@ -1,37 +0,0 @@

1−{ lib

2−, aiohttp

3−, buildPythonPackage

4−, fetchPypi

5−, pythonOlder

6−}:

7−

8−buildPythonPackage rec {

9− pname = "meater-python";

10− version = "0.0.8";

11− format = "setuptools";

12−

13− disabled = pythonOlder "3.7";

14−

15− src = fetchPypi {

16− inherit pname version;

17− hash = "sha256-86XJmKOc2MCyU9v0UAZsPCUL/kAXywOlQOIHaykNF1o=";

18− };

19−

20− propagatedBuildInputs = [

21− aiohttp

22− ];

23−

24− # Module has no tests

25− doCheck = false;

26−

27− pythonImportsCheck = [

28− "meater"

29− ];

30−

31− meta = with lib; {

32− description = "Library for the Apption Labs Meater cooking probe";

33− homepage = "https://github.com/Sotolotl/meater-python";

34− license = licenses.asl20;

35− maintainers = with maintainers; [ fab ];

36− };

37−}

pkgs/development/python-modules/mypy-boto3-s3/default.nix+2−2

@@ -8,14 +8,14 @@

99buildPythonPackage rec {

1010 pname = "mypy-boto3-s3";

11− version = "1.22.6";

11+ version = "1.22.0.post1";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.6";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4=";

18+ hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4=";

1919 };

2020

2121 propagatedBuildInputs = [

pkgs/development/python-modules/namedlist/default.nix+9−30

@@ -1,54 +1,33 @@

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, fetchpatch

5−, pytestCheckHook

6−, pythonOlder

4+, pytest

75}:

97buildPythonPackage rec {

108 pname = "namedlist";

119 version = "1.8";

12− format = "setuptools";

13−

14− disabled = pythonOlder "3.7";

1510

1611 src = fetchPypi {

1712 inherit pname version;

18− hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8=";

13+ sha256 = "34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef";

1914 };

2015

21− checkInputs = [

22− pytestCheckHook

23− ];

24−

25− patches = [

26− # Deprecation warning using collections.abc, https://gitlab.com/ericvsmith/namedlist/-/merge_requests/1

27− (fetchpatch {

28− url = "https://gitlab.com/ericvsmith/namedlist/-/commit/102d15b455e6f058b9c95fe135167be82b34c14a.patch";

29− sha256 = "sha256-IfDgiObFFSOUnAlXR/+ye8uutGaFJ/AyQvCb76iNaMM=";

30− })

31− ];

32−

3316 # Test file has a `unittest.main()` at the bottom that fails the tests;

3417 # py.test can run the tests without it.

3518 postPatch = ''

3619 substituteInPlace test/test_namedlist.py --replace "unittest.main()" ""

3720 '';

3821

39− pythonImportsCheck = [

40− "namedlist"

41− ];

42−

43− disabledTests = [

44− # AttributeError: module 'collections' has no attribute 'Container'

45− "test_ABC"

46− ];

22+ checkInputs = [ pytest ];

23+ checkPhase = ''

24+ py.test

25+ '';

4726

48− meta = with lib; {

27+ meta = {

4928 description = "Similar to namedtuple, but instances are mutable";

5029 homepage = "https://gitlab.com/ericvsmith/namedlist";

51− license = licenses.asl20;

52− maintainers = with maintainers; [ ivan ];

30+ license = lib.licenses.asl20;

31+ maintainers = with lib.maintainers; [ ivan ];

5332 };

5433}

pkgs/development/python-modules/nbclient/default.nix+10−33

@@ -1,50 +1,27 @@

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−, pythonOlder

5−, async_generator

6−, traitlets

7−, nbformat

8−, nest-asyncio

9−, jupyter-client

10−, pytestCheckHook

11−, xmltodict

12−, nbconvert

13−, ipywidgets

1+{ lib, buildPythonPackage, fetchPypi, pythonOlder,

2+ async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,

3+ pytest, xmltodict, nbconvert, ipywidgets

4+, doCheck ? true

145}:

156

16−let nbclient = buildPythonPackage rec {

7+buildPythonPackage rec {

178 pname = "nbclient";

18− version = "0.6.2";

19− format = "setuptools";

20−

9+ version = "0.5.13";

2110 disabled = pythonOlder "3.7";

2211

2312 src = fetchPypi {

2413 inherit pname version;

25− hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";

14+ sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";

2615 };

2716

17+ inherit doCheck;

18+ checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

2819 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

2920

30− # circular dependencies if enabled by default

31− doCheck = false;

32−

33− checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ];

34−

35− preCheck = ''

36− export HOME=$(mktemp -d)

37− '';

38−

39− passthru.tests = {

40− check = nbclient.overridePythonAttrs (_: { doCheck = true; });

41− };

42−

4321 meta = with lib; {

4422 homepage = "https://github.com/jupyter/nbclient";

4523 description = "A client library for executing notebooks";

4624 license = licenses.bsd3;

4725 maintainers = [ maintainers.erictapen ];

4826 };

49−};

50−in nbclient

27+}

pkgs/development/python-modules/nbconvert/default.nix+7−8

@@ -5,11 +5,13 @@

55, glibcLocales

66, entrypoints

77, bleach

8+, beautifulsoup4

89, mistune

910, nbclient

1011, jinja2

1112, pygments

1213, traitlets

14+, testpath

1315, jupyter_core

1416, jupyterlab-pygments

1517, nbformat

@@ -18,18 +20,15 @@

1820, tornado

1921, jupyter-client

2022, defusedxml

21−, tinycss2

22−, beautifulsoup4

2323}:

2424

2525buildPythonPackage rec {

2626 pname = "nbconvert";

27− version = "6.5.0";

28− format = "setuptools";

27+ version = "6.4.5";

2928

3029 src = fetchPypi {

3130 inherit pname version;

32− hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";

31+ sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";

3332 };

3433

3534 # Add $out/share/jupyter to the list of paths that are used to search for

@@ -45,10 +44,10 @@ buildPythonPackage rec {

4544 checkInputs = [ pytestCheckHook glibcLocales ];

4645

4746 propagatedBuildInputs = [

48− entrypoints bleach mistune jinja2 pygments traitlets

47+ entrypoints bleach mistune jinja2 pygments traitlets testpath

4948 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

50− defusedxml tinycss2 beautifulsoup4

51− nbclient

49+ defusedxml beautifulsoup4

50+ (nbclient.override { doCheck = false; }) # avoid infinite recursion

5251 jupyterlab-pygments

5352 ];

5453

pkgs/development/python-modules/nvchecker/default.nix+2−2

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "nvchecker";

23− version = "2.8";

23+ version = "2.7";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.7";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

2929 owner = "lilydjwg";

3030 repo = pname;

3131 rev = "v${version}";

32− hash = "sha256-ikpjR1fEZBsSOE20jxTyarb9Pqn3Fz+TYOzXp0g4G9c=";

32+ hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";

3333 };

3434

3535 nativeBuildInputs = [

pkgs/development/python-modules/openstep-plist/default.nixdeleted−31

@@ -1,31 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, fetchPypi

4−, setuptools-scm

5−, pytestCheckHook

6−, cython

7−, pythonImportsCheckHook

8−}:

9−

10−buildPythonPackage rec {

11− pname = "openstep-plist";

12− version = "0.3.0";

13−

14− src = fetchPypi {

15− pname = "openstep_plist";

16− inherit version;

17− sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk=";

18− extension = "zip";

19− };

20−

21− nativeBuildInputs = [ setuptools-scm cython ];

22− checkInputs = [ pytestCheckHook ];

23− pythonImportsCheck = [ "openstep_plist" ];

24−

25− meta = {

26− description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist";

27− homepage = "https://github.com/fonttools/openstep-plist";

28− license = lib.licenses.mit;

29− maintainers = [ lib.maintainers.BarinovMaxim ];

30− };

31−}

pkgs/development/python-modules/peaqevcore/default.nix+2−2

@@ -6,14 +6,14 @@

77buildPythonPackage rec {

88 pname = "peaqevcore";

9− version = "0.0.22";

9+ version = "0.0.21";

1010 format = "setuptools";

1111

1212 disabled = pythonOlder "3.7";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0=";

16+ hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";

1717 };

1818

1919 postPatch = ''

pkgs/development/python-modules/proton-client/0001-OpenSSL-path-fix.patchdeleted−41

@@ -1,41 +0,0 @@

1−From 48da17d61e38657dfb10f2ac642fd3e6a45ee607 Mon Sep 17 00:00:00 2001

2−From: "P. R. d. O" <d.ol.rod@tutanota.com>

3−Date: Wed, 27 Apr 2022 14:29:53 -0600

4−Subject: [PATCH] OpenSSL path fix

5−

6−---

7− proton/srp/_ctsrp.py | 12 ++----------

8− 1 file changed, 2 insertions(+), 10 deletions(-)

9−

10−diff --git a/proton/srp/_ctsrp.py b/proton/srp/_ctsrp.py

11−index e19f184..af359c5 100644

12−--- a/proton/srp/_ctsrp.py

13−+++ b/proton/srp/_ctsrp.py

14−@@ -24,22 +24,14 @@ from .util import PM_VERSION, SRP_LEN_BYTES, SALT_LEN_BYTES, hash_password

15− dlls = list()

16−

17− platform = sys.platform

18−-if platform == 'darwin':

19−- dlls.append(ctypes.cdll.LoadLibrary('libssl.dylib'))

20−-elif 'win' in platform:

21−+if 'win' in platform:

22− for d in ('libeay32.dll', 'libssl32.dll', 'ssleay32.dll'):

23− try:

24− dlls.append(ctypes.cdll.LoadLibrary(d))

25− except Exception:

26− pass

27− else:

28−- try:

29−- dlls.append(ctypes.cdll.LoadLibrary('libssl.so.10'))

30−- except OSError:

31−- try:

32−- dlls.append(ctypes.cdll.LoadLibrary('libssl.so.1.0.0'))

33−- except OSError:

34−- dlls.append(ctypes.cdll.LoadLibrary('libssl.so'))

35−+ dlls.append(ctypes.cdll.LoadLibrary('@openssl@/lib/libssl@ext@'))

36−

37−

38− class BIGNUM_Struct(ctypes.Structure):

39−--

40−2.35.1

41−

pkgs/development/python-modules/proton-client/default.nix+8−18

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

11{ lib

2−, stdenv

32, buildPythonPackage

43, fetchFromGitHub

54, pythonOlder

6−, substituteAll

75, bcrypt

86, pyopenssl

97, python-gnupg

10−, pytestCheckHook

118, requests

129, openssl

1310}:

@@ -33,21 +30,14 @@ buildPythonPackage rec {

3330

3431 buildInputs = [ openssl ];

3532

36− patches = [

37− # Patches library by fixing the openssl path

38− (substituteAll {

39− src = ./0001-OpenSSL-path-fix.patch;

40− openssl = openssl.out;

41− ext = stdenv.hostPlatform.extensions.sharedLibrary;

42− })

43− ];

44−

45− checkInputs = [ pytestCheckHook ];

46−

47− disabledTests = [

48− #ValueError: Invalid modulus

49− "test_modulus_verification"

50− ];

33+ # This patch is supposed to indicate where to load OpenSSL library,

34+ # but it is not working as intended.

35+ #patchPhase = ''

36+ # substituteInPlace proton/srp/_ctsrp.py --replace \

37+ # "ctypes.cdll.LoadLibrary('libssl.so.10')" "'${lib.getLib openssl}/lib/libssl.so'"

38+ #'';

39+ # Regarding the issue above, I'm disabling tests for now

40+ doCheck = false;

5141

5242 pythonImportsCheck = [ "proton" ];

5343

pkgs/development/python-modules/py-desmume/default.nix+14−3

@@ -3,18 +3,29 @@

33, alsa-lib, soundtouch, openal

44}:

6+let

7+ desmume = fetchFromGitHub {

8+ owner = "SkyTemple";

9+ repo = "desmume";

10+ rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7";

11+ sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842";

12+ };

13+in

614buildPythonPackage rec {

715 pname = "py-desmume";

8− version = "0.0.4.post2";

16+ version = "0.0.3.post2";

917

1018 src = fetchFromGitHub {

1119 owner = "SkyTemple";

1220 repo = pname;

1321 rev = version;

14− sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";

15− fetchSubmodules = true;

22+ sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1";

1623 };

1724

25+ postPatch = ''

26+ cp -R --no-preserve=mode ${desmume} __build_desmume

27+ '';

28+

1829 buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];

1930 nativeBuildInputs = [ meson ninja pkg-config ];

2031 propagatedBuildInputs = [ pillow pygobject3 ];

pkgs/development/python-modules/pychromecast/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "pychromecast";

13− version = "12.0.0";

13+ version = "11.0.0";

1414 format = "setuptools";

1515

1616 disabled = !isPy3k;

@@ -18,7 +18,7 @@ buildPythonPackage rec {

1818 src = fetchPypi {

1919 pname = "PyChromecast";

2020 inherit version;

21− sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";

21+ sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";

2222 };

2323

2424 propagatedBuildInputs = [

pkgs/development/python-modules/pydeconz/default.nix+4−6

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

11{ lib

22, aiohttp

33, aioresponses

4−, async-timeout

54, buildPythonPackage

65, fetchFromGitHub

76, pytest-aiohttp

@@ -11,21 +10,20 @@

1110

1211buildPythonPackage rec {

1312 pname = "pydeconz";

14− version = "91";

13+ version = "87";

1514 format = "setuptools";

1615

17− disabled = pythonOlder "3.9";

16+ disabled = pythonOlder "3.7";

1817

1918 src = fetchFromGitHub {

2019 owner = "Kane610";

2120 repo = "deconz";

22− rev = "refs/tags/v${version}";

23− hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";

21+ rev = "v${version}";

22+ sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";

2423 };

2524

2625 propagatedBuildInputs = [

2726 aiohttp

28− async-timeout

2927 ];

3028

3129 checkInputs = [

pkgs/development/python-modules/pyeapi/default.nix+8−36

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

11{ lib

22, buildPythonPackage

3+, pythonAtLeast

34, fetchFromGitHub

4−, fetchpatch

5−, mock

65, netaddr

76, pytestCheckHook

8−, pythonOlder

7+, mock

98}:

109

1110buildPythonPackage rec {

@@ -13,7 +12,8 @@ buildPythonPackage rec {

1312 version = "0.8.4";

1413 format = "pyproject";

1514

16− disabled = pythonOlder "3.7";

15+ # https://github.com/arista-eosplus/pyeapi/issues/189

16+ disabled = pythonAtLeast "3.10";

1717

1818 src = fetchFromGitHub {

1919 owner = "arista-eosplus";

@@ -22,49 +22,21 @@ buildPythonPackage rec {

2222 sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";

2323 };

2424

25− propagatedBuildInputs = [

26− netaddr

27− ];

25+ propagatedBuildInputs = [ netaddr ];

2826

2927 checkInputs = [

3028 mock

3129 pytestCheckHook

3230 ];

3331

34− patches = [

35− # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223

36− (fetchpatch {

37− name = "fix-collection-usage.patch";

38− url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch";

39− sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8=";

40− })

41− (fetchpatch {

42− name = "fix-collection-usage-2.patch";

43− url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch";

44− sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo=";

45− excludes = [

46− ".github/workflows/ci.yml"

47− ];

48− })

49− (fetchpatch {

50− name = "fix-collection-usage-3.patch";

51− url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch";

52− sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE=";

53− })

54− ];

32+ pytestFlagsArray = [ "test/unit" ];

5533

56− pytestFlagsArray = [

57− "test/unit"

58− ];

59−

60− pythonImportsCheck = [

61− "pyeapi"

62− ];

34+ pythonImportsCheck = [ "pyeapi" ];

6335

6436 meta = with lib; {

6537 description = "Client for Arista eAPI";

6638 homepage = "https://github.com/arista-eosplus/pyeapi";

6739 license = licenses.bsd3;

68− maintainers = with maintainers; [ astro ];

40+ maintainers = [ maintainers.astro ];

6941 };

7042}

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "pyevilgenius";

11− version = "2.0.0";

11+ version = "1.0.0";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.8";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "home-assistant-libs";

1818 repo = pname;

1919 rev = version;

20− sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";

20+ sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/pyinfra/default.nix+2−2

@@ -17,14 +17,14 @@

1717

1818buildPythonPackage rec {

1919 pname = "pyinfra";

20− version = "2.0.2";

20+ version = "2.0.1";

2121 format = "setuptools";

2222

2323 disabled = pythonOlder "3.7";

2424

2525 src = fetchPypi {

2626 inherit pname version;

27− sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0=";

27+ sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE=";

2828 };

2929

3030 propagatedBuildInputs = [

pkgs/development/python-modules/pyinsteon/default.nix+3−3

@@ -16,7 +16,7 @@

1616

1717buildPythonPackage rec {

1818 pname = "pyinsteon";

19− version = "1.1.0";

19+ version = "1.0.16";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

@@ -24,8 +24,8 @@ buildPythonPackage rec {

2424 src = fetchFromGitHub {

2525 owner = pname;

2626 repo = pname;

27− rev = "refs/tags/${version}";

28− hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";

27+ rev = version;

28+ hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";

2929 };

3030

3131 propagatedBuildInputs = [

pkgs/development/python-modules/pykulersky/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "pykulersky";

14− version = "0.5.4";

14+ version = "0.5.3";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.6";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "emlove";

2121 repo = pname;

2222 rev = version;

23− sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg=";

23+ sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pymyq/default.nix+3−3

@@ -9,14 +9,14 @@

1010buildPythonPackage rec {

1111 pname = "pymyq";

12− version = "3.1.5";

12+ version = "3.1.4";

1313 disabled = pythonOlder "3.8";

1414

1515 src = fetchFromGitHub {

1616 owner = "arraylabs";

1717 repo = pname;

18− rev = "refs/tags/v${version}";

19− sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw=";

18+ rev = "v${version}";

19+ sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/pynetgear/default.nix+2−2

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

88buildPythonPackage rec {

99 pname = "pynetgear";

10− version = "0.10.0";

10+ version = "0.9.4";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "MatMaul";

1717 repo = pname;

1818 rev = "refs/tags/${version}";

19− sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI=";

19+ sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/pynws/default.nix+2−2

@@ -13,14 +13,14 @@

1313

1414buildPythonPackage rec {

1515 pname = "pynws";

16− version = "1.4.1";

16+ version = "1.3.2";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchFromGitHub {

2020 owner = "MatthewFlamm";

2121 repo = pname;

2222 rev = "v${version}";

23− sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y=";

23+ sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pyomo/default.nix+22−34

@@ -1,60 +1,48 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4−, parameterized

4+, isPy27

5+, pyutilib

6+, appdirs

57, ply

6−, pytestCheckHook

7−, pythonOlder

8+, six

9+, nose

10+, glpk

811}:

912

1013buildPythonPackage rec {

1114 pname = "pyomo";

12− version = "6.4.0";

13− format = "setuptools";

14−

15− disabled = pythonOlder "3.7";

15+ version = "6.3.0";

16+ disabled = isPy27; # unable to import pyutilib.th

1617

1718 src = fetchFromGitHub {

1819 repo = "pyomo";

1920 owner = "pyomo";

2021 rev = version;

21− hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8=";

22+ sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs=";

2223 };

2324

25+ checkInputs = [ nose glpk ];

2426 propagatedBuildInputs = [

27+ pyutilib

28+ appdirs

2529 ply

30+ six

2631 ];

2732

28− checkInputs = [

29− parameterized

30− pytestCheckHook

31− ];

32−

33− pythonImportsCheck = [

34− "pyomo"

35− ];

36−

37− preCheck = ''

38− export HOME=$(mktemp -d);

33+ checkPhase = ''

34+ rm pyomo/bilevel/tests/test_blp.py \

35+ pyomo/version/tests/test_installer.py \

36+ pyomo/common/tests/test_download.py \

37+ pyomo/core/tests/examples/test_pyomo.py

38+ export HOME=$TMPDIR

39+ nosetests

3940 '';

4041

41− disabledTestPaths = [

42− # Don't test the documentation and the examples

43− "doc/"

44− "examples/"

45− # Tests don't work properly in the sandbox

46− "pyomo/environ/tests/test_environ.py"

47− ];

48−

49− disabledTests = [

50− # Test requires lsb_release

51− "test_get_os_version"

52− ];

53−

5442 meta = with lib; {

55− description = "Python Optimization Modeling Objects";

43+ description = "Pyomo: Python Optimization Modeling Objects";

5644 homepage = "http://pyomo.org";

5745 license = licenses.bsd3;

58− maintainers = with maintainers; [ costrouc ];

46+ maintainers = [ maintainers.costrouc ];

5947 };

6048}

pkgs/development/python-modules/pyrogram/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313buildPythonPackage rec {

1414 pname = "pyrogram";

15− version = "2.0.16";

15+ version = "2.0.14";

1616

1717 disabled = pythonOlder "3.7";

1818

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "pyrogram";

2121 repo = "pyrogram";

2222 rev = "v${version}";

23− hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg=";

23+ hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pytenable/default.nix+2−2

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "pytenable";

23− version = "1.4.6";

23+ version = "1.4.4";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.7";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

2929 owner = "tenable";

3030 repo = "pyTenable";

3131 rev = version;

32− hash = "sha256-0isXHh0b2l8Br4XXR1y8A+zu8vkJjEsJ6faNNEx12lM=";

32+ hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc=";

3333 };

3434

3535 propagatedBuildInputs = [

pkgs/development/python-modules/python-sql/default.nix+8−24

@@ -1,34 +1,18 @@

1−{ lib

2−, fetchPypi

3−, buildPythonPackage

4−, pytestCheckHook

5−, pythonOlder

6−}:

1+{ lib, fetchPypi, buildPythonPackage }:

83buildPythonPackage rec {

94 pname = "python-sql";

10− version = "1.4.0";

11− format = "setuptools";

12−

13− disabled = pythonOlder "3.7";

5+ version = "1.3.0";

146

157 src = fetchPypi {

168 inherit pname version;

17− hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY=";

9+ sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176";

1810 };

1911

20− checkInputs = [

21− pytestCheckHook

22− ];

23−

24− pythonImportsCheck = [

25− "sql"

26− ];

27−

28− meta = with lib; {

29− description = "Library to write SQL queries in a pythonic way";

30− homepage = "https://pypi.org/project/python-sql/";

31− license = licenses.bsd3;

32− maintainers = with maintainers; [ johbo ];

12+ meta = {

13+ homepage = "https://python-sql.tryton.org/";

14+ description = "A library to write SQL queries in a pythonic way";

15+ maintainers = with lib.maintainers; [ johbo ];

16+ license = lib.licenses.bsd3;

3317 };

3418}

pkgs/development/python-modules/pytomorrowio/default.nix+2−4

@@ -3,20 +3,19 @@

33, pythonOlder

44, fetchPypi

55, aiohttp

6−, pytest-aiohttp

76, pytest-asyncio

87, pytestCheckHook

98}:

109

1110buildPythonPackage rec {

1211 pname = "pytomorrowio";

13− version = "0.3.3";

12+ version = "0.2.1";

1413

1514 disabled = pythonOlder "3.7";

1615

1716 src = fetchPypi {

1817 inherit pname version;

19− sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";

18+ sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";

2019 };

2120

2221 propagatedBuildInputs = [

@@ -24,7 +23,6 @@ buildPythonPackage rec {

2423 ];

2524

2625 checkInputs = [

27− pytest-aiohttp

2826 pytest-asyncio

2927 pytestCheckHook

3028 ];

pkgs/development/python-modules/pywinrm/default.nix+12−28

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

11{ lib

22, buildPythonPackage

33, fetchPypi

4−, pythonOlder

4+, isPy38

55, kerberos

66, mock

7−, pytestCheckHook

7+, pytest

88, requests

99, requests_ntlm

1010, six

@@ -13,41 +13,25 @@

1313

1414buildPythonPackage rec {

1515 pname = "pywinrm";

16− version = "0.4.3";

17− format = "setuptools";

18−

19− disabled = pythonOlder "3.8";

16+ version = "0.4.2";

17+ disabled = isPy38;

2018

2119 src = fetchPypi {

2220 inherit pname version;

23− hash = "sha256-mVZ0v1rGSyViycVlQEcxCeUw02veEMJi1aUpYSGtVWU=";

21+ sha256 = "e7865ec5e46e7fedb859c656cfaba4fcf669de7c042b5a7d8a759544636bcfb7";

2422 };

2523

26− propagatedBuildInputs = [

27− requests

28− requests_ntlm

29− six

30− kerberos

31− xmltodict

32− ];

33−

34− checkInputs = [

35− mock

36− pytestCheckHook

37− ];

38−

39− pythonImportsCheck = [

40− "winrm"

41− ];

42−

43− pytestFlagsArray = [

44− "winrm/tests/"

45− ];

24+ checkInputs = [ mock pytest ];

25+ propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ];

4626

4727 meta = with lib; {

4828 description = "Python library for Windows Remote Management";

4929 homepage = "https://github.com/diyan/pywinrm";

5030 license = licenses.mit;

51− maintainers = with maintainers; [ elasticdog kamadorueda ];

31+ maintainers = with maintainers; [

32+ elasticdog

33+ kamadorueda

34+ ];

35+ platforms = platforms.all;

5236 };

5337}

pkgs/development/python-modules/ropper/default.nix+15−26

@@ -1,43 +1,32 @@

11{ lib

22, buildPythonPackage

3−, fetchFromGitHub

3+, fetchPypi

44, capstone

55, filebytes

6−, pytestCheckHook

7−, pythonOlder

6+, pytest

87}:

109buildPythonPackage rec {

1110 pname = "ropper";

12− version = "1.13.7";

13− format = "setuptools";

11+ version = "1.13.6";

1412

15− disabled = pythonOlder "3.7";

16−

17− src = fetchFromGitHub {

18− owner = "sashs";

19− repo = "Ropper";

20− rev = "v${version}";

21− hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE=";

13+ src = fetchPypi {

14+ inherit pname version;

15+ sha256 = "6e4226f5ef01951c7df87029535e051c6deb3f156f7511613fb69e8a7f4801fb";

2216 };

17+ # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise

18+ # workaround: sudo chmod 777 /dev/shm

19+ checkPhase = ''

20+ py.test testcases

21+ '';

22+ doCheck = false; # Tests not included in archive

2323

24− propagatedBuildInputs = [

25− capstone

26− filebytes

27− ];

28−

29− checkInputs = [

30− pytestCheckHook

31− ];

32−

33− pythonImportsCheck = [

34− "ropper"

35− ];

36−

24+ checkInputs = [pytest];

25+ propagatedBuildInputs = [ capstone filebytes ];

3726 meta = with lib; {

38− description = "Show information about files in different file formats";

3927 homepage = "https://scoding.de/ropper/";

4028 license = licenses.bsd3;

29+ description = "Show information about files in different file formats";

4130 maintainers = with maintainers; [ bennofs ];

4231 };

4332}

pkgs/development/python-modules/scmrepo/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "scmrepo";

17− version = "0.0.20";

17+ version = "0.0.19";

1818 format = "pyproject";

1919

2020 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "iterative";

2424 repo = pname;

2525 rev = "refs/tags/${version}";

26− hash = "sha256-3gNHWncP9laevuX3EcnmNJ825eQehoLp75WJ5V5/R9w=";

26+ hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

@@ -41,7 +41,7 @@

4141

4242buildPythonPackage rec {

4343 pname = "sentry-sdk";

44− version = "1.5.11";

44+ version = "1.5.10";

4545 format = "setuptools";

4646

4747 disabled = pythonOlder "3.7";

@@ -50,7 +50,7 @@ buildPythonPackage rec {

5050 owner = "getsentry";

5151 repo = "sentry-python";

5252 rev = version;

53− hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0=";

53+ hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0=";

5454 };

5555

5656 propagatedBuildInputs = [

pkgs/development/python-modules/signedjson/default.nix+18−31

@@ -1,53 +1,40 @@

11{ lib

22, buildPythonPackage

3−, canonicaljson

43, fetchPypi

5−, importlib-metadata

4+, fetchpatch

5+, canonicaljson

6+, unpaddedbase64

67, pynacl

7−, pytestCheckHook

8−, pythonOlder

9−, setuptools-scm

108, typing-extensions

11−, unpaddedbase64

9+, setuptools-scm

10+, importlib-metadata

11+, pythonOlder

1212}:

1313

1414buildPythonPackage rec {

1515 pname = "signedjson";

16− version = "1.1.4";

17− format = "setuptools";

18−

19− disabled = pythonOlder "3.7";

16+ version = "1.1.1";

2017

2118 src = fetchPypi {

2219 inherit pname version;

23− hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI=";

20+ sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m";

2421 };

2522

26− nativeBuildInputs = [

27− setuptools-scm

28− ];

29−

30− propagatedBuildInputs = [

31− canonicaljson

32− unpaddedbase64

33− pynacl

34− ] ++ lib.optionals (pythonOlder "3.8") [

35− importlib-metadata

36− typing-extensions

37− ];

38−

39− checkInputs = [

40− pytestCheckHook

23+ patches = [

24+ # Do not require importlib_metadata on python 3.8

25+ (fetchpatch {

26+ url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch";

27+ sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1";

28+ })

4129 ];

4230

43− pythonImportsCheck = [

44− "signedjson"

45− ];

31+ nativeBuildInputs = [ setuptools-scm ];

32+ propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]

33+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

4634

4735 meta = with lib; {

36+ homepage = "https://pypi.org/project/signedjson/";

4837 description = "Sign JSON with Ed25519 signatures";

49− homepage = "https://github.com/matrix-org/python-signedjson";

5038 license = licenses.asl20;

51− maintainers = with maintainers; [ ];

5239 };

5340}

pkgs/development/python-modules/simplisafe-python/default.nix+2−6

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

33, aresponses

44, asynctest

55, backoff

6−, beautifulsoup4

76, buildPythonPackage

87, docutils

98, fetchFromGitHub

@@ -20,7 +19,7 @@

2019

2120buildPythonPackage rec {

2221 pname = "simplisafe-python";

23− version = "2022.05.0";

22+ version = "2022.03.3";

2423 format = "pyproject";

2524

2625 disabled = pythonOlder "3.8";

@@ -29,7 +28,7 @@ buildPythonPackage rec {

2928 owner = "bachya";

3029 repo = pname;

3130 rev = version;

32− sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";

31+ sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw=";

3332 };

3433

3534 nativeBuildInputs = [

@@ -39,7 +38,6 @@ buildPythonPackage rec {

3938 propagatedBuildInputs = [

4039 aiohttp

4140 backoff

42− beautifulsoup4

4341 docutils

4442 pytz

4543 voluptuous

@@ -64,8 +62,6 @@ buildPythonPackage rec {

6462 # simplipy/api.py:253: InvalidCredentialsError

6563 "test_request_error_failed_retry"

6664 "test_update_error"

67− # ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution]

68− "test_client_async_from_refresh_token_unknown_error"

6965 ];

7066

7167 disabledTestPaths = [

pkgs/development/python-modules/skia-pathops/default.nixdeleted−43

@@ -1,43 +0,0 @@

1−{ lib

2−, buildPythonPackage

3−, cython

4−, ninja

5−, setuptools-scm

6−, setuptools

7−, fetchPypi

8−, gn

9−, pytestCheckHook

10−}:

11−

12−buildPythonPackage rec {

13− pname = "skia-pathops";

14− version = "0.7.2";

15−

16− src = fetchPypi {

17− pname = "skia-pathops";

18− inherit version;

19− extension = "zip";

20− sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA=";

21− };

22−

23− postPatch = ''

24− substituteInPlace setup.py \

25− --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \

26− 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'

27− '';

28−

29− nativeBuildInputs = [ cython ninja setuptools-scm ];

30−

31− propagatedBuildInputs = [ setuptools ];

32−

33− checkInputs = [ pytestCheckHook ];

34−

35− pythonImportsCheck = [ "pathops" ];

36−

37− meta = {

38− description = "Python access to operations on paths using the Skia library";

39− homepage = "https://skia.org/dev/present/pathops";

40− license = lib.licenses.bsd3;

41− maintainers = [ lib.maintainers.BarinovMaxim ];

42− };

43−}

pkgs/development/python-modules/skytemple-files/default.nix+2−2

@@ -4,13 +4,13 @@

55buildPythonPackage rec {

66 pname = "skytemple-files";

7− version = "1.3.9";

7+ version = "1.3.3";

99 src = fetchFromGitHub {

1010 owner = "SkyTemple";

1111 repo = pname;

1212 rev = version;

13− sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";

13+ sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws";

1414 fetchSubmodules = true;

1515 };

1616

pkgs/development/python-modules/skytemple-rust/default.nix+6−15

@@ -1,34 +1,25 @@

1−{ lib

2−, stdenv

3−, buildPythonPackage

4−, fetchFromGitHub

5−, libiconv

6−, Foundation

7−, rustPlatform

8−, setuptools-rust }:

1+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:

103buildPythonPackage rec {

114 pname = "skytemple-rust";

12− version = "1.3.7";

5+ version = "unstable-2021-08-11";

136

147 src = fetchFromGitHub {

158 owner = "SkyTemple";

169 repo = pname;

17− rev = version;

18− sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";

10+ rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd";

11+ sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml";

1912 };

2013

2114 cargoDeps = rustPlatform.fetchCargoTarball {

2215 inherit src;

2316 name = "${pname}-${version}";

24− sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";

17+ sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873";

2518 };

2619

27− buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

20+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

2821 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

2922

30− GETTEXT_SYSTEM = true;

31−

3223 doCheck = false; # there are no tests

3324 pythonImportsCheck = [ "skytemple_rust" ];

3425

pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2

@@ -5,13 +5,13 @@

66buildPythonPackage rec {

77 pname = "skytemple-ssb-debugger";

8− version = "1.3.8.post2";

8+ version = "1.3.0";

1010 src = fetchFromGitHub {

1111 owner = "SkyTemple";

1212 repo = pname;

1313 rev = version;

14− sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";

14+ sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";

1515 };

1616

1717 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

pkgs/development/python-modules/slack-sdk/default.nix+3−3

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "slack-sdk";

23− version = "3.16.0";

23+ version = "3.15.2";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.6";

@@ -28,8 +28,8 @@ buildPythonPackage rec {

2828 src = fetchFromGitHub {

2929 owner = "slackapi";

3030 repo = "python-slack-sdk";

31− rev = "refs/tags/v${version}";

32− sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0=";

31+ rev = "v${version}";

32+ sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4=";

3333 };

3434

3535 propagatedBuildInputs = [

pkgs/development/python-modules/slixmpp/0001-xep_0030-allow-extra-args-in-get_info_from_domain.patchdeleted−36

@@ -1,36 +0,0 @@

1−From 7b5ac168892dedc5bd6be4244b18dc32d37d00fd Mon Sep 17 00:00:00 2001

2−From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>

3−Date: Fri, 22 Apr 2022 15:26:05 +0200

4−Subject: [PATCH] xep_0030: allow extra args in get_info_from_domain

5−

6−Aftermath of ea2d851a.

7−

8−http_upload from xep_0363 is now forwarding all its extra input args

9−to get_info_from_domain. Sadly for us, get_info_from_domain won't

10−accept any extra args passed that way and will yield a "got an

11−unexpected keyword argument".

12−

13−Modifying get_info_from_domain to accept these extra args.

14−

15−I hit this bug by passing a timeout_callback argument to http_upload.

16−Adding this scenario to the relevant integration test.

17−---

18− itests/test_httpupload.py | 1 +

19− slixmpp/plugins/xep_0030/disco.py | 2 +-

20− 2 files changed, 2 insertions(+), 1 deletion(-)

21−

22−diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py

23−index 37d453aa..9f9a45f2 100644

24−--- a/slixmpp/plugins/xep_0030/disco.py

25−+++ b/slixmpp/plugins/xep_0030/disco.py

26−@@ -307,7 +307,7 @@ class XEP_0030(BasePlugin):

27− return self.api['has_identity'](jid, node, ifrom, data)

28−

29− async def get_info_from_domain(self, domain=None, timeout=None,

30−- cached=True, callback=None):

31−+ cached=True, callback=None, **iqkwargs):

32− """Fetch disco#info of specified domain and one disco#items level below

33− """

34−

35−--

36−2.35.1

pkgs/development/python-modules/slixmpp/default.nix−2

@@ -39,8 +39,6 @@ buildPythonPackage rec {

3939 src = ./hardcode-gnupg-path.patch;

4040 inherit gnupg;

4141 })

42− # Upstream MR: https://lab.louiz.org/poezio/slixmpp/-/merge_requests/198

43− ./0001-xep_0030-allow-extra-args-in-get_info_from_domain.patch

4442 ];

4543

4644 disabledTestPaths = [

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

@@ -24,12 +24,12 @@

2424

2525buildPythonPackage rec {

2626 pname = "snowflake-connector-python";

27− version = "2.7.7";

27+ version = "2.7.6";

2828 disabled = pythonOlder "3.6";

2929

3030 src = fetchPypi {

3131 inherit pname version;

32− sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";

32+ sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";

3333 };

3434

3535 postPatch = ''

pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "sqlalchemy-mixins";

13− version = "1.5.3";

13+ version = "1.5.1";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

1818 src = fetchFromGitHub {

1919 owner = "absent1706";

2020 repo = pname;

21− rev = "refs/tags/v${version}";

22− sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M=";

21+ rev = "v${version}";

22+ sha256 = "sha256-HZiv7F0/UatgY3KlILgzywrK5NJE/tDe6B8/smeYwlM=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/python-modules/sqlmap/default.nix+2−2

@@ -7,11 +7,11 @@

88buildPythonPackage rec {

99 pname = "sqlmap";

10− version = "1.6.5";

10+ version = "1.6.4";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg=";

14+ sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";

1515 };

1616

1717 postPatch = ''

pkgs/development/python-modules/stripe/default.nix+2−2

@@ -7,14 +7,14 @@

88buildPythonPackage rec {

99 pname = "stripe";

10− version = "2.75.0";

10+ version = "2.74.0";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME=";

17+ hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA=";

1818 };

1919

2020 propagatedBuildInputs = [

pkgs/development/python-modules/superqt/default.nix+3−3

@@ -11,13 +11,13 @@

1111

1212buildPythonPackage rec {

1313 pname = "superqt";

14− version = "0.3.2";

14+ version = "0.3.1";

1515

1616 src = fetchFromGitHub {

1717 owner = "napari";

1818 repo = pname;

19− rev = "refs/tags/v${version}";

20− sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc=";

19+ rev = "v${version}";

20+ sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4=";

2121 };

2222 format = "pyproject";

2323 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/python-modules/teslajsonpy/default.nix+2−2

@@ -15,7 +15,7 @@

1515

1616buildPythonPackage rec {

1717 pname = "teslajsonpy";

18− version = "2.2.0";

18+ version = "2.1.0";

1919 format = "pyproject";

2020

2121 disabled = pythonOlder "3.7";

@@ -24,7 +24,7 @@ buildPythonPackage rec {

2424 owner = "zabuldon";

2525 repo = pname;

2626 rev = "refs/tags/v${version}";

27− sha256 = "sha256-/y+ZXNqNbSIjQeTDacu3/Fd+6FrDrW3Nigptj0f5KTg=";

27+ sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk=";

2828 };

2929

3030 nativeBuildInputs = [

pkgs/development/python-modules/textual/default.nix+13−16

@@ -1,34 +1,38 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, fetchpatch

45, poetry-core

56, rich

67, typing-extensions

78, pytestCheckHook

8−, pythonOlder

99}:

1010

1111buildPythonPackage rec {

1212 pname = "textual";

13− version = "0.1.18";

13+ version = "0.1.15";

1414 format = "pyproject";

1515

16− disabled = pythonOlder "3.7";

17−

1816 src = fetchFromGitHub {

1917 owner = "Textualize";

2018 repo = pname;

2119 rev = "v${version}";

22− sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";

20+ sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";

2321 };

2422

25− nativeBuildInputs = [

26− poetry-core

23+ patches = [

24+ (fetchpatch {

25+ # v0.1.15 git tag has 0.1.14 in pyproject.toml

26+ name = "version.patch";

27+ url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch";

28+ sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp";

29+ })

2730 ];

2831

32+ nativeBuildInputs = [ poetry-core ];

33+

2934 propagatedBuildInputs = [

3035 rich

31− ] ++ lib.optionals (pythonOlder "3.9") [

3236 typing-extensions

3337 ];

3438

@@ -36,14 +40,7 @@ buildPythonPackage rec {

3640 pytestCheckHook

3741 ];

3842

39− postPatch = ''

40− substituteInPlace pyproject.toml \

41− --replace 'rich = "^12.3.0"' 'rich = "*"'

42− '';

43−

44− pythonImportsCheck = [

45− "textual"

46− ];

43+ pythonImportsCheck = [ "textual" ];

4744

4845 meta = with lib; {

4946 description = "TUI framework for Python inspired by modern web development";

pkgs/development/python-modules/total-connect-client/default.nix+2−2

@@ -8,7 +8,7 @@

99buildPythonPackage rec {

1010 pname = "total-connect-client";

11− version = "2022.3";

11+ version = "2022.2.1";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "craigjmidwinter";

1818 repo = "total-connect-client";

1919 rev = version;

20− hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";

20+ hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/types-paramiko/default.nix+2−2

@@ -6,11 +6,11 @@

77buildPythonPackage rec {

88 pname = "types-paramiko";

9− version = "2.10.0";

9+ version = "2.8.21";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− sha256 = "sha256-q2iT1fzl7QaWTWGTntanFoqxSVKUWpCZWmKKXoKl4WE=";

13+ sha256 = "sha256-ZAyFCsqK3EGw1aIl7jaseBJonhpDcMMS+OS5Ks7I5AU=";

1414 };

1515

1616 pythonImportsCheck = [

pkgs/development/python-modules/ufo2ft/default.nix+2−2

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "ufo2ft";

15− version = "2.27.0";

15+ version = "2.26.0";

1616

1717 format = "setuptools";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE=";

21+ sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg=";

2222 };

2323

2424 patches = [

pkgs/development/python-modules/ufoLib2/default.nix−3

@@ -5,7 +5,6 @@

55, fonttools

66, pytestCheckHook

77, fs

8−, setuptools-scm

98}:

109

1110buildPythonPackage rec {

@@ -26,8 +25,6 @@ buildPythonPackage rec {

2625 fs

2726 ];

2827

29− nativeBuildInputs = [ setuptools-scm ];

30−

3128 checkInputs = [

3229 pytestCheckHook

3330 ];

pkgs/development/python-modules/voluptuous/default.nix+11−15

@@ -1,31 +1,27 @@

11{ lib

22, buildPythonPackage

3−, fetchFromGitHub

4−, pytestCheckHook

3+, fetchPypi

4+, nose

55}:

77buildPythonPackage rec {

88 pname = "voluptuous";

9− version = "0.13.1";

9+ version = "0.13.0";

1010

11− src = fetchFromGitHub {

12− owner = "alecthomas";

13− repo = pname;

14− rev = version;

15− hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";

11+ src = fetchPypi {

12+ inherit pname version;

13+ sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";

1614 };

1715

1816 checkInputs = [

19− pytestCheckHook

17+ nose

2018 ];

2119

22− pythonImportsCheck = [

23− "voluptuous"

24− ];

20+ checkPhase = ''

21+ nosetests

22+ '';

2523

26− pytestFlagsArray = [

27− "voluptuous/tests/"

28− ];

24+ pythonImportsCheck = [ "voluptuous" ];

2925

3026 meta = with lib; {

3127 description = "Python data validation library";

pkgs/development/python-modules/wandb/default.nix+12−20

@@ -12,7 +12,6 @@

1212, jsonref

1313, jsonschema

1414, matplotlib

15−, nbconvert

1615, nbformat

1716, pandas

1817, pathtools

@@ -37,7 +36,7 @@

3736

3837buildPythonPackage rec {

3938 pname = "wandb";

40− version = "0.12.16";

39+ version = "0.12.15";

4140 format = "setuptools";

4241

4342 disabled = pythonOlder "3.6";

@@ -46,7 +45,7 @@ buildPythonPackage rec {

4645 owner = pname;

4746 repo = "client";

4847 rev = "v${version}";

49− hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";

48+ hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo=";

5049 };

5150

5251 # setuptools is necessary since pkg_resources is required at runtime.

@@ -67,20 +66,6 @@ buildPythonPackage rec {

6766 shortuuid

6867 ];

6968

70− # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

71− # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

72− # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

73− # why we don't put it in propagatedBuildInputs. Note that this is difficult to

74− # test offline due to https://github.com/wandb/client/issues/3519.

75− postInstall = ''

76− mkdir -p $out/bin

77− ln -s ${git}/bin/git $out/bin/git

78− '';

79−

80− preCheck = ''

81− export HOME=$(mktemp -d)

82− '';

83−

8469 checkInputs = [

8570 azure-core

8671 bokeh

@@ -88,9 +73,6 @@ buildPythonPackage rec {

8873 jsonref

8974 jsonschema

9075 matplotlib

91− # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's

92− # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488.

93− nbconvert

9476 nbformat

9577 pandas

9678 pydantic

@@ -101,6 +83,16 @@ buildPythonPackage rec {

10183 tqdm

10284 ];

10385

86+ # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

87+ # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

88+ # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

89+ # why we don't put it in propagatedBuildInputs. Note that this is difficult to

90+ # test offline due to https://github.com/wandb/client/issues/3519.

91+ postInstall = ''

92+ mkdir -p $out/bin

93+ ln -s ${git}/bin/git $out/bin/git

94+ '';

95+

10496 disabledTestPaths = [

10597 # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.

10698 "tests/test_cli.py"

pkgs/development/python-modules/webssh/default.nix+2−2

@@ -8,12 +8,12 @@

99buildPythonPackage rec {

1010 pname = "webssh";

11− version = "1.6.0";

11+ version = "1.5.3";

1212 format = "setuptools";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94=";

16+ hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4=";

1717 };

1818

1919 propagatedBuildInputs = [

pkgs/development/python-modules/xknx/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313buildPythonPackage rec {

1414 pname = "xknx";

15− version = "0.21.2";

15+ version = "0.21.1";

1616 format = "setuptools";

1717

1818 disabled = pythonOlder "3.8";

@@ -21,7 +21,7 @@ buildPythonPackage rec {

2121 owner = "XKNX";

2222 repo = pname;

2323 rev = "refs/tags/${version}";

24− sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w=";

24+ sha256 = "sha256-QNy/jUh/kIj6sabWnmC5L00ikBTrVmOEp6mFBya29WM=";

2525 };

2626

2727 propagatedBuildInputs = [

pkgs/development/python-modules/youtube-search-python/default.nix+2−2

@@ -7,14 +7,14 @@

88buildPythonPackage rec {

99 pname = "youtube-search-python";

10− version = "1.6.5";

10+ version = "1.6.4";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.6";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8=";

17+ hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0=";

1818 };

1919

2020 propagatedBuildInputs = [

pkgs/development/python-modules/zeroconf/default.nix+2−4

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "zeroconf";

13− version = "0.38.5";

13+ version = "0.38.4";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.7";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "jstasiak";

2020 repo = "python-zeroconf";

2121 rev = version;

22− hash = "sha256-QmmVxrvBPEwsmD/XJZClNQj4PUX+7X+75ZWSOO4/C24=";

22+ sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw=";

2323 };

2424

2525 propagatedBuildInputs = [

@@ -39,8 +39,6 @@ buildPythonPackage rec {

3939 "test_launch_and_close_v4_v6"

4040 "test_launch_and_close_v6_only"

4141 "test_integration_with_listener_ipv6"

42− # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')]

43− "test_service_browser_expire_callbacks"

4442 ] ++ lib.optionals stdenv.isDarwin [

4543 "test_lots_of_names"

4644 ];

pkgs/development/python-modules/zigpy/default.nix+2−4

@@ -4,7 +4,6 @@

44, asynctest

55, buildPythonPackage

66, crccheck

7−, cryptography

87, fetchFromGitHub

98, pycryptodome

109, pytest-aiohttp

@@ -16,7 +15,7 @@

1615

1716buildPythonPackage rec {

1817 pname = "zigpy";

19− version = "0.45.1";

18+ version = "0.44.2";

2019 format = "setuptools";

2120

2221 disabled = pythonOlder "3.7";

@@ -25,14 +24,13 @@ buildPythonPackage rec {

2524 owner = "zigpy";

2625 repo = "zigpy";

2726 rev = version;

28− sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";

27+ sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";

2928 };

3029

3130 propagatedBuildInputs = [

3231 aiohttp

3332 aiosqlite

3433 crccheck

35− cryptography

3634 pycryptodome

3735 voluptuous

3836 ];

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "zwave-js-server-python";

13− version = "0.36.1";

13+ version = "0.35.3";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "home-assistant-libs";

2020 repo = pname;

2121 rev = version;

22− sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";

22+ sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/quickemu/default.nix+2−2

@@ -11,7 +11,7 @@

1111, cdrtools

1212, usbutils

1313, util-linux

14−, spice-gtk

14+, spicy

1515, swtpm

1616, wget

1717, xdg-user-dirs

@@ -32,7 +32,7 @@ let

3232 cdrtools

3333 usbutils

3434 util-linux

35− spice-gtk

35+ spicy

3636 swtpm

3737 wget

3838 xdg-user-dirs

pkgs/development/tools/analysis/checkov/default.nix+2−3

@@ -32,13 +32,13 @@ with py.pkgs;

3232

3333buildPythonApplication rec {

3434 pname = "checkov";

35− version = "2.0.1110";

35+ version = "2.0.1102";

3636

3737 src = fetchFromGitHub {

3838 owner = "bridgecrewio";

3939 repo = pname;

4040 rev = version;

41− hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI=";

41+ hash = "sha256-OPYlgj8jdgCQJddy9UUXMjHJtQcoMrZbghgPUdyUV5Y=";

4242 };

4343

4444 nativeBuildInputs = with py.pkgs; [

@@ -89,7 +89,6 @@ buildPythonApplication rec {

8989 pytest-mock

9090 pytest-xdist

9191 pytestCheckHook

92− responses

9392 ];

9493

9594 postPatch = ''

pkgs/development/tools/analysis/codeql/default.nix+2−2

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

33stdenv.mkDerivation rec {

44 pname = "codeql";

5− version = "2.8.5";

5+ version = "2.8.2";

77 dontConfigure = true;

88 dontBuild = true;

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

1010

1111 src = fetchzip {

1212 url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";

13− sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw=";

13+ sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs=";

1414 };

1515

1616 nativeBuildInputs = [

pkgs/development/tools/analysis/cvehound/default.nix+12−17

@@ -1,34 +1,30 @@

1−{ lib

2−, fetchFromGitHub

3−, coccinelle

4−, gnugrep

5−, python3

6−}:

7−

8−python3.pkgs.buildPythonApplication rec {

1+{ lib, fetchFromGitHub, coccinelle, gnugrep, python3Packages }:

3+with python3Packages;

5+buildPythonApplication rec {

96 pname = "cvehound";

10− version = "1.0.9";

7+ version = "1.0.4";

118

129 src = fetchFromGitHub {

1310 owner = "evdenis";

1411 repo = "cvehound";

1512 rev = version;

16− hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM=";

13+ sha256 = "sha256-m8vpea02flQ8elSvGWv9FqBhsEcBzRYjcUk+dc4kb2M=";

1714 };

1815

1916 makeWrapperArgs = [

2017 "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}"

2118 ];

2219

23− propagatedBuildInputs = with python3.pkgs; [

24− lxml

20+ propagatedBuildInputs = [

21+ psutil

2522 setuptools

2623 sympy

2724 ];

2825

29− checkInputs = with python3.pkgs; [

26+ checkInputs = [

3027 GitPython

31− psutil

3228 pytestCheckHook

3329 ];

3430

@@ -36,11 +32,10 @@ python3.pkgs.buildPythonApplication rec {

3632 doCheck = false;

3733

3834 meta = with lib; {

39− description = "Tool to check linux kernel source dump for known CVEs";

35+ description = "tool to check linux kernel source dump for known CVEs";

4036 homepage = "https://github.com/evdenis/cvehound";

41− changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog";

4237 # See https://github.com/evdenis/cvehound/issues/22

43− license = with licenses; [ gpl2Only gpl3Plus ];

38+ license = with licenses; [ gpl2Only gpl3Only ];

4439 maintainers = with maintainers; [ ambroisie ];

4540 };

4641}

pkgs/development/tools/build-managers/bloop/default.nix+46−16

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

11{ stdenv

22, fetchurl

3+, coursier

34, autoPatchelfHook

45, installShellFiles

56, makeWrapper

@@ -10,34 +11,58 @@

1011

1112stdenv.mkDerivation rec {

1213 pname = "bloop";

13− version = "1.5.0";

14+ version = "1.4.13";

1415

15− platform =

16− if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

17− else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"

18− else throw "unsupported platform";

16+ bloop-coursier-channel = fetchurl {

17+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";

18+ sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo=";

19+ };

1920

2021 bloop-bash = fetchurl {

2122 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";

22− sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";

23+ sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";

2324 };

2425

2526 bloop-fish = fetchurl {

2627 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";

27− sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

28+ sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

2829 };

2930

3031 bloop-zsh = fetchurl {

3132 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";

32− sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

33+ sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

3334 };

3435

35− bloop-binary = fetchurl rec {

36− url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";

37− sha256 =

38− if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE="

39− else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0="

40− else throw "unsupported platform";

36+ bloop-coursier = stdenv.mkDerivation rec {

37+ name = "${pname}-coursier-${version}";

38+

39+ platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

40+ else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"

41+ else throw "unsupported platform";

42+

43+ dontUnpack = true;

44+ installPhase = ''

45+ runHook preInstall

46+

47+ export COURSIER_CACHE=$(pwd)

48+ export COURSIER_JVM_CACHE=$(pwd)

49+

50+ mkdir channel

51+ ln -s ${bloop-coursier-channel} channel/bloop.json

52+ ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop

53+

54+ # Only keeping the binary, we'll wrap it ourselves

55+ # This guarantees the output of this fixed-output derivation doesn't have references to itself

56+ install -D -m 0755 .bloop.aux $out

57+

58+ runHook postInstall

59+ '';

60+

61+ outputHashMode = "recursive";

62+ outputHashAlgo = "sha256";

63+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4="

64+ else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g="

65+ else throw "unsupported platform";

4166 };

4267

4368 dontUnpack = true;

@@ -49,9 +74,14 @@ stdenv.mkDerivation rec {

4974 installPhase = ''

5075 runHook preInstall

5176

52− install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped

77+ export COURSIER_CACHE=$(pwd)

78+ export COURSIER_JVM_CACHE=$(pwd)

79+

80+ install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped

5381

54− makeWrapper $out/.bloop-wrapped $out/bin/bloop

82+ makeWrapper $out/.bloop-wrapped $out/bin/bloop \

83+ --set CS_NATIVE_LAUNCHER true \

84+ --set IS_CS_INSTALLED_LAUNCHER true

5585

5686 #Install completions

5787 installShellCompletion --name bloop --bash ${bloop-bash}

pkgs/development/tools/build-managers/scala-cli/default.nix+3−3

@@ -1,15 +1,15 @@

11{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:

33let

4− version = "0.1.5";

4+ version = "0.1.4";

55 assets = {

66 x86_64-darwin = {

77 asset = "scala-cli-x86_64-apple-darwin.gz";

8− sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl";

8+ sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy";

99 };

1010 x86_64-linux = {

1111 asset = "scala-cli-x86_64-pc-linux.gz";

12− sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v";

12+ sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9";

1313 };

1414 };

1515in

pkgs/development/tools/database/liquibase/default.nix+1−1

@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {

6666 ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}

6767

6868 ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \

69− liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"}

69+ liquibase.integration.commandline.Main \''${1+"\$@"}

7070 EOF

7171 chmod +x $out/bin/liquibase

7272 '';

pkgs/development/tools/dive/default.nix+2

@@ -13,6 +13,8 @@ buildGoModule rec {

1313

1414 vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";

1515

16+ doCheck = false;

17+

1618 nativeBuildInputs = [ pkg-config ];

1719

1820 buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];

pkgs/development/tools/gosec/default.nix+2

@@ -20,6 +20,8 @@ buildGoModule rec {

2020 "cmd/gosec"

2121 ];

2222

23+ doCheck = false;

24+

2325 ldflags = [

2426 "-s"

2527 "-w"

pkgs/development/tools/just/default.nix+3−3

@@ -10,16 +10,16 @@

1010

1111rustPlatform.buildRustPackage rec {

1212 pname = "just";

13− version = "1.1.3";

13+ version = "1.1.2";

1414

1515 src = fetchFromGitHub {

1616 owner = "casey";

1717 repo = pname;

1818 rev = version;

19− sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";

19+ sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";

2020 };

2121

22− cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";

22+ cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";

2323

2424 nativeBuildInputs = [ installShellFiles ];

2525 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

pkgs/development/tools/kdash/default.nixdeleted−34

@@ -1,34 +0,0 @@

1−{ lib, stdenv

2−, fetchFromGitHub

3−, rustPlatform

4−, pkg-config

5−, perl

6−, python3

7−, openssl

8−, xorg

9−}:

10−

11−rustPlatform.buildRustPackage rec {

12− pname = "kdash";

13− version = "0.3.1";

14−

15− src = fetchFromGitHub {

16− owner = "kdash-rs";

17− repo = pname;

18− rev = "v${version}";

19− sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq";

20− };

21−

22− nativeBuildInputs = [ perl python3 pkg-config ];

23−

24− buildInputs = [ openssl xorg.xcbutil ];

25−

26− cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204";

27−

28− meta = with lib; {

29− description = "A simple and fast dashboard for Kubernetes";

30− homepage = "https://github.com/kdash-rs/kdash";

31− license = with licenses; [ mit ];

32− maintainers = with maintainers; [ matthiasbeyer ];

33− };

34−}

pkgs/development/tools/metals/default.nix+11−6

@@ -1,14 +1,14 @@

1−{ stdenv, lib, coursier, jre, makeWrapper, setJavaClassPath }:

1+{ stdenv, lib, coursier, jdk, jre, makeWrapper }:

33stdenv.mkDerivation rec {

44 pname = "metals";

5− version = "0.11.4";

5+ version = "0.11.2";

77 deps = stdenv.mkDerivation {

88 name = "${pname}-deps-${version}";

99 buildCommand = ''

1010 export COURSIER_CACHE=$(pwd)

11− ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \

11+ ${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \

1212 -r bintray:scalacenter/releases \

1313 -r sonatype:snapshots > deps

1414 mkdir -p $out/share/java

@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {

1616 '';

1717 outputHashMode = "recursive";

1818 outputHashAlgo = "sha256";

19− outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y=";

19+ outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U=";

2020 };

2121

22− nativeBuildInputs = [ makeWrapper setJavaClassPath ];

23− buildInputs = [ deps ];

22+ nativeBuildInputs = [ makeWrapper ];

23+ buildInputs = [ jdk deps ];

2424

2525 dontUnpack = true;

2626

@@ -32,19 +32,24 @@ stdenv.mkDerivation rec {

3232 # This variant is not targeted at any particular client, clients are

3333 # expected to declare their supported features in initialization options.

3434 makeWrapper ${jre}/bin/java $out/bin/metals \

35+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

3536 --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"

3637

3738 # Further variants targeted at clients with featuresets pre-set.

3839 makeWrapper ${jre}/bin/java $out/bin/metals-emacs \

40+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

3941 --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main"

4042

4143 makeWrapper ${jre}/bin/java $out/bin/metals-vim \

44+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

4245 --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main"

4346

4447 makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \

48+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

4549 --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main"

4650

4751 makeWrapper ${jre}/bin/java $out/bin/metals-sublime \

52+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

4853 --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"

4954 '';

5055

pkgs/development/tools/misc/clojure-lsp/default.nix+3−3

@@ -2,18 +2,18 @@

33buildGraalvmNativeImage rec {

44 pname = "clojure-lsp";

5− version = "2022.05.03-12.35.40";

5+ version = "2022.04.18-00.59.32";

77 src = fetchFromGitHub {

88 owner = pname;

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc=";

11+ sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE=";

1212 };

1313

1414 jar = fetchurl {

1515 url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";

16− sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf";

16+ sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e";

1717 };

1818

1919 extraNativeImageBuildArgs = [

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+2−10

@@ -5,7 +5,7 @@

55}:

66let

77 # Poetry2nix version

8− version = "1.28.0";

8+ version = "1.27.1";

1010 inherit (poetryLib) isCompatible readTOML moduleName;

1111

@@ -287,20 +287,12 @@ lib.makeScope pkgs.newScope (self: {

287287 (name: value: projectDir + "/${value.path}")

288288 (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);

289289

290− excludedEditablePackageNames = builtins.filter

291− (pkg: editablePackageSources."${pkg}" == null)

292− (builtins.attrNames editablePackageSources);

293−

294− allEditablePackageSources = (

290+ editablePackageSources' = (

295291 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

296292 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

297293 // editablePackageSources

298294 );

299295

300− editablePackageSources' = builtins.removeAttrs

301− allEditablePackageSources

302− excludedEditablePackageNames;

303−

304296 poetryPython = self.mkPoetryPackages {

305297 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

306298 editablePackageSources = editablePackageSources';

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

@@ -180,7 +180,7 @@ let

180180 hasGitIgnore = builtins.pathExists gitIgnore;

181181 gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];

182182 in

183− lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

183+ lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

184184

185185 /*

186186 Provides a source filtering mechanism that:

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+5−153

@@ -29,9 +29,6 @@

2929 "aioflo": [

3030 "poetry-core"

3131 ],

32− "aiogithubapi": [

33− "poetry-core"

34− ],

3532 "aioguardian": [

3633 "poetry-core"

3734 ],

@@ -92,21 +89,9 @@

9289 "amqtt": [

9390 "poetry-core"

9491 ],

95− "ansible-doctor": [

96− "poetry-core"

97− ],

98− "ansible-later": [

99− "poetry-core"

100− ],

101− "ansible-runner": [

102− "pbr"

103− ],

10492 "apache-beam": [

10593 "cython"

10694 ],

107− "aplpy": [

108− "cython"

109− ],

11095 "argon2_cffi": [

11196 "flitBuildHook"

11297 ],

@@ -129,24 +114,15 @@

129114 "atomman": [

130115 "cython"

131116 ],

132− "atpublic": [

133− "pdm-pep517"

134− ],

135117 "autarco": [

136118 "poetry-core"

137119 ],

138120 "authcaptureproxy": [

139121 "poetry-core"

140122 ],

141− "av": [

142− "cython"

143− ],

144123 "awesomeversion": [

145124 "poetry-core"

146125 ],

147− "aws-adfs": [

148− "poetry-core"

149− ],

150126 "aws-error-utils": [

151127 "poetry"

152128 ],

@@ -171,9 +147,6 @@

171147 "boltztrap2": [

172148 "cython"

173149 ],

174− "bsblan": [

175− "poetry-core"

176− ],

177150 "build": [

178151 "flit-core"

179152 ],

@@ -210,9 +183,6 @@

210183 "clikit": [

211184 "poetry-core"

212185 ],

213− "cloudflare-dyndns": [

214− "poetry"

215− ],

216186 "collections-extended": [

217187 "poetry-core"

218188 ],

@@ -240,8 +210,7 @@

240210 "poetry-core"

241211 ],

242212 "cssselect2": [

243− "flit",

244− "flit-core"

213+ "flit"

245214 ],

246215 "cwcwidth": [

247216 "cython"

@@ -255,15 +224,9 @@

255224 "cypari2": [

256225 "cython"

257226 ],

258− "cypherpunkpay": [

259− "poetry-core"

260− ],

261227 "cysignals": [

262228 "cython"

263229 ],

264− "datadog": [

265− "hatchling"

266− ],

267230 "datrie": [

268231 "cython"

269232 ],

@@ -297,9 +260,6 @@

297260 "doc8": [

298261 "pbr"

299262 ],

300− "docstring-parser": [

301− "poetry-core"

302− ],

303263 "dtlssocket": [

304264 "cython"

305265 ],

@@ -341,8 +301,7 @@

341301 "poetry-core"

342302 ],

343303 "entrypoints": [

344− "flit",

345− "flit-core"

304+ "flit"

346305 ],

347306 "enturclient": [

348307 "poetry-core"

@@ -350,13 +309,6 @@

350309 "enumatch": [

351310 "poetry"

352311 ],

353− "exceptiongroup": [

354− "flit-core",

355− "flitBuildHook"

356− ],

357− "falcon": [

358− "cython"

359− ],

360312 "fastapi": [

361313 "flitBuildHook"

362314 ],

@@ -426,9 +378,6 @@

426378 "generic": [

427379 "poetry-core"

428380 ],

429− "gensim": [

430− "cython"

431− ],

432381 "glances-api": [

433382 "poetry-core"

434383 ],

@@ -543,15 +492,9 @@

543492 "ipwhl": [

544493 "flitBuildHook"

545494 ],

546− "iso8601": [

547− "poetry-core"

548− ],

549495 "isort": [

550496 "poetry-core"

551497 ],

552− "jarowinkler": [

553− "cython"

554− ],

555498 "jedi-language-server": [

556499 "poetry"

557500 ],

@@ -576,12 +519,6 @@

576519 "jupyterlab": [

577520 "jupyter-packaging"

578521 ],

579− "jupyterlab-code-formatter": [

580− "jupyter-packaging"

581− ],

582− "jupyterlab-pygments": [

583− "jupyter-packaging"

584− ],

585522 "keystoneauth1": [

586523 "pbr"

587524 ],

@@ -600,9 +537,6 @@

600537 "ldappool": [

601538 "pbr"

602539 ],

603− "levenshtein": [

604− "cython"

605− ],

606540 "libgpuarray": [

607541 "cython"

608542 ],

@@ -630,9 +564,6 @@

630564 "lockfile": [

631565 "pbr"

632566 ],

633− "lsassy": [

634− "poetry-core"

635− ],

636567 "luftdaten": [

637568 "poetry-core"

638569 ],

@@ -654,9 +585,6 @@

654585 "marisa-trie": [

655586 "cython"

656587 ],

657− "markdown-it-py": [

658− "flit-core"

659− ],

660588 "mask-rcnn": [

661589 "cython"

662590 ],

@@ -679,9 +607,6 @@

679607 "memory-allocator": [

680608 "cython"

681609 ],

682− "meteofrance-api": [

683− "poetry"

684− ],

685610 "metprint": [

686611 "poetry-core"

687612 ],

@@ -693,7 +618,6 @@

693618 "poetry"

694619 ],

695620 "mkdocs-jupyter": [

696− "ipython_genutils",

697621 "poetry-core"

698622 ],

699623 "mkdocs-literate-nav": [

@@ -750,9 +674,6 @@

750674 "netdata": [

751675 "poetry-core"

752676 ],

753− "netutils": [

754− "poetry-core"

755− ],

756677 "newversion": [

757678 "poetry-core"

758679 ],

@@ -768,9 +689,6 @@

768689 "nkdfu": [

769690 "flitBuildHook"

770691 ],

771− "notebook-shim": [

772− "jupyter-packaging"

773− ],

774692 "notus-scanner": [

775693 "poetry-core"

776694 ],

@@ -810,9 +728,6 @@

810728 "openvino": [

811729 "cython"

812730 ],

813− "ordered-set": [

814− "flit-core"

815− ],

816731 "ormar": [

817732 "poetry-core"

818733 ],

@@ -892,9 +807,6 @@

892807 "poetry": [

893808 "poetry-core"

894809 ],

895− "poetry-dynamic-versioning": [

896− "poetry-core"

897− ],

898810 "poetry2conda": [

899811 "poetry"

900812 ],

@@ -1018,9 +930,6 @@

1018930 "pymaven-patch": [

1019931 "pbr"

1020932 ],

1021− "pymdown-extensions": [

1022− "hatchling"

1023− ],

1024933 "pymfy": [

1025934 "poetry-core"

1026935 ],

@@ -1045,9 +954,6 @@

1045954 "pyoverkiz": [

1046955 "poetry-core"

1047956 ],

1048− "pyparsing": [

1049− "flit-core"

1050− ],

1051957 "pypass": [

1052958 "pbr"

1053959 ],

@@ -1072,21 +978,12 @@

1072978 "pyproject-flake8": [

1073979 "flit-core"

1074980 ],

1075− "pypsrp": [

1076− "poetry-core"

1077− ],

1078981 "pyquil": [

1079982 "poetry-core"

1080983 ],

1081− "pyrad": [

1082− "poetry-core"

1083− ],

1084984 "pyregion": [

1085985 "cython"

1086986 ],

1087− "pyrevolve": [

1088− "cython"

1089− ],

1090987 "pyrmvtransport": [

1091988 "flit"

1092989 ],

@@ -1102,9 +999,6 @@

1102999 "pysigma": [

11031000 "poetry-core"

11041001 ],

1105− "pysigma-backend-insightidr": [

1106− "poetry-core"

1107− ],

11081002 "pysigma-backend-splunk": [

11091003 "poetry-core"

11101004 ],

@@ -1114,30 +1008,14 @@

11141008 "pysigma-pipeline-sysmon": [

11151009 "poetry-core"

11161010 ],

1117− "pysigma-pipeline-windows": [

1118− "poetry-core"

1119− ],

1120− "pyslurm": [

1121− "cython"

1122− ],

11231011 "pysmf": [

11241012 "cython"

11251013 ],

11261014 "pysml": [

11271015 "poetry-core"

11281016 ],

1129− "pysnmp-pyasn1": [

1130− "poetry-core"

1131− ],

1132− "pysnmp-pysmi": [

1133− "poetry-core"

1134− ],

1135− "pysnmplib": [

1136− "poetry-core"

1137− ],

11381017 "pysnow": [

1139− "poetry",

1140− "poetry-core"

1018+ "poetry"

11411019 ],

11421020 "pysptk": [

11431021 "cython"

@@ -1157,9 +1035,6 @@

11571035 "pytest-httpserver": [

11581036 "poetry-core"

11591037 ],

1160− "pytest-isort": [

1161− "poetry-core"

1162− ],

11631038 "pytest-mockservers": [

11641039 "poetry-core"

11651040 ],

@@ -1222,9 +1097,6 @@

12221097 "python-openstackclient": [

12231098 "pbr"

12241099 ],

1225− "python-pae": [

1226− "poetry-core"

1227− ],

12281100 "python-pkcs11": [

12291101 "cython"

12301102 ],

@@ -1343,8 +1215,7 @@

13431215 "poetry-core"

13441216 ],

13451217 "rokuecp": [

1346− "poetry",

1347− "poetry-core"

1218+ "poetry"

13481219 ],

13491220 "roombapy": [

13501221 "poetry-core"

@@ -1409,9 +1280,6 @@

14091280 "sentinel": [

14101281 "poetry-core"

14111282 ],

1412− "seventeentrack": [

1413− "poetry-core"

1414− ],

14151283 "sfepy": [

14161284 "cython"

14171285 ],

@@ -1433,15 +1301,9 @@

14331301 "slowapi": [

14341302 "poetry-core"

14351303 ],

1436− "socksio": [

1437− "flit-core"

1438− ],

14391304 "solo-python": [

14401305 "flitBuildHook"

14411306 ],

1442− "soupsieve": [

1443− "hatchling"

1444− ],

14451307 "spacy-pkuseg": [

14461308 "cython"

14471309 ],

@@ -1563,8 +1425,7 @@

15631425 "cython"

15641426 ],

15651427 "testpath": [

1566− "flit",

1567− "flit-core"

1428+ "flit"

15681429 ],

15691430 "testrepository": [

15701431 "pbr"

@@ -1644,9 +1505,6 @@

16441505 "typing-extensions": [

16451506 "flit-core"

16461507 ],

1647− "uharfbuzz": [

1648− "cython"

1649− ],

16501508 "unpaddedbase64": [

16511509 "poetry-core"

16521510 ],

@@ -1692,14 +1550,8 @@

16921550 "yoda": [

16931551 "cython"

16941552 ],

1695− "yte": [

1696− "poetry-core"

1697− ],

16981553 "zeversolarlocal": [

16991554 "flit-core",

17001555 "flitBuildHook"

1701− ],

1702− "zwave-me-ws": [

1703− "poetry-core"

17041556 ]

17051557}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+4−98

@@ -8,14 +8,13 @@ let

88 { self

99 , drv

1010 , attr

11− , extraAttrs ? [ ]

1211 }:

1312 let

1413 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

1514 in

1615 (

1716 # Flit only works on Python3

18− if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv

17+ if (attr == "flit-core" || attr == "flit") && !self.isPy3k then drv

1918 else

2019 drv.overridePythonAttrs (

2120 old:

@@ -24,7 +23,7 @@ let

2423 { }

2524 else

2625 {

27− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs;

26+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ];

2827 }

2928 )

3029 );

@@ -56,16 +55,6 @@ lib.composeManyExtensions [

5655 systems)

5756 buildSystems)

5857

59− # Build systems with conditionals

60− (self: super: {

61−

62− platformdirs =

63− if lib.versionAtLeast super.platformdirs.version "2.5.2"

64− then addBuildSystem { inherit self; drv = super.platformdirs; attr = "hatchling"; extraAttrs = [ "hatch-vcs" ]; }

65− else super.platformdirs;

66−

67− })

68−

6958 # Build fixes

7059 (self: super:

7160 let

@@ -448,17 +437,6 @@ lib.composeManyExtensions [

448437 }

449438 );

450439

451− # Setuptools >= 60 broke build_py_2to3

452− docutils =

453− if lib.versionOlder super.docutils.version "0.16" && lib.versionAtLeast super.setuptools.version "60" then

454− (

455− super.docutils.overridePythonAttrs (

456− old: {

457− SETUPTOOLS_USE_DISTUTILS = "stdlib";

458− }

459− )

460− ) else super.docutils;

461−

462440 # Environment markers are not always included (depending on how a dep was defined)

463441 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

464442

@@ -866,17 +844,6 @@ lib.composeManyExtensions [

866844 }

867845 );

868846

869− lsassy =

870− if super.lsassy.version == "3.1.1" then

871− super.lsassy.overridePythonAttrs

872− (old: {

873− # pyproject.toml contains a constraint `rich = "^10.6.0"` which is not replicated in setup.py

874− # hence pypi misses it and poetry pins rich to 11.0.0

875− preConfigure = (old.preConfigure or "") + ''

876− rm pyproject.toml

877− '';

878− }) else super.lsassy;

879−

880847 lxml = super.lxml.overridePythonAttrs (

881848 old: {

882849 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

@@ -1176,26 +1143,6 @@ lib.composeManyExtensions [

11761143 }

11771144 );

11781145

1179− orjson =

1180− let

1181− getCargoHash = version: {

1182− "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4=";

1183− "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4=";

1184− }.${version} or null;

1185− in

1186− super.orjson.overridePythonAttrs (old: {

1187− cargoDeps = pkgs.rustPlatform.fetchCargoTarball {

1188− inherit (old) src;

1189− name = "${old.pname}-${old.version}";

1190− hash = getCargoHash old.version;

1191− };

1192− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [

1193− pkgs.rustPlatform.cargoSetupHook

1194− pkgs.rustPlatform.maturinBuildHook

1195− ];

1196− buildInputs = (old.buildInputs or [ ]) ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv;

1197− });

1198−

11991146 osqp = super.osqp.overridePythonAttrs (

12001147 old: {

12011148 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

@@ -1203,29 +1150,6 @@ lib.composeManyExtensions [

12031150 }

12041151 );

12051152

1206−

1207− pandas = super.pandas.overridePythonAttrs (old: {

1208−

1209− buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx;

1210−

1211− # Doesn't work with -Werror,-Wunused-command-line-argument

1212− # https://github.com/NixOS/nixpkgs/issues/39687

1213− hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

1214−

1215− # For OSX, we need to add a dependency on libcxx, which provides

1216− # `complex.h` and other libraries that pandas depends on to build.

1217− postPatch = lib.optionalString stdenv.isDarwin ''

1218− cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1";

1219− echo "Adding $cpp_sdk to the setup.py common_include variable"

1220− substituteInPlace setup.py \

1221− --replace "['pandas/src/klib', 'pandas/src']" \

1222− "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"

1223− '';

1224−

1225−

1226− enableParallelBuilding = true;

1227− });

1228−

12291153 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

12301154 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

12311155 postInstall = old.postInstall or "" + ''

@@ -1272,12 +1196,8 @@ lib.composeManyExtensions [

12721196

12731197 pillow = super.pillow.overridePythonAttrs (

12741198 old: {

1275− nativeBuildInputs = (old.nativeBuildInputs or [ ])

1276− ++ [ pkg-config self.pytest-runner ];

1277− buildInputs = with pkgs; (old.buildInputs or [ ])

1278− ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]

1279− ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]

1280− ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];

1199+ nativeBuildInputs = [ pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]);

1200+ buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);

12811201 }

12821202 );

12831203

@@ -1326,14 +1246,6 @@ lib.composeManyExtensions [

13261246 }

13271247 );

13281248

1329− psycopg2cffi = super.psycopg2cffi.overridePythonAttrs (

1330− old: {

1331− buildInputs = (old.buildInputs or [ ])

1332− ++ lib.optional stdenv.isDarwin pkgs.openssl;

1333− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ];

1334− }

1335− );

1336−

13371249 py-solc-x = super.py-solc-x.overridePythonAttrs (

13381250 old: {

13391251 preConfigure = ''

@@ -1948,12 +1860,6 @@ lib.composeManyExtensions [

19481860

19491861 });

19501862

1951− soundfile = super.soundfile.overridePythonAttrs (old: {

1952− postPatch = ''

1953− substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${pkgs.libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"

1954− '';

1955− });

1956−

19571863 systemd-python = super.systemd-python.overridePythonAttrs (old: {

19581864 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

19591865 nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];

pkgs/development/tools/protoc-gen-entgrpc/default.nixdeleted−28

@@ -1,28 +0,0 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

2−

3−buildGoModule rec {

4− pname = "protoc-gen-entgrpc";

5− version = "0.2.0";

6−

7− src = fetchFromGitHub {

8− owner = "ent";

9− repo = "contrib";

10− rev = "v${version}";

11− sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";

12− };

13−

14− vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";

15−

16− subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];

17−

18− ldflags = [ "-s" "-w" ];

19−

20− meta = with lib; {

21− description = "Generator of an implementation of the service interface for ent protobuff";

22− downloadPage = "https://github.com/ent/contrib/";

23− license = licenses.asl20;

24− homepage = "https://entgo.io/";

25− maintainers = with maintainers; [ superherointj ];

26− };

27−}

28−

pkgs/development/tools/rust/cargo-sync-readme/default.nix+3−4

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

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-sync-readme";

5− version = "1.1";

5+ version = "1.0";

77 src = fetchFromGitHub {

88 owner = "phaazon";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";

11+ sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

1212 };

1313

14− cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";

14+ cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";

1515

1616 meta = with lib; {

1717 description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

1818 homepage = "https://github.com/phaazon/cargo-sync-readme";

19− changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";

2019 license = licenses.bsd3;

2120 maintainers = with maintainers; [ b4dm4n ];

2221 };

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

@@ -11,14 +11,14 @@

1111

1212rustPlatform.buildRustPackage rec {

1313 pname = "rust-analyzer-unwrapped";

14− version = "2022-05-02";

15− cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";

14+ version = "2022-04-11";

15+ cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI=";

1616

1717 src = fetchFromGitHub {

1818 owner = "rust-analyzer";

1919 repo = "rust-analyzer";

2020 rev = version;

21− sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

21+ sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY=";

2222 };

2323

2424 patches = [

pkgs/development/tools/scalafix/default.nix+7−10

@@ -1,36 +1,33 @@

1−{ lib, stdenv, jre, coursier, makeWrapper, installShellFiles, setJavaClassPath }:

1+{ lib, stdenv, jdk, jre, coursier, makeWrapper }:

33let

44 baseName = "scalafix";

5− version = "0.10.0";

5+ version = "0.9.0";

66 deps = stdenv.mkDerivation {

77 name = "${baseName}-deps-${version}";

88 buildCommand = ''

99 export COURSIER_CACHE=$(pwd)

10− ${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.13.8:${version} > deps

10+ ${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps

1111 mkdir -p $out/share/java

1212 cp $(< deps) $out/share/java/

1313 '';

1414 outputHashMode = "recursive";

15− outputHash = "sha256-lDeg90L484MggtQ2a9OyHv4UcfLPjzG3OJZCaWW2AC8=";

15+ outputHashAlgo = "sha256";

16+ outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0";

1617 };

1718in

1819stdenv.mkDerivation {

1920 pname = baseName;

2021 inherit version;

2122

22− nativeBuildInputs = [ makeWrapper installShellFiles setJavaClassPath ];

23− buildInputs = [ deps ];

23+ nativeBuildInputs = [ makeWrapper ];

24+ buildInputs = [ jdk deps ];

2425

2526 dontUnpack = true;

2627

2728 installPhase = ''

2829 makeWrapper ${jre}/bin/java $out/bin/${baseName} \

2930 --add-flags "-cp $CLASSPATH scalafix.cli.Cli"

30−

31− installShellCompletion --cmd ${baseName} \

32− --bash <($out/bin/${baseName} --bash) \

33− --zsh <($out/bin/${baseName} --zsh)

3431 '';

3532

3633 installCheckPhase = ''

pkgs/development/tools/unityhub/default.nix+6−5

@@ -1,14 +1,15 @@

11{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:

3−appimageTools.wrapType2 rec {

4− pname = "unityhub";

3+let

54 version = "2.3.2";

6−

75 src = fetchurl {

86 # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage

97 url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";

108 sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";

119 };

10+ name = "unityhub";

11+in appimageTools.wrapType2 rec {

12+ inherit name src;

1213

1314 extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr

1415 alsa-lib cups libcap fontconfig freetype pango

@@ -22,11 +23,11 @@ appimageTools.wrapType2 rec {

2223 ]);

2324

2425 extraInstallCommands =

25− let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in

26+ let appimageContents = appimageTools.extractType2 { inherit name src; }; in

2627 ''

2728 install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications

2829 substituteInPlace $out/share/applications/unityhub.desktop \

29− --replace 'Exec=AppRun' 'Exec=${pname}'

30+ --replace 'Exec=AppRun' 'Exec=${name}'

3031 install -m 444 -D ${appimageContents}/unityhub.png \

3132 $out/share/icons/hicolor/64x64/apps/unityhub.png

3233 '';

pkgs/development/tools/vulkan-validation-layers/default.nix+3−3

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

33, stdenv

44, fetchFromGitHub

55, cmake

6−, pkg-config

6+, pkgconfig

77, glslang

88, libffi

99, libX11

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

4545

4646 nativeBuildInputs = [

4747 cmake

48− pkg-config

48+ pkgconfig

4949 ];

5050

5151 buildInputs = [

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {

6565 "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"

6666 "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"

6767 "-DBUILD_LAYER_SUPPORT_FILES=ON"

68− "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

68+ "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

6969 # Hide dev warnings that are useless for packaging

7070 "-Wno-dev"

7171 ];

pkgs/development/tools/wails/default.nix+3−3

@@ -15,16 +15,16 @@

1515

1616buildGoModule rec {

1717 pname = "wails";

18− version = "2.0.0-beta.36";

18+ version = "2.0.0-beta.34";

1919

2020 src = fetchFromGitHub {

2121 owner = "wailsapp";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";

24+ sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";

2525 } + "/v2";

2626

27− vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";

27+ vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";

2828

2929 proxyVendor = true;

3030

pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js+1−2

@@ -49,8 +49,7 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) {

4949 url = "${url}";

5050 ref = "${branch}";

5151 rev = "${rev}";

52− } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then {

53− # workaround for https://github.com/NixOS/nix/issues/5128

52+ } // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then {

5453 allRefs = true;

5554 } else {}));

5655 ` : `

pkgs/development/web/nodejs/nodejs.nix+2−2

@@ -136,7 +136,7 @@ let

136136

137137 ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

138138 mkdir -p $out/share/bash-completion/completions/

139− HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm

139+ $out/bin/npm completion > $out/share/bash-completion/completions/npm || :

140140 for dir in "$out/lib/node_modules/npm/man/"*; do

141141 mkdir -p $out/share/man/$(basename "$dir")

142142 for page in "$dir"/*; do

@@ -194,7 +194,7 @@ let

194194 maintainers = with maintainers; [ goibhniu gilligan cko marsam ];

195195 platforms = platforms.linux ++ platforms.darwin;

196196 mainProgram = "node";

197− knownVulnerabilities = optional (versionOlder version "14") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";

197+ knownVulnerabilities = optional (versionOlder version "12") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";

198198 };

199199

200200 passthru.python = python; # to ensure nodeEnv uses the same version

pkgs/development/web/nodejs/v14.nix+2−2

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

77in

88 buildNodejs {

99 inherit enableNpm;

10− version = "14.19.2";

11− sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";

10+ version = "14.19.1";

11+ sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk=";

1212 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

1313 }

pkgs/development/web/nodejs/v18.nix+2−2

@@ -7,8 +7,8 @@ let

77in

88buildNodejs {

99 inherit enableNpm;

10− version = "18.1.0";

11− sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";

10+ version = "18.0.0";

11+ sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU=";

1212 patches = [

1313 ./disable-darwin-v8-system-instrumentation.patch

1414 ];

pkgs/games/7kaa/default.nix+10−7

@@ -15,15 +15,17 @@

1515}:

1616

1717let

18− pname = "7kaa";

19− version = "2.15.4p1";

2018

21− music = stdenv.mkDerivation {

22− pname = "7kaa-music";

23− version = lib.versions.majorMinor version;

19+ name = "7kaa";

20+ versionMajor = "2.15";

21+ versionMinor = "4p1";

22+

23+ music = stdenv.mkDerivation rec {

24+ pname = "${name}-music";

25+ version = "${versionMajor}";

2426

2527 src = fetchurl {

26− url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2";

28+ url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2";

2729 sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";

2830 };

2931

@@ -39,7 +41,8 @@ let

3941in

4042

4143gccStdenv.mkDerivation rec {

42− inherit pname version;

44+ pname = "${name}";

45+ version = "v${versionMajor}.${versionMinor}";

4346

4447 src = fetchFromGitHub {

4548 owner = "the3dfxdude";

pkgs/games/mindustry/default.nix+9−11

@@ -128,6 +128,15 @@ stdenv.mkDerivation rec {

128128 rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so

129129 '' + cleanupMindustrySrc;

130130

131+ # Propagate glew to prevent it from being cleaned up.

132+ # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,

133+ # and will assume that it's not actually needed.

134+ # This can cause issues.

135+ # See https://github.com/NixOS/nixpkgs/issues/109798.

136+ propagatedBuildInputs = lib.optionals enableClient [

137+ glew.out

138+ ];

139+

131140 buildInputs = lib.optionals enableClient [

132141 SDL2

133142 glew

@@ -174,17 +183,6 @@ stdenv.mkDerivation rec {

174183 makeWrapper ${jdk}/bin/java $out/bin/mindustry \

175184 --add-flags "-jar $out/share/mindustry.jar" \

176185 --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/

177−

178− # Retain runtime depends to prevent them from being cleaned up.

179− # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,

180− # and will assume that it's not actually needed.

181− # This can cause issues.

182− # See https://github.com/NixOS/nixpkgs/issues/109798.

183− echo "# Retained runtime dependencies: " >> $out/bin/mindustry

184− for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do

185− echo "# $dep" >> $out/bin/mindustry

186− done

187−

188186 install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png

189187 '' + optionalString enableServer ''

190188 install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar

pkgs/games/quake2/yquake2/default.nix+27−19

@@ -1,55 +1,63 @@

1−{ stdenv, lib, fetchFromGitHub, buildEnv, makeWrapper

1+{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper

22, SDL2, libGL, curl

3+, oggSupport ? true, libogg, libvorbis

34, openalSupport ? true, openal

5+, zipSupport ? true, zlib

46, Cocoa, OpenAL

57}:

79let

8− mkFlag = b: if b then "yes" else "no";

10+ mkFlag = b: if b then "ON" else "OFF";

911

10− games = import ./games.nix { inherit stdenv lib fetchFromGitHub; };

12+ games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; };

1113

1214 wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };

1315

1416 yquake2 = stdenv.mkDerivation rec {

1517 pname = "yquake2";

16− version = "8.01";

18+ version = "8.00";

1719

1820 src = fetchFromGitHub {

1921 owner = "yquake2";

2022 repo = "yquake2";

2123 rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";

22− sha256 = "1dll5lx4bnls5w5f2zwjhwpcpxa97rjn6ymb2v3vrjm19jbd16yd";

24+ sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w";

2325 };

2426

2527 postPatch = ''

26− substituteInPlace src/client/curl/qcurl.c \

27− --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\""

28− '' + lib.optionalString (openalSupport && !stdenv.isDarwin) ''

29− substituteInPlace Makefile \

30− --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\""

28+ substituteInPlace src/common/filesystem.c \

29+ --replace /usr/share/games/quake2 $out/share/games/quake2

3130 '';

3231

32+ nativeBuildInputs = [ cmake ];

33+

3334 buildInputs = [ SDL2 libGL curl ]

3435 ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]

35− ++ lib.optional openalSupport openal;

36−

37− makeFlags = [

38− "WITH_OPENAL=${mkFlag openalSupport}"

39− "WITH_SYSTEMWIDE=yes"

40− "WITH_SYSTEMDIR=$\{out}/share/games/quake2"

36+ ++ lib.optionals oggSupport [ libogg libvorbis ]

37+ ++ lib.optional openalSupport openal

38+ ++ lib.optional zipSupport zlib;

39+

40+ cmakeFlags = [

41+ "-DCMAKE_BUILD_TYPE=Release"

42+ "-DOGG_SUPPORT=${mkFlag oggSupport}"

43+ "-DOPENAL_SUPPORT=${mkFlag openalSupport}"

44+ "-DZIP_SUPPORT=${mkFlag zipSupport}"

45+ "-DSYSTEMWIDE_SUPPORT=ON"

4146 ];

4247

43− enableParallelBuilding = true;

48+ preConfigure = ''

49+ # Since we can't expand $out in `cmakeFlags`

50+ cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2"

51+ '';

4452

4553 installPhase = ''

4654 # Yamagi Quake II expects all binaries (executables and libs) to be in the

4755 # same directory.

48− mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2/baseq2

56+ mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2

4957 cp -r release/* $out/lib/yquake2

5058 ln -s $out/lib/yquake2/quake2 $out/bin/yquake2

5159 ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded

52− cp $src/stuff/yq2.cfg $out/share/games/quake2/baseq2

60+ cp $src/stuff/yq2.cfg $out/share/games/quake2

5361 '';

5462

5563 meta = with lib; {

pkgs/games/quake2/yquake2/games.nix+4−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchFromGitHub }:

1+{ stdenv, lib, fetchFromGitHub, cmake }:

33let

44 games = {

@@ -37,9 +37,11 @@ let

3737 rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}";

3838 };

3939

40+ nativeBuildInputs = [ cmake ];

41+

4042 installPhase = ''

4143 mkdir -p $out/lib/yquake2/${id}

42− cp release/* $out/lib/yquake2/${id}

44+ cp Release/* $out/lib/yquake2/${id}

4345 '';

4446

4547 meta = with lib; {

pkgs/misc/platformsh/default.nix+2−2

@@ -2,14 +2,14 @@

33let

44 pname = "platformsh";

5− version = "3.79.2";

5+ version = "3.79.0";

66in

77stdenv.mkDerivation {

88 inherit pname version;

1010 src = fetchurl {

1111 url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";

12− sha256 = "sha256-STGMKWgI4C6ccg8DGUhdnEENOB2//gtpU0ljM4cQCXI=";

12+ sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";

1313 };

1414

1515 dontUnpack = true;

pkgs/misc/rich-cli/default.nix+8−18

@@ -1,20 +1,17 @@

1−{ lib

2−, python3

3−}:

1+{ lib, python3 }:

53python3.pkgs.buildPythonApplication rec {

64 pname = "rich-cli";

7− version = "1.7.0";

8− format = "pyproject";

5+ version = "1.5.1";

107 src = python3.pkgs.fetchPypi {

118 inherit pname version;

12− sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";

9+ sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";

1310 };

1411

15− nativeBuildInputs = with python3.pkgs; [

16− poetry-core

17− ];

12+ format = "pyproject";

13+

14+ nativeBuildInputs = [ python3.pkgs.poetry-core ];

1815

1916 propagatedBuildInputs = with python3.pkgs; [

2017 rich

@@ -24,18 +21,11 @@ python3.pkgs.buildPythonApplication rec {

2421 rich-rst

2522 ];

2623

27− postPatch = ''

28− substituteInPlace pyproject.toml \

29− --replace 'rich = "^12.3.0"' 'rich = "*"'

30− '';

31−

32− pythonImportsCheck = [

33− "rich_cli"

34− ];

24+ buildInputs = [ python3 ];

3525

3626 meta = with lib; {

37− description = "Command Line Interface to Rich";

3827 homepage = "https://github.com/Textualize/rich-cli";

28+ description = "Command Line Interface to Rich";

3929 license = licenses.mit;

4030 maintainers = with maintainers; [ jyooru ];

4131 };

pkgs/os-specific/linux/evdi/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "evdi";

5− version = "1.10.1";

5+ version = "1.10.0";

77 src = fetchFromGitHub {

88 owner = "DisplayLink";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-XABpC2g4/e6/2HsHzrBUs6OW1lzgGBYlFAatVcA/vD8=";

11+ sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg=";

1212 };

1313

1414 NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+4−3

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

11{ lib

22, fetchpatch

33, kernel

4−, date ? "2022-04-25"

5−, commit ? "bdf6d7c1350497bc7b0be6027a51d9330645672d"

6−, diffHash ? "09bcbklvfj9i9czjdpix2iz7fvjksmavaljx8l92ay1i9fapjmhc"

4+, date ? "2022-04-08"

5+, commit ? "6ddf061e68560a2bb263b126af7e894a6c1afb5f"

6+, diffHash ? "1nkrr1cxavw0rqxlyiz7pf9igvqay0d5kk7194v9ph3fcp9rz5kc"

77, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

88, argsOverride ? {}

99, ...

@@ -17,6 +17,7 @@

1717 extraMeta = {

1818 branch = "master";

1919 maintainers = with lib.maintainers; [ davidak Madouura ];

20+ broken = true;

2021 };

2122 } // argsOverride;

2223

pkgs/os-specific/linux/nftables/default.nix+9−7

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

88, withXtables ? true , iptables

99}:

1010

11+with lib;

12+

1113stdenv.mkDerivation rec {

1214 version = "1.0.2";

1315 pname = "nftables";

@@ -26,8 +28,8 @@ stdenv.mkDerivation rec {

2628 buildInputs = [

2729 libmnl libnftnl libpcap

2830 gmp jansson libedit

29− ] ++ lib.optional withXtables iptables

30− ++ lib.optional withPython python3;

31+ ] ++ optional withXtables iptables

32+ ++ optional withPython python3;

3133

3234 preConfigure = ''

3335 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file

@@ -44,12 +46,12 @@ stdenv.mkDerivation rec {

4446 configureFlags = [

4547 "--with-json"

4648 "--with-cli=editline"

47− ] ++ lib.optional (!withDebugSymbols) "--disable-debug"

48− ++ lib.optional (!withPython) "--disable-python"

49− ++ lib.optional withPython "--enable-python"

50− ++ lib.optional withXtables "--with-xtables";

49+ ] ++ optional (!withDebugSymbols) "--disable-debug"

50+ ++ optional (!withPython) "--disable-python"

51+ ++ optional withPython "--enable-python"

52+ ++ optional withXtables "--with-xtables";

5153

52− meta = with lib; {

54+ meta = {

5355 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

5456 homepage = "https://netfilter.org/projects/nftables/";

5557 license = licenses.gpl2Only;

pkgs/os-specific/linux/vmware/default.nixdeleted−47

@@ -1,47 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }:

2−

3−stdenv.mkDerivation rec {

4− pname = "vmware-modules";

5− version = "${vmware-workstation.version}-${kernel.version}";

6−

7− src = fetchFromGitHub {

8− owner = "mkubecek";

9− repo = "vmware-host-modules";

10− rev = "w${vmware-workstation.version}-k5.17";

11− sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0=";

12− };

13−

14− hardeningDisable = [ "pic" ];

15−

16− nativeBuildInputs = kernel.moduleBuildDependencies;

17−

18− enableParallelBuilding = true;

19−

20− postPatch = ''

21− substituteInPlace Makefile \

22− --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \

23− --replace '$(shell uname -r)' "${kernel.modDirVersion}" \

24− --replace /sbin/modinfo "${kmod}/bin/modinfo" \

25− --replace 'test -z "$(DESTDIR)"' "0"

26−

27− for module in "vmmon-only" "vmnet-only"; do

28− substituteInPlace "./$module/Makefile" \

29− --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \

30− --replace '$(shell uname -r)' "${kernel.modDirVersion}" \

31− --replace /bin/grep "${gnugrep}/bin/grep"

32− done

33− '';

34−

35− preInstall = ''

36− mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc"

37− '';

38−

39− meta = with lib; {

40− description = "Kernel modules needed for VMware hypervisor";

41− homepage = "https://github.com/mkubecek/vmware-host-modules";

42− license = licenses.gpl2Only;

43− platforms = [ "x86_64-linux" ];

44− broken = kernel.kernelOlder "5.5" && kernel.isHardened;

45− maintainers = with maintainers; [ deinferno ];

46− };

47−}

pkgs/servers/home-assistant/component-packages.nix+14−35

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

22# Do not edit!

44{

5− version = "2022.5.0";

5+ version = "2022.4.7";

66 components = {

77 "abode" = ps: with ps; [

88 abodepy

@@ -157,6 +157,10 @@

157157 ];

158158 "arest" = ps: with ps; [

159159 ];

160+ "arlo" = ps: with ps; [

161+ ha-ffmpeg

162+ pyarlo

163+ ];

160164 "arris_tg2492lg" = ps: with ps; [

161165 arris-tg2492lg

162166 ];

@@ -550,6 +554,8 @@

550554 "digital_ocean" = ps: with ps; [

551555 digital-ocean

552556 ];

557+ "digitalloggers" = ps: with ps; [

558+ ]; # missing inputs: dlipower

553559 "directv" = ps: with ps; [

554560 directv

555561 ];

@@ -987,7 +993,8 @@

987993 ];

988994 "google" = ps: with ps; [

989995 aiohttp-cors

990− gcal-sync

996+ google-api-python-client

997+ httplib2

991998 oauth2client

992999 ];

9931000 "google_assistant" = ps: with ps; [

@@ -1241,15 +1248,9 @@

12411248 ];

12421249 "insteon" = ps: with ps; [

12431250 aiohttp-cors

1244− fnvhash

1245− home-assistant-frontend

1246− insteon-frontend-home-assistant

1247− lru-dict

1248− pillow

12491251 pyinsteon

12501252 pyserial

12511253 pyudev

1252− sqlalchemy

12531254 ];

12541255 "integration" = ps: with ps; [

12551256 ];

@@ -1390,10 +1391,8 @@

13901391 life360

13911392 ];

13921393 "lifx" = ps: with ps; [

1393− aiohttp-cors

13941394 aiolifx

13951395 aiolifx-effects

1396− ifaddr

13971396 ];

13981397 "lifx_cloud" = ps: with ps; [

13991398 ];

@@ -1515,9 +1514,6 @@

15151514 "mazda" = ps: with ps; [

15161515 pymazda

15171516 ];

1518− "meater" = ps: with ps; [

1519− meater-python

1520− ];

15211517 "media_extractor" = ps: with ps; [

15221518 aiohttp-cors

15231519 youtube-dl-light

@@ -2092,9 +2088,6 @@

20922088 ];

20932089 "qnap" = ps: with ps; [

20942090 ]; # missing inputs: qnapstats

2095− "qnap_qsw" = ps: with ps; [

2096− aioqsw

2097− ];

20982091 "qrcode" = ps: with ps; [

20992092 pillow

21002093 pyzbar

@@ -2316,10 +2309,6 @@

23162309 "sentry" = ps: with ps; [

23172310 sentry-sdk

23182311 ];

2319− "senz" = ps: with ps; [

2320− aiohttp-cors

2321− aiosenz

2322− ];

23232312 "serial" = ps: with ps; [

23242313 pyserial-asyncio

23252314 ];

@@ -2393,10 +2382,6 @@

23932382 ];

23942383 "slide" = ps: with ps; [

23952384 ]; # missing inputs: goslide-api

2396− "slimproto" = ps: with ps; [

2397− aiohttp-cors

2398− aioslimproto

2399− ];

24002385 "sma" = ps: with ps; [

24012386 pysma

24022387 ];

@@ -2435,7 +2420,7 @@

24352420 paho-mqtt

24362421 ];

24372422 "snmp" = ps: with ps; [

2438− pysnmplib

2423+ pysnmp

24392424 ];

24402425 "solaredge" = ps: with ps; [

24412426 solaredge

@@ -2762,9 +2747,6 @@

27622747 pytradfri

27632748 ]

27642749 ++ pytradfri.extras-require.async;

2765− "trafikverket_ferry" = ps: with ps; [

2766− pytrafikverket

2767− ];

27682750 "trafikverket_train" = ps: with ps; [

27692751 pytrafikverket

27702752 ];

@@ -2846,10 +2828,11 @@

28462828 ];

28472829 "update" = ps: with ps; [

28482830 ];

2831+ "updater" = ps: with ps; [

2832+ ];

28492833 "upnp" = ps: with ps; [

28502834 aiohttp-cors

28512835 async-upnp-client

2852− getmac

28532836 ifaddr

28542837 zeroconf

28552838 ];

@@ -3185,6 +3168,7 @@

31853168 "apprise"

31863169 "aprs"

31873170 "arcam_fmj"

3171+ "arlo"

31883172 "aseko_pool_live"

31893173 "asuswrt"

31903174 "atag"

@@ -3452,7 +3436,6 @@

34523436 "manual_mqtt"

34533437 "maxcube"

34543438 "mazda"

3455− "meater"

34563439 "media_player"

34573440 "media_source"

34583441 "melcloud"

@@ -3557,7 +3540,6 @@

35573540 "pvpc_hourly_pricing"

35583541 "python_script"

35593542 "qld_bushfire"

3560− "qnap_qsw"

35613543 "rachio"

35623544 "radarr"

35633545 "radio_browser"

@@ -3600,7 +3582,6 @@

36003582 "sensibo"

36013583 "sensor"

36023584 "sentry"

3603− "senz"

36043585 "seventeentrack"

36053586 "shell_command"

36063587 "shelly"

@@ -3614,7 +3595,6 @@

36143595 "siren"

36153596 "slack"

36163597 "sleepiq"

3617− "slimproto"

36183598 "sma"

36193599 "smappee"

36203600 "smart_meter_texas"

@@ -3668,7 +3648,6 @@

36683648 "tailscale"

36693649 "tankerkoenig"

36703650 "tasmota"

3671− "tautulli"

36723651 "tcp"

36733652 "telegram"

36743653 "telegram_bot"

@@ -3692,7 +3671,6 @@

36923671 "trace"

36933672 "tractive"

36943673 "tradfri"

3695− "trafikverket_ferry"

36963674 "trafikverket_train"

36973675 "trafikverket_weatherstation"

36983676 "transmission"

@@ -3711,6 +3689,7 @@

37113689 "upb"

37123690 "upcloud"

37133691 "update"

3692+ "updater"

37143693 "upnp"

37153694 "uptime"

37163695 "uptimerobot"

pkgs/servers/home-assistant/default.nix+4−15

@@ -30,6 +30,7 @@ let

3030 defaultOverrides = [

3131 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt

3232 (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")

33+ (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")

3334

3435 # pytest-aiohttp>0.3.0 breaks home-assistant tests

3536 (self: super: {

@@ -46,21 +47,9 @@ let

4647 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

4748 doCheck = false; # requires aiohttp>=1.0.0

4849 });

49− gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {

50− doCheck = false; # requires aiohttp>=1.0.0

51− });

5250 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

5351 doCheck = false; # requires aiohttp>=1.0.0

5452 });

55− pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: {

56− doCheck = false; # requires pytest-aiohttp>=1.0.0

57− });

58− pynws = super.pynws.overridePythonAttrs (oldAttrs: {

59− doCheck = false; # requires pytest-aiohttp>=1.0.0

60− });

61− pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: {

62− doCheck = false; # requires pytest-aiohttp>=1.0.0

63− });

6453 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

6554 doCheck = false; # requires pytest-aiohttp>=1.0.0

6655 });

@@ -121,7 +110,7 @@ let

121110 src = fetchFromGitHub {

122111 owner = "ManneW";

123112 repo = "vilfo-api-client-python";

124− rev = "v${version}";

113+ rev = "v$version}";

125114 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

126115 };

127116 });

@@ -179,7 +168,7 @@ let

179168 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

180169

181170 # Don't forget to run parse-requirements.py after updating

182− hassVersion = "2022.5.0";

171+ hassVersion = "2022.4.7";

183172

184173in python.pkgs.buildPythonApplication rec {

185174 pname = "homeassistant";

@@ -197,7 +186,7 @@ in python.pkgs.buildPythonApplication rec {

197186 owner = "home-assistant";

198187 repo = "core";

199188 rev = version;

200− hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";

189+ hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";

201190 };

202191

203192 # leave this in, so users don't have to constantly update their downstream patch handling

pkgs/servers/home-assistant/frontend.nix+2−2

@@ -4,7 +4,7 @@ buildPythonPackage rec {

44 # the frontend version corresponding to a specific home-assistant version can be found here

55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

66 pname = "home-assistant-frontend";

7− version = "20220504.0";

7+ version = "20220405.0";

88 format = "wheel";

1010 src = fetchPypi {

@@ -12,7 +12,7 @@ buildPythonPackage rec {

1212 pname = "home_assistant_frontend";

1313 dist = "py3";

1414 python = "py3";

15− sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";

15+ sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";

1616 };

1717

1818 # there is nothing to strip in this package

pkgs/servers/hqplayerd/default.nix+27−30

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

1−{ stdenv, lib

2−, addOpenGLRunpath

1+{ stdenv

32, alsa-lib

3+, addOpenGLRunpath

44, autoPatchelfHook

55, cairo

66, fetchurl

@@ -8,25 +8,26 @@

88, gcc11

99, gnome

1010, gssdp

11−, gupnp

12−, gupnp-av

1311, lame

12+, lib

1413, libgmpris

15−, libusb-compat-0_1

1614, llvmPackages_10

17−, meson

1815, mpg123

19−, ninja

2016, rpmextract

2117, wavpack

18+

19+, gupnp

20+, gupnp-av

21+, meson

22+, ninja

2223}:

2324stdenv.mkDerivation rec {

2425 pname = "hqplayerd";

25− version = "4.31.0-89";

26+ version = "4.30.3-87";

2627

2728 src = fetchurl {

2829 url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm";

29− hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg=";

30+ hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A=";

3031 };

3132

3233 unpackPhase = ''

@@ -46,7 +47,6 @@ stdenv.mkDerivation rec {

4647 gupnp-av

4748 lame

4849 libgmpris

49− libusb-compat-0_1

5050 llvmPackages_10.openmp

5151 mpg123

5252 wavpack

@@ -58,37 +58,34 @@ stdenv.mkDerivation rec {

5858 installPhase = ''

5959 runHook preInstall

6060

61− # executables

62− mkdir -p $out

63− cp -rv ./usr/bin $out/bin

64−

65− # libs

66− mkdir -p $out

67− cp -rv ./opt/hqplayerd/lib $out

61+ # main executable

62+ mkdir -p $out/bin

63+ cp ./usr/bin/hqplayerd $out/bin

6864

69− # configuration

70− mkdir -p $out/etc

71− cp -rv ./etc/hqplayer $out/etc/

65+ # main configuration

66+ mkdir -p $out/etc/hqplayer

67+ cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/

7268

7369 # udev rules

74− mkdir -p $out/etc/udev

75− cp -rv ./etc/udev/rules.d $out/etc/udev/

70+ mkdir -p $out/etc/udev/rules.d

71+ cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/

7672

7773 # kernel module cfgs

78− mkdir -p $out/etc

79− cp -rv ./etc/modules-load.d $out/etc/

74+ mkdir -p $out/etc/modules-load.d

75+ cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/

8076

8177 # systemd service file

82− mkdir -p $out/lib/systemd

83− cp -rv ./usr/lib/systemd/system $out/lib/systemd/

78+ mkdir -p $out/lib/systemd/system

79+ cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/

8480

8581 # documentation

86− mkdir -p $out/share/doc

87− cp -rv ./usr/share/doc/hqplayerd $out/share/doc/

82+ mkdir -p $out/share/doc/hqplayerd

83+ cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/

8884

8985 # misc service support files

90− mkdir -p $out/var/lib

91− cp -rv ./var/lib/hqplayer $out/var/lib/

86+ mkdir -p $out/var/lib/hqplayer

87+ cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer

88+

9289 runHook postInstall

9390 '';

9491

pkgs/servers/irc/inspircd/default.nix+2−2

@@ -142,13 +142,13 @@ in

142142

143143stdenv.mkDerivation rec {

144144 pname = "inspircd";

145− version = "3.13.0";

145+ version = "3.12.0";

146146

147147 src = fetchFromGitHub {

148148 owner = pname;

149149 repo = pname;

150150 rev = "v${version}";

151− sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl";

151+ sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY=";

152152 };

153153

154154 outputs = [ "bin" "lib" "man" "doc" "out" ];

pkgs/servers/keycloak/default.nix+4−4

@@ -13,11 +13,11 @@

1313

1414stdenv.mkDerivation rec {

1515 pname = "keycloak";

16− version = "18.0.0";

16+ version = "17.0.1";

1717

1818 src = fetchzip {

1919 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

20− sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";

20+ sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";

2121 };

2222

2323 nativeBuildInputs = [ makeWrapper jre ];

@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {

5757 '';

5858

5959 postFixup = ''

60− substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR'

61− substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'

60+ substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR'

61+ substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'

6262

6363 for script in $(find $out/bin -type f -executable); do

6464 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin

pkgs/servers/mastodon/default.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818

1919 yarnOfflineCache = fetchYarnDeps {

2020 yarnLock = "${src}/yarn.lock";

21− sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I=";

21+ sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8=";

2222 };

2323

2424 mastodon-gems = bundlerEnv {

pkgs/servers/mastodon/gemset.nix+72−72

@@ -5,10 +5,10 @@

55 platforms = [];

66 source = {

77 remotes = ["https://rubygems.org"];

8− sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl";

8+ sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz";

99 type = "gem";

1010 };

11− version = "6.1.5.1";

11+ version = "6.1.5";

1212 };

1313 actionmailbox = {

1414 dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];

@@ -16,10 +16,10 @@

1616 platforms = [];

1717 source = {

1818 remotes = ["https://rubygems.org"];

19− sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw";

19+ sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh";

2020 type = "gem";

2121 };

22− version = "6.1.5.1";

22+ version = "6.1.5";

2323 };

2424 actionmailer = {

2525 dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];

@@ -27,10 +27,10 @@

2727 platforms = [];

2828 source = {

2929 remotes = ["https://rubygems.org"];

30− sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s";

30+ sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf";

3131 type = "gem";

3232 };

33− version = "6.1.5.1";

33+ version = "6.1.5";

3434 };

3535 actionpack = {

3636 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

@@ -38,10 +38,10 @@

3838 platforms = [];

3939 source = {

4040 remotes = ["https://rubygems.org"];

41− sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l";

41+ sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w";

4242 type = "gem";

4343 };

44− version = "6.1.5.1";

44+ version = "6.1.5";

4545 };

4646 actiontext = {

4747 dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];

@@ -49,10 +49,10 @@

4949 platforms = [];

5050 source = {

5151 remotes = ["https://rubygems.org"];

52− sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j";

52+ sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib";

5353 type = "gem";

5454 };

55− version = "6.1.5.1";

55+ version = "6.1.5";

5656 };

5757 actionview = {

5858 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

@@ -60,10 +60,10 @@

6060 platforms = [];

6161 source = {

6262 remotes = ["https://rubygems.org"];

63− sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv";

63+ sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi";

6464 type = "gem";

6565 };

66− version = "6.1.5.1";

66+ version = "6.1.5";

6767 };

6868 active_model_serializers = {

6969 dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];

@@ -92,10 +92,10 @@

9292 platforms = [];

9393 source = {

9494 remotes = ["https://rubygems.org"];

95− sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49";

95+ sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws";

9696 type = "gem";

9797 };

98− version = "6.1.5.1";

98+ version = "6.1.5";

9999 };

100100 activemodel = {

101101 dependencies = ["activesupport"];

@@ -103,10 +103,10 @@

103103 platforms = [];

104104 source = {

105105 remotes = ["https://rubygems.org"];

106− sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn";

106+ sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195";

107107 type = "gem";

108108 };

109− version = "6.1.5.1";

109+ version = "6.1.5";

110110 };

111111 activerecord = {

112112 dependencies = ["activemodel" "activesupport"];

@@ -114,10 +114,10 @@

114114 platforms = [];

115115 source = {

116116 remotes = ["https://rubygems.org"];

117− sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0";

117+ sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939";

118118 type = "gem";

119119 };

120− version = "6.1.5.1";

120+ version = "6.1.5";

121121 };

122122 activestorage = {

123123 dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];

@@ -125,10 +125,10 @@

125125 platforms = [];

126126 source = {

127127 remotes = ["https://rubygems.org"];

128− sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv";

128+ sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph";

129129 type = "gem";

130130 };

131− version = "6.1.5.1";

131+ version = "6.1.5";

132132 };

133133 activesupport = {

134134 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

@@ -136,10 +136,10 @@

136136 platforms = [];

137137 source = {

138138 remotes = ["https://rubygems.org"];

139− sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4";

139+ sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4";

140140 type = "gem";

141141 };

142− version = "6.1.5.1";

142+ version = "6.1.5";

143143 };

144144 addressable = {

145145 dependencies = ["public_suffix"];

@@ -250,10 +250,10 @@

250250 platforms = [];

251251 source = {

252252 remotes = ["https://rubygems.org"];

253− sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc";

253+ sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";

254254 type = "gem";

255255 };

256− version = "1.582.0";

256+ version = "1.558.0";

257257 };

258258 aws-sdk-core = {

259259 dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];

@@ -261,10 +261,10 @@

261261 platforms = [];

262262 source = {

263263 remotes = ["https://rubygems.org"];

264− sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";

264+ sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";

265265 type = "gem";

266266 };

267− version = "3.130.2";

267+ version = "3.127.0";

268268 };

269269 aws-sdk-kms = {

270270 dependencies = ["aws-sdk-core" "aws-sigv4"];

@@ -272,10 +272,10 @@

272272 platforms = [];

273273 source = {

274274 remotes = ["https://rubygems.org"];

275− sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";

275+ sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";

276276 type = "gem";

277277 };

278− version = "1.56.0";

278+ version = "1.55.0";

279279 };

280280 aws-sdk-s3 = {

281281 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];

@@ -283,10 +283,10 @@

283283 platforms = [];

284284 source = {

285285 remotes = ["https://rubygems.org"];

286− sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i";

286+ sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";

287287 type = "gem";

288288 };

289− version = "1.113.2";

289+ version = "1.113.0";

290290 };

291291 aws-sigv4 = {

292292 dependencies = ["aws-eventstream"];

@@ -294,10 +294,10 @@

294294 platforms = [];

295295 source = {

296296 remotes = ["https://rubygems.org"];

297− sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";

297+ sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";

298298 type = "gem";

299299 };

300− version = "1.5.0";

300+ version = "1.4.0";

301301 };

302302 bcrypt = {

303303 groups = ["default" "pam_authentication"];

@@ -369,20 +369,20 @@

369369 platforms = [];

370370 source = {

371371 remotes = ["https://rubygems.org"];

372− sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg";

372+ sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1";

373373 type = "gem";

374374 };

375− version = "1.11.1";

375+ version = "1.10.3";

376376 };

377377 brakeman = {

378378 groups = ["development"];

379379 platforms = [];

380380 source = {

381381 remotes = ["https://rubygems.org"];

382− sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";

382+ sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy";

383383 type = "gem";

384384 };

385− version = "5.2.2";

385+ version = "5.2.1";

386386 };

387387 browser = {

388388 groups = ["default"];

@@ -864,10 +864,10 @@

864864 platforms = [];

865865 source = {

866866 remotes = ["https://rubygems.org"];

867− sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v";

867+ sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m";

868868 type = "gem";

869869 };

870− version = "1.2.7";

870+ version = "1.2.6";

871871 };

872872 excon = {

873873 groups = ["default"];

@@ -1102,10 +1102,10 @@

11021102 platforms = [];

11031103 source = {

11041104 remotes = ["https://rubygems.org"];

1105− sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j";

1105+ sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka";

11061106 type = "gem";

11071107 };

1108− version = "1.5.3";

1108+ version = "1.5.2";

11091109 };

11101110 fuubar = {

11111111 dependencies = ["rspec-core" "ruby-progressbar"];

@@ -1312,10 +1312,10 @@

13121312 platforms = [];

13131313 source = {

13141314 remotes = ["https://rubygems.org"];

1315− sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk";

1315+ sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0";

13161316 type = "gem";

13171317 };

1318− version = "1.0.9";

1318+ version = "1.0.8";

13191319 };

13201320 idn-ruby = {

13211321 groups = ["default"];

@@ -1342,10 +1342,10 @@

13421342 platforms = [];

13431343 source = {

13441344 remotes = ["https://rubygems.org"];

1345− sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";

1345+ sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";

13461346 type = "gem";

13471347 };

1348− version = "1.6.1";

1348+ version = "1.6.0";

13491349 };

13501350 json = {

13511351 groups = ["default" "test"];

@@ -1545,10 +1545,10 @@

15451545 platforms = [];

15461546 source = {

15471547 remotes = ["https://rubygems.org"];

1548− sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr";

1548+ sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

15491549 type = "gem";

15501550 };

1551− version = "2.17.0";

1551+ version = "2.16.0";

15521552 };

15531553 mail = {

15541554 dependencies = ["mini_mime"];

@@ -1690,10 +1690,10 @@

16901690 platforms = [];

16911691 source = {

16921692 remotes = ["https://rubygems.org"];

1693− sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";

1693+ sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";

16941694 type = "gem";

16951695 };

1696− version = "1.5.1";

1696+ version = "1.4.4";

16971697 };

16981698 multi_json = {

16991699 groups = ["default"];

@@ -1762,10 +1762,10 @@

17621762 platforms = [];

17631763 source = {

17641764 remotes = ["https://rubygems.org"];

1765− sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";

1765+ sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";

17661766 type = "gem";

17671767 };

1768− version = "1.13.4";

1768+ version = "1.13.3";

17691769 };

17701770 nsa = {

17711771 dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];

@@ -1941,10 +1941,10 @@

19411941 platforms = [];

19421942 source = {

19431943 remotes = ["https://rubygems.org"];

1944− sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a";

1944+ sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8";

19451945 type = "gem";

19461946 };

1947− version = "2.8.3";

1947+ version = "2.8.2";

19481948 };

19491949 pkg-config = {

19501950 groups = ["default"];

@@ -2099,10 +2099,10 @@

20992099 platforms = [];

21002100 source = {

21012101 remotes = ["https://rubygems.org"];

2102− sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq";

2102+ sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx";

21032103 type = "gem";

21042104 };

2105− version = "6.6.1";

2105+ version = "6.6.0";

21062106 };

21072107 rack-cors = {

21082108 dependencies = ["rack"];

@@ -2154,10 +2154,10 @@

21542154 platforms = [];

21552155 source = {

21562156 remotes = ["https://rubygems.org"];

2157− sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8";

2157+ sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv";

21582158 type = "gem";

21592159 };

2160− version = "6.1.5.1";

2160+ version = "6.1.5";

21612161 };

21622162 rails-controller-testing = {

21632163 dependencies = ["actionpack" "actionview" "activesupport"];

@@ -2220,10 +2220,10 @@

22202220 platforms = [];

22212221 source = {

22222222 remotes = ["https://rubygems.org"];

2223− sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9";

2223+ sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93";

22242224 type = "gem";

22252225 };

2226− version = "6.1.5.1";

2226+ version = "6.1.5";

22272227 };

22282228 rainbow = {

22292229 groups = ["default" "development" "test"];

@@ -2293,10 +2293,10 @@

22932293 platforms = [];

22942294 source = {

22952295 remotes = ["https://rubygems.org"];

2296− sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";

2296+ sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";

22972297 type = "gem";

22982298 };

2299− version = "2.3.0";

2299+ version = "2.2.1";

23002300 };

23012301 request_store = {

23022302 dependencies = ["rack"];

@@ -2399,10 +2399,10 @@

23992399 platforms = [];

24002400 source = {

24012401 remotes = ["https://rubygems.org"];

2402− sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm";

2402+ sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";

24032403 type = "gem";

24042404 };

2405− version = "3.11.1";

2405+ version = "3.11.0";

24062406 };

24072407 rspec-rails = {

24082408 dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];

@@ -2410,10 +2410,10 @@

24102410 platforms = [];

24112411 source = {

24122412 remotes = ["https://rubygems.org"];

2413− sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l";

2413+ sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa";

24142414 type = "gem";

24152415 };

2416− version = "5.1.2";

2416+ version = "5.1.1";

24172417 };

24182418 rspec-sidekiq = {

24192419 dependencies = ["rspec-core" "sidekiq"];

@@ -2453,10 +2453,10 @@

24532453 platforms = [];

24542454 source = {

24552455 remotes = ["https://rubygems.org"];

2456− sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";

2456+ sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";

24572457 type = "gem";

24582458 };

2459− version = "1.27.0";

2459+ version = "1.26.1";

24602460 };

24612461 rubocop-ast = {

24622462 dependencies = ["parser"];

@@ -2464,10 +2464,10 @@

24642464 platforms = [];

24652465 source = {

24662466 remotes = ["https://rubygems.org"];

2467− sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";

2467+ sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";

24682468 type = "gem";

24692469 };

2470− version = "1.17.0";

2470+ version = "1.16.0";

24712471 };

24722472 rubocop-rails = {

24732473 dependencies = ["activesupport" "rack" "rubocop"];

@@ -2603,10 +2603,10 @@

26032603 platforms = [];

26042604 source = {

26052605 remotes = ["https://rubygems.org"];

2606− sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3";

2606+ sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx";

26072607 type = "gem";

26082608 };

2609− version = "3.2.0";

2609+ version = "3.1.1";

26102610 };

26112611 sidekiq-unique-jobs = {

26122612 dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];

@@ -2614,10 +2614,10 @@

26142614 platforms = [];

26152615 source = {

26162616 remotes = ["https://rubygems.org"];

2617− sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq";

2617+ sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y";

26182618 type = "gem";

26192619 };

2620− version = "7.1.21";

2620+ version = "7.1.16";

26212621 };

26222622 simple-navigation = {

26232623 dependencies = ["activesupport"];

pkgs/servers/mastodon/source.nix+2−2

@@ -2,8 +2,8 @@

22{ fetchgit, applyPatches }: let

33 src = fetchgit {

44 url = "https://github.com/mastodon/mastodon.git";

5− rev = "v3.5.2";

6− sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was";

5+ rev = "v3.5.1";

6+ sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0";

77 };

88in applyPatches {

99 inherit src;

pkgs/servers/mastodon/version.nix+1−1

@@ -1 +1 @@

1−"3.5.2"

1+"3.5.1"

pkgs/servers/matrix-synapse/default.nix+2−2

@@ -11,11 +11,11 @@ in

1111with python3.pkgs;

1212buildPythonApplication rec {

1313 pname = "matrix-synapse";

14− version = "1.58.0";

14+ version = "1.57.0";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";

18+ sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";

1919 };

2020

2121 buildInputs = [ openssl ];

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1

@@ -1,4 +1,4 @@

1−# This file has been generated by node2nix 1.11.1. Do not edit!

1+# This file has been generated by node2nix 1.9.0. Do not edit!

33{pkgs ? import <nixpkgs> {

44 inherit system;

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+7−7

@@ -1,4 +1,4 @@

1−# This file has been generated by node2nix 1.11.1. Do not edit!

1+# This file has been generated by node2nix 1.9.0. Do not edit!

33{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

@@ -3128,13 +3128,13 @@ let

31283128 sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A==";

31293129 };

31303130 };

3131− "matrix-org-irc-1.2.1" = {

3131+ "matrix-org-irc-1.2.0" = {

31323132 name = "matrix-org-irc";

31333133 packageName = "matrix-org-irc";

3134− version = "1.2.1";

3134+ version = "1.2.0";

31353135 src = fetchurl {

3136− url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.1.tgz";

3137− sha512 = "x7SoeIOP+Z6R2s8PJqhM89OZNsS2RO4srx7c3JGa/VN6rtJ1AMLEyW4EPCVh09tGiTvmbit9KJysjLvFQPx9KA==";

3136+ url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz";

3137+ sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ==";

31383138 };

31393139 };

31403140 "media-typer-0.3.0" = {

@@ -5031,7 +5031,7 @@ let

50315031 args = {

50325032 name = "matrix-appservice-irc";

50335033 packageName = "matrix-appservice-irc";

5034− version = "0.34.0";

5034+ version = "0.33.1";

50355035 src = ./.;

50365036 dependencies = [

50375037 sources."@alloc/quick-lru-5.2.0"

@@ -5475,7 +5475,7 @@ let

54755475 sources."qs-6.10.3"

54765476 ];

54775477 })

5478− sources."matrix-org-irc-1.2.1"

5478+ sources."matrix-org-irc-1.2.0"

54795479 sources."media-typer-0.3.0"

54805480 sources."merge-descriptors-1.0.1"

54815481 sources."merge2-1.4.1"

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2

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

11{

22 "name": "matrix-appservice-irc",

3− "version": "0.34.0",

3+ "version": "0.33.1",

44 "description": "An IRC Bridge for Matrix",

55 "main": "app.js",

66 "bin": "./bin/matrix-appservice-irc",

@@ -34,7 +34,7 @@

3434 "he": "^1.2.0",

3535 "logform": "^2.4.0",

3636 "matrix-appservice-bridge": "^3.2.0",

37− "matrix-org-irc": "^1.2.1",

37+ "matrix-org-irc": "^1.2.0",

3838 "matrix-bot-sdk": "0.5.19",

3939 "nopt": "^3.0.1",

4040 "p-queue": "^6.6.2",

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4

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

11{

22 "url": "https://github.com/matrix-org/matrix-appservice-irc",

3− "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161",

4− "date": "2022-05-04T09:06:31+02:00",

5− "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc",

6− "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l",

3+ "rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc",

4+ "date": "2022-03-30T14:29:04+01:00",

5+ "path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc",

6+ "sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi",

77 "fetchLFS": false,

88 "fetchSubmodules": false,

99 "deepClone": false,

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

@@ -1,19 +1,19 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

1+{ lib, buildGoPackage, fetchFromGitHub }:

3−buildGoModule rec {

3+buildGoPackage rec {

44 pname = "aws-s3-exporter";

5− version = "0.5.0";

5+ version = "0.4.1";

7+ goPackagePath = "github.com/ribbybibby/s3_exporter";

79 src = fetchFromGitHub {

810 owner = "ribbybibby";

911 repo = "s3_exporter";

1012 rev = "v${version}";

11− sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";

13+ sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";

1214 };

1315

14− vendorSha256 = null;

15−

16− ldflags = [ "-s" "-w" ];

16+ doCheck = true;

1717

1818 meta = with lib; {

1919 description = "Exports Prometheus metrics about S3 buckets and objects";

pkgs/servers/monitoring/prometheus/haproxy-exporter.nix+7−9

@@ -1,20 +1,18 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

1+{ lib, buildGoPackage, fetchFromGitHub }:

3−buildGoModule rec {

3+buildGoPackage rec {

44 pname = "haproxy_exporter";

5− version = "0.13.0";

5+ version = "0.12.0";

7+ goPackagePath = "github.com/prometheus/haproxy_exporter";

79 src = fetchFromGitHub {

10+ rev = "v${version}";

811 owner = "prometheus";

912 repo = "haproxy_exporter";

10− rev = "v${version}";

11− sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";

13+ sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn";

1214 };

1315

14− vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";

15−

16− ldflags = [ "-s" "-w" ];

17−

1816 meta = with lib; {

1917 description = "HAProxy Exporter for the Prometheus monitoring system";

2018 homepage = "https://github.com/prometheus/haproxy_exporter";

pkgs/servers/monitoring/uchiwa/bower-packages.nixnew file+25

@@ -0,0 +1,25 @@

1+# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)

2+{ fetchbower, buildEnv }:

3+buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [

4+ (fetchbower "uchiwa-web" "1.7.0" "1.7.0" "1qn09j3a1ngqn36rhz7a2dj00szr0r6fjb40lfbmq3drkzppgbm1")

5+ (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")

6+ (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")

7+ (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")

8+ (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi")

9+ (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj")

10+ (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0")

11+ (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai")

12+ (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3")

13+ (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh")

14+ (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8")

15+ (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9")

16+ (fetchbower "bootstrap" "3.1.1" "3.1.1" "1a06mx1rw5h4wq89kqpa8g2pbiddm3p21dxq50jyi29sywd01ny4")

17+ (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "1k6hhvsd75hdfrz8qcjzmb12c17fdn0h3l3l5k9wgd0rfhhfkyvd")

18+ (fetchbower "fontawesome" "4.4.0" "~4.4.0" "09mrbik8i3skjwchn7ns2020bqmb51kbd3mqi59vh444s4az2sc7")

19+ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")

20+ (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")

21+ (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")

22+ (fetchbower "ua-parser-js" "0.7.20" "~0.7.12" "18r0islba6cwkvx4s2gna7skhsn2vqjcf1xyap5pcmycjnq93j8s")

23+ (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")

24+ (fetchbower "jquery" "3.4.1" ">= 1.9.0" "1vk25pbc55m2c82mqf26rfhxhnliq18isi4vbm4p98a1b9vp8fq7")

25+]; }

pkgs/servers/monitoring/uchiwa/default.nixnew file+53

@@ -0,0 +1,53 @@

1+{ lib, stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }:

3+let

4+ inherit (import ./src.nix) version sha256;

5+ owner = "sensu";

6+ repo = "uchiwa";

8+ src = fetchFromGitHub {

9+ inherit owner repo sha256;

10+ rev = version;

11+ };

12+

13+ backend = buildGoPackage {

14+ pname = "uchiwa-backend";

15+ inherit version;

16+ goPackagePath = "github.com/${owner}/${repo}";

17+ inherit src;

18+ postInstall = ''

19+ mkdir -p $out

20+ cp go/src/github.com/sensu/uchiwa/public/index.html $out/

21+ '';

22+ };

23+

24+ frontend = buildBowerComponents {

25+ name = "uchiwa-frontend-${version}";

26+ generated = ./bower-packages.nix;

27+ inherit src;

28+ };

29+

30+in stdenv.mkDerivation {

31+ pname = "uchiwa";

32+ inherit version;

33+

34+ inherit src;

35+

36+ nativeBuildInputs = [ makeWrapper ];

37+

38+ buildCommand = ''

39+ mkdir -p $out/bin $out/public

40+ makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \

41+ --add-flags "-p $out/public"

42+ ln -s ${backend.out}/index.html $out/public/index.html

43+ ln -s ${frontend.out}/bower_components $out/public/bower_components

44+ '';

45+

46+ meta = with lib; {

47+ description = "A Dashboard for the sensu monitoring framework";

48+ homepage = "http://sensuapp.org/";

49+ license = licenses.mit;

50+ maintainers = with maintainers; [ peterhoeg ];

51+ platforms = platforms.unix;

52+ };

53+}

pkgs/servers/monitoring/uchiwa/src.nixnew file+4

@@ -0,0 +1,4 @@

1+{

2+ version = "1.7.0-1";

3+ sha256 = "0fa3zzh6d8v1lfn828s0x65pcknycwyv0d1mndi0gvdfbfg463nf";

4+}

pkgs/servers/monitoring/uchiwa/update.shnew file+42

@@ -0,0 +1,42 @@

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix

4+set -euo pipefail

5+IFS=$'\n\t'

7+# set -x

9+REPO=sensu/uchiwa

10+VERSION=0.0.1

11+SHA="1111111111111111111111111111111111111111111111111111"

12+DIR=$(pwd)

13+

14+write_src() {

15+ cat <<_EOF > $DIR/src.nix

16+{

17+ version = "${VERSION}";

18+ sha256 = "${SHA}";

19+}

20+_EOF

21+}

22+

23+LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)

24+echo "Latest version: ${LATEST_VERSION}"

25+

26+VERSION=${1:-${LATEST_VERSION}}

27+echo "Updating to: ${VERSION}"

28+

29+TOP=$(git rev-parse --show-toplevel)

30+

31+cd $(dirname $0)

32+

33+write_src

34+pushd $TOP >/dev/null

35+SHA=$(nix-prefetch-url -A uchiwa.src)

36+popd >/dev/null

37+write_src

38+

39+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > bower.json

40+rm -f bower-packages.nix

41+bower2nix bower.json $DIR/bower-packages.nix

42+rm -f bower.json

pkgs/servers/moonraker/default.nix+3−3

@@ -20,13 +20,13 @@ let

2020 ]);

2121in stdenvNoCC.mkDerivation rec {

2222 pname = "moonraker";

23− version = "unstable-2022-04-23";

23+ version = "unstable-2022-03-10";

2424

2525 src = fetchFromGitHub {

2626 owner = "Arksine";

2727 repo = "moonraker";

28− rev = "cd520ba91728abb5a3d959269fbd8e4f40d1eb0b";

29− sha256 = "sha256-sopX9t+LjYldx+syKwU3I0x/VYy4hLyXfitG0uumayE=";

28+ rev = "ee312ee9c6597c8d077d7c3208ccea4e696c97ca";

29+ sha256 = "l0VOQIfKgZ/Je4z+SKhWMgYzxye8WKs9W1GkNs7kABo=";

3030 };

3131

3232 nativeBuildInputs = [ makeWrapper ];

pkgs/servers/redpanda/default.nixdeleted−35

@@ -1,35 +0,0 @@

1−{ lib, stdenv, fetchzip }:

2−

3−let

4− version = "21.11.15";

5− platform = if stdenv.isLinux then "linux" else "darwin";

6− arch = if stdenv.isAarch64 then "arm" else "amd";

7−in stdenv.mkDerivation rec {

8− pname = "redpanda";

9− inherit version;

10−

11− src = fetchzip {

12− url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip";

13− sha256 = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";

14− };

15−

16− installPhase = ''

17− runHook preInstall

18−

19− mkdir -p $out/bin

20− cp rpk $out/bin

21−

22− runHook postInstall

23− '';

24−

25− # stripping somehow completely breaks it

26− dontStrip = true;

27−

28− meta = with lib; {

29− description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! ";

30− license = licenses.bsl11;

31− homepage = "https://redpanda.com/";

32− maintainers = with maintainers; [ happysalada ];

33− platforms = platforms.all;

34− };

35−}

pkgs/servers/roon-server/default.nix+2−2

@@ -16,7 +16,7 @@

1616}:

1717stdenv.mkDerivation rec {

1818 pname = "roon-server";

19− version = "1.8-935";

19+ version = "1.8-933";

2020

2121 src =

2222 let

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

2424 in

2525 fetchurl {

2626 url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";

27− hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg=";

27+ hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE=";

2828 };

2929

3030 dontConfigure = true;

pkgs/servers/unifi/default.nix+2−2

@@ -65,7 +65,7 @@ in rec {

6565 };

6666

6767 unifi7 = generic {

68− version = "7.1.61";

69− sha256 = "sha256-7Ac8BjlBLCslSU6IZK0EtheKz4CtH7tcmR8J2rUGYbs=";

68+ version = "7.0.25";

69+ sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";

7070 };

7171}

pkgs/servers/web-apps/sogo/default.nix+2−2

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

11{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir

22, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests

3−, oath-toolkit }:

3+, oathToolkit }:

44gnustep.stdenv.mkDerivation rec {

55 pname = "SOGo";

66 version = "5.5.0";

@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {

1313 };

1414

1515 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];

16− buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ];

16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];

1717

1818 patches = [

1919 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches

pkgs/servers/web-apps/wallabag/default.nix+1−3

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

44}:

66# Point the environment variable $WALLABAG_DATA to a data directory

7−# that contains the folder `app` which must be a clone of

7+# that contains the folder `app/config` which must be a clone of

88# wallabag's configuration files with your customized `parameters.yml`.

9−# In practice you need to copy `${pkgs.wallabag}/app` and the

10−# customizzed `parameters.yml` to $WALLABAG_DATA.

119# These need to be updated every package upgrade.

1210#

1311# After a package upgrade, empty the `var/cache` folder or unexpected

pkgs/servers/xmpp/prosody/default.nix+22−9

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

11{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg

2−, icu

32, lua

43, nixosTests

54, withLibevent ? true

@@ -14,7 +13,7 @@ with lib;

1413

1514let

1615 luaEnv = lua.withPackages(p: with p; [

17− luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound

16+ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3

1817 ]

1918 ++ lib.optional withLibevent p.luaevent

2019 ++ lib.optional withDBI p.luadbi

@@ -22,19 +21,21 @@ let

2221 );

2322in

2423stdenv.mkDerivation rec {

25− version = "0.12.0"; # also update communityModules

24+ version = "0.11.13"; # also update communityModules

2625 pname = "prosody";

2726 # The following community modules are necessary for the nixos module

2827 # prosody module to comply with XEP-0423 and provide a working

2928 # default setup.

3029 nixosModuleDeps = [

30+ "bookmarks"

3131 "cloud_notify"

3232 "vcard_muc"

33+ "smacks"

3334 "http_upload"

3435 ];

3536 src = fetchurl {

3637 url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";

37− sha256 = "sha256-dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo=";

38+ sha256 = "sha256-OcYbNGoJtRJbYEy5aeFCBsu8uGyBFW/8a6LWJSfPBDI=";

3839 };

3940

4041 # A note to all those merging automated updates: Please also update this

@@ -42,13 +43,13 @@ stdenv.mkDerivation rec {

4243 # version.

4344 communityModules = fetchhg {

4445 url = "https://hg.prosody.im/prosody-modules";

45− rev = "65438e4ba563";

46− sha256 = "sha256-zHOrMzcgHOdBl7nObM+OauifbcmKEOfAuj81MDSoLMk=";

46+ rev = "54fa2116bbf3";

47+ sha256 = "sha256-OKZ7tD75q8/GMXruUQ+r9l0BxzdbPHNf41fZ3fHVQVw=";

4748 };

4849

4950 nativeBuildInputs = [ makeWrapper ];

5051 buildInputs = [

51− luaEnv libidn openssl icu

52+ luaEnv libidn openssl

5253 ]

5354 ++ withExtraLibs;

5455

@@ -62,14 +63,26 @@ stdenv.mkDerivation rec {

6263 make -C tools/migration

6364 '';

6465

66+ luaEnvPath = lua.pkgs.lib.genLuaPathAbsStr luaEnv;

67+ luaEnvCPath = lua.pkgs.lib.genLuaCPathAbsStr luaEnv;

68+

6569 # the wrapping should go away once lua hook is fixed

6670 postInstall = ''

6771 ${concatMapStringsSep "\n" (module: ''

6872 cp -r $communityModules/mod_${module} $out/lib/prosody/modules/

6973 '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}

74+ wrapProgram $out/bin/prosody \

75+ --prefix LUA_PATH ';' "$luaEnvPath" \

76+ --prefix LUA_CPATH ';' "$luaEnvCPath"

7077 wrapProgram $out/bin/prosodyctl \

71− --add-flags '--config "/etc/prosody/prosody.cfg.lua"'

78+ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \

79+ --prefix LUA_PATH ';' "$luaEnvPath" \

80+ --prefix LUA_CPATH ';' "$luaEnvCPath"

81+

7282 make -C tools/migration install

83+ wrapProgram $out/bin/prosody-migrator \

84+ --prefix LUA_PATH ';' "$luaEnvPath" \

85+ --prefix LUA_CPATH ';' "$luaEnvCPath"

7386 '';

7487

7588 passthru = {

@@ -82,6 +95,6 @@ stdenv.mkDerivation rec {

8295 license = licenses.mit;

8396 homepage = "https://prosody.im";

8497 platforms = platforms.linux;

85− maintainers = with maintainers; [ fpletz globin ];

98+ maintainers = with maintainers; [ fpletz globin ninjatrappeur ];

8699 };

87100}

pkgs/stdenv/generic/check-meta.nix+15−40

@@ -7,17 +7,13 @@ let

77 # If we're in hydra, we can dispense with the more verbose error

88 # messages and make problems easier to spot.

99 inHydra = config.inHydra or false;

10− # Allow the user to opt-into additional warnings, e.g.

11− # import <nixpkgs> { config = { showDerivationWarnings = [ "maintainerless" ]; }; }

12− showWarnings = config.showDerivationWarnings;

13−

1410 getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");

1511

1612 # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426

1713 # for why this defaults to false, but I (@copumpkin) want to default it to true soon.

1814 shouldCheckMeta = config.checkMeta or false;

1915

20− allowUnfree = config.allowUnfree

16+ allowUnfree = config.allowUnfree or false

2117 || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";

2218

2319 allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];

@@ -38,10 +34,10 @@ let

3834 hasBlocklistedLicense = assert areLicenseListsValid; attrs:

3935 hasLicense attrs && lib.lists.any (l: builtins.elem l blocklist) (lib.lists.toList attrs.meta.license);

4036

41− allowBroken = config.allowBroken

37+ allowBroken = config.allowBroken or false

4238 || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";

4339

44− allowUnsupportedSystem = config.allowUnsupportedSystem

40+ allowUnsupportedSystem = config.allowUnsupportedSystem or false

4541 || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";

4642

4743 isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses;

@@ -50,9 +46,6 @@ let

5046 hasLicense attrs &&

5147 isUnfree (lib.lists.toList attrs.meta.license);

5248

53− hasNoMaintainers = attrs:

54− attrs ? meta.maintainers && (lib.length attrs.meta.maintainers) == 0;

55−

5649 isMarkedBroken = attrs: attrs.meta.broken or false;

5750

5851 hasUnsupportedPlatform = attrs:

@@ -98,7 +91,6 @@ let

9891 insecure = remediate_insecure;

9992 broken-outputs = remediateOutputsToInstall;

10093 unknown-meta = x: "";

101− maintainerless = x: "";

10294 };

10395 remediation_env_var = allow_attr: {

10496 Unfree = "NIXPKGS_ALLOW_UNFREE";

@@ -207,14 +199,6 @@ let

207199 else throw;

208200 in handler msg;

209201

210− handleEvalWarning = { meta, attrs }: { reason , errormsg ? "" }:

211− let

212− remediationMsg = (builtins.getAttr reason remediation) attrs;

213− msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}"

214− else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway."

215− + (if remediationMsg != "" then "\n${remediationMsg}" else "");

216− isEnabled = lib.findFirst (x: x == reason) null showWarnings;

217− in if isEnabled != null then builtins.trace msg true else true;

218202

219203 metaTypes = with lib.types; rec {

220204 # These keys are documented

@@ -293,37 +277,28 @@ let

293277 insecure = isMarkedInsecure attrs;

294278 }

295279 // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then

296− { valid = "no"; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }

280+ { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }

297281 else if hasBlocklistedLicense attrs then

298− { valid = "no"; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; }

282+ { valid = false; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; }

299283 else if !allowBroken && attrs.meta.broken or false then

300− { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }

284+ { valid = false; reason = "broken"; errormsg = "is marked as broken"; }

301285 else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then

302− { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; }

286+ { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; }

303287 else if !(hasAllowedInsecure attrs) then

304− { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }

288+ { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }

305289 else if checkOutputsToInstall attrs then

306− { valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }

290+ { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }

307291 else let res = checkMeta (attrs.meta or {}); in if res != [] then

308− { valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }

309− # --- warnings ---

310− # Please also update the type in /pkgs/top-level/config.nix alongside this.

311− else if hasNoMaintainers attrs then

312− { valid = "warn"; reason = "maintainerless"; errormsg = "has no maintainers"; }

313− # -----

314− else { valid = "yes"; });

292+ { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }

293+ else { valid = true; });

315294

316295 assertValidity = { meta, attrs }: let

317296 validity = checkValidity attrs;

318297 in validity // {

319− # Throw an error if trying to evaluate a non-valid derivation

320− # or, alternatively, just output a warning message.

321− handled =

322− {

323− no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; };

324− warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; };

325− yes = true;

326− }.${validity.valid};

298+ # Throw an error if trying to evaluate an non-valid derivation

299+ handled = if !validity.valid

300+ then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }

301+ else true;

327302 };

328303

329304in assertValidity

pkgs/stdenv/generic/make-derivation.nix+4−69

@@ -9,72 +9,8 @@ let

99 # to build it. This is a bit confusing for cross compilation.

1010 inherit (stdenv) hostPlatform;

1111 };

12−

13− makeOverlayable = mkDerivationSimple:

14− fnOrAttrs:

15− if builtins.isFunction fnOrAttrs

16− then makeDerivationExtensible mkDerivationSimple fnOrAttrs

17− else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs;

18−

19− # Based off lib.makeExtensible, with modifications:

20− makeDerivationExtensible = mkDerivationSimple: rattrs:

21− let

22− # NOTE: The following is a hint that will be printed by the Nix cli when

23− # encountering an infinite recursion. It must not be formatted into

24− # separate lines, because Nix would only show the last line of the comment.

25−

26− # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`.

27− args = rattrs (args // { inherit finalPackage; });

28− # ^^^^

29−

30− finalPackage =

31− mkDerivationSimple

32− (f0:

33− let

34− f = self: super:

35− # Convert f0 to an overlay. Legacy is:

36− # overrideAttrs (super: {})

37− # We want to introduce self. We follow the convention of overlays:

38− # overrideAttrs (self: super: {})

39− # Which means the first parameter can be either self or super.

40− # This is surprising, but far better than the confusion that would

41− # arise from flipping an overlay's parameters in some cases.

42− let x = f0 super;

43− in

44− if builtins.isFunction x

45− then

46− # Can't reuse `x`, because `self` comes first.

47− # Looks inefficient, but `f0 super` was a cheap thunk.

48− f0 self super

49− else x;

50− in

51− makeDerivationExtensible mkDerivationSimple

52− (self: let super = rattrs self; in super // f self super))

53− args;

54− in finalPackage;

55−

56− # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs),

57− # but pre-evaluated for a slight improvement in performance.

58− makeDerivationExtensibleConst = mkDerivationSimple: attrs:

59− mkDerivationSimple

60− (f0:

61− let

62− f = self: super:

63− let x = f0 super;

64− in

65− if builtins.isFunction x

66− then

67− f0 self super

68− else x;

69− in

70− makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs))

71− attrs;

72−

7312in

7413

75−makeOverlayable (overrideAttrs:

76−

77−

7814# `mkDerivation` wraps the builtin `derivation` function to

7915# produce derivations that use this stdenv and its shell.

8016#

@@ -134,7 +70,6 @@ makeOverlayable (overrideAttrs:

13470

13571, # TODO(@Ericson2314): Make always true and remove

13672 strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform

137−

13873, meta ? {}

13974, passthru ? {}

14075, pos ? # position used in error messages and for meta.position

@@ -435,7 +370,7 @@ else let

435370 } // {

436371 # Expose the result of the checks for everyone to see.

437372 inherit (validity) unfree broken unsupported insecure;

438− available = validity.valid != "no"

373+ available = validity.valid

439374 && (if config.checkMetaRecursively or false

440375 then lib.all (d: d.meta.available or true) references

441376 else true);

@@ -446,6 +381,8 @@ in

446381lib.extendDerivation

447382 validity.handled

448383 ({

384+ overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs));

385+

449386 # A derivation that always builds successfully and whose runtime

450387 # dependencies are the original derivations build time dependencies

451388 # This allows easy building and distributing of all derivations

@@ -471,12 +408,10 @@ lib.extendDerivation

471408 args = [ "-c" "export > $out" ];

472409 });

473410

474− inherit meta passthru overrideAttrs;

411+ inherit meta passthru;

475412 } //

476413 # Pass through extra attributes that are not inputs, but

477414 # should be made available to Nix expressions using the

478415 # derivation (e.g., in assertions).

479416 passthru)

480417 (derivation derivationArg)

481−

482−)

pkgs/tools/X11/opentabletdriver/default.nix+2−2

@@ -19,13 +19,13 @@

1919

2020buildDotnetModule rec {

2121 pname = "OpenTabletDriver";

22− version = "0.6.0.4";

22+ version = "0.6.0.3";

2323

2424 src = fetchFromGitHub {

2525 owner = "OpenTabletDriver";

2626 repo = "OpenTabletDriver";

2727 rev = "v${version}";

28− sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";

28+ sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos=";

2929 };

3030

3131 debPkg = fetchurl {

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

@@ -20,7 +20,6 @@

2020 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

2121 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

2222 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })

23− (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

2423 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

2524 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

2625 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

@@ -28,6 +27,7 @@

2827 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

2928 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

3029 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

30+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

3131 (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

3232 (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

3333 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })

pkgs/tools/admin/aws-google-auth/default.nix+3−3

@@ -20,15 +20,15 @@

2020

2121buildPythonApplication rec {

2222 pname = "aws-google-auth";

23− version = "0.0.38";

23+ version = "0.0.37";

2424

2525 # Pypi doesn't ship the tests, so we fetch directly from GitHub

2626 # https://github.com/cevoaustralia/aws-google-auth/issues/120

2727 src = fetchFromGitHub {

2828 owner = "cevoaustralia";

2929 repo = "aws-google-auth";

30− rev = "refs/tags/${version}";

31− sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4=";

30+ rev = version;

31+ sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd";

3232 };

3333

3434 propagatedBuildInputs = [

pkgs/tools/admin/lxd/default.nix−1

@@ -48,7 +48,6 @@ buildGo118Package rec {

4848 '';

4949

5050 passthru.tests.lxd = nixosTests.lxd;

51− passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

5251

5352 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

5453 buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

pkgs/tools/admin/pgadmin/default.nix+54−87

@@ -1,21 +1,21 @@

1−{ lib

1+{ stdenv

2+, lib

23, python3

34, fetchurl

45, zlib

56, mkYarnModules

67, sphinx

78, nixosTests

8−, pkgs

99}:

1010

1111let

1212

1313 pname = "pgadmin";

14− version = "6.8";

14+ version = "6.7";

1515

1616 src = fetchurl {

1717 url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

18− sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw=";

18+ sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d";

1919 };

2020

2121 yarnDeps = mkYarnModules {

@@ -25,78 +25,9 @@ let

2525 yarnLock = ./yarn.lock;

2626 yarnNix = ./yarn.nix;

2727 };

28−

29− # move buildDeps here to easily pass to test suite

30− buildDeps = with pythonPackages; [

31− flask

32− flask-gravatar

33− flask_login

34− flask_mail

35− flask_migrate

36− flask_sqlalchemy

37− flask_wtf

38− flask-compress

39− passlib

40− pytz

41− simplejson

42− six

43− sqlparse

44− wtforms

45− flask-paranoid

46− psutil

47− psycopg2

48− python-dateutil

49− sqlalchemy

50− itsdangerous

51− flask-security-too

52− bcrypt

53− cryptography

54− sshtunnel

55− ldap3

56− flask-babelex

57− flask-babel

58− gssapi

59− flask-socketio

60− eventlet

61− httpagentparser

62− user-agents

63− wheel

64− authlib

65− qrcode

66− pillow

67− pyotp

68− botocore

69− boto3

70− ];

71−

72− # override necessary on pgadmin4 6.8

73− pythonPackages = python3.pkgs.overrideScope (final: prev: rec {

74− flask = prev.flask.overridePythonAttrs (oldAttrs: rec {

75− version = "2.0.3";

76− src = oldAttrs.src.override {

77− inherit version;

78− sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";

79− };

80− disabledTests = (oldAttrs.disabledTests or [ ]) ++ [

81− "test_aborting"

82− ];

83− });

84− flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec {

85− # tests fail due to downgrades here

86− doCheck = false;

87− });

88− werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {

89− version = "2.0.3";

90− src = oldAttrs.src.override {

91− inherit version;

92− sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";

93− };

94− });

95− });

96−

9728in

9829

99−pythonPackages.buildPythonApplication rec {

30+python3.pkgs.buildPythonApplication rec {

10031 inherit pname version src;

10132

10233 # from Dockerfile

@@ -112,19 +43,19 @@ pythonPackages.buildPythonApplication rec {

11243 postPatch = ''

11344 # patching Makefile, so it doesn't try to build sphinx documentation here

11445 # (will do so later)

115− substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"

46+ substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true"

11647 # fix document which refers a non-existing document and fails

11748 substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""

11849 patchShebangs .

11950 # relax dependencies

12051 substituteInPlace requirements.txt \

52+ --replace "Pillow==8.3.*" "Pillow>=8.3.0" \

12153 --replace "psycopg2==2.9.*" "psycopg2>=2.9" \

12254 --replace "cryptography==3.*" "cryptography>=3.0" \

12355 --replace "requests==2.25.*" "requests>=2.25.0" \

12456 --replace "boto3==1.20.*" "boto3>=1.20" \

12557 --replace "botocore==1.23.*" "botocore>=1.23" \

126− --replace "pytz==2021.*" "pytz" \

127− --replace "Werkzeug==2.0.3" "werkzeug>=2.*"

58+ --replace "pytz==2021.*" "pytz"

12859 # don't use Server Mode (can be overridden later)

12960 substituteInPlace pkg/pip/setup_pip.py \

13061 --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \

@@ -170,10 +101,10 @@ pythonPackages.buildPythonApplication rec {

170101 cp -v ../pkg/pip/setup_pip.py setup.py

171102 '';

172103

173− nativeBuildInputs = with pythonPackages; [ cython pip ];

104+ nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ];

174105 buildInputs = [

175106 zlib

176− pythonPackages.wheel

107+ python3.pkgs.wheel

177108 ];

178109

179110 # tests need an own data, log directory

@@ -181,21 +112,57 @@ pythonPackages.buildPythonApplication rec {

181112 # checks will be run through nixos/tests

182113 doCheck = false;

183114

184− # speaklater3 is seperate because when passing buildDeps

185− # to the test, it fails there due to a collision with speaklater

186− propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];

115+ propagatedBuildInputs = with python3.pkgs; [

116+ flask

117+ flask-gravatar

118+ flask_login

119+ flask_mail

120+ flask_migrate

121+ flask_sqlalchemy

122+ flask_wtf

123+ flask-compress

124+ passlib

125+ pytz

126+ simplejson

127+ six

128+ speaklater3

129+ sqlparse

130+ wtforms

131+ flask-paranoid

132+ psutil

133+ psycopg2

134+ python-dateutil

135+ sqlalchemy

136+ itsdangerous

137+ flask-security-too

138+ bcrypt

139+ cryptography

140+ sshtunnel

141+ ldap3

142+ flask-babelex

143+ flask-babel

144+ gssapi

145+ flask-socketio

146+ eventlet

147+ httpagentparser

148+ user-agents

149+ wheel

150+ authlib

151+ qrcode

152+ pillow

153+ pyotp

154+ botocore

155+ boto3

156+ ];

187157

188− passthru.tests = {

189− standalone = nixosTests.pgadmin4-standalone;

190− # regression and function tests of the package itself

191− package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; }));

158+ passthru = {

159+ tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; };

192160 };

193161

194162 meta = with lib; {

195163 description = "Administration and development platform for PostgreSQL";

196164 homepage = "https://www.pgadmin.org/";

197165 license = licenses.mit;

198− changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html";

199166 maintainers = with maintainers; [ gador ];

200167 };

201168}

pkgs/tools/admin/pgadmin/package.json+4−7

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

88 "license": "PostgreSQL",

99 "devDependencies": {

1010 "@babel/core": "^7.10.2",

11− "@babel/eslint-parser": "^7.17.0",

12− "@babel/eslint-plugin": "^7.17.7",

11+ "@babel/eslint-parser": "^7.12.13",

12+ "@babel/eslint-plugin": "^7.12.13",

1313 "@babel/plugin-proposal-object-rest-spread": "^7.10.1",

1414 "@babel/plugin-syntax-jsx": "^7.16.0",

1515 "@babel/preset-env": "^7.10.2",

@@ -82,12 +82,11 @@

8282 "@date-io/core": "^1.3.6",

8383 "@date-io/date-fns": "1.x",

8484 "@emotion/sheet": "^1.0.1",

85+ "@fortawesome/fontawesome-free": "^5.14.0",

8586 "@material-ui/core": "4.11.0",

8687 "@material-ui/icons": "^4.11.2",

8788 "@material-ui/lab": "4.0.0-alpha.58",

8889 "@material-ui/pickers": "^3.2.10",

89− "@mui/icons-material": "^5.4.2",

90− "@mui/material": "^5.4.3",

9190 "@projectstorm/react-diagrams": "^6.6.1",

9291 "@simonwep/pickr": "^1.5.1",

9392 "@szhsin/react-menu": "^2.2.0",

@@ -146,7 +145,7 @@

146145 "path-fx": "^2.0.0",

147146 "pathfinding": "^0.4.18",

148147 "paths-js": "^0.4.9",

149− "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613",

148+ "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422",

150149 "postcss": "^8.2.15",

151150 "raf": "^3.4.1",

152151 "rc-dock": "^3.2.9",

@@ -155,8 +154,6 @@

155154 "react-checkbox-tree": "^1.7.2",

156155 "react-dom": "^17.0.1",

157156 "react-draggable": "^4.4.4",

158− "react-rnd": "^10.3.5",

159− "react-router-dom": "^6.2.2",

160157 "react-select": "^4.2.1",

161158 "react-table": "^7.6.3",

162159 "react-timer-hook": "^3.0.5",

pkgs/tools/admin/pgadmin/yarn.lock+22−231

@@ -91,19 +91,19 @@

9191 json5 "^2.1.2"

9292 semver "^6.3.0"

9393

94−"@babel/eslint-parser@^7.17.0":

95− version "7.17.0"

96− resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"

97− integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==

94+"@babel/eslint-parser@^7.12.13":

95+ version "7.13.8"

96+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687"

97+ integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==

9898 dependencies:

99− eslint-scope "^5.1.1"

100− eslint-visitor-keys "^2.1.0"

99+ eslint-scope "5.1.0"

100+ eslint-visitor-keys "^1.3.0"

101101 semver "^6.3.0"

102102

103−"@babel/eslint-plugin@^7.17.7":

104− version "7.17.7"

105− resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8"

106− integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==

103+"@babel/eslint-plugin@^7.12.13":

104+ version "7.13.0"

105+ resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b"

106+ integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==

107107 dependencies:

108108 eslint-rule-composer "^0.3.0"

109109

@@ -1741,13 +1741,6 @@

17411741 dependencies:

17421742 regenerator-runtime "^0.13.4"

17431743

1744−"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6":

1745− version "7.17.8"

1746− resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"

1747− integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==

1748− dependencies:

1749− regenerator-runtime "^0.13.4"

1750−

17511744"@babel/template@^7.12.13", "@babel/template@^7.14.5":

17521745 version "7.14.5"

17531746 resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"

@@ -1856,17 +1849,6 @@

18561849 "@emotion/weak-memoize" "^0.2.5"

18571850 stylis "^4.0.3"

18581851

1859−"@emotion/cache@^11.7.1":

1860− version "11.7.1"

1861− resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"

1862− integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==

1863− dependencies:

1864− "@emotion/memoize" "^0.7.4"

1865− "@emotion/sheet" "^1.1.0"

1866− "@emotion/utils" "^1.0.0"

1867− "@emotion/weak-memoize" "^0.2.5"

1868− stylis "4.0.13"

1869−

18701852"@emotion/core@^10.0.14":

18711853 version "10.1.1"

18721854 resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"

@@ -1900,13 +1882,6 @@

19001882 dependencies:

19011883 "@emotion/memoize" "0.7.4"

19021884

1903−"@emotion/is-prop-valid@^1.1.2":

1904− version "1.1.2"

1905− resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"

1906− integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==

1907− dependencies:

1908− "@emotion/memoize" "^0.7.4"

1909−

19101885"@emotion/memoize@0.7.4":

19111886 version "0.7.4"

19121887 resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"

@@ -1962,11 +1937,6 @@

19621937 resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"

19631938 integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==

19641939

1965−"@emotion/sheet@^1.1.0":

1966− version "1.1.0"

1967− resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"

1968− integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==

1969−

19701940"@emotion/styled-base@^10.0.27":

19711941 version "10.0.31"

19721942 resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"

@@ -2147,93 +2117,6 @@

21472117 prop-types "^15.7.2"

21482118 react-is "^16.8.0 || ^17.0.0"

21492119

2150−"@mui/base@5.0.0-alpha.74":

2151− version "5.0.0-alpha.74"

2152− resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750"

2153− integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==

2154− dependencies:

2155− "@babel/runtime" "^7.17.2"

2156− "@emotion/is-prop-valid" "^1.1.2"

2157− "@mui/types" "^7.1.3"

2158− "@mui/utils" "^5.5.3"

2159− "@popperjs/core" "^2.11.4"

2160− clsx "^1.1.1"

2161− prop-types "^15.7.2"

2162− react-is "^17.0.2"

2163−

2164−"@mui/icons-material@^5.4.2":

2165− version "5.5.1"

2166− resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb"

2167− integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==

2168− dependencies:

2169− "@babel/runtime" "^7.17.2"

2170−

2171−"@mui/material@^5.4.3":

2172− version "5.5.3"

2173− resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc"

2174− integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==

2175− dependencies:

2176− "@babel/runtime" "^7.17.2"

2177− "@mui/base" "5.0.0-alpha.74"

2178− "@mui/system" "^5.5.3"

2179− "@mui/types" "^7.1.3"

2180− "@mui/utils" "^5.5.3"

2181− "@types/react-transition-group" "^4.4.4"

2182− clsx "^1.1.1"

2183− csstype "^3.0.11"

2184− hoist-non-react-statics "^3.3.2"

2185− prop-types "^15.7.2"

2186− react-is "^17.0.2"

2187− react-transition-group "^4.4.2"

2188−

2189−"@mui/private-theming@^5.5.3":

2190− version "5.5.3"

2191− resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab"

2192− integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==

2193− dependencies:

2194− "@babel/runtime" "^7.17.2"

2195− "@mui/utils" "^5.5.3"

2196− prop-types "^15.7.2"

2197−

2198−"@mui/styled-engine@^5.5.2":

2199− version "5.5.2"

2200− resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6"

2201− integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==

2202− dependencies:

2203− "@babel/runtime" "^7.17.2"

2204− "@emotion/cache" "^11.7.1"

2205− prop-types "^15.7.2"

2206−

2207−"@mui/system@^5.5.3":

2208− version "5.5.3"

2209− resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5"

2210− integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==

2211− dependencies:

2212− "@babel/runtime" "^7.17.2"

2213− "@mui/private-theming" "^5.5.3"

2214− "@mui/styled-engine" "^5.5.2"

2215− "@mui/types" "^7.1.3"

2216− "@mui/utils" "^5.5.3"

2217− clsx "^1.1.1"

2218− csstype "^3.0.11"

2219− prop-types "^15.7.2"

2220−

2221−"@mui/types@^7.1.3":

2222− version "7.1.3"

2223− resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"

2224− integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==

2225−

2226−"@mui/utils@^5.5.3":

2227− version "5.5.3"

2228− resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65"

2229− integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==

2230− dependencies:

2231− "@babel/runtime" "^7.17.2"

2232− "@types/prop-types" "^15.7.4"

2233− "@types/react-is" "^16.7.1 || ^17.0.0"

2234− prop-types "^15.7.2"

2235− react-is "^17.0.2"

2236−

22372120"@nodelib/fs.scandir@2.1.4":

22382121 version "2.1.4"

22392122 resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"

@@ -2276,11 +2159,6 @@

22762159 resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"

22772160 integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==

22782161

2279−"@popperjs/core@^2.11.4":

2280− version "2.11.4"

2281− resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503"

2282− integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==

2283−

22842162"@popperjs/core@^2.8.3":

22852163 version "2.9.0"

22862164 resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"

@@ -2558,11 +2436,6 @@

25582436 resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"

25592437 integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

25602438

2561−"@types/prop-types@^15.7.4":

2562− version "15.7.4"

2563− resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"

2564− integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==

2565−

25662439"@types/q@^1.5.1":

25672440 version "1.5.4"

25682441 resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"

@@ -2575,13 +2448,6 @@

25752448 dependencies:

25762449 "@types/react" "^16"

25772450

2578−"@types/react-is@^16.7.1 || ^17.0.0":

2579− version "17.0.3"

2580− resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a"

2581− integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==

2582− dependencies:

2583− "@types/react" "*"

2584−

25852451"@types/react-transition-group@^4.2.0":

25862452 version "4.4.1"

25872453 resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"

@@ -2589,13 +2455,6 @@

25892455 dependencies:

25902456 "@types/react" "*"

25912457

2592−"@types/react-transition-group@^4.4.4":

2593− version "4.4.4"

2594− resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"

2595− integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==

2596− dependencies:

2597− "@types/react" "*"

2598−

25992458"@types/react@*", "@types/react@^16":

26002459 version "16.14.10"

26012460 resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477"

@@ -4681,11 +4540,6 @@ csstype@^2.5.2, csstype@^2.5.7:

46814540 resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"

46824541 integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==

46834542

4684−csstype@^3.0.11:

4685− version "3.0.11"

4686− resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"

4687− integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==

4688−

46894543csstype@^3.0.2:

46904544 version "3.0.8"

46914545 resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"

@@ -5369,6 +5223,14 @@ eslint-rule-composer@^0.3.0:

53695223 resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"

53705224 integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==

53715225

5226+eslint-scope@5.1.0:

5227+ version "5.1.0"

5228+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"

5229+ integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==

5230+ dependencies:

5231+ esrecurse "^4.1.0"

5232+ estraverse "^4.1.1"

5233+

53725234eslint-scope@^5.1.1:

53735235 version "5.1.1"

53745236 resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"

@@ -5389,7 +5251,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:

53895251 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"

53905252 integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

53915253

5392−eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:

5254+eslint-visitor-keys@^2.0.0:

53935255 version "2.1.0"

53945256 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"

53955257 integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==

@@ -5458,7 +5320,7 @@ esquery@^1.4.0:

54585320 dependencies:

54595321 estraverse "^5.1.0"

54605322

5461−esrecurse@^4.3.0:

5323+esrecurse@^4.1.0, esrecurse@^4.3.0:

54625324 version "4.3.0"

54635325 resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"

54645326 integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==

@@ -5636,11 +5498,6 @@ fast-levenshtein@^2.0.6:

56365498 resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"

56375499 integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=

56385500

5639−fast-memoize@^2.5.1:

5640− version "2.5.2"

5641− resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"

5642− integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==

5643−

56445501fast-safe-stringify@^2.0.7:

56455502 version "2.0.7"

56465503 resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"

@@ -6202,13 +6059,6 @@ hex-color-regex@^1.1.0:

62026059 resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"

62036060 integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

62046061

6205−history@^5.2.0:

6206− version "5.3.0"

6207− resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"

6208− integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==

6209− dependencies:

6210− "@babel/runtime" "^7.7.6"

6211−

62126062hmac-drbg@^1.0.1:

62136063 version "1.0.1"

62146064 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"

@@ -8501,9 +8351,9 @@ performance-now@^2.1.0:

85018351 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

85028352 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

85038353

8504−"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613":

8354+"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422":

85058355 version "1.0.0"

8506− resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613"

8356+ resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422"

85078357 dependencies:

85088358 "@types/classnames" "^2.2.6"

85098359 "@types/react" "^16.7.18"

@@ -9173,13 +9023,6 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0

91739023 react-is "^16.12.0"

91749024 shallowequal "^1.1.0"

91759025

9176−re-resizable@6.9.1:

9177− version "6.9.1"

9178− resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"

9179− integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==

9180− dependencies:

9181− fast-memoize "^2.5.1"

9182−

91839026react-aspen@^1.1.0, react-aspen@^1.1.1:

91849027 version "1.1.1"

91859028 resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038"

@@ -9220,14 +9063,6 @@ react-dom@^17.0.1:

92209063 object-assign "^4.1.1"

92219064 scheduler "^0.20.2"

92229065

9223−react-draggable@4.4.3:

9224− version "4.4.3"

9225− resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"

9226− integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==

9227− dependencies:

9228− classnames "^2.2.5"

9229− prop-types "^15.6.0"

9230−

92319066react-draggable@^4.4.4:

92329067 version "4.4.4"

92339068 resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"

@@ -9258,30 +9093,6 @@ react-property@1.0.1:

92589093 resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6"

92599094 integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==

92609095

9261−react-rnd@^10.3.5:

9262− version "10.3.5"

9263− resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139"

9264− integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==

9265− dependencies:

9266− re-resizable "6.9.1"

9267− react-draggable "4.4.3"

9268− tslib "2.3.0"

9269−

9270−react-router-dom@^6.2.2:

9271− version "6.3.0"

9272− resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"

9273− integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==

9274− dependencies:

9275− history "^5.2.0"

9276− react-router "6.3.0"

9277−

9278−react-router@6.3.0:

9279− version "6.3.0"

9280− resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"

9281− integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==

9282− dependencies:

9283− history "^5.2.0"

9284−

92859096react-select@^4.2.1:

92869097 version "4.3.1"

92879098 resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"

@@ -9333,16 +9144,6 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g

93339144 loose-envify "^1.4.0"

93349145 prop-types "^15.6.2"

93359146

9336−react-transition-group@^4.4.2:

9337− version "4.4.2"

9338− resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"

9339− integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==

9340− dependencies:

9341− "@babel/runtime" "^7.5.5"

9342− dom-helpers "^5.0.1"

9343− loose-envify "^1.4.0"

9344− prop-types "^15.6.2"

9345−

93469147react-transition-state@^1.1.3:

93479148 version "1.1.3"

93489149 resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f"

@@ -10360,11 +10161,6 @@ stylehacks@^5.0.1:

1036010161 browserslist "^4.16.0"

1036110162 postcss-selector-parser "^6.0.4"

1036210163

10363−stylis@4.0.13:

10364− version "4.0.13"

10365− resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"

10366− integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==

10367−

1036810164stylis@^4.0.3, stylis@^4.0.7:

1036910165 version "4.0.10"

1037010166 resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

@@ -10715,11 +10511,6 @@ trim-right@^1.0.1:

1071510511 resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

1071610512 integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

1071710513

10718−tslib@2.3.0:

10719− version "2.3.0"

10720− resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"

10721− integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

10722−

1072310514tslib@^2.2.0:

1072410515 version "2.2.0"

1072510516 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"

pkgs/tools/admin/pgadmin/yarn.nix+18−226

@@ -74,19 +74,19 @@

7474 };

7575 }

7676 {

77− name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

77+ name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

7878 path = fetchurl {

79− name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

80− url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz";

81− sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==";

79+ name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

80+ url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz";

81+ sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==";

8282 };

8383 }

8484 {

85− name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

85+ name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

8686 path = fetchurl {

87− name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

88− url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz";

89− sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==";

87+ name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

88+ url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz";

89+ sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==";

9090 };

9191 }

9292 {

@@ -1577,14 +1577,6 @@

15771577 sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";

15781578 };

15791579 }

1580− {

1581− name = "_babel_runtime___runtime_7.17.8.tgz";

1582− path = fetchurl {

1583− name = "_babel_runtime___runtime_7.17.8.tgz";

1584− url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz";

1585− sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";

1586− };

1587− }

15881580 {

15891581 name = "_babel_template___template_7.14.5.tgz";

15901582 path = fetchurl {

@@ -1681,14 +1673,6 @@

16811673 sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==";

16821674 };

16831675 }

1684− {

1685− name = "_emotion_cache___cache_11.7.1.tgz";

1686− path = fetchurl {

1687− name = "_emotion_cache___cache_11.7.1.tgz";

1688− url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz";

1689− sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==";

1690− };

1691− }

16921676 {

16931677 name = "_emotion_core___core_10.1.1.tgz";

16941678 path = fetchurl {

@@ -1721,14 +1705,6 @@

17211705 sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==";

17221706 };

17231707 }

1724− {

1725− name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";

1726− path = fetchurl {

1727− name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";

1728− url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz";

1729− sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==";

1730− };

1731− }

17321708 {

17331709 name = "_emotion_memoize___memoize_0.7.4.tgz";

17341710 path = fetchurl {

@@ -1785,14 +1761,6 @@

17851761 sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==";

17861762 };

17871763 }

1788− {

1789− name = "_emotion_sheet___sheet_1.1.0.tgz";

1790− path = fetchurl {

1791− name = "_emotion_sheet___sheet_1.1.0.tgz";

1792− url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz";

1793− sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==";

1794− };

1795− }

17961764 {

17971765 name = "_emotion_styled_base___styled_base_10.0.31.tgz";

17981766 path = fetchurl {

@@ -1961,70 +1929,6 @@

19611929 sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==";

19621930 };

19631931 }

1964− {

1965− name = "_mui_base___base_5.0.0_alpha.74.tgz";

1966− path = fetchurl {

1967− name = "_mui_base___base_5.0.0_alpha.74.tgz";

1968− url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz";

1969− sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==";

1970− };

1971− }

1972− {

1973− name = "_mui_icons_material___icons_material_5.5.1.tgz";

1974− path = fetchurl {

1975− name = "_mui_icons_material___icons_material_5.5.1.tgz";

1976− url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz";

1977− sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==";

1978− };

1979− }

1980− {

1981− name = "_mui_material___material_5.5.3.tgz";

1982− path = fetchurl {

1983− name = "_mui_material___material_5.5.3.tgz";

1984− url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz";

1985− sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==";

1986− };

1987− }

1988− {

1989− name = "_mui_private_theming___private_theming_5.5.3.tgz";

1990− path = fetchurl {

1991− name = "_mui_private_theming___private_theming_5.5.3.tgz";

1992− url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz";

1993− sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==";

1994− };

1995− }

1996− {

1997− name = "_mui_styled_engine___styled_engine_5.5.2.tgz";

1998− path = fetchurl {

1999− name = "_mui_styled_engine___styled_engine_5.5.2.tgz";

2000− url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz";

2001− sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==";

2002− };

2003− }

2004− {

2005− name = "_mui_system___system_5.5.3.tgz";

2006− path = fetchurl {

2007− name = "_mui_system___system_5.5.3.tgz";

2008− url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz";

2009− sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==";

2010− };

2011− }

2012− {

2013− name = "_mui_types___types_7.1.3.tgz";

2014− path = fetchurl {

2015− name = "_mui_types___types_7.1.3.tgz";

2016− url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz";

2017− sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==";

2018− };

2019− }

2020− {

2021− name = "_mui_utils___utils_5.5.3.tgz";

2022− path = fetchurl {

2023− name = "_mui_utils___utils_5.5.3.tgz";

2024− url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz";

2025− sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==";

2026− };

2027− }

20281932 {

20291933 name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz";

20301934 path = fetchurl {

@@ -2073,14 +1977,6 @@

20731977 sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==";

20741978 };

20751979 }

2076− {

2077− name = "_popperjs_core___core_2.11.4.tgz";

2078− path = fetchurl {

2079− name = "_popperjs_core___core_2.11.4.tgz";

2080− url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz";

2081− sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==";

2082− };

2083− }

20841980 {

20851981 name = "_popperjs_core___core_2.9.0.tgz";

20861982 path = fetchurl {

@@ -2417,14 +2313,6 @@

24172313 sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";

24182314 };

24192315 }

2420− {

2421− name = "_types_prop_types___prop_types_15.7.4.tgz";

2422− path = fetchurl {

2423− name = "_types_prop_types___prop_types_15.7.4.tgz";

2424− url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz";

2425− sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==";

2426− };

2427− }

24282316 {

24292317 name = "_types_q___q_1.5.4.tgz";

24302318 path = fetchurl {

@@ -2441,14 +2329,6 @@

24412329 sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==";

24422330 };

24432331 }

2444− {

2445− name = "_types_react_is___react_is_17.0.3.tgz";

2446− path = fetchurl {

2447− name = "_types_react_is___react_is_17.0.3.tgz";

2448− url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz";

2449− sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==";

2450− };

2451− }

24522332 {

24532333 name = "_types_react_transition_group___react_transition_group_4.4.1.tgz";

24542334 path = fetchurl {

@@ -2457,14 +2337,6 @@

24572337 sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==";

24582338 };

24592339 }

2460− {

2461− name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";

2462− path = fetchurl {

2463− name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";

2464− url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz";

2465− sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==";

2466− };

2467− }

24682340 {

24692341 name = "_types_react___react_16.14.10.tgz";

24702342 path = fetchurl {

@@ -4601,14 +4473,6 @@

46014473 sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";

46024474 };

46034475 }

4604− {

4605− name = "csstype___csstype_3.0.11.tgz";

4606− path = fetchurl {

4607− name = "csstype___csstype_3.0.11.tgz";

4608− url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz";

4609− sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==";

4610− };

4611− }

46124476 {

46134477 name = "csstype___csstype_3.0.8.tgz";

46144478 path = fetchurl {

@@ -5321,6 +5185,14 @@

53215185 sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";

53225186 };

53235187 }

5188+ {

5189+ name = "eslint_scope___eslint_scope_5.1.0.tgz";

5190+ path = fetchurl {

5191+ name = "eslint_scope___eslint_scope_5.1.0.tgz";

5192+ url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz";

5193+ sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";

5194+ };

5195+ }

53245196 {

53255197 name = "eslint_scope___eslint_scope_5.1.1.tgz";

53265198 path = fetchurl {

@@ -5569,14 +5441,6 @@

55695441 sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";

55705442 };

55715443 }

5572− {

5573− name = "fast_memoize___fast_memoize_2.5.2.tgz";

5574− path = fetchurl {

5575− name = "fast_memoize___fast_memoize_2.5.2.tgz";

5576− url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz";

5577− sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==";

5578− };

5579− }

55805444 {

55815445 name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";

55825446 path = fetchurl {

@@ -6217,14 +6081,6 @@

62176081 sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";

62186082 };

62196083 }

6220− {

6221− name = "history___history_5.3.0.tgz";

6222− path = fetchurl {

6223− name = "history___history_5.3.0.tgz";

6224− url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz";

6225− sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==";

6226− };

6227− }

62286084 {

62296085 name = "hmac_drbg___hmac_drbg_1.0.1.tgz";

62306086 path = fetchurl {

@@ -8967,8 +8823,8 @@

89678823 let

89688824 repo = fetchgit {

89698825 url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";

8970− rev = "c966febebcdffaa46f1ccf0769fe5308f179d613";

8971− sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081";

8826+ rev = "bf7ac7be65898883e3e05c9733426152a1da6422";

8827+ sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63";

89728828 };

89738829 in

89748830 runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''

@@ -9697,14 +9553,6 @@

96979553 sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg==";

96989554 };

96999555 }

9700− {

9701− name = "re_resizable___re_resizable_6.9.1.tgz";

9702− path = fetchurl {

9703− name = "re_resizable___re_resizable_6.9.1.tgz";

9704− url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz";

9705− sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==";

9706− };

9707− }

97089556 {

97099557 name = "react_aspen___react_aspen_1.1.1.tgz";

97109558 path = fetchurl {

@@ -9737,14 +9585,6 @@

97379585 sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==";

97389586 };

97399587 }

9740− {

9741− name = "react_draggable___react_draggable_4.4.3.tgz";

9742− path = fetchurl {

9743− name = "react_draggable___react_draggable_4.4.3.tgz";

9744− url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz";

9745− sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==";

9746− };

9747− }

97489588 {

97499589 name = "react_draggable___react_draggable_4.4.4.tgz";

97509590 path = fetchurl {

@@ -9785,30 +9625,6 @@

97859625 sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==";

97869626 };

97879627 }

9788− {

9789− name = "react_rnd___react_rnd_10.3.5.tgz";

9790− path = fetchurl {

9791− name = "react_rnd___react_rnd_10.3.5.tgz";

9792− url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz";

9793− sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==";

9794− };

9795− }

9796− {

9797− name = "react_router_dom___react_router_dom_6.3.0.tgz";

9798− path = fetchurl {

9799− name = "react_router_dom___react_router_dom_6.3.0.tgz";

9800− url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz";

9801− sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==";

9802− };

9803− }

9804− {

9805− name = "react_router___react_router_6.3.0.tgz";

9806− path = fetchurl {

9807− name = "react_router___react_router_6.3.0.tgz";

9808− url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz";

9809− sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==";

9810− };

9811− }

98129628 {

98139629 name = "react_select___react_select_4.3.1.tgz";

98149630 path = fetchurl {

@@ -9857,14 +9673,6 @@

98579673 sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==";

98589674 };

98599675 }

9860− {

9861− name = "react_transition_group___react_transition_group_4.4.2.tgz";

9862− path = fetchurl {

9863− name = "react_transition_group___react_transition_group_4.4.2.tgz";

9864− url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz";

9865− sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==";

9866− };

9867− }

98689676 {

98699677 name = "react_transition_state___react_transition_state_1.1.3.tgz";

98709678 path = fetchurl {

@@ -11057,14 +10865,6 @@

1105710865 sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==";

1105810866 };

1105910867 }

11060− {

11061− name = "stylis___stylis_4.0.13.tgz";

11062− path = fetchurl {

11063− name = "stylis___stylis_4.0.13.tgz";

11064− url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz";

11065− sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==";

11066− };

11067− }

1106810868 {

1106910869 name = "stylis___stylis_4.0.10.tgz";

1107010870 path = fetchurl {

@@ -11433,14 +11233,6 @@

1143311233 sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM=";

1143411234 };

1143511235 }

11436− {

11437− name = "tslib___tslib_2.3.0.tgz";

11438− path = fetchurl {

11439− name = "tslib___tslib_2.3.0.tgz";

11440− url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz";

11441− sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==";

11442− };

11443− }

1144411236 {

1144511237 name = "tslib___tslib_2.2.0.tgz";

1144611238 path = fetchurl {

pkgs/tools/admin/syft/default.nix+3−3

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "syft";

5− version = "0.45.1";

5+ version = "0.44.1";

77 src = fetchFromGitHub {

88 owner = "anchore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew=";

11+ sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg=";

23+ vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/admin/winbox/default.nix+1−1

@@ -70,7 +70,7 @@ symlinkJoin {

7070 homepage = "https://mikrotik.com";

7171 downloadPage = "https://mikrotik.com/download";

7272 changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";

73− license = licenses.unfree;

73+ license = licenses.gpl3Plus;

7474 maintainers = with maintainers; [ yrd ];

7575 };

7676}

pkgs/tools/cd-dvd/ventoy-bin/default.nix+6−11

@@ -24,7 +24,7 @@ let

2424 }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

2525in stdenv.mkDerivation rec {

2626 pname = "ventoy-bin";

27− version = "1.0.74";

27+ version = "1.0.72";

2828

2929 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]

3030 ++ lib.optional withQt5 qt5.wrapQtAppsHook;

@@ -40,13 +40,13 @@ in stdenv.mkDerivation rec {

4040

4141 src = fetchurl {

4242 url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";

43− sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo=";

43+ sha256 = "sha256-1mfe6ZnqkeBNGNjI7Qx7jG5FLgfn6rVwr0VQvSOG7Ow=";

4444 };

4545 patches = [

4646 (fetchpatch {

4747 name = "sanitize.patch";

48− url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=057f2d1eb496c7a3aaa8229e99a7f709428fa4c5";

49− sha256 = "sha256-iAtLtM+Q4OsXDK83eCnPNomeNSEqdRLFfK2x7ybPSpk=";

48+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8";

49+ sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o=";

5050 })

5151 ./fix-for-read-only-file-system.patch

5252 ./add-mips64.patch

@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {

8282 aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;

8383 mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;

8484 esac

85− rm README

85+ rm README tool/VentoyWorker.sh.orig

8686 rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.

8787

8888 # Copy from "$src" to "$out".

@@ -106,15 +106,10 @@ in stdenv.mkDerivation rec {

106106 makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \

107107 --prefix PATH : "${lib.makeBinPath buildInputs}" \

108108 --chdir "$VENTOY_PATH"

109− mkdir "$out"/share/{applications,pixmaps}

110− ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/

111− cp ${./ventoy-gui.desktop} "$out"/share/applications/

112109 '' + lib.optionalString (!withGtk3) ''

113− rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}

110+ rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3"

114111 '' + lib.optionalString (!withQt5) ''

115112 rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"

116− '' + lib.optionalString (!withGtk3 && !withQt5) ''

117− rm "$VENTOY_PATH"/VentoyGUI.*

118113 '';

119114

120115 meta = with lib; {

pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktopdeleted−10

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

1−[Desktop Entry]

2−Categories=Utility;

3−Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files

4−Exec=ventoy-gui

5−Hidden=false

6−Icon=VentoyLogo

7−Name=Ventoy

8−StartupNotify=true

9−Terminal=false

10−Type=Application

pkgs/tools/filesystems/bcachefs-tools/default.nix+3−3

@@ -22,13 +22,13 @@

2222

2323stdenv.mkDerivation {

2424 pname = "bcachefs-tools";

25− version = "unstable-2022-05-02";

25+ version = "unstable-2022-04-08";

2626

2727 src = fetchFromGitHub {

2828 owner = "koverstreet";

2929 repo = "bcachefs-tools";

30− rev = "6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa";

31− sha256 = "0483zhm3gmk6fd1pn815i3fixwlwsnks3817gn7n3idbbw0kg5ng";

30+ rev = "986533d8d5b21c8eb512bbb3f0496d3d2a087c5d";

31+ sha256 = "1qvb5l937nnls5j82ipgrdh6q5fk923z752rzzqqcms6fz7rrjs4";

3232 };

3333

3434 postPatch = ''

pkgs/tools/filesystems/ceph/default.nix+2−2

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

99, gtest

1010, cunit, snappy

1111, makeWrapper

12−, leveldb, oath-toolkit

12+, leveldb, oathToolkit

1313, libnl, libcap_ng

1414, rdkafka

1515, nixosTests

@@ -161,7 +161,7 @@ in rec {

161161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [

162162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3

163163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit

164− snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka

164+ snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka

165165 cryptsetup sqlite lua icu bzip2

166166 ] ++ lib.optionals stdenv.isLinux [

167167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

@@ -4,11 +4,11 @@

55stdenv.mkDerivation rec {

66 pname = "xfsprogs";

7− version = "5.16.0";

7+ version = "5.15.0";

99 src = fetchurl {

1010 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

11− hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";

11+ sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";

1212 };

1313

1414 outputs = [ "bin" "dev" "out" "doc" ];

pkgs/tools/graphics/vulkan-tools/default.nix+3−3

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

22, stdenv

33, fetchFromGitHub

44, cmake

5−, pkg-config

5+, pkgconfig

66, glslang

77, libffi

88, libX11

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {

3333

3434 nativeBuildInputs = [

3535 cmake

36− pkg-config

36+ pkgconfig

3737 ];

3838

3939 buildInputs = [

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {

5959 "-DBUILD_ICD=OFF"

6060 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

6161 "-DCMAKE_INSTALL_RPATH=${libraryPath}"

62− "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

62+ "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

6363 # Hide dev warnings that are useless for packaging

6464 "-Wno-dev"

6565 ];

pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patchdeleted−18

@@ -1,18 +0,0 @@

1−:100644 100644 fac4f53 aed9617 M src/rimeengine.cpp

2−

3−diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp

4−index fac4f53..aed9617 100644

5−--- a/src/rimeengine.cpp

6−+++ b/src/rimeengine.cpp

7−@@ -164,7 +164,10 @@ void RimeEngine::rimeStart(bool fullcheck) {

8− RIME_ERROR() << "Failed to create user directory: " << userDir;

9− }

10− }

11−- const char *sharedDataDir = RIME_DATA_DIR;

12−+ const char *sharedDataDir = getenv("NIX_RIME_DATA_DIR");

13−+ if (!sharedDataDir) {

14−+ sharedDataDir = RIME_DATA_DIR;

15−+ }

16−

17− RIME_STRUCT(RimeTraits, fcitx_rime_traits);

18− fcitx_rime_traits.shared_data_dir = sharedDataDir;

pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix−2

@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {

3535 librime

3636 ];

3737

38− patches = [ ./fcitx5-rime-with-nix-env-variable.patch ];

39−

4038 meta = with lib; {

4139 description = "RIME support for Fcitx5";

4240 homepage = "https://github.com/fcitx/fcitx5-rime";

pkgs/tools/inputmethods/lisgd/default.nix+2−2

@@ -11,13 +11,13 @@

1111

1212stdenv.mkDerivation rec {

1313 pname = "lisgd";

14− version = "0.3.4";

14+ version = "0.3.3";

1515

1616 src = fetchFromSourcehut {

1717 owner = "~mil";

1818 repo = "lisgd";

1919 rev = version;

20− hash = "sha256-ZzPdIwN4/G5Te51gJpbNcHVkG4Rplcaa8yHDJr58oyk=";

20+ sha256 = "sha256-zcDxR2fKsjuX+vxjhr5UcqEsiNM+zWd2SBaA6Xly3AI=";

2121 };

2222

2323 inherit patches;

pkgs/tools/misc/calamares-nixos-extensions/default.nixdeleted−30

@@ -1,30 +0,0 @@

1−{ stdenv, fetchFromGitHub, lib }:

2−

3−stdenv.mkDerivation rec {

4− pname = "calamares-nixos-extensions";

5− version = "0.3.8";

6−

7− src = fetchFromGitHub {

8− owner = "NixOS";

9− repo = "calamares-nixos-extensions";

10− rev = version;

11− sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4=";

12− };

13−

14− installPhase = ''

15− runHook preInstall

16− mkdir -p $out/{lib,share}/calamares

17− cp -r modules $out/lib/calamares/

18− cp -r config/* $out/share/calamares/

19− cp -r branding $out/share/calamares/

20− runHook postInstall

21− '';

22−

23− meta = with lib; {

24− description = "Calamares modules for NixOS";

25− homepage = "https://github.com/NixOS/calamares-nixos-extensions";

26− license = with licenses; [ gpl3Plus bsd2 cc-by-40 cc-by-sa-40 cc0 ];

27− maintainers = with maintainers; [ vlinkz ];

28− platforms = platforms.linux;

29− };

30−}

pkgs/tools/misc/calamares/default.nix+14−52

@@ -1,48 +1,24 @@

1−{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2

2−, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python

3−, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

1+{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore

2+, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase

3+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

44, ckbcomp, xkeyboard_config, mkDerivation

5−, nixos-extensions ? false

65}:

87mkDerivation rec {

98 pname = "calamares";

10− version = "3.2.56";

9+ version = "3.2.55";

1110

1211 # release including submodule

1312 src = fetchurl {

14− url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";

15− sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03";

13+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";

14+ sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI=";

1615 };

1716

18− patches = lib.optionals nixos-extensions [

19− # Modifies the users module to only set passwords of user and root

20− # as the users will have already been created in the configuration.nix file

21− ./userjob.patch

22− # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files

23− # as by default it only searches /usr/share/calamares/ and /nix/store/<hash>-calamares-<version>/share/calamares/

24− # but calamares-nixos-extensions is not in either of these locations

25− ./nixos-extensions-paths.patch

26− # Uses pkexec within modules in order to run calamares without root permissions as a whole

27− # Also fixes storage check in the welcome module

28− ./nonroot.patch

29− # Adds unfree qml to packagechooserq

30− ./unfreeq.patch

31− # Adds config to change name of packagechooserq

32− # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932

33− ./packagechooserq.patch

34− # Modifies finished module to add some NixOS resources

35− # Modifies packagechooser module to change the UI

36− ./uimod.patch

37− # Remove options for unsupported partition types

38− ./partitions.patch

39− ];

40−

4117 nativeBuildInputs = [ cmake extra-cmake-modules ];

4218 buildInputs = [

43− boost kparts.dev kpmcore.out kservice.dev kirigami2

44− libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python

45− qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

19+ boost kparts.dev kpmcore.out kservice.dev

20+ libatasmart libxcb libyamlcpp parted polkit-qt python qtbase

21+ qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

4622 ];

4723

4824 cmakeFlags = [

@@ -56,28 +32,15 @@ mkDerivation rec {

5632 POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";

5733

5834 postPatch = ''

59− # Run calamares without root. Other patches make it functional as a normal user

60− sed -e "s,pkexec calamares,calamares," \

61− -i calamares.desktop

62−

63− sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \

64− -i calamares.desktop

65−

66− # Fix desktop reference with wayland

67− mv calamares.desktop io.calamares.calamares.desktop

68−

69− sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \

70− -i CMakeLists.txt

71−

7235 sed -e "s,/usr/bin/calamares,$out/bin/calamares," \

36+ -i calamares.desktop \

7337 -i com.github.calamares.calamares.policy

7438

7539 sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \

76− -i src/modules/locale/SetTimezoneJob.cpp \

77− -i src/libcalamares/locale/TimeZone.cpp

40+ -i src/modules/locale/SetTimezoneJob.cpp

7841

7942 sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \

80− -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp

43+ -i src/modules/keyboard/keyboardwidget/keyboardglobal.h

8144

8245 sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \

8346 -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

@@ -88,9 +51,8 @@ mkDerivation rec {

8851

8952 meta = with lib; {

9053 description = "Distribution-independent installer framework";

91− homepage = "https://calamares.io/";

92− license = with licenses; [ gpl3Plus bsd2 cc0 ];

93− maintainers = with maintainers; [ manveru vlinkz ];

54+ license = with licenses; [ gpl3Plus bsd2 ];

55+ maintainers = with maintainers; [ manveru ];

9456 platforms = platforms.linux;

9557 };

9658}

pkgs/tools/misc/calamares/nixos-extensions-paths.patchdeleted−46

@@ -1,46 +0,0 @@

1−diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp

2−index de709156f..a0b6c5faf 100644

3−--- a/src/calamares/main.cpp

4−+++ b/src/calamares/main.cpp

5−@@ -131,6 +132,8 @@ main( int argc, char* argv[] )

6− // TODO: umount anything in /tmp/calamares-... as an emergency save function

7− #endif

8−

9−+ CalamaresUtils::setNixosDirs();

10−+

11− bool is_debug = handle_args( a );

12−

13− #ifdef WITH_KF5DBus

14−diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp

15−index f333d6e64..6118fb412 100644

16−--- a/src/libcalamares/utils/Dirs.cpp

17−+++ b/src/libcalamares/utils/Dirs.cpp

18−@@ -115,6 +116,14 @@ setXdgDirs()

19− s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );

20− }

21−

22−+void

23−+setNixosDirs()

24−+{

25−+ s_extraConfigDirs << "/run/current-system/sw/share/calamares/";

26−+ s_extraDataDirs << "/run/current-system/sw/share/calamares/";

27−+ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );

28−+}

29−+

30− QStringList

31− extraConfigDirs()

32− {

33−diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h

34−index 445cbe1f1..da869d446 100644

35−--- a/src/libcalamares/utils/Dirs.h

36−+++ b/src/libcalamares/utils/Dirs.h

37−@@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden();

38− /** @brief Setup extra config and data dirs from the XDG variables.

39− */

40− DLLEXPORT void setXdgDirs();

41−+/** @brief Setup extra config and data dirs fir NixOS.

42−+ */

43−+DLLEXPORT void setNixosDirs();

44− /** @brief Are any extra directories configured? */

45− DLLEXPORT bool haveExtraDirs();

46− /** @brief XDG_CONFIG_DIRS, each guaranteed to end with / */

pkgs/tools/misc/calamares/nonroot.patchdeleted−105

@@ -1,105 +0,0 @@

1−diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp

2−index c7146c2d7..e165d9a8f 100644

3−--- a/src/libcalamares/utils/Runner.cpp

4−+++ b/src/libcalamares/utils/Runner.cpp

5−@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run()

6− }

7− if ( m_location == RunLocation::RunInTarget )

8− {

9−- process.setProgram( "chroot" );

10−- process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command );

11−+ process.setProgram( "pkexec" );

12−+ process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command );

13− }

14− else

15− {

16−- process.setProgram( "env" );

17−- process.setArguments( m_command );

18−+ process.setProgram( "pkexec" );

19−+ process.setArguments( QStringList { "env" } + m_command );

20− }

21−

22− if ( m_output )

23−diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py

24−index a3318d1a0..5fbe202fd 100644

25−--- a/src/modules/mount/main.py

26−+++ b/src/modules/mount/main.py

27−@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions):

28−

29− # Ensure that the created directory has the correct SELinux context on

30− # SELinux-enabled systems.

31−- os.makedirs(mount_point, exist_ok=True)

32−+ subprocess.check_call(["pkexec", "mkdir", "-p", mount_point])

33−+

34− try:

35− subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])

36− except FileNotFoundError as e:

37−@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions):

38− for s in btrfs_subvolumes:

39− if not s["subvolume"]:

40− continue

41−- os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True)

42−- subprocess.check_call(["btrfs", "subvolume", "create",

43−+ subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])])

44−+ subprocess.check_call(["pkexec", "btrfs", "subvolume", "create",

45− root_mount_point + s["subvolume"]])

46− if s["mountPoint"] == "/":

47− # insert the root subvolume into global storage

48− libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"])

49−- subprocess.check_call(["umount", "-v", root_mount_point])

50−+ subprocess.check_call(["pkexec", "umount", "-v", root_mount_point])

51−

52− device = partition["device"]

53−

54−diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp

55−index ca7219ca4..6ac682ba4 100644

56−--- a/src/modules/welcome/checker/GeneralRequirements.cpp

57−+++ b/src/modules/welcome/checker/GeneralRequirements.cpp

58−@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )

59− cWarning() << "GeneralRequirements is configured without libparted.";

60− return false;

61− #else

62−- return check_big_enough( requiredSpace );

63−+ return big_enough( requiredSpace );

64− #endif

65− }

66−

67−+bool

68−+GeneralRequirements::big_enough( qint64 requiredSpace )

69−+{

70−+ FILE *fpipe;

71−+ char command[128];

72−+ snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace);

73−+ char c = 0;

74−+

75−+ if (0 == (fpipe = (FILE*)popen(command, "r")))

76−+ {

77−+ cWarning() << "Failed to check storage size.";

78−+ return false;

79−+ }

80−+

81−+ while (fread(&c, sizeof c, 1, fpipe))

82−+ {

83−+ pclose(fpipe);

84−+ return true;

85−+ }

86−+

87−+ pclose(fpipe);

88−+

89−+ return false;

90−+}

91−

92− bool

93− GeneralRequirements::checkEnoughRam( qint64 requiredRam )

94−diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h

95−index b6646da11..ea27324fa 100644

96−--- a/src/modules/welcome/checker/GeneralRequirements.h

97−+++ b/src/modules/welcome/checker/GeneralRequirements.h

98−@@ -36,6 +36,7 @@ private:

99− bool checkHasPower();

100− bool checkHasInternet();

101− bool checkIsRoot();

102−+ bool big_enough( qint64 requiredSpace );

103−

104− qreal m_requiredStorageGiB;

105− qreal m_requiredRamGiB;

pkgs/tools/misc/calamares/packagechooserq.patchdeleted−136

@@ -1,136 +0,0 @@

1−diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp

2−index 491fe5c25..667621597 100644

3−--- a/src/modules/packagechooser/Config.cpp

4−+++ b/src/modules/packagechooser/Config.cpp

5−@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice )

6− emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );

7− }

8−

9−+QString

10−+Config::prettyName() const

11−+{

12−+ return m_stepName ? m_stepName->get() : tr( "Packages" );

13−+}

14−+

15− QString

16− Config::prettyStatus() const

17− {

18−@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )

19− cWarning() << "Single-selection QML module must use 'Legacy' method.";

20− }

21− }

22−+

23−+ bool labels_ok = false;

24−+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

25−+ if ( labels_ok )

26−+ {

27−+ if ( labels.contains( "step" ) )

28−+ {

29−+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

30−+ }

31−+ }

32− }

33−diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h

34−index b04b1c30b..d1b783a8d 100644

35−--- a/src/modules/packagechooser/Config.h

36−+++ b/src/modules/packagechooser/Config.h

37−@@ -98,6 +98,7 @@ public:

38− QString packageChoice() const { return m_packageChoice.value_or( QString() ); }

39− void setPackageChoice( const QString& packageChoice );

40−

41−+ QString prettyName() const;

42− QString prettyStatus() const;

43−

44− signals:

45−@@ -120,6 +121,7 @@ private:

46− * Reading the property will return an empty QString.

47− */

48− std::optional< QString > m_packageChoice;

49−+ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar

50− };

51−

52−

53−diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp

54−index 9057004de..8eacf82ec 100644

55−--- a/src/modules/packagechooser/PackageChooserViewStep.cpp

56−+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp

57−@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )

58− : Calamares::ViewStep( parent )

59− , m_config( new Config( this ) )

60− , m_widget( nullptr )

61−- , m_stepName( nullptr )

62− {

63− emit nextStatusChanged( false );

64− }

65−@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep()

66− {

67− m_widget->deleteLater();

68− }

69−- delete m_stepName;

70− }

71−

72−-

73− QString

74− PackageChooserViewStep::prettyName() const

75− {

76−- return m_stepName ? m_stepName->get() : tr( "Packages" );

77−+ return m_config->prettyName();

78− }

79−

80−

81−@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap

82− m_config->setDefaultId( moduleInstanceKey() );

83− m_config->setConfigurationMap( configurationMap );

84−

85−- bool labels_ok = false;

86−- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

87−- if ( labels_ok )

88−- {

89−- if ( labels.contains( "step" ) )

90−- {

91−- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

92−- }

93−- }

94−-

95− if ( m_widget )

96− {

97− hookupModel();

98−diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h

99−index 7561f2bd7..76b35aed8 100644

100−--- a/src/modules/packagechooser/PackageChooserViewStep.h

101−+++ b/src/modules/packagechooser/PackageChooserViewStep.h

102−@@ -50,7 +50,6 @@ private:

103−

104− Config* m_config;

105− PackageChooserPage* m_widget;

106−- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar

107− };

108−

109− CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )

110−diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

111−index 543c9771d..7c4d5fda7 100644

112−--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

113−+++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

114−@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )

115− QString

116− PackageChooserQmlViewStep::prettyName() const

117− {

118−- return tr( "Packages" );

119−+ return m_config->prettyName();

120− }

121−

122− QString

123−@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration

124− m_config->setDefaultId( moduleInstanceKey() );

125− m_config->setConfigurationMap( configurationMap );

126− Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last

127−+ /*bool labels_ok = false;

128−+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

129−+ if ( labels_ok )

130−+ {

131−+ if ( labels.contains( "step" ) )

132−+ {

133−+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

134−+ }

135−+ }*/

136− }

pkgs/tools/misc/calamares/partitions.patchdeleted−28

@@ -1,28 +0,0 @@

1−diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp

2−index c5b17c69e..353b6f964 100644

3−--- a/src/modules/partition/gui/CreatePartitionDialog.cpp

4−+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp

5−@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,

6− {

7− // We need to ensure zfs is added to the list if the zfs module is enabled

8− if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

9−- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

10−+ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

11−+ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) )

12− {

13− fsNames << userVisibleFS( fs ); // This is put into the combobox

14− if ( fs->type() == defaultFSType )

15−diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

16−index 0bc35cabe..3cf8a7fa2 100644

17−--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp

18−+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

19−@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,

20− {

21− // We need to ensure zfs is added to the list if the zfs module is enabled

22− if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

23−- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

24−+ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

25−+ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) )

26− {

27− fsNames << userVisibleFS( fs ); // For the combo box

28− }

pkgs/tools/misc/calamares/uimod.patchdeleted−85

@@ -1,85 +0,0 @@

1−diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp

2−index 6c5f9ad16..24d75e07b 100644

3−--- a/src/modules/finished/FinishedPage.cpp

4−+++ b/src/modules/finished/FinishedPage.cpp

5−@@ -71,7 +71,10 @@ FinishedPage::retranslate()

6− {

7− ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

8− "%1 has been set up on your computer.<br/>"

9−- "You may now start using your new system." )

10−+ "You may now start using your new system.<br/>"

11−+ "You can change every setting later except the bootloader.<br/>"

12−+ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

13−+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

14− .arg( branding->versionedName() ) );

15− ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

16− "<p>When this box is checked, your system will "

17−@@ -84,7 +87,10 @@ FinishedPage::retranslate()

18− ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

19− "%1 has been installed on your computer.<br/>"

20− "You may now restart into your new system, or continue "

21−- "using the %2 Live environment." )

22−+ "using the %2 Live environment.<br/>"

23−+ "You can change every setting later except the bootloader.<br/>"

24−+ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

25−+ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

26− .arg( branding->versionedName(), branding->productName() ) );

27− ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

28− "<p>When this box is checked, your system will "

29−diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp

30−index 721329c1b..164b9945e 100644

31−--- a/src/modules/packagechooser/PackageChooserPage.cpp

32−+++ b/src/modules/packagechooser/PackageChooserPage.cpp

33−@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index )

34− if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )

35− {

36− ui->productName->setText( m_introduction.name.get() );

37−+ ui->productName->setStyleSheet("font-weight: bold");

38− ui->productScreenshot->setPixmap( m_introduction.screenshot );

39− ui->productDescription->setText( m_introduction.description.get() );

40− }

41−diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui

42−index d021b08b3..fecfa3060 100644

43−--- a/src/modules/packagechooser/page_package.ui

44−+++ b/src/modules/packagechooser/page_package.ui

45−@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later

46− </item>

47− <item>

48−- <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1">

49−+ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1">

50−- <item>

51−- <widget class="QLabel" name="productName">

52−- <property name="sizePolicy">

53−- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

54−- <horstretch>0</horstretch>

55−- <verstretch>0</verstretch>

56−- </sizepolicy>

57−- </property>

58−- <property name="text">

59−- <string>Product Name</string>

60−- </property>

61−- </widget>

62−- </item>

63− <item>

64− <widget class="FixedAspectRatioLabel" name="productScreenshot">

65− <property name="sizePolicy">

66−@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later

67− </property>

68− </widget>

69− </item>

70−+ <item>

71−+ <widget class="QLabel" name="productName">

72−+ <property name="sizePolicy">

73−+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

74−+ <horstretch>0</horstretch>

75−+ <verstretch>0</verstretch>

76−+ </sizepolicy>

77−+ </property>

78−+ <property name="text">

79−+ <string>Product Name</string>

80−+ </property>

81−+ </widget>

82−+ </item>

83− <item>

84− <widget class="QLabel" name="productDescription">

85− <property name="sizePolicy">

pkgs/tools/misc/calamares/unfreeq.patchdeleted−109

@@ -1,109 +0,0 @@

1−diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc

2−index 1b892dce1..ee80a934b 100644

3−--- a/src/modules/packagechooserq/packagechooserq.qrc

4−+++ b/src/modules/packagechooserq/packagechooserq.qrc

5−@@ -4,5 +4,6 @@

6− <file>images/libreoffice.jpg</file>

7− <file>images/no-selection.png</file>

8− <file>images/plasma.png</file>

9−+ <file>packagechooserq@unfree.qml</file>

10− </qresource>

11− </RCC>

12−diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml

13−new file mode 100644

14−index 000000000..cb87d864a

15−--- /dev/null

16−+++ b/src/modules/packagechooserq/packagechooserq@unfree.qml

17−@@ -0,0 +1,75 @@

18−+/* === This file is part of Calamares - <https://calamares.io> ===

19−+ *

20−+ * SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>

21−+ * SPDX-License-Identifier: GPL-3.0-or-later

22−+ *

23−+ * Calamares is Free Software: see the License-Identifier above.

24−+ *

25−+ */

26−+

27−+import io.calamares.core 1.0

28−+import io.calamares.ui 1.0

29−+

30−+import QtQuick 2.15

31−+import QtQuick.Controls 2.15

32−+import QtQuick.Layouts 1.3

33−+

34−+Item {

35−+

36−+ SystemPalette {

37−+ id: palette

38−+ colorGroup: SystemPalette.Active

39−+ }

40−+

41−+ width: parent.width

42−+ height: parent.height

43−+

44−+ Rectangle {

45−+ anchors.fill: parent

46−+ color: palette.window

47−+

48−+ ButtonGroup {

49−+ id: switchGroup

50−+ }

51−+

52−+ Column {

53−+ id: column

54−+ anchors.centerIn: parent

55−+ spacing: 5

56−+

57−+ Rectangle {

58−+ width: 700

59−+ height: 200

60−+ color: palette.base

61−+ radius: 10

62−+ border.width: 0

63−+ Text {

64−+ color: palette.text

65−+ width: 600

66−+ height: 150

67−+ anchors.centerIn: parent

68−+ text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>")

69−+ font.pointSize: 12

70−+ wrapMode: Text.WordWrap

71−+ }

72−+

73−+ CheckBox {

74−+ id: element2

75−+ anchors.horizontalCenter: parent.horizontalCenter

76−+ y: 145

77−+ text: qsTr("Allow unfree software")

78−+ checked: false

79−+

80−+ onCheckedChanged: {

81−+ if ( checked ) {

82−+ config.packageChoice = "unfree"

83−+ } else {

84−+ config.packageChoice = "free"

85−+ }

86−+ }

87−+ }

88−+ }

89−+ }

90−+ }

91−+

92−+}

93−diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf

94−new file mode 100644

95−index 000000000..da79a8eac

96−--- /dev/null

97−+++ b/src/modules/packagechooserq/unfree.conf

98−@@ -0,0 +1,11 @@

99−+# SPDX-FileCopyrightText: no

100−+# SPDX-License-Identifier: CC0-1.0

101−+#

102−+---

103−+qmlLabel:

104−+ label: "Unfree Software"

105−+method: legacy

106−+mode: required

107−+labels:

108−+ step: "Unfree Software"

109−+packageChoice: free

pkgs/tools/misc/calamares/userjob.patchdeleted−31

@@ -1,31 +0,0 @@

1−diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp

2−index eedfd274d..0f3e78848 100644

3−--- a/src/modules/users/Config.cpp

4−+++ b/src/modules/users/Config.cpp

5−@@ -972,26 +972,11 @@ Config::createJobs() const

6−

7− Calamares::Job* j;

8−

9−- if ( !m_sudoersGroup.isEmpty() )

10−- {

11−- j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle );

12−- jobs.append( Calamares::job_ptr( j ) );

13−- }

14−-

15−- j = new SetupGroupsJob( this );

16−- jobs.append( Calamares::job_ptr( j ) );

17−-

18−- j = new CreateUserJob( this );

19−- jobs.append( Calamares::job_ptr( j ) );

20−-

21− j = new SetPasswordJob( loginName(), userPassword() );

22− jobs.append( Calamares::job_ptr( j ) );

23−

24− j = new SetPasswordJob( "root", rootPassword() );

25− jobs.append( Calamares::job_ptr( j ) );

26−

27−- j = new SetHostNameJob( this );

28−- jobs.append( Calamares::job_ptr( j ) );

29−-

30− return jobs;

31− }

pkgs/tools/misc/chezmoi/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "chezmoi";

5− version = "2.15.2";

5+ version = "2.15.1";

77 src = fetchFromGitHub {

88 owner = "twpayne";

99 repo = "chezmoi";

1010 rev = "v${version}";

11− sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";

11+ sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8=";

1212 };

1313

14− vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";

14+ vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";

1515

1616 doCheck = false;

1717

pkgs/tools/misc/cht.sh/default.nix+3−3

@@ -10,15 +10,15 @@

1010

1111stdenv.mkDerivation {

1212 pname = "cht.sh";

13− version = "unstable-2022-04-18";

13+ version = "unstable-2022-04-17";

1414

1515 nativeBuildInputs = [ makeWrapper ];

1616

1717 src = fetchFromGitHub {

1818 owner = "chubin";

1919 repo = "cheat.sh";

20− rev = "571377f2f79422398a701cb1864487124ec3dcc6";

21− sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0=";

20+ rev = "7f769d6f3697541e55fd3ea9b71f190296529e48";

21+ sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo=";

2222 };

2323

2424 # Fix ".cht.sh-wrapped" in the help message

pkgs/tools/misc/fclones/default.nix+3−3

@@ -8,16 +8,16 @@

99rustPlatform.buildRustPackage rec {

1010 pname = "fclones";

11− version = "0.23.0";

11+ version = "0.22.0";

1212

1313 src = fetchFromGitHub {

1414 owner = "pkolaczk";

1515 repo = pname;

1616 rev = "v${version}";

17− sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI=";

17+ sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY=";

1818 };

1919

20− cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c=";

20+ cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo=";

2121

2222 buildInputs = lib.optionals stdenv.isDarwin [

2323 AppKit

pkgs/tools/misc/lookatme/default.nixnew file+67

@@ -0,0 +1,67 @@

1+{ lib, python3, fetchFromGitHub }:

3+let

4+ py = python3.override {

5+ packageOverrides = self: super: {

6+ self = py;

7+ # use click 7

8+ click = self.callPackage ../../../development/python2-modules/click/default.nix { };

9+ # needs pyyaml 5

10+ pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {

11+ name = "${oldAttrs.pname}-${version}";

12+ version = "5.4.1";

13+ src = fetchFromGitHub {

14+ owner = "yaml";

15+ repo = "pyyaml";

16+ rev = version;

17+ sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM=";

18+ };

19+ checkPhase = ''

20+ runHook preCheck

21+ PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all

22+ runHook postCheck

23+ '';

24+ });

25+ };

26+ };

27+in

28+with py.pkgs;

29+

30+buildPythonApplication rec {

31+ pname = "lookatme";

32+ version = "2.3.2";

33+ format = "setuptools";

34+

35+ src = fetchPypi {

36+ inherit pname version;

37+ sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw=";

38+ };

39+

40+ checkInputs = [

41+ pytest-mock

42+ pytestCheckHook

43+ six

44+ ];

45+

46+ disabledTests = [

47+ # https://github.com/d0c-s4vage/lookatme/issues/126

48+ "test_sanity_check_that_errors_are_detected"

49+ "test_styles_defaults"

50+ ];

51+

52+ propagatedBuildInputs = [

53+ click

54+ pyyaml

55+ pygments

56+ marshmallow

57+ mistune

58+ urwid

59+ ];

60+

61+ meta = with lib; {

62+ description = "An interactive, terminal-based markdown presenter";

63+ homepage = "https://github.com/d0c-s4vage/lookatme";

64+ license = licenses.mit;

65+ maintainers = with maintainers; [ ameer ];

66+ };

67+}

pkgs/tools/misc/partition-manager/default.nix+5−5

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

11{ mkDerivation, fetchurl, lib, makeWrapper

22, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook

3−, kconfig, kcrash, kinit, kpmcore, polkit-qt

3+, kconfig, kcrash, kinit, kpmcore

44, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux

55, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs

66, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs

@@ -41,16 +41,16 @@ let

4141in mkDerivation rec {

4242 pname = "partitionmanager";

4343 # NOTE: When changing this version, also change the version of `kpmcore`.

44− version = "22.04.0";

44+ version = "4.2.0";

4545

4646 src = fetchurl {

47− url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

48− hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";

47+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

48+ hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";

4949 };

5050

5151 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];

5252

53− propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];

53+ propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];

5454

5555 postFixup = ''

5656 wrapProgram $out/bin/partitionmanager \

pkgs/tools/misc/pferd/default.nix+2−2

@@ -5,14 +5,14 @@

66python3Packages.buildPythonApplication rec {

77 pname = "pferd";

8− version = "3.4.0";

8+ version = "3.3.1";

99 format = "pyproject";

1010

1111 src = fetchFromGitHub {

1212 owner = "Garmelon";

1313 repo = "PFERD";

1414 rev = "v${version}";

15− sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g";

15+ sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh";

1616 };

1717

1818 propagatedBuildInputs = with python3Packages; [

pkgs/tools/misc/rust-motd/default.nix+3−5

@@ -9,23 +9,21 @@

1010rustPlatform.buildRustPackage rec {

1111 pname = "rust-motd";

12− version = "0.2.1";

12+ version = "0.1.1";

1313

1414 src = fetchFromGitHub {

1515 owner = "rust-motd";

1616 repo = pname;

1717 rev = "v${version}";

18− sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4=";

18+ sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m";

1919 };

2020

21− cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA=";

21+ cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY=";

2222

2323 nativeBuildInputs = [ pkg-config ];

2424

2525 buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

2626

27− OPENSSL_NO_VENDOR = 1;

28−

2927 meta = with lib; {

3028 description = "Beautiful, useful MOTD generation with zero runtime dependencies";

3129 homepage = "https://github.com/rust-motd/rust-motd";

pkgs/tools/misc/zellij/default.nix+3−3

@@ -15,16 +15,16 @@

1515

1616rustPlatform.buildRustPackage rec {

1717 pname = "zellij";

18− version = "0.29.1";

18+ version = "0.27.0";

1919

2020 src = fetchFromGitHub {

2121 owner = "zellij-org";

2222 repo = "zellij";

2323 rev = "v${version}";

24− sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8=";

24+ sha256 = "sha256-iQ+Z1A/wiui2IHuK35e6T/44TYaf6+KbaDl5GfVF2vo=";

2525 };

2626

27− cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw=";

27+ cargoSha256 = "sha256-DMHIvqClBpBplvqqXM2dUOumO+Ean4yAHWDplJ9PaUM=";

2828

2929 nativeBuildInputs = [

3030 mandown

pkgs/tools/networking/pssh/default.nix+4−7

@@ -1,14 +1,14 @@

1−{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:

1+{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:

3−python3Packages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "pssh";

5− version = "2.3.4";

5+ version = "2.3.1";

77 src = fetchFromGitHub {

88 owner = "lilydjwg";

99 repo = "pssh";

1010 rev = "v${version}";

11− hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";

11+ sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";

1212 };

1313

1414 postPatch = ''

@@ -20,9 +20,6 @@ python3Packages.buildPythonApplication rec {

2020 done

2121 '';

2222

23− # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126

24− doCheck = false;

25−

2623 meta = with lib; {

2724 description = "Parallel SSH Tools";

2825 longDescription = ''

pkgs/tools/networking/urlwatch/default.nix+2−2

@@ -5,13 +5,13 @@

66python3Packages.buildPythonApplication rec {

77 pname = "urlwatch";

8− version = "2.25";

8+ version = "2.24";

1010 src = fetchFromGitHub {

1111 owner = "thp";

1212 repo = "urlwatch";

1313 rev = version;

14− hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4=";

14+ sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU=";

1515 };

1616

1717 propagatedBuildInputs = with python3Packages; [

pkgs/tools/package-management/nix/default.nix+3−3

@@ -89,12 +89,12 @@ in lib.makeExtensible (self: {

8989

9090 unstable = lib.lowPrio (common rec {

9191 version = "2.8";

92− suffix = "pre20220503_${lib.substring 0 7 src.rev}";

92+ suffix = "pre20220428_${lib.substring 0 7 src.rev}";

9393 src = fetchFromGitHub {

9494 owner = "NixOS";

9595 repo = "nix";

96− rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e";

97− sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4=";

96+ rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab";

97+ sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw=";

9898 };

9999 });

100100})

pkgs/tools/security/cryptomator/default.nix+3−3

@@ -6,13 +6,13 @@

77let

88 pname = "cryptomator";

9− version = "1.6.10";

9+ version = "1.6.8";

1010

1111 src = fetchFromGitHub {

1212 owner = "cryptomator";

1313 repo = "cryptomator";

1414 rev = version;

15− sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s=";

15+ sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U=";

1616 };

1717

1818 # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)

@@ -37,7 +37,7 @@ let

3737

3838 outputHashAlgo = "sha256";

3939 outputHashMode = "recursive";

40− outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak=";

40+ outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc=";

4141

4242 doCheck = false;

4343 };

pkgs/tools/security/fulcio/default.nix+3−3

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "fulcio";

5− version = "0.4.1";

5+ version = "0.4.0";

77 src = fetchFromGitHub {

88 owner = "sigstore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";

11+ sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";

23+ vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/security/gopass/default.nix+3−3

@@ -13,7 +13,7 @@

1313

1414buildGoModule rec {

1515 pname = "gopass";

16− version = "1.14.1";

16+ version = "1.14.0";

1717

1818 nativeBuildInputs = [ installShellFiles makeWrapper ];

1919

@@ -21,10 +21,10 @@ buildGoModule rec {

2121 owner = "gopasspw";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";

24+ sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";

2525 };

2626

27− vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";

27+ vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";

2828

2929 subPackages = [ "." ];

3030

pkgs/tools/security/grype/default.nix+3−3

@@ -6,13 +6,13 @@

77buildGoModule rec {

88 pname = "grype";

9− version = "0.36.1";

9+ version = "0.36.0";

1010

1111 src = fetchFromGitHub {

1212 owner = "anchore";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18=";

15+ sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw=";

1616 # populate values that require us to use git. By doing this in postFetch we

1717 # can delete .git afterwards and maintain better reproducibility of the src.

1818 leaveDotGit = true;

@@ -25,7 +25,7 @@ buildGoModule rec {

2525 '';

2626 };

2727

28− vendorSha256 = "sha256-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA=";

28+ vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI=";

2929

3030 nativeBuildInputs = [

3131 installShellFiles

pkgs/tools/security/jadx/default.nix+3−3

@@ -2,13 +2,13 @@

33let

44 pname = "jadx";

5− version = "1.3.5";

5+ version = "1.3.4";

77 src = fetchFromGitHub {

88 owner = "skylot";

99 repo = pname;

1010 rev = "v${version}";

11− hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";

11+ hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";

1212 };

1313

1414 deps = stdenv.mkDerivation {

@@ -40,7 +40,7 @@ let

4040 '';

4141

4242 outputHashMode = "recursive";

43− outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";

43+ outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";

4444 };

4545in stdenv.mkDerivation {

4646 inherit pname version src;

pkgs/tools/security/john/default.nix+7−17

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

1−{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2

2−, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch

1+{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2

2+, gcc, python3Packages, perl, perlPackages, makeWrapper

33}:

55with lib;

@@ -8,21 +8,11 @@ stdenv.mkDerivation rec {

88 pname = "john";

99 version = "1.9.0-jumbo-1";

1010

11− src = fetchFromGitHub {

12− owner = "openwall";

13− repo = pname;

14− rev = "1.9.0-Jumbo-1";

15− sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs=";

11+ src = fetchurl {

12+ url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";

13+ sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";

1614 };

1715

18− patches = [

19− (fetchpatch {

20− name = "fix-gcc-11-struct-allignment-incompatibility.patch";

21− url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch";

22− sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A=";

23− })

24− ];

25−

2616 postPatch = ''

2717 sed -ri -e '

2818 s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!

@@ -79,8 +69,8 @@ stdenv.mkDerivation rec {

7969

8070 meta = {

8171 description = "John the Ripper password cracker";

82− license = licenses.gpl2Plus;

83− homepage = "https://github.com/openwall/john/";

72+ license = licenses.gpl2;

73+ homepage = "https://github.com/magnumripper/JohnTheRipper/";

8474 maintainers = with maintainers; [ offline matthewbauer ];

8575 platforms = platforms.unix;

8676 };

pkgs/tools/security/jwt-cli/default.nix+3−3

@@ -2,16 +2,16 @@

33rustPlatform.buildRustPackage rec {

44 pname = "jwt-cli";

5− version = "5.0.3";

5+ version = "5.0.2";

77 src = fetchFromGitHub {

88 owner = "mike-engel";

99 repo = pname;

1010 rev = version;

11− sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59";

11+ sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r";

1212 };

1313

14− cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf";

14+ cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs";

1515

1616 buildInputs = lib.optional stdenv.isDarwin Security;

1717

pkgs/tools/security/nmap/default.nix+18−6

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

11{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

22, pcre, libssh2

3+, graphicalSupport ? false

34, libX11 ? null

45, gtk2 ? null

6+, python2 ? null

57, makeWrapper ? null

68, withLua ? true

79}:

@@ -9,7 +11,7 @@

911with lib;

1012

1113stdenv.mkDerivation rec {

12− pname = "nmap";

14+ pname = "nmap${optionalString graphicalSupport "-graphical"}";

1315 version = "7.92";

1416

1517 src = fetchurl {

@@ -39,9 +41,7 @@ stdenv.mkDerivation rec {

3941 configureFlags = [

4042 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

4143 "--with-liblinear=included"

42− "--without-ndiff"

43− "--without-zenmap"

44− ];

44+ ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

4545

4646 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

4747 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,8 +49,20 @@ stdenv.mkDerivation rec {

4949 "CC=${stdenv.cc.targetPrefix}gcc"

5050 ];

5151

52− nativeBuildInputs = [ pkg-config ];

53− buildInputs = [ pcre libssh2 libpcap openssl ];

52+ pythonPath = with python2.pkgs; optionals graphicalSupport [

53+ pygtk pysqlite pygobject2 pycairo

54+ ];

55+

56+ nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];

57+ buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [

58+ python2 libX11 gtk2

59+ ]);

60+

61+ postInstall = optionalString graphicalSupport ''

62+ buildPythonPath "$out $pythonPath"

63+ patchPythonScript $out/bin/ndiff

64+ patchPythonScript $out/bin/zenmap

65+ '';

5466

5567 enableParallelBuilding = true;

5668

pkgs/tools/security/oath-toolkit/update.sh+1−1

@@ -5,7 +5,7 @@ set -euo pipefail

66nixfile='default.nix'

77release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

8−attr='oath-toolkit'

8+attr='oathToolkit'

99command='oathtool --version'

1010

1111color() {

pkgs/tools/security/pass/extensions/otp.nix+3−3

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, oath-toolkit }:

1+{ lib, stdenv, fetchFromGitHub, oathToolkit }:

33stdenv.mkDerivation rec {

44 pname = "pass-otp";

@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

1212 };

1313

14− buildInputs = [ oath-toolkit ];

14+ buildInputs = [ oathToolkit ];

1515

1616 dontBuild = true;

1717

1818 patchPhase = ''

19− sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash

19+ sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash

2020 '';

2121

2222 installFlags = [ "PREFIX=$(out)"

pkgs/tools/security/plasma-pass/default.nix+2−2

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

11{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules

22, ki18n

33, kitemmodels

4−, oath-toolkit

4+, oathToolkit

55, qgpgme

66, plasma-framework

77, qt5 }:

@@ -21,7 +21,7 @@ mkDerivation rec {

2121 buildInputs = [

2222 ki18n

2323 kitemmodels

24− oath-toolkit

24+ oathToolkit

2525 qgpgme

2626 plasma-framework

2727 qt5.qtbase

pkgs/tools/security/tor/default.nix+5−9

@@ -30,11 +30,11 @@ let

3030in

3131stdenv.mkDerivation rec {

3232 pname = "tor";

33− version = "0.4.7.7";

33+ version = "0.4.6.10";

3434

3535 src = fetchurl {

3636 url = "https://dist.torproject.org/${pname}-${version}.tar.gz";

37− sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q=";

37+ sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";

3838 };

3939

4040 outputs = [ "out" "geoip" ];

@@ -45,13 +45,9 @@ stdenv.mkDerivation rec {

4545

4646 patches = [ ./disable-monotonic-timer-tests.patch ];

4747

48− configureFlags =

49− # cross compiles correctly but needs the following

50− lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]

51− ++

52− # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599

53− lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ]

54− ;

48+ # cross compiles correctly but needs the following

49+ configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

50+ "--disable-tool-name-check";

5551

5652 NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";

5753

pkgs/tools/system/freeipmi/default.nix+1−6

@@ -1,4 +1,4 @@

1−{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:

1+{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:

33stdenv.mkDerivation rec {

44 version = "1.6.9";

@@ -9,13 +9,8 @@ stdenv.mkDerivation rec {

99 sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";

1010 };

1111

12− depsBuildBuild = [ buildPackages.stdenv.cc ];

13−

1412 buildInputs = [ libgcrypt readline libgpg-error ];

1513

16− configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)

17− [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ];

18−

1914 doCheck = true;

2015

2116 meta = {

pkgs/tools/system/runitor/default.nixdeleted−52

@@ -1,52 +0,0 @@

1−{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:

2−

3−buildGoModule rec {

4− pname = "runitor";

5− version = "0.9.2";

6− vendorSha256 = null;

7−

8− src = fetchFromGitHub {

9− owner = "bdd";

10− repo = "runitor";

11− rev = "v${version}";

12− sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";

13− };

14−

15− ldflags = [

16− "-s" "-w" "-X main.Version=v${version}"

17− ];

18−

19− # TODO(cole-h):

20− # End-to-end tests requiring localhost networking currently under

21− # OfBorg's Linux builders, while passing under Darwin.

22− #

23− # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891

24− #

25− # Temporarily disable tests.

26− doCheck = false;

27−

28− passthru.tests.version = testers.testVersion {

29− package = runitor;

30− command = "runitor -version";

31− version = "v${version}";

32− };

33−

34− # Unit tests require binding to local addresses for listening sockets.

35− __darwinAllowLocalNetworking = true;

36−

37− meta = with lib; {

38− homepage = "https://bdd.fi/x/runitor";

39− description = "A command runner with healthchecks.io integration";

40− longDescription = ''

41− Runitor runs the supplied command, captures its output, and based on its exit

42− code reports successful or failed execution to https://healthchecks.io or your

43− private instance.

44−

45− Healthchecks.io is a web service for monitoring periodic tasks. It's like a

46− dead man's switch for your cron jobs. You get alerted if they don't run on time

47− or terminate with a failure.

48− '';

49− license = licenses.bsd0;

50− maintainers = with maintainers; [ bdd ];

51− };

52−}

pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patchdeleted−25

@@ -1,25 +0,0 @@

1−From 1990ac93c9dbf3ada0eb2f045ef1aa95bbef7018 Mon Sep 17 00:00:00 2001

2−From: "P. R. d. O" <d.ol.rod@tutanota.com>

3−Date: Thu, 21 Apr 2022 07:40:30 -0600

4−Subject: [PATCH] Setting markdown_bin

5−

6−---

7− bb.sh | 2 +-

8− 1 file changed, 1 insertion(+), 1 deletion(-)

9−

10−diff --git a/bb.sh b/bb.sh

11−index 9d8e645..40fb54d 100755

12−--- a/bb.sh

13−+++ b/bb.sh

14−@@ -160,7 +160,7 @@ global_variables() {

15−

16− # Markdown location. Trying to autodetect by default.

17− # The invocation must support the signature 'markdown_bin in.md > out.html'

18−- [[ -f Markdown.pl ]] && markdown_bin=./Markdown.pl || markdown_bin=$(which Markdown.pl 2>/dev/null || which markdown 2>/dev/null)

19−+ markdown_bin=@markdown_path@

20− }

21−

22− # Check for the validity of some variables

23−--

24−2.35.1

25−

pkgs/tools/text/bashblog/default.nixdeleted−59

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

1−{ stdenv

2−, lib

3−, fetchzip

4−, fetchFromGitHub

5−, makeWrapper

6−, substituteAll

7−, perlPackages

8−# Flags to enable processors

9−# Currently, Markdown.pl does not work

10−, usePandoc ? true

11−, pandoc }:

12−

13−let

14− inherit (perlPackages) TextMarkdown;

15− # As bashblog supports various markdown processors

16− # we can set flags to enable a certain processor

17− markdownpl_path = "${perlPackages.TextMarkdown}/bin/Markdown.pl";

18− pandoc_path = "${pandoc}/bin/pandoc";

19−

20−in stdenv.mkDerivation rec {

21− pname = "bashblog";

22− version = "unstable-2022-03-26";

23−

24− src = fetchFromGitHub {

25− owner = "cfenollosa";

26− repo = "bashblog";

27− rev = "c3d4cc1d905560ecfefce911c319469f7a7ff8a8";

28− sha256 = "sha256-THlP/JuaZzDq9QctidwLRiUVFxRhGNhRKleWbQiqsgg=";

29− };

30−

31− nativeBuildInputs = [ makeWrapper ];

32−

33− buildInputs = [ TextMarkdown ]

34− ++ lib.optionals usePandoc [ pandoc ];

35−

36− patches = [

37− (substituteAll {

38− src = ./0001-Setting-markdown_bin.patch;

39− markdown_path = if usePandoc then pandoc_path else markdownpl_path;

40− })

41− ];

42−

43− postPatch = ''

44− patchShebangs bb.sh

45− '';

46−

47− installPhase = ''

48− mkdir -p $out/bin

49− install -Dm755 bb.sh $out/bin/bashblog

50− '';

51−

52− meta = with lib; {

53− description = "A single Bash script to create blogs";

54− homepage = "https://github.com/cfenollosa/bashblog";

55− license = licenses.gpl3Only;

56− platforms = platforms.unix;

57− maintainers = with maintainers; [ wolfangaukang ];

58− };

59−}

pkgs/tools/text/xml/xpf/default.nixnew file+21

@@ -0,0 +1,21 @@

1+{lib, stdenv, fetchurl, python2, libxml2}:

3+assert libxml2.pythonSupport == true;

5+stdenv.mkDerivation rec {

6+ pname = "xpf";

7+ version = "0.2";

9+ src = fetchurl {

10+ url = "http://tarballs.nixos.org/xpf-${version}.tar.gz";

11+ sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";

12+ };

13+

14+ buildInputs = [ python2 libxml2 ];

15+

16+ meta = {

17+ description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";

18+ homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters";

19+ platforms = lib.platforms.unix;

20+ };

21+}

pkgs/tools/virtualization/lxd-image-server/default.nix−3

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

33, rsync

44, python3

55, fetchFromGitHub

6−, nixosTests

76}:

98python3.pkgs.buildPythonApplication rec {

@@ -38,8 +37,6 @@ python3.pkgs.buildPythonApplication rec {

3837

3938 doCheck = false;

4039

41− passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

42−

4340 meta = with lib; {

4441 description = "Creates and manages a simplestreams lxd image server on top of nginx";

4542 homepage = "https://github.com/Avature/lxd-image-server";

pkgs/top-level/aliases.nix+1−10

@@ -92,7 +92,6 @@ mapAliases ({

9292 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

9393 avldrums-lv2 = x42-avldrums; # Added 2020-03-29

9494 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18

95− awesome-4-0 = awesome; # Added 2022-05-05

9695 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

9796 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

9897

@@ -147,7 +146,6 @@ mapAliases ({

147146

148147 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

149148 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02

150− caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25

151149 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13

152150 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13

153151 callPackage_i686 = pkgsi686Linux.callPackage;

@@ -326,7 +324,6 @@ mapAliases ({

326324 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

327325 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

328326 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14

329− dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21

330327 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

331328 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

332329 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07

@@ -873,8 +870,7 @@ mapAliases ({

873870 nix_2_6 = nixVersions.nix_2_6;

874871 nixopsUnstable = nixops_unstable; # Added 2022-03-03

875872 nmap-unfree = nmap; # Added 2021-04-06

876− nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26

877− nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26

873+ nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22

878874 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

879875 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

880876 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

@@ -885,7 +881,6 @@ mapAliases ({

885881

886882 ### O ###

887883

888− oathToolkit = oath-toolkit; # Added 2022-04-04

889884 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

890885 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

891886 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

@@ -1006,7 +1001,6 @@ mapAliases ({

10061001 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

10071002 ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18

10081003 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22

1009− pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21

10101004 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

10111005 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

10121006 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02

@@ -1311,14 +1305,12 @@ mapAliases ({

13111305 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

13121306 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

13131307 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

1314− twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26

13151308 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

13161309

13171310 ### U ###

13181311

13191312 uberwriter = apostrophe; # Added 2020-04-23

13201313 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21

1321− uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02

13221314 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22

13231315 ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11

13241316 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22

@@ -1398,7 +1390,6 @@ mapAliases ({

13981390 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

13991391 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

14001392 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1401− xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

14021393 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

14031394 xf86_input_mtrack = throw ''

14041395 xf86_input_mtrack has been removed from nixpkgs as it is broken and

pkgs/top-level/all-packages.nix+33−34