git.iko.soy/typeable/nixpkgs

on e4dfaba help sign in

from76b29a4

swap

to0 ahead, 590 behind

compare

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

since splitsnapshots

unifiedsplit

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

10

10

11## `fetchurl` and `fetchzip` {#fetchurl}

11## `fetchurl` and `fetchzip` {#fetchurl}

12

12

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.

14

14

15```nix

15```nix

16{ stdenv, fetchurl }:

16{ stdenv, fetchurl }:

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

24}

24}

25```

25```

26

26

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.

28

28

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.

30

30

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

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

32

32

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

38

38

39Used 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`.

39Used 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`.

40

40

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.

42

42

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:

44

44

45```nix

45```nix

46{ stdenv, fetchgit }:

46{ stdenv, fetchgit }:

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

78

78

79## `fetchFromGitHub` {#fetchfromgithub}

79## `fetchFromGitHub` {#fetchfromgithub}

80

80

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.

82

82

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

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

84

84

85## `fetchFromGitLab` {#fetchfromgitlab}

85## `fetchFromGitLab` {#fetchfromgitlab}

86

86

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.

88

88

89## `fetchFromGitiles` {#fetchfromgitiles}

89## `fetchFromGitiles` {#fetchfromgitiles}

90

90

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.

92

92

93## `fetchFromBitbucket` {#fetchfrombitbucket}

93## `fetchFromBitbucket` {#fetchfrombitbucket}

94

94

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

96

96

97## `fetchFromSavannah` {#fetchfromsavannah}

97## `fetchFromSavannah` {#fetchfromsavannah}

98

98

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.

100

100

101## `fetchFromRepoOrCz` {#fetchfromrepoorcz}

101## `fetchFromRepoOrCz` {#fetchfromrepoorcz}

102

102

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.

104

104

105## `fetchFromSourcehut` {#fetchfromsourcehut}

105## `fetchFromSourcehut` {#fetchfromsourcehut}

106

106

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

111

111

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

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

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

113or `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`

58

58

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

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

60

60

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

62

62

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

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

64

64

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

87}

87}

88```

88```

89

89

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:

91

91

92```ShellSession

92```ShellSession

93$ docker images

93$ docker images

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

95hello latest de2bf4786de6 About a minute ago 25.2MB

95hello latest de2bf4786de6 About a minute ago 25.2MB

96```

96```

97

97

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

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

99

99

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

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

101

101

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

119

119

120`contents` _optional_

120`contents` _optional_

121

121

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.

123

123

124 *Default:* `[]`

124 *Default:* `[]`

125

125

126`config` _optional_

126`config` _optional_

127

127

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

129

129

130 *Default:* `{}`

130 *Default:* `{}`

131

131

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

195

195

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

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

197

197

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.

199

199

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.

201

201

202The 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.

202The 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.

203

203

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

213$(nix-build) | docker load

213$(nix-build) | docker load

214```

214```

215

215

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:

217

217

218```ShellSession

218```ShellSession

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

219$(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 @@

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

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

2

2

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.

4

4

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

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

6

6

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.

8

8

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

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

10

10

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

30}

30}

31```

31```

32

32

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

34

34

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

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

36

36

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

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

33

33

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

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

35

35

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.

37

37

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

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

39let

39let

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

4

4

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

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

6

6

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.

8

8

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

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

10

10

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.

12

12

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:

14

14

15```ShellSession

15```ShellSession

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

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

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

19

19

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

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

21

21

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

23

23

24```nix

24```nix

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

25with 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

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

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

9```

9```

10

10

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.

12

12

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

14

14

15```nix

15```nix

16packageOverrides = pkgs: {

16packageOverrides = pkgs: {

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

22}

22}

23```

23```

24

24

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

26

26

27```ShellSession

27```ShellSession

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

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

29```

29```

30

30

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.

32

32

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

34

34

35```nix

35```nix

36packageOverrides = pkgs: {

36packageOverrides = pkgs: {

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

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

1# Elm {#sec-elm}

1# Elm {#sec-elm}

2

2

3−To start a development environment, run:

3+To start a development environment do

4

4

5```ShellSession

5```ShellSession

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

6nix-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.

20}

20}

21```

21```

22

22

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.

24

24

25```nix

25```nix

26{

26{

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

101}

101}

102```

102```

103

103

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.

105

105

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

107

107

108```nix

108```nix

109overrides = self: super: rec {

109overrides = self: super: rec {

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

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

1# /etc files {#etc}

1# /etc files {#etc}

2

2

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.

4

4

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.

6

6

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

8

8

9

9

10```bash

10```bash

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

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

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

16```

16```

17

17

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

2

2

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

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

4

4

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:

6

6

7```nix

7```nix

8{

8{

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

40}

40}

41```

41```

42

42

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

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)

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

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.

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.

47

47

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

48## 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.

50

52

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.

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

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

37

37

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

38The `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

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

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

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

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

42

42

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

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

24 checking for fuse.h... no

24 checking for fuse.h... no

25 configure: error: No fuse.h found.

25 configure: error: No fuse.h found.

26

26

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

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

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

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

29is 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

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

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

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

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

33sample FUSE programs without defining `FUSE_USE_VERSION`.

33sample 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.

6

6

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

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

8

8

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:

10

10

11```nix

11```nix

12{ pkgs, ... }: {

12{ pkgs, ... }: {

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

19

19

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

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

21

21

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:

23

23

24```nix

24```nix

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

25ibus-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

31

31

32The `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:

32The `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:

33

33

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

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

35

35

36```nix

36```nix

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

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

4

4

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

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

6

6

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:

8

8

9```nix

9```nix

10modulesTree = [kernel]

10modulesTree = [kernel]

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

14

14

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

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

16

16

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.

18

18

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

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

20

20

213. 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:

213. 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:

22

22

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

24

24

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.

26

26

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

28

28

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

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

30

30

31 ```ShellSession

31 ```ShellSession

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

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

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

34 $ make menuconfig ARCH=arch

34 $ make menuconfig ARCH=arch

35 ```

35 ```

36

36

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

38

38

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

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

40

40

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

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

1# Locales {#locales}

1# Locales {#locales}

2

2

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.

4

4

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

4

4

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

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

6

6

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

8

8

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.

10

10

11As 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.

11As 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

12

12

13If 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.

13If 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.

14

14

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

4

4

5- `fzf` : `fzf-share`

5- `fzf` : `fzf-share`

6

6

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:

8

8

9```bash

9```bash

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

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

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

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

2

2

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

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

4

4

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.

6

6

7Nix problems and constraints:

7Nix problems and constraints:

8

8

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

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

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

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

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

13

13

14The 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.

14The 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.

15

15

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

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

17

17

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.

19

19

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

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

21

21

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

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

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

33

33

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

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

36

36

37 ```

37 ```

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

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

42

42

43- **Java**

43- **Java**

44

44

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

46

46

47 ```

47 ```

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

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

49 ```

49 ```

50

50

51− you need to add:

51+ you need to add

52

52

53 ```nix

53 ```nix

54 steam.override { withJava = true; };

54 steam.override { withJava = true; };

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

56

56

57## steam-run {#sec-steam-run}

57## steam-run {#sec-steam-run}

58

58

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

60

60

61```

61```

62steam-run ./foo

62steam-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.

4

4

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

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

6

6

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

8

8

9```nix

9```nix

10rxvt-unicode.override {

10rxvt-unicode.override {

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

58

58

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

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

60

60

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

62

62

63A 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.

63A 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.

64

64

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:

66

66

67```nix

67```nix

68passthru.perlPackages = [ "self" ];

68passthru.perlPackages = [ "self" ];

69```

69```

70

70

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}

2

2

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

4

4

5```nix

5```nix

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

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

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

13

13

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

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

15

15

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:

17

17

18```nix

18```nix

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

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

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

49

49

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

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

51

51

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

53

53

54```nix

54```nix

55weechat.override {

55weechat.override {

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

64}

64}

65```

65```

66

66

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:

68

68

69```nix

69```nix

70{ stdenv, fetchurl }:

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

35

35

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

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

37

37

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.

39

39

40::: {.note}

40::: {.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`.

42:::

42:::

43

43

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

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

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

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

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

220```

220```

221

221

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

223by `hi`'s output.

223by `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.

96

96

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

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

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

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

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

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

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

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

102

102

doc/stdenv/meta.chapter.md−34

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

175

175

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

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

177

177

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−

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

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

213

179

214A 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`.

180A 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

317

317

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

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

319

319

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−

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

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

375

321

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

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

39Example usage:

39Example usage:

40

40

41```nix

41```nix

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

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

43 separateDebugInfo = true;

43 separateDebugInfo = true;

44});

44});

45```

45```

46

46

47In 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.

47In 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.

48

48

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

49+The argument `oldAttrs` 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`.

54

50

55::: {.note}

51::: {.note}

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

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

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

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

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

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

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

5# 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.

7

7

8{ lib }:

8{ lib }:

9rec {

9rec {

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

568

568

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

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

570

570

571− else { };

571+ else pc;

572}

572}

maintainers/maintainer-list.nix−18

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

1409 githubId = 164148;

1409 githubId = 164148;

1410 name = "Ben Darwin";

1410 name = "Ben Darwin";

1411 };

1411 };

1412− bdd = {

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

1414− github = "bdd";

1415− githubId = 11135;

1416− name = "Berk D. Demir";

1417− };

1418 bdesham = {

1412 bdesham = {

1419 email = "benjamin@esham.io";

1413 email = "benjamin@esham.io";

1420 github = "bdesham";

1414 github = "bdesham";

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

13294 githubId = 1771332;

13288 githubId = 1771332;

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

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

13296 };

13290 };

13297− vlinkz = {

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

13299− github = "vlinkz";

13300− githubId = 20145996;

13301− name = "Victor Fuentes";

13302− };

13303 vlstill = {

13291 vlstill = {

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

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

13305 github = "vlstill";

13293 github = "vlstill";

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

14211 github = "deifactor";

14199 github = "deifactor";

14212 githubId = 30192992;

14200 githubId = 30192992;

14213 };

14201 };

14214− deinferno = {

14215− name = "deinferno";

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

14217− github = "deinferno";

14218− githubId = 14363193;

14219− };

14220 fzakaria = {

14202 fzakaria = {

14221 name = "Farid Zakaria";

14203 name = "Farid Zakaria";

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

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

maintainers/scripts/luarocks-packages.csv−1

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

64luasql-sqlite3,,,,,,vyp

64luasql-sqlite3,,,,,,vyp

65luassert,,,,,,

65luassert,,,,,,

66luasystem,,,,,,

66luasystem,,,,,,

67−luaunbound,,,,,

68luautf8,,,,,,pstn

67luautf8,,,,,,pstn

69luazip,,,,,,

68luazip,,,,,,

70lua-yajl,,,,,,pstn

69lua-yajl,,,,,,pstn

maintainers/scripts/pluginupdate.py+6−12

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

311

311

312 return plugins

312 return plugins

313

313

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−

324class Editor:

314class Editor:

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

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

326

316

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

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

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

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

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

345

335

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

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

347 """To fill the cache"""

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

349 plugins = []

343 plugins = []

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

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

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

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

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

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

43 Shell.

43 Shell.

44 </para>

44 </para>

45 </listitem>

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

73 <listitem>

46 <listitem>

74 <para>

47 <para>

75 PHP 8.1 is now available

48 PHP 8.1 is now available

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

101 </para>

74 </para>

102 </listitem>

75 </listitem>

103 <listitem>

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

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

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>

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>

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

116− have been removed.

117− </para>

118 </listitem>

79 </listitem>

119 <listitem>

80 <listitem>

120 <para>

81 <para>

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

151 default.

112 default.

152 </para>

113 </para>

153 </listitem>

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

162 </itemizedlist>

115 </itemizedlist>

163 </section>

116 </section>

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

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

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

544 <literal>/etc/containers</literal>.

497 <literal>/etc/containers</literal>.

545 </para>

498 </para>

546 </listitem>

499 </listitem>

547− <listitem>

548− <para>

549− For new installations

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

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

552− want to use Docker on systems where

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

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

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

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

557− <quote>docker</quote>.

558− </para>

559− </listitem>

560 <listitem>

500 <listitem>

561 <para>

501 <para>

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

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

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

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

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

878 updated.

818 updated.

879 </para>

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

885 </listitem>

820 </listitem>

886 <listitem>

821 <listitem>

887 <para>

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

17

17

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

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

19

19

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−

35- PHP 8.1 is now available

20- PHP 8.1 is now available

36

21

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

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

42

27

43- Systemd has been upgraded to the version 250.

28- Systemd has been upgraded to the version 250.

44

29

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

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

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

47

32

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

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

53

38

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

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

55

40

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−

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

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

59

42

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

43- [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

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

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

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

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

183

166

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−

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

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

188 by systemd since Linux 3.5.

168 by systemd since Linux 3.5.

189

169

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

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

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

363 location if the `stateVersion` is updated.

343 location if the `stateVersion` is updated.

364

344

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−

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

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

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

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

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

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

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

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

27 networking.useDHCP = false;

27 networking.useDHCP = false;

28 networking.interfaces.eth0.useDHCP = true;

28 networking.interfaces.eth0.useDHCP = true;

29

29

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

31 documentation.enable = true;

31 documentation.enable = true;

32 documentation.nixos.enable = true;

32 documentation.nixos.enable = true;

33 environment.noXlibs = false;

33 environment.noXlibs = false;

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

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

72 })

72 })

73 (mkIf cfg.enableAllFirmware {

73 (mkIf cfg.enableAllFirmware {

74 assertions = [{

74 assertions = [{

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

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

76 message = ''

76 message = ''

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

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

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

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

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

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

5let

5let

6 im = config.i18n.inputMethod;

6 im = config.i18n.inputMethod;

7 cfg = im.fcitx5;

7 cfg = im.fcitx5;

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

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

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

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

11in {

9in {

12 options = {

10 options = {

13 i18n.inputMethod.fcitx5 = {

11 i18n.inputMethod.fcitx5 = {

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

19 Enabled Fcitx5 addons.

17 Enabled Fcitx5 addons.

20 '';

18 '';

21 };

19 };

22−

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

24 };

20 };

25 };

21 };

26

22

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

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

28 i18n.inputMethod.package = fcitx5Package;

24 i18n.inputMethod.package = fcitx5Package;

29

25

30− environment = mkMerge [{

26+ environment.variables = {

31− variables = {

32− GTK_IM_MODULE = "fcitx";

27+ GTK_IM_MODULE = "fcitx";

33− QT_IM_MODULE = "fcitx";

28+ QT_IM_MODULE = "fcitx";

34− XMODIFIERS = "@im=fcitx";

29+ XMODIFIERS = "@im=fcitx";

35− };

36− }

30+ };

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− })];

46 };

31 };

47}

32}

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

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

35 # Enable sound in graphical iso's.

35 # Enable sound in graphical iso's.

36 hardware.pulseaudio.enable = true;

36 hardware.pulseaudio.enable = true;

37

37

38− # Spice guest additions

38+ environment.systemPackages = [

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

40−

41− # Enable plymouth

42− boot.plymouth.enable = true;

43−

44− environment.defaultPackages = with pkgs; [

45 # Include gparted for partitioning disks.

39 # Include gparted for partitioning disks.

46− gparted

40+ pkgs.gparted

47

41

48 # Include some editors.

42 # Include some editors.

49− vim

43+ pkgs.vim

50− nano

44+ pkgs.bvi # binary editor

45+ pkgs.joe

51

46

52 # Include some version control tools.

47 # Include some version control tools.

53− git

48+ pkgs.git

54− rsync

55

49

56 # Firefox for reading the manual.

50 # Firefox for reading the manual.

57− firefox

51+ pkgs.firefox

58

52

59− glxinfo

53+ pkgs.glxinfo

60 ];

54 ];

61

55

62}

56}

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

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

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

2

2

3−{ ... }:

3+{ lib, ... }:

4+

5+with lib;

4

6

5{

7{

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

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

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

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

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

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

2# Plasma 5.

2# Plasma 5.

3

3

4−{ pkgs, ... }:

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

5+

6+with lib;

5

7

6{

8{

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

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

nixos/modules/module-list.nix−1

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

1256 ./virtualisation/virtualbox-guest.nix

1256 ./virtualisation/virtualbox-guest.nix

1257 ./virtualisation/virtualbox-host.nix

1257 ./virtualisation/virtualbox-host.nix

1258 ./virtualisation/vmware-guest.nix

1258 ./virtualisation/vmware-guest.nix

1259− ./virtualisation/vmware-host.nix

1260 ./virtualisation/waydroid.nix

1259 ./virtualisation/waydroid.nix

1261 ./virtualisation/xen-dom0.nix

1260 ./virtualisation/xen-dom0.nix

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

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

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

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

6 prg = config.programs;

6 prg = config.programs;

7 cfg = prg.thefuck;

7 cfg = prg.thefuck;

8

8

9− bashAndZshInitScript = ''

9+ initScript = ''

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

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

11 '';

11 '';

12− fishInitScript = ''

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

14− '';

15in

12in

16 {

13 {

17 options = {

14 options = {

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

33 config = mkIf cfg.enable {

30 config = mkIf cfg.enable {

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

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

35

32

36− programs.bash.interactiveShellInit = bashAndZshInitScript;

33+ programs.bash.interactiveShellInit = initScript;

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

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

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

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

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

37+ '';

39 };

38 };

40 }

39 }

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

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

492 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}"}

492 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}"}

493 '') +

493 '') +

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

494 (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}

496 '') +

496 '') +

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

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

498 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"}

498 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

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

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

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

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

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

1133 ++ 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 ]

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

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

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

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

1137

1137

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

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

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

1222 '' +

1222 '' +

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

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

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

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

1225 '' +

1225 '' +

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

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

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

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

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

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

8

8

9 cfg = config.services.udev;

9 cfg = config.services.udev;

10

10

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−

29 extraUdevRules = pkgs.writeTextFile {

11 extraUdevRules = pkgs.writeTextFile {

30 name = "extra-udev-rules";

12 name = "extra-udev-rules";

31 text = cfg.extraRules;

13 text = cfg.extraRules;

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

368 ];

350 ];

369 boot.initrd.systemd.storePaths = [

351 boot.initrd.systemd.storePaths = [

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

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

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

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

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"

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

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

376

355

377 # Generate the udev rules for the initrd

356 # Generate the udev rules for the initrd

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

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

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

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

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

387 };

366 };

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

389 };

367 };

390− # Insert initrd rules

368+ # Insert custom rules

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

392− initrdUdevRules

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

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

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

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

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

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

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

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

397− }))

373+ });

398− ];

399

374

400 environment.etc =

375 environment.etc =

401 {

376 {

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

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

820 '') cfg.muc}

820 '') cfg.muc}

821

821

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

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

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

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

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

825 http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit}

824 http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit}

826 http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter}

825 http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter}

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

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

441

441

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

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

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

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

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

445 ssh-keygen \

444 ssh-keygen \

446 -t "${k.type}" \

445 -t "${k.type}" \

447 ${if k ? bits then "-b ${toString k.bits}" else ""} \

446 ${if k ? bits then "-b ${toString k.bits}" else ""} \

nixos/modules/services/web-apps/keycloak.nix+1−2

@@ -540,8 +540,7 @@ in

540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;

540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;

541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

542 db-password._secret = cfg.database.passwordFile;

542 db-password._secret = cfg.database.passwordFile;

543− db-url-host = cfg.database.host;

543+ db-url-host = "${cfg.database.host}:${toString cfg.database.port}";

544− db-url-port = toString cfg.database.port;

545 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;

544 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;

546 db-url-properties = prefixUnlessEmpty "?" dbProps;

545 db-url-properties = prefixUnlessEmpty "?" dbProps;

547 db-url = null;

546 db-url = null;

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1

@@ -33,7 +33,7 @@ let

33 netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else "";

33 netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else "";

34

34

35 copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''

35 copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''

36− empty_file=$(${pkgs.coreutils}/bin/mktemp)

36+ empty_file=$(mktemp)

37

37

38 ${concatStrings (mapAttrsToList (n: v: ''

38 ${concatStrings (mapAttrsToList (n: v: ''

39 ${pkgs.coreutils}/bin/install -Dp "${v}" "${efi.efiSysMountPoint}/"${escapeShellArg n}

39 ${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() {

318

318

319 echo "checking $device..."

319 echo "checking $device..."

320

320

321− fsck -V -a "$device"

321+ fsckFlags=

322+ if test "$fsType" != "btrfs"; then

323+ fsckFlags="-V -a"

324+ fi

325+ fsck $fsckFlags "$device"

322 fsckResult=$?

326 fsckResult=$?

323

327

324 if test $(($fsckResult | 2)) = $fsckResult; then

328 if test $(($fsckResult | 2)) = $fsckResult; then

nixos/modules/system/boot/systemd/shutdown.nix+1−1

@@ -44,7 +44,7 @@ in {

44 ];

44 ];

45 };

45 };

46

46

47− path = [pkgs.util-linux pkgs.makeInitrdNGTool];

47+ path = [pkgs.util-linux pkgs.makeInitrdNGTool pkgs.glibc pkgs.patchelf];

48 serviceConfig.Type = "oneshot";

48 serviceConfig.Type = "oneshot";

49 script = ''

49 script = ''

50 mkdir -p /run/initramfs

50 mkdir -p /run/initramfs

nixos/modules/virtualisation/oci-containers.nix+5−1

@@ -338,7 +338,11 @@ in {

338

338

339 backend = mkOption {

339 backend = mkOption {

340 type = types.enum [ "podman" "docker" ];

340 type = types.enum [ "podman" "docker" ];

341+ default =

342+ # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman

341− default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker";

343+ # if versionAtLeast config.system.stateVersion "20.09" then "podman"

344+ # else "docker";

345+ "docker";

342 description = "The underlying Docker implementation to use.";

346 description = "The underlying Docker implementation to use.";

343 };

347 };

344

348

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 {

132 # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314

132 # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314

133 #(onFullSupported "nixos.tests.nfs3.simple")

133 #(onFullSupported "nixos.tests.nfs3.simple")

134 (onFullSupported "nixos.tests.nfs4.simple")

134 (onFullSupported "nixos.tests.nfs4.simple")

135− (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman")

136 (onFullSupported "nixos.tests.openssh")

135 (onFullSupported "nixos.tests.openssh")

137 (onFullSupported "nixos.tests.pantheon")

136 (onFullSupported "nixos.tests.pantheon")

138 (onFullSupported "nixos.tests.php.fpm")

137 (onFullSupported "nixos.tests.php.fpm")

139 (onFullSupported "nixos.tests.php.httpd")

138 (onFullSupported "nixos.tests.php.httpd")

140 (onFullSupported "nixos.tests.php.pcre")

139 (onFullSupported "nixos.tests.php.pcre")

141 (onFullSupported "nixos.tests.plasma5")

140 (onFullSupported "nixos.tests.plasma5")

142− (onSystems ["x86_64-linux"] "nixos.tests.podman")

143 (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")

141 (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")

144 (onFullSupported "nixos.tests.predictable-interface-names.predictable")

142 (onFullSupported "nixos.tests.predictable-interface-names.predictable")

145 (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")

143 (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")

nixos/release.nix+2−2

@@ -150,13 +150,13 @@ in rec {

150 });

150 });

151

151

152 iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

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

154 type = "plasma5";

154 type = "plasma5";

155 inherit system;

155 inherit system;

156 });

156 });

157

157

158 iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

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

160 type = "gnome";

160 type = "gnome";

161 inherit system;

161 inherit system;

162 });

162 });

nixos/tests/all-tests.nix+1

@@ -284,6 +284,7 @@ in

284 loki = handleTest ./loki.nix {};

284 loki = handleTest ./loki.nix {};

285 lvm2 = handleTest ./lvm2 {};

285 lvm2 = handleTest ./lvm2 {};

286 lxd = handleTest ./lxd.nix {};

286 lxd = handleTest ./lxd.nix {};

287+ lxd-image = handleTest ./lxd-image.nix {};

287 lxd-nftables = handleTest ./lxd-nftables.nix {};

288 lxd-nftables = handleTest ./lxd-nftables.nix {};

288 lxd-image-server = handleTest ./lxd-image-server.nix {};

289 lxd-image-server = handleTest ./lxd-image-server.nix {};

289 #logstash = handleTest ./logstash.nix {};

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

2

2

3let

3let

4− lxd-image = import ../release.nix {

4+ # Since we don't have access to the internet during the tests, we have to

5− configuration = {

5+ # pre-fetch lxd containers beforehand.

6− # Building documentation makes the test unnecessarily take a longer time:

6+ #

7− documentation.enable = lib.mkForce false;

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

8− };

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

9 };

17 };

10

18

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

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

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

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+

13

46

14in {

47in {

15 name = "lxd-image-server";

48 name = "lxd-image-server";

16

49

17 meta = with pkgs.lib.maintainers; {

50 meta = with pkgs.lib.maintainers; {

18− maintainers = [ mkg20001 patryk27 ];

51+ maintainers = [ mkg20001 ];

19 };

52 };

20

53

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

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

@@ -67,20 +100,20 @@ in {

67 # lxd expects the pool's directory to already exist

100 # lxd expects the pool's directory to already exist

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

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

69

102

103+

70 machine.succeed(

104 machine.succeed(

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

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

72 )

106 )

73

107

74 machine.succeed(

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

76 )

110 )

77

111

78− loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"

112+ loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"

79

113

80 with subtest("push image to server"):

114 with subtest("push image to server"):

81− machine.succeed("lxc launch nixos test")

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

82− machine.sleep(5)

83− machine.succeed("lxc stop -f test")

116+ machine.succeed("lxc stop test")

84 machine.succeed("lxc publish --public test --alias=testimg")

117 machine.succeed("lxc publish --public test --alias=testimg")

85 machine.succeed("lxc image export testimg")

118 machine.succeed("lxc image export testimg")

86 machine.succeed("ls >&2")

119 machine.succeed("ls >&2")

nixos/tests/lxd-image.nixnew file+89

@@ -0,0 +1,89 @@

1+# This test ensures that the nixOS lxd images builds and functions properly

2+# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software

3+

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

5+ release = import ../release.nix {

6+ /* configuration = {

7+ environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works

8+ }; */

9+ };

10+

11+ metadata = release.lxdMeta.${pkgs.system};

12+ image = release.lxdImage.${pkgs.system};

13+

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

15+ storage_pools:

16+ - name: default

17+ driver: dir

18+ config:

19+ source: /var/lxd-pool

20+

21+ networks:

22+ - name: lxdbr0

23+ type: bridge

24+ config:

25+ ipv4.address: auto

26+ ipv6.address: none

27+

28+ profiles:

29+ - name: default

30+ devices:

31+ eth0:

32+ name: eth0

33+ network: lxdbr0

34+ type: nic

35+ root:

36+ path: /

37+ pool: default

38+ type: disk

39+ '';

40+in {

41+ name = "lxd-image";

42+

43+ meta = with pkgs.lib.maintainers; {

44+ maintainers = [ mkg20001 ];

45+ };

46+

47+ nodes.machine = { lib, ... }: {

48+ virtualisation = {

49+ # disk full otherwise

50+ diskSize = 2048;

51+

52+ lxc.lxcfs.enable = true;

53+ lxd.enable = true;

54+ };

55+ };

56+

57+ testScript = ''

58+ machine.wait_for_unit("sockets.target")

59+ machine.wait_for_unit("lxd.service")

60+ machine.wait_for_file("/var/lib/lxd/unix.socket")

61+

62+ # It takes additional second for lxd to settle

63+ machine.sleep(1)

64+

65+ # lxd expects the pool's directory to already exist

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

67+

68+ machine.succeed(

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

70+ )

71+

72+ # TODO: test custom built container aswell

73+

74+ with subtest("importing container works"):

75+ machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")

76+

77+ with subtest("launching container works"):

78+ machine.succeed("lxc launch nixos machine -c security.nesting=true")

79+ # make sure machine boots up properly

80+ machine.sleep(5)

81+

82+ with subtest("container shell works"):

83+ machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")

84+ machine.succeed("lxc exec machine /run/current-system/sw/bin/true")

85+

86+ # with subtest("rebuilding works"):

87+ # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")

88+ '';

89+})

nixos/tests/lxd.nix+94−40

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

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

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

2

2

3let

3let

4− lxd-image = import ../release.nix {

4+ # Since we don't have access to the internet during the tests, we have to

5− configuration = {

5+ # pre-fetch lxd containers beforehand.

6− # Building documentation makes the test unnecessarily take a longer time:

6+ #

7− documentation.enable = lib.mkForce false;

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

8

19

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

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

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

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

11− };

31+ '';

12 };

32 };

13

33

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

34+ alpine-meta = {

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

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+

16

77

17in {

78in {

18 name = "lxd";

79 name = "lxd";

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

23

84

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

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

25 virtualisation = {

86 virtualisation = {

26− diskSize = 2048;

27−

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

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

29 # cores to lean on

88 # cores to lean on

30 cores = 2;

89 cores = 2;

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

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

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

50

109

51 machine.succeed(

110 machine.succeed(

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

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

53 )

112 )

54

113

55 machine.succeed(

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

57 )

116 )

58

117

59− with subtest("Container can be managed"):

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

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

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

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

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

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

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

65

122

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

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

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

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

68− machine.sleep(5)

69

125

70 ## ---------- ##

126 ## ---------- ##

71 ## limits.cpu ##

127 ## limits.cpu ##

72

128

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

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

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

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

75− machine.sleep(5)

76

131

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

133+ # to the primal methods

77 assert (

134 assert (

78 "1"

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

80 )

137 )

81

138

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

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

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

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

84− machine.sleep(5)

85

141

86 assert (

142 assert (

87 "2"

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

89 )

145 )

90

146

91 ## ------------- ##

147 ## ------------- ##

92 ## limits.memory ##

148 ## limits.memory ##

93

149

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

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

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

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

96− machine.sleep(5)

97

152

98 assert (

153 assert (

99 "MemTotal: 62500 kB"

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

101 )

156 )

102

157

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

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

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

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

105− machine.sleep(5)

106

160

107 assert (

161 assert (

108 "MemTotal: 125000 kB"

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

110 )

164 )

111

165

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

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

113 '';

167 '';

114})

168})

nixos/tests/matrix-appservice-irc.nix−3

@@ -20,9 +20,6 @@ import ./make-test-python.nix ({ pkgs, ... }:

20

20

21 enable_registration = true;

21 enable_registration = true;

22

22

23− # don't use this in production, always use some form of verification

24− enable_registration_without_verification = true;

25−

26 listeners = [ {

23 listeners = [ {

27 # The default but tls=false

24 # The default but tls=false

28 bind_addresses = [

25 bind_addresses = [

nixos/tests/openssh.nix+6−12

@@ -80,21 +80,17 @@ in {

80

80

81 client.wait_for_unit("network.target")

81 client.wait_for_unit("network.target")

82 client.succeed(

82 client.succeed(

83− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",

83+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"

84− timeout=30

85 )

84 )

86 client.succeed(

85 client.succeed(

87− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",

86+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"

88− timeout=30

89 )

87 )

90

88

91 client.succeed(

89 client.succeed(

92− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",

90+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"

93− timeout=30

94 )

91 )

95 client.succeed(

92 client.succeed(

96− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",

93+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"

97− timeout=30

98 )

94 )

99

95

100 with subtest("configured-authkey"):

96 with subtest("configured-authkey"):

@@ -103,12 +99,10 @@ in {

103 )

99 )

104 client.succeed("chmod 600 privkey.snakeoil")

100 client.succeed("chmod 600 privkey.snakeoil")

105 client.succeed(

101 client.succeed(

106− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",

102+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"

107− timeout=30

108 )

103 )

109 client.succeed(

104 client.succeed(

110− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",

105+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"

111− timeout=30

112 )

106 )

113

107

114 with subtest("localhost-only"):

108 with subtest("localhost-only"):

nixos/tests/pam/pam-oath-login.nix+1−1

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

7 # how many passwords have been made. In this env, we'll always be on

7 # how many passwords have been made. In this env, we'll always be on

8 # the 0th counter, so the password is static.

8 # the 0th counter, so the password is static.

9 #

9 #

10− # Generated in nix-shell -p oath-toolkit

10+ # Generated in nix-shell -p oathToolkit

11 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3

11 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3

12 # and picking a the first 4:

12 # and picking a the first 4:

13 oathSnakeOilPassword1 = "143349";

13 oathSnakeOilPassword1 = "143349";

nixos/tests/pgadmin4.nix+48−37

@@ -1,27 +1,53 @@

1−import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:

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

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− */

19

2

20 let

3 let

21 pgadmin4SrcDir = "/pgadmin";

4 pgadmin4SrcDir = "/pgadmin";

22 pgadmin4Dir = "/var/lib/pgadmin";

5 pgadmin4Dir = "/var/lib/pgadmin";

23 pgadmin4LogDir = "/var/log/pgadmin";

6 pgadmin4LogDir = "/var/log/pgadmin";

24

7

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+ ]);

25 in

51 in

26 {

52 {

27 name = "pgadmin4";

53 name = "pgadmin4";

@@ -29,27 +55,12 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

29

55

30 nodes.machine = { pkgs, ... }: {

56 nodes.machine = { pkgs, ... }: {

31 imports = [ ./common/x11.nix ];

57 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−

39 environment.systemPackages = with pkgs; [

58 environment.systemPackages = with pkgs; [

40 pgadmin4

59 pgadmin4

41 postgresql

60 postgresql

61+ python-with-needed-packages

42 chromedriver

62 chromedriver

43 chromium

63 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− )

53 ];

64 ];

54 services.postgresql = {

65 services.postgresql = {

55 enable = true;

66 enable = true;

@@ -110,7 +121,7 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

110 with subtest("run browser test"):

121 with subtest("run browser test"):

111 machine.succeed(

122 machine.succeed(

112 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

123 '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 \

114 browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'

125 browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'

115 )

126 )

116

127

@@ -120,13 +131,13 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..

120 machine.succeed(

131 machine.succeed(

121 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

132 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

122 && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \

133 && 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'

124 )

135 )

125

136

126 with subtest("run resql test"):

137 with subtest("run resql test"):

127 machine.succeed(

138 machine.succeed(

128 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

139 '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'

130 )

141 )

131 '';

142 '';

132 })

143 })

nixos/tests/systemd-initrd-simple.nix+1−1

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

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

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

2 name = "systemd-initrd-simple";

2 name = "systemd-initrd-simple";

3

3

4− nodes.machine = { pkgs, ... }: {

4+ machine = { pkgs, ... }: {

5 boot.initrd.systemd = {

5 boot.initrd.systemd = {

6 enable = true;

6 enable = true;

7 emergencyAccess = true;

7 emergencyAccess = true;

nixos/tests/xmpp/xmpp-sendmessage.nix+4−1

@@ -51,8 +51,11 @@ class CthonTest(ClientXMPP):

51 log.info('Message sent')

51 log.info('Message sent')

52

52

53 # Test http upload (XEP_0363)

53 # 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)

54 try:

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

56 except:

59 except:

57 log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")

60 log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")

58 sys.exit(1)

61 sys.exit(1)

pkgs/applications/audio/greg/default.nix+3−3

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

2

2

3with pythonPackages; buildPythonApplication rec {

3with pythonPackages; buildPythonApplication rec {

4 pname = "greg";

4 pname = "greg";

5− version = "0.4.8";

5+ version = "0.4.7";

6

6

7 disabled = !isPy3k;

7 disabled = !isPy3k;

8

8

9 src = fetchFromGitHub {

9 src = fetchFromGitHub {

10 owner = "manolomartinez";

10 owner = "manolomartinez";

11 repo = pname;

11 repo = pname;

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

12+ rev = "v" + version;

13− sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";

13+ sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";

14 };

14 };

15

15

16 propagatedBuildInputs = [ setuptools feedparser ];

16 propagatedBuildInputs = [ setuptools feedparser ];

pkgs/applications/audio/plexamp/default.nix+3−3

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

2

2

3let

3let

4 pname = "plexamp";

4 pname = "plexamp";

5− version = "4.2.1";

5+ version = "4.2.0";

6

6

7 src = fetchurl {

7 src = fetchurl {

8 url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

8 url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";

9 name="${pname}-${version}.AppImage";

9 name="${pname}-${version}.AppImage";

10− sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A==";

10+ sha512 = "yIdZoKTJJEpUzEqvixQ7JJBxzrtCRov31dGBDOjMiK/oA2q00Xo6XVDvAhYuIn6ocZqK+I5jHfmf4qYaRePDvg==";

11 };

11 };

12

12

13 appimageContents = appimageTools.extractType2 {

13 appimageContents = appimageTools.extractType2 {

@@ -33,7 +33,7 @@ in appimageTools.wrapType2 {

33 meta = with lib; {

33 meta = with lib; {

34 description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

34 description = "A beautiful Plex music player for audiophiles, curators, and hipsters";

35 homepage = "https://plexamp.com/";

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

37 license = licenses.unfree;

37 license = licenses.unfree;

38 maintainers = with maintainers; [ killercup synthetica ];

38 maintainers = with maintainers; [ killercup synthetica ];

39 platforms = [ "x86_64-linux" ];

39 platforms = [ "x86_64-linux" ];

pkgs/applications/editors/android-studio/common.nix−2

@@ -52,7 +52,6 @@

52, xkeyboard_config

52, xkeyboard_config

53, zlib

53, zlib

54, makeDesktopItem

54, makeDesktopItem

55−, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper

56}:

55}:

57

56

58let

57let

@@ -81,7 +80,6 @@ let

81 --set-default JAVA_HOME "$out/jre" \

80 --set-default JAVA_HOME "$out/jre" \

82 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

81 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

83 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \

82 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \

84− ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \

85 --set FONTCONFIG_FILE ${fontsConf} \

83 --set FONTCONFIG_FILE ${fontsConf} \

86 --prefix PATH : "${lib.makeBinPath [

84 --prefix PATH : "${lib.makeBinPath [

87

85

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

2

2

3let

3let

4 mkStudio = opts: callPackage (import ./common.nix opts) {

4 mkStudio = opts: callPackage (import ./common.nix opts) {

@@ -7,7 +7,6 @@ let

7 };

7 };

8 inherit (gnome2) GConf gnome_vfs;

8 inherit (gnome2) GConf gnome_vfs;

9 inherit buildFHSUserEnv;

9 inherit buildFHSUserEnv;

10− inherit tiling_wm;

11 };

10 };

12 stableVersion = {

11 stableVersion = {

13 version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"

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

3

3

4let

4let

5

5

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

7− buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

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

8

7

9 inherit (lib) extends;

8 inherit (lib) extends;

10

9

@@ -25,7 +24,6 @@ let

25

24

26 plugins = callPackage ./generated.nix {

25 plugins = callPackage ./generated.nix {

27 inherit buildVimPluginFrom2Nix;

26 inherit buildVimPluginFrom2Nix;

28− inherit (vimUtils) buildNeovimPluginFrom2Nix;

29 };

27 };

30

28

31 # TL;DR

29 # TL;DR

pkgs/applications/editors/vim/plugins/generated.nix+440−441

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

1# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!

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

3

3

4final: prev:

4final: prev:

5{

5{

@@ -53,12 +53,12 @@ final: prev:

53

53

54 Coqtail = buildVimPluginFrom2Nix {

54 Coqtail = buildVimPluginFrom2Nix {

55 pname = "Coqtail";

55 pname = "Coqtail";

56− version = "2022-04-21";

56+ version = "2022-04-15";

57 src = fetchFromGitHub {

57 src = fetchFromGitHub {

58 owner = "whonore";

58 owner = "whonore";

59 repo = "Coqtail";

59 repo = "Coqtail";

60− rev = "0b8f2408f96481a373f336b4405af03008e39a4e";

60+ rev = "93fca5d307007c05722050ffa8b4e508ca6f3b81";

61− sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki";

61+ sha256 = "022wv0lpz50ihvnkc38rmds0dl4g4b71yig9dc8nn8sicyv0312w";

62 };

62 };

63 meta.homepage = "https://github.com/whonore/Coqtail/";

63 meta.homepage = "https://github.com/whonore/Coqtail/";

64 };

64 };

@@ -77,12 +77,12 @@ final: prev:

77

77

78 FTerm-nvim = buildVimPluginFrom2Nix {

78 FTerm-nvim = buildVimPluginFrom2Nix {

79 pname = "FTerm.nvim";

79 pname = "FTerm.nvim";

80− version = "2022-04-21";

80+ version = "2022-04-17";

81 src = fetchFromGitHub {

81 src = fetchFromGitHub {

82 owner = "numToStr";

82 owner = "numToStr";

83 repo = "FTerm.nvim";

83 repo = "FTerm.nvim";

84− rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a";

84+ rev = "c2a4c4bbd00da68d864683cd09a5d3a2b80de11d";

85− sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y";

85+ sha256 = "01xscq18slsib2liqp7mbd4wil6l61m2ipihg2i6a14s9bcd1b0y";

86 };

86 };

87 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";

87 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";

88 };

88 };

@@ -149,12 +149,12 @@ final: prev:

149

149

150 LeaderF = buildVimPluginFrom2Nix {

150 LeaderF = buildVimPluginFrom2Nix {

151 pname = "LeaderF";

151 pname = "LeaderF";

152− version = "2022-04-26";

152+ version = "2022-04-19";

153 src = fetchFromGitHub {

153 src = fetchFromGitHub {

154 owner = "Yggdroot";

154 owner = "Yggdroot";

155 repo = "LeaderF";

155 repo = "LeaderF";

156− rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d";

156+ rev = "ecd38845d65ffbe4b080cc3c2c1c7f0bfe835bb3";

157− sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn";

157+ sha256 = "0cjx9v0fafm2npknr85wb37934ysdggnmiwr9cwbd5risp9ircwh";

158 };

158 };

159 meta.homepage = "https://github.com/Yggdroot/LeaderF/";

159 meta.homepage = "https://github.com/Yggdroot/LeaderF/";

160 };

160 };

@@ -173,12 +173,12 @@ final: prev:

173

173

174 Navigator-nvim = buildVimPluginFrom2Nix {

174 Navigator-nvim = buildVimPluginFrom2Nix {

175 pname = "Navigator.nvim";

175 pname = "Navigator.nvim";

176− version = "2022-04-29";

176+ version = "2022-04-11";

177 src = fetchFromGitHub {

177 src = fetchFromGitHub {

178 owner = "numToStr";

178 owner = "numToStr";

179 repo = "Navigator.nvim";

179 repo = "Navigator.nvim";

180− rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2";

180+ rev = "52225923679ec866651bb0c2e0691374131ec939";

181− sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc";

181+ sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv";

182 };

182 };

183 meta.homepage = "https://github.com/numToStr/Navigator.nvim/";

183 meta.homepage = "https://github.com/numToStr/Navigator.nvim/";

184 };

184 };

@@ -269,12 +269,12 @@ final: prev:

269

269

270 SchemaStore-nvim = buildVimPluginFrom2Nix {

270 SchemaStore-nvim = buildVimPluginFrom2Nix {

271 pname = "SchemaStore.nvim";

271 pname = "SchemaStore.nvim";

272− version = "2022-05-02";

272+ version = "2022-04-19";

273 src = fetchFromGitHub {

273 src = fetchFromGitHub {

274 owner = "b0o";

274 owner = "b0o";

275 repo = "SchemaStore.nvim";

275 repo = "SchemaStore.nvim";

276− rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a";

276+ rev = "4112585513210a3a55e587344649a4bfb8709bdc";

277− sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk";

277+ sha256 = "1sjm13vq8608xwfhc9hyfn1n4bwpgivnpw04331giwmf4j3kp422";

278 };

278 };

279 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

279 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

280 };

280 };

@@ -305,12 +305,12 @@ final: prev:

305

305

306 SimpylFold = buildVimPluginFrom2Nix {

306 SimpylFold = buildVimPluginFrom2Nix {

307 pname = "SimpylFold";

307 pname = "SimpylFold";

308− version = "2022-05-02";

308+ version = "2021-11-04";

309 src = fetchFromGitHub {

309 src = fetchFromGitHub {

310 owner = "tmhedberg";

310 owner = "tmhedberg";

311 repo = "SimpylFold";

311 repo = "SimpylFold";

312− rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd";

312+ rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";

313− sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25";

313+ sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";

314 };

314 };

315 meta.homepage = "https://github.com/tmhedberg/SimpylFold/";

315 meta.homepage = "https://github.com/tmhedberg/SimpylFold/";

316 };

316 };

@@ -329,12 +329,12 @@ final: prev:

329

329

330 SpaceVim = buildVimPluginFrom2Nix {

330 SpaceVim = buildVimPluginFrom2Nix {

331 pname = "SpaceVim";

331 pname = "SpaceVim";

332− version = "2022-05-02";

332+ version = "2022-04-19";

333 src = fetchFromGitHub {

333 src = fetchFromGitHub {

334 owner = "SpaceVim";

334 owner = "SpaceVim";

335 repo = "SpaceVim";

335 repo = "SpaceVim";

336− rev = "97b010245f42bda351fd050a3c6ccf7806b9b007";

336+ rev = "a1b65988e72a091334cedfe7ed1d067819f4e1eb";

337− sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f";

337+ sha256 = "096q33lrgn4i8ic6y66snb312ly3rdxm8a15mykawn1n533d04nq";

338 };

338 };

339 meta.homepage = "https://github.com/SpaceVim/SpaceVim/";

339 meta.homepage = "https://github.com/SpaceVim/SpaceVim/";

340 };

340 };

@@ -486,12 +486,12 @@ final: prev:

486

486

487 aerial-nvim = buildVimPluginFrom2Nix {

487 aerial-nvim = buildVimPluginFrom2Nix {

488 pname = "aerial.nvim";

488 pname = "aerial.nvim";

489− version = "2022-05-02";

489+ version = "2022-04-19";

490 src = fetchFromGitHub {

490 src = fetchFromGitHub {

491 owner = "stevearc";

491 owner = "stevearc";

492 repo = "aerial.nvim";

492 repo = "aerial.nvim";

493− rev = "8d2ef96e44768250a652826c6586005f40eeac7f";

493+ rev = "6d5246a3f0d2861eaad4121eb467bc5e6537690d";

494− sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx";

494+ sha256 = "0by8s35hhvk38l79y5nm88cvwy53vx21ps1wg9niway5xrp0khcs";

495 };

495 };

496 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

496 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

497 };

497 };

@@ -522,12 +522,12 @@ final: prev:

522

522

523 ale = buildVimPluginFrom2Nix {

523 ale = buildVimPluginFrom2Nix {

524 pname = "ale";

524 pname = "ale";

525− version = "2022-05-02";

525+ version = "2022-04-06";

526 src = fetchFromGitHub {

526 src = fetchFromGitHub {

527 owner = "dense-analysis";

527 owner = "dense-analysis";

528 repo = "ale";

528 repo = "ale";

529− rev = "56399106fcf9d80d476307576bc307e67f0167e2";

529+ rev = "607f33a1b0f662d9809d54363e8e81a4965862ce";

530− sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv";

530+ sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx";

531 };

531 };

532 meta.homepage = "https://github.com/dense-analysis/ale/";

532 meta.homepage = "https://github.com/dense-analysis/ale/";

533 };

533 };

@@ -546,12 +546,12 @@ final: prev:

546

546

547 aniseed = buildVimPluginFrom2Nix {

547 aniseed = buildVimPluginFrom2Nix {

548 pname = "aniseed";

548 pname = "aniseed";

549− version = "2022-04-27";

549+ version = "2022-04-09";

550 src = fetchFromGitHub {

550 src = fetchFromGitHub {

551 owner = "Olical";

551 owner = "Olical";

552 repo = "aniseed";

552 repo = "aniseed";

553− rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c";

553+ rev = "c55d4879935f07dbf46e86389246449d7af272b1";

554− sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q";

554+ sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s";

555 };

555 };

556 meta.homepage = "https://github.com/Olical/aniseed/";

556 meta.homepage = "https://github.com/Olical/aniseed/";

557 };

557 };

@@ -654,12 +654,12 @@ final: prev:

654

654

655 asynctasks-vim = buildVimPluginFrom2Nix {

655 asynctasks-vim = buildVimPluginFrom2Nix {

656 pname = "asynctasks.vim";

656 pname = "asynctasks.vim";

657− version = "2022-05-01";

657+ version = "2022-04-06";

658 src = fetchFromGitHub {

658 src = fetchFromGitHub {

659 owner = "skywind3000";

659 owner = "skywind3000";

660 repo = "asynctasks.vim";

660 repo = "asynctasks.vim";

661− rev = "9cdb34314d5066b40627c83829b9d04943c9c66d";

661+ rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5";

662− sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw";

662+ sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd";

663 };

663 };

664 meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";

664 meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";

665 };

665 };

@@ -714,12 +714,12 @@ final: prev:

714

714

715 auto-session = buildVimPluginFrom2Nix {

715 auto-session = buildVimPluginFrom2Nix {

716 pname = "auto-session";

716 pname = "auto-session";

717− version = "2022-04-21";

717+ version = "2022-04-12";

718 src = fetchFromGitHub {

718 src = fetchFromGitHub {

719 owner = "rmagatti";

719 owner = "rmagatti";

720 repo = "auto-session";

720 repo = "auto-session";

721− rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a";

721+ rev = "e840b844abcc19ad6e406b193a2a5ce285238458";

722− sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw";

722+ sha256 = "0yx662qipzdmg28x0h454y95jrp952p51pl9h1dxjnwyswn8xrnm";

723 };

723 };

724 meta.homepage = "https://github.com/rmagatti/auto-session/";

724 meta.homepage = "https://github.com/rmagatti/auto-session/";

725 };

725 };

@@ -894,12 +894,12 @@ final: prev:

894

894

895 bufferline-nvim = buildVimPluginFrom2Nix {

895 bufferline-nvim = buildVimPluginFrom2Nix {

896 pname = "bufferline.nvim";

896 pname = "bufferline.nvim";

897− version = "2022-05-02";

897+ version = "2022-04-20";

898 src = fetchFromGitHub {

898 src = fetchFromGitHub {

899 owner = "akinsho";

899 owner = "akinsho";

900 repo = "bufferline.nvim";

900 repo = "bufferline.nvim";

901− rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc";

901+ rev = "f02e19bd29a27944e6bcc1e7a492fe07534b6630";

902− sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh";

902+ sha256 = "10gwj4kd7kngcrfgm4jja08ss5hza7s1bzs11fjk08y489mhracp";

903 };

903 };

904 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

904 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

905 };

905 };

@@ -1050,24 +1050,24 @@ final: prev:

1050

1050

1051 cmp-calc = buildVimPluginFrom2Nix {

1051 cmp-calc = buildVimPluginFrom2Nix {

1052 pname = "cmp-calc";

1052 pname = "cmp-calc";

1053− version = "2022-04-25";

1053+ version = "2022-04-12";

1054 src = fetchFromGitHub {

1054 src = fetchFromGitHub {

1055 owner = "hrsh7th";

1055 owner = "hrsh7th";

1056 repo = "cmp-calc";

1056 repo = "cmp-calc";

1057− rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312";

1057+ rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f";

1058− sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg";

1058+ sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch";

1059 };

1059 };

1060 meta.homepage = "https://github.com/hrsh7th/cmp-calc/";

1060 meta.homepage = "https://github.com/hrsh7th/cmp-calc/";

1061 };

1061 };

1062

1062

1063 cmp-cmdline = buildVimPluginFrom2Nix {

1063 cmp-cmdline = buildVimPluginFrom2Nix {

1064 pname = "cmp-cmdline";

1064 pname = "cmp-cmdline";

1065− version = "2022-05-02";

1065+ version = "2022-02-13";

1066 src = fetchFromGitHub {

1066 src = fetchFromGitHub {

1067 owner = "hrsh7th";

1067 owner = "hrsh7th";

1068 repo = "cmp-cmdline";

1068 repo = "cmp-cmdline";

1069− rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252";

1069+ rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0";

1070− sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68";

1070+ sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh";

1071 };

1071 };

1072 meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";

1072 meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";

1073 };

1073 };

@@ -1110,12 +1110,12 @@ final: prev:

1110

1110

1111 cmp-nvim-lsp = buildVimPluginFrom2Nix {

1111 cmp-nvim-lsp = buildVimPluginFrom2Nix {

1112 pname = "cmp-nvim-lsp";

1112 pname = "cmp-nvim-lsp";

1113− version = "2022-05-01";

1113+ version = "2022-01-15";

1114 src = fetchFromGitHub {

1114 src = fetchFromGitHub {

1115 owner = "hrsh7th";

1115 owner = "hrsh7th";

1116 repo = "cmp-nvim-lsp";

1116 repo = "cmp-nvim-lsp";

1117− rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d";

1117+ rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba";

1118− sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc";

1118+ sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca";

1119 };

1119 };

1120 meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";

1120 meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";

1121 };

1121 };

@@ -1146,12 +1146,12 @@ final: prev:

1146

1146

1147 cmp-nvim-ultisnips = buildVimPluginFrom2Nix {

1147 cmp-nvim-ultisnips = buildVimPluginFrom2Nix {

1148 pname = "cmp-nvim-ultisnips";

1148 pname = "cmp-nvim-ultisnips";

1149− version = "2022-04-22";

1149+ version = "2022-04-15";

1150 src = fetchFromGitHub {

1150 src = fetchFromGitHub {

1151 owner = "quangnguyen30192";

1151 owner = "quangnguyen30192";

1152 repo = "cmp-nvim-ultisnips";

1152 repo = "cmp-nvim-ultisnips";

1153− rev = "21f02b62deb409ce69928a23406076bd0043ddbc";

1153+ rev = "c6ace8ca97ca7db5cca319759efd93fbf6cc0bce";

1154− sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv";

1154+ sha256 = "0jys7fl9r6n7khacypkg643lk2aadsnniyrm7nar0k08swdwhl48";

1155 };

1155 };

1156 meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";

1156 meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";

1157 };

1157 };

@@ -1170,12 +1170,12 @@ final: prev:

1170

1170

1171 cmp-pandoc-references = buildVimPluginFrom2Nix {

1171 cmp-pandoc-references = buildVimPluginFrom2Nix {

1172 pname = "cmp-pandoc-references";

1172 pname = "cmp-pandoc-references";

1173− version = "2022-04-20";

1173+ version = "2022-02-16";

1174 src = fetchFromGitHub {

1174 src = fetchFromGitHub {

1175 owner = "jc-doyle";

1175 owner = "jc-doyle";

1176 repo = "cmp-pandoc-references";

1176 repo = "cmp-pandoc-references";

1177− rev = "2c808dff631a783ddd2c554c4c6033907589baf6";

1177+ rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54";

1178− sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";

1178+ sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs";

1179 };

1179 };

1180 meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";

1180 meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";

1181 };

1181 };

@@ -1230,12 +1230,12 @@ final: prev:

1230

1230

1231 cmp-treesitter = buildVimPluginFrom2Nix {

1231 cmp-treesitter = buildVimPluginFrom2Nix {

1232 pname = "cmp-treesitter";

1232 pname = "cmp-treesitter";

1233− version = "2022-04-25";

1233+ version = "2021-12-02";

1234 src = fetchFromGitHub {

1234 src = fetchFromGitHub {

1235 owner = "ray-x";

1235 owner = "ray-x";

1236 repo = "cmp-treesitter";

1236 repo = "cmp-treesitter";

1237− rev = "c5187c31abd081ecef8b41e5eb476b7340442310";

1237+ rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb";

1238− sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5";

1238+ sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa";

1239 };

1239 };

1240 meta.homepage = "https://github.com/ray-x/cmp-treesitter/";

1240 meta.homepage = "https://github.com/ray-x/cmp-treesitter/";

1241 };

1241 };

@@ -1266,12 +1266,12 @@ final: prev:

1266

1266

1267 cmp_luasnip = buildVimPluginFrom2Nix {

1267 cmp_luasnip = buildVimPluginFrom2Nix {

1268 pname = "cmp_luasnip";

1268 pname = "cmp_luasnip";

1269− version = "2022-05-01";

1269+ version = "2022-04-01";

1270 src = fetchFromGitHub {

1270 src = fetchFromGitHub {

1271 owner = "saadparwaiz1";

1271 owner = "saadparwaiz1";

1272 repo = "cmp_luasnip";

1272 repo = "cmp_luasnip";

1273− rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36";

1273+ rev = "b10829736542e7cc9291e60bab134df1273165c9";

1274− sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj";

1274+ sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l";

1275 };

1275 };

1276 meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";

1276 meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";

1277 };

1277 };

@@ -1314,12 +1314,12 @@ final: prev:

1314

1314

1315 coc-lua = buildVimPluginFrom2Nix {

1315 coc-lua = buildVimPluginFrom2Nix {

1316 pname = "coc-lua";

1316 pname = "coc-lua";

1317− version = "2022-04-26";

1317+ version = "2022-04-20";

1318 src = fetchFromGitHub {

1318 src = fetchFromGitHub {

1319 owner = "josa42";

1319 owner = "josa42";

1320 repo = "coc-lua";

1320 repo = "coc-lua";

1321− rev = "3601c8ddde380349764fc0bc016b915703c9ad86";

1321+ rev = "0df59c8c81acfb7b0abadd49222a769ddf0730ec";

1322− sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx";

1322+ sha256 = "0ij2q9q96dv3rms6qdjsqvgyl0fk3w1h67fhjq7kcagci78cka9k";

1323 };

1323 };

1324 meta.homepage = "https://github.com/josa42/coc-lua/";

1324 meta.homepage = "https://github.com/josa42/coc-lua/";

1325 };

1325 };

@@ -1374,24 +1374,24 @@ final: prev:

1374

1374

1375 coc-nvim = buildVimPluginFrom2Nix {

1375 coc-nvim = buildVimPluginFrom2Nix {

1376 pname = "coc.nvim";

1376 pname = "coc.nvim";

1377− version = "2022-05-01";

1377+ version = "2022-04-19";

1378 src = fetchFromGitHub {

1378 src = fetchFromGitHub {

1379 owner = "neoclide";

1379 owner = "neoclide";

1380 repo = "coc.nvim";

1380 repo = "coc.nvim";

1381− rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02";

1381+ rev = "6f81e3034bf04f2d8d65b82b3ac15d93b737cf0b";

1382− sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6";

1382+ sha256 = "0hx8g0xlh0n6yqpv58s8vb2k0gdh1h13d05l1m3wn3gpvid17xi3";

1383 };

1383 };

1384 meta.homepage = "https://github.com/neoclide/coc.nvim/";

1384 meta.homepage = "https://github.com/neoclide/coc.nvim/";

1385 };

1385 };

1386

1386

1387 codi-vim = buildVimPluginFrom2Nix {

1387 codi-vim = buildVimPluginFrom2Nix {

1388 pname = "codi.vim";

1388 pname = "codi.vim";

1389− version = "2022-04-30";

1389+ version = "2022-04-16";

1390 src = fetchFromGitHub {

1390 src = fetchFromGitHub {

1391 owner = "metakirby5";

1391 owner = "metakirby5";

1392 repo = "codi.vim";

1392 repo = "codi.vim";

1393− rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0";

1393+ rev = "d9a93193dbb23516eebb19ef5ba01b43287ea35d";

1394− sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd";

1394+ sha256 = "0yk3jfp8r432s0kan0g6ml0yyz731yygv0zzpx75l9lfagdv0xpy";

1395 };

1395 };

1396 meta.homepage = "https://github.com/metakirby5/codi.vim/";

1396 meta.homepage = "https://github.com/metakirby5/codi.vim/";

1397 };

1397 };

@@ -1435,12 +1435,12 @@ final: prev:

1435

1435

1436 comment-nvim = buildVimPluginFrom2Nix {

1436 comment-nvim = buildVimPluginFrom2Nix {

1437 pname = "comment.nvim";

1437 pname = "comment.nvim";

1438− version = "2022-04-27";

1438+ version = "2022-04-19";

1439 src = fetchFromGitHub {

1439 src = fetchFromGitHub {

1440 owner = "numtostr";

1440 owner = "numtostr";

1441 repo = "comment.nvim";

1441 repo = "comment.nvim";

1442− rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a";

1442+ rev = "ef3e6bfa41073a73c298ae90d2796f8ceda71c6a";

1443− sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h";

1443+ sha256 = "1ki607wsam22h01gwq8a4vw3jq1yj2zmfp2laglh5cy5dgarm4vv";

1444 };

1444 };

1445 meta.homepage = "https://github.com/numtostr/comment.nvim/";

1445 meta.homepage = "https://github.com/numtostr/comment.nvim/";

1446 };

1446 };

@@ -1579,12 +1579,12 @@ final: prev:

1579

1579

1580 conjure = buildVimPluginFrom2Nix {

1580 conjure = buildVimPluginFrom2Nix {

1581 pname = "conjure";

1581 pname = "conjure";

1582− version = "2022-04-29";

1582+ version = "2022-04-09";

1583 src = fetchFromGitHub {

1583 src = fetchFromGitHub {

1584 owner = "Olical";

1584 owner = "Olical";

1585 repo = "conjure";

1585 repo = "conjure";

1586− rev = "842c81892648de759e639ad2d395757b98be06d5";

1586+ rev = "422cadf51dd44306713f3f7965e40ec606290c49";

1587− sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8";

1587+ sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh";

1588 };

1588 };

1589 meta.homepage = "https://github.com/Olical/conjure/";

1589 meta.homepage = "https://github.com/Olical/conjure/";

1590 };

1590 };

@@ -1627,12 +1627,12 @@ final: prev:

1627

1627

1628 coq_nvim = buildVimPluginFrom2Nix {

1628 coq_nvim = buildVimPluginFrom2Nix {

1629 pname = "coq_nvim";

1629 pname = "coq_nvim";

1630− version = "2022-05-02";

1630+ version = "2022-04-20";

1631 src = fetchFromGitHub {

1631 src = fetchFromGitHub {

1632 owner = "ms-jpq";

1632 owner = "ms-jpq";

1633 repo = "coq_nvim";

1633 repo = "coq_nvim";

1634− rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3";

1634+ rev = "0502a7f14ab73b80353d076842d58730a0239a16";

1635− sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf";

1635+ sha256 = "1s46iafdwxr20qw08si0lwbh81x9ffh2wvd4rxcyvhlxc7h686rp";

1636 };

1636 };

1637 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";

1637 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";

1638 };

1638 };

@@ -1663,12 +1663,12 @@ final: prev:

1663

1663

1664 crates-nvim = buildVimPluginFrom2Nix {

1664 crates-nvim = buildVimPluginFrom2Nix {

1665 pname = "crates.nvim";

1665 pname = "crates.nvim";

1666− version = "2022-05-02";

1666+ version = "2022-04-19";

1667 src = fetchFromGitHub {

1667 src = fetchFromGitHub {

1668 owner = "saecki";

1668 owner = "saecki";

1669 repo = "crates.nvim";

1669 repo = "crates.nvim";

1670− rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383";

1670+ rev = "fc46bf69f0b2293f25581123b46023226d102cc1";

1671− sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q";

1671+ sha256 = "079hraq9cjxjpqrli4y2nk9xwpvkhxmrbrhxq9by1wb1q1a39da3";

1672 };

1672 };

1673 meta.homepage = "https://github.com/saecki/crates.nvim/";

1673 meta.homepage = "https://github.com/saecki/crates.nvim/";

1674 };

1674 };

@@ -1795,12 +1795,12 @@ final: prev:

1795

1795

1796 defx-nvim = buildVimPluginFrom2Nix {

1796 defx-nvim = buildVimPluginFrom2Nix {

1797 pname = "defx.nvim";

1797 pname = "defx.nvim";

1798− version = "2022-04-21";

1798+ version = "2022-04-14";

1799 src = fetchFromGitHub {

1799 src = fetchFromGitHub {

1800 owner = "Shougo";

1800 owner = "Shougo";

1801 repo = "defx.nvim";

1801 repo = "defx.nvim";

1802− rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2";

1802+ rev = "b636df644005bb4805cba70b238df73b302640eb";

1803− sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j";

1803+ sha256 = "1aha5vashdiz59iy8l8kbkyvwngw5m7n131k7ar82gxi0zqsj6q8";

1804 };

1804 };

1805 meta.homepage = "https://github.com/Shougo/defx.nvim/";

1805 meta.homepage = "https://github.com/Shougo/defx.nvim/";

1806 };

1806 };

@@ -1855,12 +1855,12 @@ final: prev:

1855

1855

1856 deol-nvim = buildVimPluginFrom2Nix {

1856 deol-nvim = buildVimPluginFrom2Nix {

1857 pname = "deol.nvim";

1857 pname = "deol.nvim";

1858− version = "2022-04-29";

1858+ version = "2022-03-16";

1859 src = fetchFromGitHub {

1859 src = fetchFromGitHub {

1860 owner = "Shougo";

1860 owner = "Shougo";

1861 repo = "deol.nvim";

1861 repo = "deol.nvim";

1862− rev = "0bdb926d328765144dd788c062161c565dc38732";

1862+ rev = "4ecffa4502a65f90397c2194ae308dac49194a65";

1863− sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x";

1863+ sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9";

1864 };

1864 };

1865 meta.homepage = "https://github.com/Shougo/deol.nvim/";

1865 meta.homepage = "https://github.com/Shougo/deol.nvim/";

1866 };

1866 };

@@ -2169,12 +2169,12 @@ final: prev:

2169

2169

2170 dressing-nvim = buildVimPluginFrom2Nix {

2170 dressing-nvim = buildVimPluginFrom2Nix {

2171 pname = "dressing.nvim";

2171 pname = "dressing.nvim";

2172− version = "2022-05-01";

2172+ version = "2022-03-31";

2173 src = fetchFromGitHub {

2173 src = fetchFromGitHub {

2174 owner = "stevearc";

2174 owner = "stevearc";

2175 repo = "dressing.nvim";

2175 repo = "dressing.nvim";

2176− rev = "a476efd3f372d6b5b0df431cac36911fb84c515e";

2176+ rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217";

2177− sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy";

2177+ sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy";

2178 };

2178 };

2179 meta.homepage = "https://github.com/stevearc/dressing.nvim/";

2179 meta.homepage = "https://github.com/stevearc/dressing.nvim/";

2180 };

2180 };

@@ -2193,12 +2193,12 @@ final: prev:

2193

2193

2194 edge = buildVimPluginFrom2Nix {

2194 edge = buildVimPluginFrom2Nix {

2195 pname = "edge";

2195 pname = "edge";

2196− version = "2022-04-27";

2196+ version = "2022-04-14";

2197 src = fetchFromGitHub {

2197 src = fetchFromGitHub {

2198 owner = "sainnhe";

2198 owner = "sainnhe";

2199 repo = "edge";

2199 repo = "edge";

2200− rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674";

2200+ rev = "957a0f4d17f253ac23f9c870eb92d7ad2ea4b7e0";

2201− sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4";

2201+ sha256 = "15m6b5svvcfsmiq87vhn77q5z7zg22vpnh9qbcv0y6cd04s69n2d";

2202 };

2202 };

2203 meta.homepage = "https://github.com/sainnhe/edge/";

2203 meta.homepage = "https://github.com/sainnhe/edge/";

2204 };

2204 };

@@ -2279,12 +2279,12 @@ final: prev:

2279

2279

2280 everforest = buildVimPluginFrom2Nix {

2280 everforest = buildVimPluginFrom2Nix {

2281 pname = "everforest";

2281 pname = "everforest";

2282− version = "2022-04-27";

2282+ version = "2022-04-14";

2283 src = fetchFromGitHub {

2283 src = fetchFromGitHub {

2284 owner = "sainnhe";

2284 owner = "sainnhe";

2285 repo = "everforest";

2285 repo = "everforest";

2286− rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32";

2286+ rev = "64f486a4856bfbfd6604c700c938b34cf551561b";

2287− sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah";

2287+ sha256 = "18yxab99d9cy45ir2dfqr8wi0s56qyrzglgcslp97wnjiq79673d";

2288 };

2288 };

2289 meta.homepage = "https://github.com/sainnhe/everforest/";

2289 meta.homepage = "https://github.com/sainnhe/everforest/";

2290 };

2290 };

@@ -2460,12 +2460,12 @@ final: prev:

2460

2460

2461 formatter-nvim = buildVimPluginFrom2Nix {

2461 formatter-nvim = buildVimPluginFrom2Nix {

2462 pname = "formatter.nvim";

2462 pname = "formatter.nvim";

2463− version = "2022-04-26";

2463+ version = "2022-03-29";

2464 src = fetchFromGitHub {

2464 src = fetchFromGitHub {

2465 owner = "mhartington";

2465 owner = "mhartington";

2466 repo = "formatter.nvim";

2466 repo = "formatter.nvim";

2467− rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9";

2467+ rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31";

2468− sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp";

2468+ sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n";

2469 };

2469 };

2470 meta.homepage = "https://github.com/mhartington/formatter.nvim/";

2470 meta.homepage = "https://github.com/mhartington/formatter.nvim/";

2471 };

2471 };

@@ -2484,12 +2484,12 @@ final: prev:

2484

2484

2485 friendly-snippets = buildVimPluginFrom2Nix {

2485 friendly-snippets = buildVimPluginFrom2Nix {

2486 pname = "friendly-snippets";

2486 pname = "friendly-snippets";

2487− version = "2022-04-25";

2487+ version = "2022-04-17";

2488 src = fetchFromGitHub {

2488 src = fetchFromGitHub {

2489 owner = "rafamadriz";

2489 owner = "rafamadriz";

2490 repo = "friendly-snippets";

2490 repo = "friendly-snippets";

2491− rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938";

2491+ rev = "804c3f55ec4ec46f7257451b3cd731df991b9212";

2492− sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w";

2492+ sha256 = "0sznw2q70zac924yf0z0ic3frmmjmryjh4af46fw2zrbrq4kk9vq";

2493 };

2493 };

2494 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

2494 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

2495 };

2495 };

@@ -2604,12 +2604,12 @@ final: prev:

2604

2604

2605 gentoo-syntax = buildVimPluginFrom2Nix {

2605 gentoo-syntax = buildVimPluginFrom2Nix {

2606 pname = "gentoo-syntax";

2606 pname = "gentoo-syntax";

2607− version = "2022-05-02";

2607+ version = "2022-02-23";

2608 src = fetchFromGitHub {

2608 src = fetchFromGitHub {

2609 owner = "gentoo";

2609 owner = "gentoo";

2610 repo = "gentoo-syntax";

2610 repo = "gentoo-syntax";

2611− rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1";

2611+ rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";

2612− sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h";

2612+ sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";

2613 };

2613 };

2614 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";

2614 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";

2615 };

2615 };

@@ -2652,24 +2652,24 @@ final: prev:

2652

2652

2653 git-blame-nvim = buildVimPluginFrom2Nix {

2653 git-blame-nvim = buildVimPluginFrom2Nix {

2654 pname = "git-blame.nvim";

2654 pname = "git-blame.nvim";

2655− version = "2022-04-29";

2655+ version = "2022-03-03";

2656 src = fetchFromGitHub {

2656 src = fetchFromGitHub {

2657 owner = "f-person";

2657 owner = "f-person";

2658 repo = "git-blame.nvim";

2658 repo = "git-blame.nvim";

2659− rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541";

2659+ rev = "e60bfbc314476777a5ce200e533699691a5cdfa5";

2660− sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl";

2660+ sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k";

2661 };

2661 };

2662 meta.homepage = "https://github.com/f-person/git-blame.nvim/";

2662 meta.homepage = "https://github.com/f-person/git-blame.nvim/";

2663 };

2663 };

2664

2664

2665 git-messenger-vim = buildVimPluginFrom2Nix {

2665 git-messenger-vim = buildVimPluginFrom2Nix {

2666 pname = "git-messenger.vim";

2666 pname = "git-messenger.vim";

2667− version = "2022-05-02";

2667+ version = "2021-11-13";

2668 src = fetchFromGitHub {

2668 src = fetchFromGitHub {

2669 owner = "rhysd";

2669 owner = "rhysd";

2670 repo = "git-messenger.vim";

2670 repo = "git-messenger.vim";

2671− rev = "6c0b55fb38d0e0633127823aab89b0676d13e509";

2671+ rev = "2e67899355f3f631aad6845925e4c2c13546444d";

2672− sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk";

2672+ sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp";

2673 };

2673 };

2674 meta.homepage = "https://github.com/rhysd/git-messenger.vim/";

2674 meta.homepage = "https://github.com/rhysd/git-messenger.vim/";

2675 };

2675 };

@@ -2710,14 +2710,14 @@ final: prev:

2710 meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";

2710 meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";

2711 };

2711 };

2712

2712

2713− gitsigns-nvim = buildNeovimPluginFrom2Nix {

2713+ gitsigns-nvim = buildVimPluginFrom2Nix {

2714 pname = "gitsigns.nvim";

2714 pname = "gitsigns.nvim";

2715− version = "2022-05-02";

2715+ version = "2022-04-19";

2716 src = fetchFromGitHub {

2716 src = fetchFromGitHub {

2717 owner = "lewis6991";

2717 owner = "lewis6991";

2718 repo = "gitsigns.nvim";

2718 repo = "gitsigns.nvim";

2719− rev = "ef153188e849bd317c00448755bc4182a2bd495d";

2719+ rev = "498abfa13dd749be963bc87a5b37da0d3e42a50e";

2720− sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp";

2720+ sha256 = "11d2pnqgngm6546r1nr0cf1dj7qkgvdn0ld2h1jn3fm07l892sgv";

2721 };

2721 };

2722 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

2722 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

2723 };

2723 };

@@ -2760,12 +2760,12 @@ final: prev:

2760

2760

2761 golden-ratio = buildVimPluginFrom2Nix {

2761 golden-ratio = buildVimPluginFrom2Nix {

2762 pname = "golden-ratio";

2762 pname = "golden-ratio";

2763− version = "2022-04-21";

2763+ version = "2020-04-03";

2764 src = fetchFromGitHub {

2764 src = fetchFromGitHub {

2765 owner = "roman";

2765 owner = "roman";

2766 repo = "golden-ratio";

2766 repo = "golden-ratio";

2767− rev = "7df80253680e4755b82955425da31d8c1f8e23b6";

2767+ rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043";

2768− sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq";

2768+ sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654";

2769 };

2769 };

2770 meta.homepage = "https://github.com/roman/golden-ratio/";

2770 meta.homepage = "https://github.com/roman/golden-ratio/";

2771 };

2771 };

@@ -2844,24 +2844,24 @@ final: prev:

2844

2844

2845 gruvbox-material = buildVimPluginFrom2Nix {

2845 gruvbox-material = buildVimPluginFrom2Nix {

2846 pname = "gruvbox-material";

2846 pname = "gruvbox-material";

2847− version = "2022-04-27";

2847+ version = "2022-04-14";

2848 src = fetchFromGitHub {

2848 src = fetchFromGitHub {

2849 owner = "sainnhe";

2849 owner = "sainnhe";

2850 repo = "gruvbox-material";

2850 repo = "gruvbox-material";

2851− rev = "3d664943daf65bf99390a52c5dbc557f87fac552";

2851+ rev = "45d05b6affeec1f858a13c0d8fe511db32c85afd";

2852− sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj";

2852+ sha256 = "18sf80zgdsfb2bd9dgdww9prlhkydk695gj9wd9zah24zfc5mcv7";

2853 };

2853 };

2854 meta.homepage = "https://github.com/sainnhe/gruvbox-material/";

2854 meta.homepage = "https://github.com/sainnhe/gruvbox-material/";

2855 };

2855 };

2856

2856

2857 gruvbox-nvim = buildVimPluginFrom2Nix {

2857 gruvbox-nvim = buildVimPluginFrom2Nix {

2858 pname = "gruvbox.nvim";

2858 pname = "gruvbox.nvim";

2859− version = "2022-04-26";

2859+ version = "2022-04-18";

2860 src = fetchFromGitHub {

2860 src = fetchFromGitHub {

2861 owner = "ellisonleao";

2861 owner = "ellisonleao";

2862 repo = "gruvbox.nvim";

2862 repo = "gruvbox.nvim";

2863− rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123";

2863+ rev = "028302225e19eb203ebb6876b689cc0ce2631169";

2864− sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8";

2864+ sha256 = "0npsh72z3xb9p1jdhz1g9jpx20c2d52mkkg4ix07bmy40ynkbsxs";

2865 };

2865 };

2866 meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";

2866 meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";

2867 };

2867 };

@@ -2976,24 +2976,24 @@ final: prev:

2976

2976

2977 hop-nvim = buildVimPluginFrom2Nix {

2977 hop-nvim = buildVimPluginFrom2Nix {

2978 pname = "hop.nvim";

2978 pname = "hop.nvim";

2979− version = "2022-04-25";

2979+ version = "2022-03-22";

2980 src = fetchFromGitHub {

2980 src = fetchFromGitHub {

2981 owner = "phaazon";

2981 owner = "phaazon";

2982 repo = "hop.nvim";

2982 repo = "hop.nvim";

2983− rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578";

2983+ rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3";

2984− sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v";

2984+ sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2";

2985 };

2985 };

2986 meta.homepage = "https://github.com/phaazon/hop.nvim/";

2986 meta.homepage = "https://github.com/phaazon/hop.nvim/";

2987 };

2987 };

2988

2988

2989 hotpot-nvim = buildVimPluginFrom2Nix {

2989 hotpot-nvim = buildVimPluginFrom2Nix {

2990 pname = "hotpot.nvim";

2990 pname = "hotpot.nvim";

2991− version = "2022-04-24";

2991+ version = "2022-04-10";

2992 src = fetchFromGitHub {

2992 src = fetchFromGitHub {

2993 owner = "rktjmp";

2993 owner = "rktjmp";

2994 repo = "hotpot.nvim";

2994 repo = "hotpot.nvim";

2995− rev = "f481b30f1d93df6016092623199ddc8bfe1624d0";

2995+ rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e";

2996− sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj";

2996+ sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf";

2997 };

2997 };

2998 meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";

2998 meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";

2999 };

2999 };

@@ -3012,12 +3012,12 @@ final: prev:

3012

3012

3013 iceberg-vim = buildVimPluginFrom2Nix {

3013 iceberg-vim = buildVimPluginFrom2Nix {

3014 pname = "iceberg.vim";

3014 pname = "iceberg.vim";

3015− version = "2022-04-26";

3015+ version = "2021-12-28";

3016 src = fetchFromGitHub {

3016 src = fetchFromGitHub {

3017 owner = "cocopon";

3017 owner = "cocopon";

3018 repo = "iceberg.vim";

3018 repo = "iceberg.vim";

3019− rev = "5ac9da61e8626d1218498a35e515f36387efe454";

3019+ rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c";

3020− sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq";

3020+ sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa";

3021 };

3021 };

3022 meta.homepage = "https://github.com/cocopon/iceberg.vim/";

3022 meta.homepage = "https://github.com/cocopon/iceberg.vim/";

3023 };

3023 };

@@ -3277,12 +3277,12 @@ final: prev:

3277

3277

3278 kanagawa-nvim = buildVimPluginFrom2Nix {

3278 kanagawa-nvim = buildVimPluginFrom2Nix {

3279 pname = "kanagawa.nvim";

3279 pname = "kanagawa.nvim";

3280− version = "2022-04-21";

3280+ version = "2022-04-14";

3281 src = fetchFromGitHub {

3281 src = fetchFromGitHub {

3282 owner = "rebelot";

3282 owner = "rebelot";

3283 repo = "kanagawa.nvim";

3283 repo = "kanagawa.nvim";

3284− rev = "0ad738e7cc43514d35388c1caca13990d688aa5c";

3284+ rev = "acf0f5d61236b416c804d649cd76db8390de9ae6";

3285− sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca";

3285+ sha256 = "03xmcph28q1y8n0ykga5m6biw9flpnx02sy7j2w3f1q2shknnwf3";

3286 };

3286 };

3287 meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";

3287 meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";

3288 };

3288 };

@@ -3361,12 +3361,12 @@ final: prev:

3361

3361

3362 lean-nvim = buildVimPluginFrom2Nix {

3362 lean-nvim = buildVimPluginFrom2Nix {

3363 pname = "lean.nvim";

3363 pname = "lean.nvim";

3364− version = "2022-05-02";

3364+ version = "2022-04-19";

3365 src = fetchFromGitHub {

3365 src = fetchFromGitHub {

3366 owner = "Julian";

3366 owner = "Julian";

3367 repo = "lean.nvim";

3367 repo = "lean.nvim";

3368− rev = "902eb7f75d664bccd251c38d7921570b05b47cdc";

3368+ rev = "354630520ed3fe73c69796fb2e566a7c2125cd04";

3369− sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3";

3369+ sha256 = "1gwgbgg0dc0fwcdz6qs6mgvg0ybxgld3wm2wprq89abpacfz29dz";

3370 };

3370 };

3371 meta.homepage = "https://github.com/Julian/lean.nvim/";

3371 meta.homepage = "https://github.com/Julian/lean.nvim/";

3372 };

3372 };

@@ -3469,12 +3469,12 @@ final: prev:

3469

3469

3470 lightline-bufferline = buildVimPluginFrom2Nix {

3470 lightline-bufferline = buildVimPluginFrom2Nix {

3471 pname = "lightline-bufferline";

3471 pname = "lightline-bufferline";

3472− version = "2022-04-28";

3472+ version = "2022-03-27";

3473 src = fetchFromGitHub {

3473 src = fetchFromGitHub {

3474 owner = "mengelbrecht";

3474 owner = "mengelbrecht";

3475 repo = "lightline-bufferline";

3475 repo = "lightline-bufferline";

3476− rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab";

3476+ rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff";

3477− sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj";

3477+ sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq";

3478 };

3478 };

3479 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

3479 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

3480 };

3480 };

@@ -3613,12 +3613,12 @@ final: prev:

3613

3613

3614 litee-nvim = buildVimPluginFrom2Nix {

3614 litee-nvim = buildVimPluginFrom2Nix {

3615 pname = "litee.nvim";

3615 pname = "litee.nvim";

3616− version = "2022-04-25";

3616+ version = "2022-02-28";

3617 src = fetchFromGitHub {

3617 src = fetchFromGitHub {

3618 owner = "ldelossa";

3618 owner = "ldelossa";

3619 repo = "litee.nvim";

3619 repo = "litee.nvim";

3620− rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff";

3620+ rev = "c9fd775aebf702c81e2077693336584a0027d496";

3621− sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y";

3621+ sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd";

3622 };

3622 };

3623 meta.homepage = "https://github.com/ldelossa/litee.nvim/";

3623 meta.homepage = "https://github.com/ldelossa/litee.nvim/";

3624 };

3624 };

@@ -3684,12 +3684,12 @@ final: prev:

3684

3684

3685 lsp_signature-nvim = buildVimPluginFrom2Nix {

3685 lsp_signature-nvim = buildVimPluginFrom2Nix {

3686 pname = "lsp_signature.nvim";

3686 pname = "lsp_signature.nvim";

3687− version = "2022-05-01";

3687+ version = "2022-04-16";

3688 src = fetchFromGitHub {

3688 src = fetchFromGitHub {

3689 owner = "ray-x";

3689 owner = "ray-x";

3690 repo = "lsp_signature.nvim";

3690 repo = "lsp_signature.nvim";

3691− rev = "6d160406f948a810c40304224a1255c8bba5a415";

3691+ rev = "a351509512687293fd659ba4ee7e34412c3a8f70";

3692− sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3";

3692+ sha256 = "00xzd8b13krysdw21zm9ms902cxm04xl1wd2l7rb04431s2v9vc0";

3693 };

3693 };

3694 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

3694 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

3695 };

3695 };

@@ -3699,11 +3699,11 @@ final: prev:

3699 version = "2022-04-18";

3699 version = "2022-04-18";

3700 src = fetchFromGitHub {

3700 src = fetchFromGitHub {

3701 owner = "onsails";

3701 owner = "onsails";

3702− repo = "lspkind.nvim";

3702+ repo = "lspkind-nvim";

3703 rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7";

3703 rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7";

3704 sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk";

3704 sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk";

3705 };

3705 };

3706− meta.homepage = "https://github.com/onsails/lspkind.nvim/";

3706+ meta.homepage = "https://github.com/onsails/lspkind-nvim/";

3707 };

3707 };

3708

3708

3709 lspsaga-nvim = buildVimPluginFrom2Nix {

3709 lspsaga-nvim = buildVimPluginFrom2Nix {

@@ -3744,24 +3744,24 @@ final: prev:

3744

3744

3745 lualine-nvim = buildVimPluginFrom2Nix {

3745 lualine-nvim = buildVimPluginFrom2Nix {

3746 pname = "lualine.nvim";

3746 pname = "lualine.nvim";

3747− version = "2022-05-02";

3747+ version = "2022-04-17";

3748 src = fetchFromGitHub {

3748 src = fetchFromGitHub {

3749 owner = "nvim-lualine";

3749 owner = "nvim-lualine";

3750 repo = "lualine.nvim";

3750 repo = "lualine.nvim";

3751− rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31";

3751+ rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d";

3752− sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d";

3752+ sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k";

3753 };

3753 };

3754 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

3754 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

3755 };

3755 };

3756

3756

3757 luasnip = buildVimPluginFrom2Nix {

3757 luasnip = buildVimPluginFrom2Nix {

3758 pname = "luasnip";

3758 pname = "luasnip";

3759− version = "2022-05-01";

3759+ version = "2022-04-15";

3760 src = fetchFromGitHub {

3760 src = fetchFromGitHub {

3761 owner = "l3mon4d3";

3761 owner = "l3mon4d3";

3762 repo = "luasnip";

3762 repo = "luasnip";

3763− rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e";

3763+ rev = "6b67cb12747225a6412d8263bb97d6d2b8d9366a";

3764− sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r";

3764+ sha256 = "08a1kk8z3mcq65dh0hi44188dxkqjfg3yilr8viamyni1kwy7gf3";

3765 };

3765 };

3766 meta.homepage = "https://github.com/l3mon4d3/luasnip/";

3766 meta.homepage = "https://github.com/l3mon4d3/luasnip/";

3767 };

3767 };

@@ -3864,12 +3864,12 @@ final: prev:

3864

3864

3865 mini-nvim = buildVimPluginFrom2Nix {

3865 mini-nvim = buildVimPluginFrom2Nix {

3866 pname = "mini.nvim";

3866 pname = "mini.nvim";

3867− version = "2022-05-01";

3867+ version = "2022-04-20";

3868 src = fetchFromGitHub {

3868 src = fetchFromGitHub {

3869 owner = "echasnovski";

3869 owner = "echasnovski";

3870 repo = "mini.nvim";

3870 repo = "mini.nvim";

3871− rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88";

3871+ rev = "8134370549e73a5a72d24ffc7ea6a881cf4502ad";

3872− sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7";

3872+ sha256 = "0llkj31jkqnm3igs2f7cw8wxbc9877jk1mc2shnh1ii2dh0kmz68";

3873 };

3873 };

3874 meta.homepage = "https://github.com/echasnovski/mini.nvim/";

3874 meta.homepage = "https://github.com/echasnovski/mini.nvim/";

3875 };

3875 };

@@ -3912,12 +3912,12 @@ final: prev:

3912

3912

3913 mkdx = buildVimPluginFrom2Nix {

3913 mkdx = buildVimPluginFrom2Nix {

3914 pname = "mkdx";

3914 pname = "mkdx";

3915− version = "2022-04-29";

3915+ version = "2022-04-08";

3916 src = fetchFromGitHub {

3916 src = fetchFromGitHub {

3917 owner = "SidOfc";

3917 owner = "SidOfc";

3918 repo = "mkdx";

3918 repo = "mkdx";

3919− rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7";

3919+ rev = "a4645528e2ddedfb6350c142660c3e0468057f1c";

3920− sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql";

3920+ sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd";

3921 };

3921 };

3922 meta.homepage = "https://github.com/SidOfc/mkdx/";

3922 meta.homepage = "https://github.com/SidOfc/mkdx/";

3923 };

3923 };

@@ -4176,12 +4176,12 @@ final: prev:

4176

4176

4177 neco-vim = buildVimPluginFrom2Nix {

4177 neco-vim = buildVimPluginFrom2Nix {

4178 pname = "neco-vim";

4178 pname = "neco-vim";

4179− version = "2022-04-21";

4179+ version = "2022-02-02";

4180 src = fetchFromGitHub {

4180 src = fetchFromGitHub {

4181 owner = "Shougo";

4181 owner = "Shougo";

4182 repo = "neco-vim";

4182 repo = "neco-vim";

4183− rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692";

4183+ rev = "4b537fa01c28f2f7cf249722530561d2e477b49f";

4184− sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k";

4184+ sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv";

4185 };

4185 };

4186 meta.homepage = "https://github.com/Shougo/neco-vim/";

4186 meta.homepage = "https://github.com/Shougo/neco-vim/";

4187 };

4187 };

@@ -4212,12 +4212,12 @@ final: prev:

4212

4212

4213 neoformat = buildVimPluginFrom2Nix {

4213 neoformat = buildVimPluginFrom2Nix {

4214 pname = "neoformat";

4214 pname = "neoformat";

4215− version = "2022-05-01";

4215+ version = "2022-04-14";

4216 src = fetchFromGitHub {

4216 src = fetchFromGitHub {

4217 owner = "sbdchd";

4217 owner = "sbdchd";

4218 repo = "neoformat";

4218 repo = "neoformat";

4219− rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a";

4219+ rev = "06920fa90ec7db3f81c6f842ebaf008c39e088cf";

4220− sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816";

4220+ sha256 = "1f5j7aisnpvykgj7p64cbvfww05fsv47pi04ckkh0gkc49g5sjmg";

4221 };

4221 };

4222 meta.homepage = "https://github.com/sbdchd/neoformat/";

4222 meta.homepage = "https://github.com/sbdchd/neoformat/";

4223 };

4223 };

@@ -4284,12 +4284,12 @@ final: prev:

4284

4284

4285 neorg = buildVimPluginFrom2Nix {

4285 neorg = buildVimPluginFrom2Nix {

4286 pname = "neorg";

4286 pname = "neorg";

4287− version = "2022-05-01";

4287+ version = "2022-04-18";

4288 src = fetchFromGitHub {

4288 src = fetchFromGitHub {

4289 owner = "nvim-neorg";

4289 owner = "nvim-neorg";

4290 repo = "neorg";

4290 repo = "neorg";

4291− rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8";

4291+ rev = "4a3ca2c0cb46a5320c124565fd4d9830435aa29f";

4292− sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1";

4292+ sha256 = "15jwzz2ldxg6ql1lzn626dcfxgndqzgpamakqk0yicbidhmdird0";

4293 };

4293 };

4294 meta.homepage = "https://github.com/nvim-neorg/neorg/";

4294 meta.homepage = "https://github.com/nvim-neorg/neorg/";

4295 };

4295 };

@@ -4332,24 +4332,24 @@ final: prev:

4332

4332

4333 neoterm = buildVimPluginFrom2Nix {

4333 neoterm = buildVimPluginFrom2Nix {

4334 pname = "neoterm";

4334 pname = "neoterm";

4335− version = "2022-04-26";

4335+ version = "2022-01-20";

4336 src = fetchFromGitHub {

4336 src = fetchFromGitHub {

4337 owner = "kassio";

4337 owner = "kassio";

4338 repo = "neoterm";

4338 repo = "neoterm";

4339− rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9";

4339+ rev = "533d311a2a9187294ea52acab32d8565d6517059";

4340− sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq";

4340+ sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6";

4341 };

4341 };

4342 meta.homepage = "https://github.com/kassio/neoterm/";

4342 meta.homepage = "https://github.com/kassio/neoterm/";

4343 };

4343 };

4344

4344

4345 neovim-ayu = buildVimPluginFrom2Nix {

4345 neovim-ayu = buildVimPluginFrom2Nix {

4346 pname = "neovim-ayu";

4346 pname = "neovim-ayu";

4347− version = "2022-05-01";

4347+ version = "2022-04-19";

4348 src = fetchFromGitHub {

4348 src = fetchFromGitHub {

4349 owner = "Shatur";

4349 owner = "Shatur";

4350 repo = "neovim-ayu";

4350 repo = "neovim-ayu";

4351− rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac";

4351+ rev = "dde7e6f02fbcb5860b24f616c9a07b5f9e52a361";

4352− sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2";

4352+ sha256 = "0800qwxlj84f8ygvniwwyrcjyfwsx7kmzq8vyz9m50zd7b20al9f";

4353 };

4353 };

4354 meta.homepage = "https://github.com/Shatur/neovim-ayu/";

4354 meta.homepage = "https://github.com/Shatur/neovim-ayu/";

4355 };

4355 };

@@ -4464,12 +4464,12 @@ final: prev:

4464

4464

4465 nightfox-nvim = buildVimPluginFrom2Nix {

4465 nightfox-nvim = buildVimPluginFrom2Nix {

4466 pname = "nightfox.nvim";

4466 pname = "nightfox.nvim";

4467− version = "2022-05-02";

4467+ version = "2022-04-20";

4468 src = fetchFromGitHub {

4468 src = fetchFromGitHub {

4469 owner = "EdenEast";

4469 owner = "EdenEast";

4470 repo = "nightfox.nvim";

4470 repo = "nightfox.nvim";

4471− rev = "25b3f3e46c87c51e4d8075d2e11f481628716363";

4471+ rev = "5d2581a71510c319d128a8b02a21181abc611202";

4472− sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx";

4472+ sha256 = "118lda4cgxkbf13khyg2i36i7fcrlfz29l0wfjhg90ci3w8qvajs";

4473 };

4473 };

4474 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";

4474 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";

4475 };

4475 };

@@ -4572,12 +4572,12 @@ final: prev:

4572

4572

4573 null-ls-nvim = buildVimPluginFrom2Nix {

4573 null-ls-nvim = buildVimPluginFrom2Nix {

4574 pname = "null-ls.nvim";

4574 pname = "null-ls.nvim";

4575− version = "2022-05-01";

4575+ version = "2022-04-16";

4576 src = fetchFromGitHub {

4576 src = fetchFromGitHub {

4577 owner = "jose-elias-alvarez";

4577 owner = "jose-elias-alvarez";

4578 repo = "null-ls.nvim";

4578 repo = "null-ls.nvim";

4579− rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9";

4579+ rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f";

4580− sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c";

4580+ sha256 = "1mifn1b83ypvaplmma1zx080vmm5nv40263lsva3z6byqyq3kfl1";

4581 };

4581 };

4582 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

4582 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

4583 };

4583 };

@@ -4620,36 +4620,36 @@ final: prev:

4620

4620

4621 nvim-autopairs = buildVimPluginFrom2Nix {

4621 nvim-autopairs = buildVimPluginFrom2Nix {

4622 pname = "nvim-autopairs";

4622 pname = "nvim-autopairs";

4623− version = "2022-04-28";

4623+ version = "2022-04-13";

4624 src = fetchFromGitHub {

4624 src = fetchFromGitHub {

4625 owner = "windwp";

4625 owner = "windwp";

4626 repo = "nvim-autopairs";

4626 repo = "nvim-autopairs";

4627− rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb";

4627+ rev = "38d486a1c47ae2722a78cf569008de0a64f4b153";

4628− sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y";

4628+ sha256 = "0qka37c8ikcqvbjq0n0kxgm8l30jy3aixs5i00a25wcwxj40kzxv";

4629 };

4629 };

4630 meta.homepage = "https://github.com/windwp/nvim-autopairs/";

4630 meta.homepage = "https://github.com/windwp/nvim-autopairs/";

4631 };

4631 };

4632

4632

4633 nvim-base16 = buildVimPluginFrom2Nix {

4633 nvim-base16 = buildVimPluginFrom2Nix {

4634 pname = "nvim-base16";

4634 pname = "nvim-base16";

4635− version = "2022-04-25";

4635+ version = "2022-03-28";

4636 src = fetchFromGitHub {

4636 src = fetchFromGitHub {

4637 owner = "RRethy";

4637 owner = "RRethy";

4638 repo = "nvim-base16";

4638 repo = "nvim-base16";

4639− rev = "70fe3102158b2765d5bba46f398bd4213997936f";

4639+ rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776";

4640− sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57";

4640+ sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z";

4641 };

4641 };

4642 meta.homepage = "https://github.com/RRethy/nvim-base16/";

4642 meta.homepage = "https://github.com/RRethy/nvim-base16/";

4643 };

4643 };

4644

4644

4645 nvim-bqf = buildVimPluginFrom2Nix {

4645 nvim-bqf = buildVimPluginFrom2Nix {

4646 pname = "nvim-bqf";

4646 pname = "nvim-bqf";

4647− version = "2022-04-30";

4647+ version = "2022-04-18";

4648 src = fetchFromGitHub {

4648 src = fetchFromGitHub {

4649 owner = "kevinhwang91";

4649 owner = "kevinhwang91";

4650 repo = "nvim-bqf";

4650 repo = "nvim-bqf";

4651− rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70";

4651+ rev = "3dbd349cf75cb23c7d1575b235ee57ecbe665d9d";

4652− sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk";

4652+ sha256 = "12nlfz0imx6i6w8jc4pw5czyfzr8m2mhlmql10i5hdncqi9ggaar";

4653 };

4653 };

4654 meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";

4654 meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";

4655 };

4655 };

@@ -4680,12 +4680,12 @@ final: prev:

4680

4680

4681 nvim-cmp = buildVimPluginFrom2Nix {

4681 nvim-cmp = buildVimPluginFrom2Nix {

4682 pname = "nvim-cmp";

4682 pname = "nvim-cmp";

4683− version = "2022-05-02";

4683+ version = "2022-04-20";

4684 src = fetchFromGitHub {

4684 src = fetchFromGitHub {

4685 owner = "hrsh7th";

4685 owner = "hrsh7th";

4686 repo = "nvim-cmp";

4686 repo = "nvim-cmp";

4687− rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4";

4687+ rev = "f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9";

4688− sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq";

4688+ sha256 = "11f53yic8j3iqd4yb0gy2d54vscqqll4lcqqcj1rp195vdd476ak";

4689 };

4689 };

4690 meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

4690 meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

4691 };

4691 };

@@ -4776,24 +4776,24 @@ final: prev:

4776

4776

4777 nvim-dap-ui = buildVimPluginFrom2Nix {

4777 nvim-dap-ui = buildVimPluginFrom2Nix {

4778 pname = "nvim-dap-ui";

4778 pname = "nvim-dap-ui";

4779− version = "2022-04-29";

4779+ version = "2022-04-17";

4780 src = fetchFromGitHub {

4780 src = fetchFromGitHub {

4781 owner = "rcarriga";

4781 owner = "rcarriga";

4782 repo = "nvim-dap-ui";

4782 repo = "nvim-dap-ui";

4783− rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2";

4783+ rev = "f136bb253f6811984369a20924251bcbfe00a5cd";

4784− sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm";

4784+ sha256 = "00nxdgsxa3yc0ifsmbs8d1s428p37x3ax3rlxacs983f5xlgmizq";

4785 };

4785 };

4786 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

4786 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

4787 };

4787 };

4788

4788

4789 nvim-dap-virtual-text = buildVimPluginFrom2Nix {

4789 nvim-dap-virtual-text = buildVimPluginFrom2Nix {

4790 pname = "nvim-dap-virtual-text";

4790 pname = "nvim-dap-virtual-text";

4791− version = "2022-04-30";

4791+ version = "2022-04-19";

4792 src = fetchFromGitHub {

4792 src = fetchFromGitHub {

4793 owner = "theHamsta";

4793 owner = "theHamsta";

4794 repo = "nvim-dap-virtual-text";

4794 repo = "nvim-dap-virtual-text";

4795− rev = "9b731b9748d243b60e61eecbe2d114c39554486e";

4795+ rev = "1c3560ecfe8a865118efe7092308abe9e8b0ae68";

4796− sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9";

4796+ sha256 = "1piz5qxymc2igqdscc3cvvympxrgmxd1ybsnqy13l7ycmknkp9hd";

4797 };

4797 };

4798 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";

4798 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";

4799 };

4799 };

@@ -4836,36 +4836,36 @@ final: prev:

4836

4836

4837 nvim-gdb = buildVimPluginFrom2Nix {

4837 nvim-gdb = buildVimPluginFrom2Nix {

4838 pname = "nvim-gdb";

4838 pname = "nvim-gdb";

4839− version = "2022-05-02";

4839+ version = "2021-12-09";

4840 src = fetchFromGitHub {

4840 src = fetchFromGitHub {

4841 owner = "sakhnik";

4841 owner = "sakhnik";

4842 repo = "nvim-gdb";

4842 repo = "nvim-gdb";

4843− rev = "d064ee481b2aec86133ebcd514c835a28776f9c5";

4843+ rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608";

4844− sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi";

4844+ sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i";

4845 };

4845 };

4846 meta.homepage = "https://github.com/sakhnik/nvim-gdb/";

4846 meta.homepage = "https://github.com/sakhnik/nvim-gdb/";

4847 };

4847 };

4848

4848

4849 nvim-gps = buildVimPluginFrom2Nix {

4849 nvim-gps = buildVimPluginFrom2Nix {

4850 pname = "nvim-gps";

4850 pname = "nvim-gps";

4851− version = "2022-04-30";

4851+ version = "2022-04-19";

4852 src = fetchFromGitHub {

4852 src = fetchFromGitHub {

4853 owner = "smiteshp";

4853 owner = "smiteshp";

4854 repo = "nvim-gps";

4854 repo = "nvim-gps";

4855− rev = "9552418fcbb9587025f4bd38364259b3888f582b";

4855+ rev = "944ea6e7244a839452ab721515141ea9208c0536";

4856− sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4";

4856+ sha256 = "0i3mjk9n9czpadzpwp2wx1640h5sl51cjgnggrm8rg9qxj5108g7";

4857 };

4857 };

4858 meta.homepage = "https://github.com/smiteshp/nvim-gps/";

4858 meta.homepage = "https://github.com/smiteshp/nvim-gps/";

4859 };

4859 };

4860

4860

4861 nvim-highlite = buildVimPluginFrom2Nix {

4861 nvim-highlite = buildVimPluginFrom2Nix {

4862 pname = "nvim-highlite";

4862 pname = "nvim-highlite";

4863− version = "2022-04-29";

4863+ version = "2022-04-18";

4864 src = fetchFromGitHub {

4864 src = fetchFromGitHub {

4865 owner = "Iron-E";

4865 owner = "Iron-E";

4866 repo = "nvim-highlite";

4866 repo = "nvim-highlite";

4867− rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665";

4867+ rev = "e46cb5695b8457403488ad44b5379421c0c5dc17";

4868− sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9";

4868+ sha256 = "0343pk8wylms0lnrpa0a5x2ig97an2ps64fgjpa8n85ng1z49z97";

4869 };

4869 };

4870 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

4870 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

4871 };

4871 };

@@ -4896,12 +4896,12 @@ final: prev:

4896

4896

4897 nvim-jdtls = buildVimPluginFrom2Nix {

4897 nvim-jdtls = buildVimPluginFrom2Nix {

4898 pname = "nvim-jdtls";

4898 pname = "nvim-jdtls";

4899− version = "2022-04-29";

4899+ version = "2022-04-14";

4900 src = fetchFromGitHub {

4900 src = fetchFromGitHub {

4901 owner = "mfussenegger";

4901 owner = "mfussenegger";

4902 repo = "nvim-jdtls";

4902 repo = "nvim-jdtls";

4903− rev = "9010412f7de118168d2fe4ba97b578d0d76cc500";

4903+ rev = "ffb08466d51f717775d85e7e334ac83156c0ca98";

4904− sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67";

4904+ sha256 = "1rlnidcn8zww6lvqx1syw2331i2gn67765cip2pz5rh8mbv4l67x";

4905 };

4905 };

4906 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";

4906 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";

4907 };

4907 };

@@ -4920,12 +4920,12 @@ final: prev:

4920

4920

4921 nvim-lightbulb = buildVimPluginFrom2Nix {

4921 nvim-lightbulb = buildVimPluginFrom2Nix {

4922 pname = "nvim-lightbulb";

4922 pname = "nvim-lightbulb";

4923− version = "2022-05-02";

4923+ version = "2022-02-24";

4924 src = fetchFromGitHub {

4924 src = fetchFromGitHub {

4925 owner = "kosayoda";

4925 owner = "kosayoda";

4926 repo = "nvim-lightbulb";

4926 repo = "nvim-lightbulb";

4927− rev = "407f05c71f757f09f775229d5709a3592f1a6910";

4927+ rev = "29ca81408119ba809d1f922edc941868af97ee86";

4928− sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9";

4928+ sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";

4929 };

4929 };

4930 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

4930 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

4931 };

4931 };

@@ -4944,12 +4944,12 @@ final: prev:

4944

4944

4945 nvim-lint = buildVimPluginFrom2Nix {

4945 nvim-lint = buildVimPluginFrom2Nix {

4946 pname = "nvim-lint";

4946 pname = "nvim-lint";

4947− version = "2022-05-02";

4947+ version = "2022-04-18";

4948 src = fetchFromGitHub {

4948 src = fetchFromGitHub {

4949 owner = "mfussenegger";

4949 owner = "mfussenegger";

4950 repo = "nvim-lint";

4950 repo = "nvim-lint";

4951− rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba";

4951+ rev = "e5416bdb27a0e61cd213850646534a18bb2ba61d";

4952− sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d";

4952+ sha256 = "1qrjpx99pb67yccvmb66ahcaa7wk9z6s9zvaxm5fpbm1xasci1mz";

4953 };

4953 };

4954 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";

4954 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";

4955 };

4955 };

@@ -4968,12 +4968,12 @@ final: prev:

4968

4968

4969 nvim-lspconfig = buildVimPluginFrom2Nix {

4969 nvim-lspconfig = buildVimPluginFrom2Nix {

4970 pname = "nvim-lspconfig";

4970 pname = "nvim-lspconfig";

4971− version = "2022-04-28";

4971+ version = "2022-04-17";

4972 src = fetchFromGitHub {

4972 src = fetchFromGitHub {

4973 owner = "neovim";

4973 owner = "neovim";

4974 repo = "nvim-lspconfig";

4974 repo = "nvim-lspconfig";

4975− rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd";

4975+ rev = "ad9903c66bac88f344890acb6532f63f1cd4dac3";

4976− sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn";

4976+ sha256 = "10fg52g53yk0d10rm96kw907wdkgqw762ib6530zrnw7p8fbm2ms";

4977 };

4977 };

4978 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

4978 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

4979 };

4979 };

@@ -4992,24 +4992,24 @@ final: prev:

4992

4992

4993 nvim-metals = buildVimPluginFrom2Nix {

4993 nvim-metals = buildVimPluginFrom2Nix {

4994 pname = "nvim-metals";

4994 pname = "nvim-metals";

4995− version = "2022-04-27";

4995+ version = "2022-04-16";

4996 src = fetchFromGitHub {

4996 src = fetchFromGitHub {

4997 owner = "scalameta";

4997 owner = "scalameta";

4998 repo = "nvim-metals";

4998 repo = "nvim-metals";

4999− rev = "6bc7681b489b04feff394f832984d14510e97e47";

4999+ rev = "bc6f2ba6d6b2c5ffd65b41f3df74761a90e538da";

5000− sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx";

5000+ sha256 = "0fk41l2jmlhrylc9xbh4h9a35j106r0lr7rd0i2lp0acqai629qg";

5001 };

5001 };

5002 meta.homepage = "https://github.com/scalameta/nvim-metals/";

5002 meta.homepage = "https://github.com/scalameta/nvim-metals/";

5003 };

5003 };

5004

5004

5005 nvim-neoclip-lua = buildVimPluginFrom2Nix {

5005 nvim-neoclip-lua = buildVimPluginFrom2Nix {

5006 pname = "nvim-neoclip.lua";

5006 pname = "nvim-neoclip.lua";

5007− version = "2022-04-29";

5007+ version = "2022-04-06";

5008 src = fetchFromGitHub {

5008 src = fetchFromGitHub {

5009 owner = "AckslD";

5009 owner = "AckslD";

5010 repo = "nvim-neoclip.lua";

5010 repo = "nvim-neoclip.lua";

5011− rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11";

5011+ rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e";

5012− sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4";

5012+ sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46";

5013 };

5013 };

5014 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";

5014 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";

5015 };

5015 };

@@ -5028,12 +5028,12 @@ final: prev:

5028

5028

5029 nvim-notify = buildVimPluginFrom2Nix {

5029 nvim-notify = buildVimPluginFrom2Nix {

5030 pname = "nvim-notify";

5030 pname = "nvim-notify";

5031− version = "2022-05-01";

5031+ version = "2022-04-17";

5032 src = fetchFromGitHub {

5032 src = fetchFromGitHub {

5033 owner = "rcarriga";

5033 owner = "rcarriga";

5034 repo = "nvim-notify";

5034 repo = "nvim-notify";

5035− rev = "ebe78bea13b60640816658ae798a199bd5118eb1";

5035+ rev = "2c8f744de34c72a5a1fabcc66da11aa017ffab88";

5036− sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp";

5036+ sha256 = "1yc98fv30fvkjb7d8acjqvl8kai1hz0mslp04n1d2069q0n6k08n";

5037 };

5037 };

5038 meta.homepage = "https://github.com/rcarriga/nvim-notify/";

5038 meta.homepage = "https://github.com/rcarriga/nvim-notify/";

5039 };

5039 };

@@ -5100,24 +5100,24 @@ final: prev:

5100

5100

5101 nvim-tree-lua = buildVimPluginFrom2Nix {

5101 nvim-tree-lua = buildVimPluginFrom2Nix {

5102 pname = "nvim-tree.lua";

5102 pname = "nvim-tree.lua";

5103− version = "2022-05-01";

5103+ version = "2022-04-18";

5104 src = fetchFromGitHub {

5104 src = fetchFromGitHub {

5105 owner = "kyazdani42";

5105 owner = "kyazdani42";

5106 repo = "nvim-tree.lua";

5106 repo = "nvim-tree.lua";

5107− rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3";

5107+ rev = "0f0f858348aacc94f98ba32880760c5a5440b825";

5108− sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr";

5108+ sha256 = "1ciir7h9s0g9i62b49swa8c8cgjqg4lz6zapkj5a8gqxqa10qh23";

5109 };

5109 };

5110 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

5110 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

5111 };

5111 };

5112

5112

5113 nvim-treesitter = buildVimPluginFrom2Nix {

5113 nvim-treesitter = buildVimPluginFrom2Nix {

5114 pname = "nvim-treesitter";

5114 pname = "nvim-treesitter";

5115− version = "2022-05-01";

5115+ version = "2022-04-19";

5116 src = fetchFromGitHub {

5116 src = fetchFromGitHub {

5117 owner = "nvim-treesitter";

5117 owner = "nvim-treesitter";

5118 repo = "nvim-treesitter";

5118 repo = "nvim-treesitter";

5119− rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b";

5119+ rev = "62fa8f77c43ed3a4ac2bbdfa4327f6b4a835bbea";

5120− sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r";

5120+ sha256 = "0cq0zbs9a52wx84ivpna4qw67dlz7i9nw6mln8948qadnzk1960r";

5121 };

5121 };

5122 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

5122 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

5123 };

5123 };

@@ -5160,24 +5160,24 @@ final: prev:

5160

5160

5161 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

5161 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

5162 pname = "nvim-treesitter-textobjects";

5162 pname = "nvim-treesitter-textobjects";

5163− version = "2022-04-21";

5163+ version = "2022-04-15";

5164 src = fetchFromGitHub {

5164 src = fetchFromGitHub {

5165 owner = "nvim-treesitter";

5165 owner = "nvim-treesitter";

5166 repo = "nvim-treesitter-textobjects";

5166 repo = "nvim-treesitter-textobjects";

5167− rev = "094e8ad3cc839e825f8dcc91352837653e365a8f";

5167+ rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d";

5168− sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz";

5168+ sha256 = "09bpgd0fqpcwifs2wna1lqyrfn4rmp2gfan4635lwjp4sixj52vc";

5169 };

5169 };

5170 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

5170 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

5171 };

5171 };

5172

5172

5173 nvim-ts-autotag = buildVimPluginFrom2Nix {

5173 nvim-ts-autotag = buildVimPluginFrom2Nix {

5174 pname = "nvim-ts-autotag";

5174 pname = "nvim-ts-autotag";

5175− version = "2022-04-22";

5175+ version = "2022-03-04";

5176 src = fetchFromGitHub {

5176 src = fetchFromGitHub {

5177 owner = "windwp";

5177 owner = "windwp";

5178 repo = "nvim-ts-autotag";

5178 repo = "nvim-ts-autotag";

5179− rev = "044a05c4c51051326900a53ba98fddacd15fea22";

5179+ rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2";

5180− sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2";

5180+ sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1";

5181 };

5181 };

5182 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

5182 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

5183 };

5183 };

@@ -5196,24 +5196,24 @@ final: prev:

5196

5196

5197 nvim-ts-rainbow = buildVimPluginFrom2Nix {

5197 nvim-ts-rainbow = buildVimPluginFrom2Nix {

5198 pname = "nvim-ts-rainbow";

5198 pname = "nvim-ts-rainbow";

5199− version = "2022-04-24";

5199+ version = "2022-04-17";

5200 src = fetchFromGitHub {

5200 src = fetchFromGitHub {

5201 owner = "p00f";

5201 owner = "p00f";

5202 repo = "nvim-ts-rainbow";

5202 repo = "nvim-ts-rainbow";

5203− rev = "a7767e2a1761078abb97f6516e45c56147e0952e";

5203+ rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0";

5204− sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";

5204+ sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3";

5205 };

5205 };

5206 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

5206 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

5207 };

5207 };

5208

5208

5209 nvim-web-devicons = buildVimPluginFrom2Nix {

5209 nvim-web-devicons = buildVimPluginFrom2Nix {

5210 pname = "nvim-web-devicons";

5210 pname = "nvim-web-devicons";

5211− version = "2022-05-01";

5211+ version = "2022-03-22";

5212 src = fetchFromGitHub {

5212 src = fetchFromGitHub {

5213 owner = "kyazdani42";

5213 owner = "kyazdani42";

5214 repo = "nvim-web-devicons";

5214 repo = "nvim-web-devicons";

5215− rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f";

5215+ rev = "09e62319974d7d7ec7e53b974724f7942470ef78";

5216− sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5";

5216+ sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq";

5217 };

5217 };

5218 meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";

5218 meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";

5219 };

5219 };

@@ -5256,12 +5256,12 @@ final: prev:

5256

5256

5257 nvimdev-nvim = buildVimPluginFrom2Nix {

5257 nvimdev-nvim = buildVimPluginFrom2Nix {

5258 pname = "nvimdev.nvim";

5258 pname = "nvimdev.nvim";

5259− version = "2022-04-24";

5259+ version = "2022-04-11";

5260 src = fetchFromGitHub {

5260 src = fetchFromGitHub {

5261 owner = "neovim";

5261 owner = "neovim";

5262 repo = "nvimdev.nvim";

5262 repo = "nvimdev.nvim";

5263− rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9";

5263+ rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7";

5264− sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4";

5264+ sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz";

5265 };

5265 };

5266 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";

5266 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";

5267 };

5267 };

@@ -5292,12 +5292,12 @@ final: prev:

5292

5292

5293 octo-nvim = buildVimPluginFrom2Nix {

5293 octo-nvim = buildVimPluginFrom2Nix {

5294 pname = "octo.nvim";

5294 pname = "octo.nvim";

5295− version = "2022-04-26";

5295+ version = "2022-04-14";

5296 src = fetchFromGitHub {

5296 src = fetchFromGitHub {

5297 owner = "pwntester";

5297 owner = "pwntester";

5298 repo = "octo.nvim";

5298 repo = "octo.nvim";

5299− rev = "622ab9feaa735dc0999e567183ce357f3dff080f";

5299+ rev = "0beb4de71062435ad934caba5728f7f01ae8b969";

5300− sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg";

5300+ sha256 = "01k7jl34x8wikq6ff456650wgf5f5z9z6a3ypr10a3pl8p7wfyzr";

5301 };

5301 };

5302 meta.homepage = "https://github.com/pwntester/octo.nvim/";

5302 meta.homepage = "https://github.com/pwntester/octo.nvim/";

5303 };

5303 };

@@ -5316,12 +5316,12 @@ final: prev:

5316

5316

5317 onedark-nvim = buildVimPluginFrom2Nix {

5317 onedark-nvim = buildVimPluginFrom2Nix {

5318 pname = "onedark.nvim";

5318 pname = "onedark.nvim";

5319− version = "2022-04-25";

5319+ version = "2022-03-23";

5320 src = fetchFromGitHub {

5320 src = fetchFromGitHub {

5321 owner = "navarasu";

5321 owner = "navarasu";

5322 repo = "onedark.nvim";

5322 repo = "onedark.nvim";

5323− rev = "08cde8acf181b3278dafb9c8284726104a11cc0f";

5323+ rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6";

5324− sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4";

5324+ sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6";

5325 };

5325 };

5326 meta.homepage = "https://github.com/navarasu/onedark.nvim/";

5326 meta.homepage = "https://github.com/navarasu/onedark.nvim/";

5327 };

5327 };

@@ -5340,12 +5340,12 @@ final: prev:

5340

5340

5341 onedarkpro-nvim = buildVimPluginFrom2Nix {

5341 onedarkpro-nvim = buildVimPluginFrom2Nix {

5342 pname = "onedarkpro.nvim";

5342 pname = "onedarkpro.nvim";

5343− version = "2022-04-26";

5343+ version = "2022-04-12";

5344 src = fetchFromGitHub {

5344 src = fetchFromGitHub {

5345 owner = "olimorris";

5345 owner = "olimorris";

5346 repo = "onedarkpro.nvim";

5346 repo = "onedarkpro.nvim";

5347− rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7";

5347+ rev = "653b5d729cb2c14c564cf5ab2145e2e24354a2ba";

5348− sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433";

5348+ sha256 = "1xw49fliqalz18nj0pa81xsx1d9zwphdzcai503m1bn2m2nclp6h";

5349 };

5349 };

5350 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

5350 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

5351 };

5351 };

@@ -5388,12 +5388,12 @@ final: prev:

5388

5388

5389 orgmode = buildVimPluginFrom2Nix {

5389 orgmode = buildVimPluginFrom2Nix {

5390 pname = "orgmode";

5390 pname = "orgmode";

5391− version = "2022-05-02";

5391+ version = "2022-04-20";

5392 src = fetchFromGitHub {

5392 src = fetchFromGitHub {

5393 owner = "nvim-orgmode";

5393 owner = "nvim-orgmode";

5394 repo = "orgmode";

5394 repo = "orgmode";

5395− rev = "1a52ca239c726d62104fad012472c28a00cdcc22";

5395+ rev = "8cd85f7afabef643db6b5d3dc01942870e71533d";

5396− sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz";

5396+ sha256 = "16rkvz8x6rvapyq7grch77j0wd5pnhjwv932v72ai6gy940d56l2";

5397 };

5397 };

5398 meta.homepage = "https://github.com/nvim-orgmode/orgmode/";

5398 meta.homepage = "https://github.com/nvim-orgmode/orgmode/";

5399 };

5399 };

@@ -5436,12 +5436,12 @@ final: prev:

5436

5436

5437 papercolor-theme = buildVimPluginFrom2Nix {

5437 papercolor-theme = buildVimPluginFrom2Nix {

5438 pname = "papercolor-theme";

5438 pname = "papercolor-theme";

5439− version = "2022-04-30";

5439+ version = "2022-03-24";

5440 src = fetchFromGitHub {

5440 src = fetchFromGitHub {

5441 owner = "NLKNguyen";

5441 owner = "NLKNguyen";

5442 repo = "papercolor-theme";

5442 repo = "papercolor-theme";

5443− rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c";

5443+ rev = "afde171829b1416125bf07a81fc28e4490aa91b2";

5444− sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c";

5444+ sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d";

5445 };

5445 };

5446 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

5446 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

5447 };

5447 };

@@ -5520,17 +5520,17 @@ final: prev:

5520

5520

5521 playground = buildVimPluginFrom2Nix {

5521 playground = buildVimPluginFrom2Nix {

5522 pname = "playground";

5522 pname = "playground";

5523− version = "2022-05-01";

5523+ version = "2022-04-08";

5524 src = fetchFromGitHub {

5524 src = fetchFromGitHub {

5525 owner = "nvim-treesitter";

5525 owner = "nvim-treesitter";

5526 repo = "playground";

5526 repo = "playground";

5527− rev = "71b00a3c665298e5155ad64a9020135808d4e3e8";

5527+ rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00";

5528− sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8";

5528+ sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns";

5529 };

5529 };

5530 meta.homepage = "https://github.com/nvim-treesitter/playground/";

5530 meta.homepage = "https://github.com/nvim-treesitter/playground/";

5531 };

5531 };

5532

5532

5533− plenary-nvim = buildNeovimPluginFrom2Nix {

5533+ plenary-nvim = buildVimPluginFrom2Nix {

5534 pname = "plenary.nvim";

5534 pname = "plenary.nvim";

5535 version = "2022-04-17";

5535 version = "2022-04-17";

5536 src = fetchFromGitHub {

5536 src = fetchFromGitHub {

@@ -5617,12 +5617,12 @@ final: prev:

5617

5617

5618 project-nvim = buildVimPluginFrom2Nix {

5618 project-nvim = buildVimPluginFrom2Nix {

5619 pname = "project.nvim";

5619 pname = "project.nvim";

5620− version = "2022-04-25";

5620+ version = "2022-01-19";

5621 src = fetchFromGitHub {

5621 src = fetchFromGitHub {

5622 owner = "ahmedkhalf";

5622 owner = "ahmedkhalf";

5623 repo = "project.nvim";

5623 repo = "project.nvim";

5624− rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77";

5624+ rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988";

5625− sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w";

5625+ sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6";

5626 };

5626 };

5627 meta.homepage = "https://github.com/ahmedkhalf/project.nvim/";

5627 meta.homepage = "https://github.com/ahmedkhalf/project.nvim/";

5628 };

5628 };

@@ -5810,12 +5810,12 @@ final: prev:

5810

5810

5811 refactoring-nvim = buildVimPluginFrom2Nix {

5811 refactoring-nvim = buildVimPluginFrom2Nix {

5812 pname = "refactoring.nvim";

5812 pname = "refactoring.nvim";

5813− version = "2022-04-27";

5813+ version = "2022-04-11";

5814 src = fetchFromGitHub {

5814 src = fetchFromGitHub {

5815 owner = "theprimeagen";

5815 owner = "theprimeagen";

5816 repo = "refactoring.nvim";

5816 repo = "refactoring.nvim";

5817− rev = "fef309f654906d931f2c714a77f5182fe70ada7d";

5817+ rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb";

5818− sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3";

5818+ sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w";

5819 };

5819 };

5820 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

5820 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

5821 };

5821 };

@@ -5846,12 +5846,12 @@ final: prev:

5846

5846

5847 rest-nvim = buildVimPluginFrom2Nix {

5847 rest-nvim = buildVimPluginFrom2Nix {

5848 pname = "rest.nvim";

5848 pname = "rest.nvim";

5849− version = "2022-05-01";

5849+ version = "2022-01-26";

5850 src = fetchFromGitHub {

5850 src = fetchFromGitHub {

5851 owner = "NTBBloodbath";

5851 owner = "NTBBloodbath";

5852 repo = "rest.nvim";

5852 repo = "rest.nvim";

5853− rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef";

5853+ rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3";

5854− sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0";

5854+ sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8";

5855 };

5855 };

5856 meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";

5856 meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";

5857 };

5857 };

@@ -5930,12 +5930,12 @@ final: prev:

5930

5930

5931 rust-tools-nvim = buildVimPluginFrom2Nix {

5931 rust-tools-nvim = buildVimPluginFrom2Nix {

5932 pname = "rust-tools.nvim";

5932 pname = "rust-tools.nvim";

5933− version = "2022-05-01";

5933+ version = "2022-03-26";

5934 src = fetchFromGitHub {

5934 src = fetchFromGitHub {

5935 owner = "simrat39";

5935 owner = "simrat39";

5936 repo = "rust-tools.nvim";

5936 repo = "rust-tools.nvim";

5937− rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac";

5937+ rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44";

5938− sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42";

5938+ sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h";

5939 };

5939 };

5940 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

5940 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

5941 };

5941 };

@@ -6147,12 +6147,12 @@ final: prev:

6147

6147

6148 sonokai = buildVimPluginFrom2Nix {

6148 sonokai = buildVimPluginFrom2Nix {

6149 pname = "sonokai";

6149 pname = "sonokai";

6150− version = "2022-04-27";

6150+ version = "2022-04-14";

6151 src = fetchFromGitHub {

6151 src = fetchFromGitHub {

6152 owner = "sainnhe";

6152 owner = "sainnhe";

6153 repo = "sonokai";

6153 repo = "sonokai";

6154− rev = "9ad83caa675cb5160760bf85dcb951946c994572";

6154+ rev = "4f29ac457ac759286bce3bb1a34f9517c91306c9";

6155− sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh";

6155+ sha256 = "1yzyk78nb0xj5f2fnfvhrpgahg3mgx82bpw7nimvf0rd29dbpfqj";

6156 };

6156 };

6157 meta.homepage = "https://github.com/sainnhe/sonokai/";

6157 meta.homepage = "https://github.com/sainnhe/sonokai/";

6158 };

6158 };

@@ -6243,12 +6243,12 @@ final: prev:

6243

6243

6244 splitjoin-vim = buildVimPluginFrom2Nix {

6244 splitjoin-vim = buildVimPluginFrom2Nix {

6245 pname = "splitjoin.vim";

6245 pname = "splitjoin.vim";

6246− version = "2022-05-02";

6246+ version = "2022-04-03";

6247 src = fetchFromGitHub {

6247 src = fetchFromGitHub {

6248 owner = "AndrewRadev";

6248 owner = "AndrewRadev";

6249 repo = "splitjoin.vim";

6249 repo = "splitjoin.vim";

6250− rev = "64f68a641084d18903769ec138b8fab45477bd92";

6250+ rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6";

6251− sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8";

6251+ sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc";

6252 fetchSubmodules = true;

6252 fetchSubmodules = true;

6253 };

6253 };

6254 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

6254 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

@@ -6401,12 +6401,12 @@ final: prev:

6401

6401

6402 symbols-outline-nvim = buildVimPluginFrom2Nix {

6402 symbols-outline-nvim = buildVimPluginFrom2Nix {

6403 pname = "symbols-outline.nvim";

6403 pname = "symbols-outline.nvim";

6404− version = "2022-05-01";

6404+ version = "2022-03-05";

6405 src = fetchFromGitHub {

6405 src = fetchFromGitHub {

6406 owner = "simrat39";

6406 owner = "simrat39";

6407 repo = "symbols-outline.nvim";

6407 repo = "symbols-outline.nvim";

6408− rev = "15ae99c27360ab42e931be127d130611375307d5";

6408+ rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2";

6409− sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi";

6409+ sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd";

6410 };

6410 };

6411 meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";

6411 meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";

6412 };

6412 };

@@ -6510,12 +6510,12 @@ final: prev:

6510

6510

6511 tagbar = buildVimPluginFrom2Nix {

6511 tagbar = buildVimPluginFrom2Nix {

6512 pname = "tagbar";

6512 pname = "tagbar";

6513− version = "2022-05-02";

6513+ version = "2022-04-07";

6514 src = fetchFromGitHub {

6514 src = fetchFromGitHub {

6515 owner = "preservim";

6515 owner = "preservim";

6516 repo = "tagbar";

6516 repo = "tagbar";

6517− rev = "a577ee4d650476243d91698f2d1228819c5fa0a5";

6517+ rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2";

6518− sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85";

6518+ sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m";

6519 };

6519 };

6520 meta.homepage = "https://github.com/preservim/tagbar/";

6520 meta.homepage = "https://github.com/preservim/tagbar/";

6521 };

6521 };

@@ -6558,12 +6558,12 @@ final: prev:

6558

6558

6559 tcomment_vim = buildVimPluginFrom2Nix {

6559 tcomment_vim = buildVimPluginFrom2Nix {

6560 pname = "tcomment_vim";

6560 pname = "tcomment_vim";

6561− version = "2022-04-24";

6561+ version = "2022-01-24";

6562 src = fetchFromGitHub {

6562 src = fetchFromGitHub {

6563 owner = "tomtom";

6563 owner = "tomtom";

6564 repo = "tcomment_vim";

6564 repo = "tcomment_vim";

6565− rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad";

6565+ rev = "3729ae43318faca94b0a1e878f9c6717b171d55e";

6566− sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn";

6566+ sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9";

6567 };

6567 };

6568 meta.homepage = "https://github.com/tomtom/tcomment_vim/";

6568 meta.homepage = "https://github.com/tomtom/tcomment_vim/";

6569 };

6569 };

@@ -6642,12 +6642,12 @@ final: prev:

6642

6642

6643 telescope-fzf-native-nvim = buildVimPluginFrom2Nix {

6643 telescope-fzf-native-nvim = buildVimPluginFrom2Nix {

6644 pname = "telescope-fzf-native.nvim";

6644 pname = "telescope-fzf-native.nvim";

6645− version = "2022-04-30";

6645+ version = "2022-02-19";

6646 src = fetchFromGitHub {

6646 src = fetchFromGitHub {

6647 owner = "nvim-telescope";

6647 owner = "nvim-telescope";

6648 repo = "telescope-fzf-native.nvim";

6648 repo = "telescope-fzf-native.nvim";

6649− rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f";

6649+ rev = "8ec164b541327202e5e74f99bcc5fe5845720e18";

6650− sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8";

6650+ sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1";

6651 };

6651 };

6652 meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";

6652 meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";

6653 };

6653 };

@@ -6679,12 +6679,12 @@ final: prev:

6679

6679

6680 telescope-github-nvim = buildVimPluginFrom2Nix {

6680 telescope-github-nvim = buildVimPluginFrom2Nix {

6681 pname = "telescope-github.nvim";

6681 pname = "telescope-github.nvim";

6682− version = "2022-04-22";

6682+ version = "2022-04-06";

6683 src = fetchFromGitHub {

6683 src = fetchFromGitHub {

6684 owner = "nvim-telescope";

6684 owner = "nvim-telescope";

6685 repo = "telescope-github.nvim";

6685 repo = "telescope-github.nvim";

6686− rev = "ee95c509901c3357679e9f2f9eaac3561c811736";

6686+ rev = "c66aee748d572961af0e6ad5130b994343f922a7";

6687− sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2";

6687+ sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz";

6688 };

6688 };

6689 meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";

6689 meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";

6690 };

6690 };

@@ -6703,12 +6703,12 @@ final: prev:

6703

6703

6704 telescope-project-nvim = buildVimPluginFrom2Nix {

6704 telescope-project-nvim = buildVimPluginFrom2Nix {

6705 pname = "telescope-project.nvim";

6705 pname = "telescope-project.nvim";

6706− version = "2022-04-28";

6706+ version = "2022-01-23";

6707 src = fetchFromGitHub {

6707 src = fetchFromGitHub {

6708 owner = "nvim-telescope";

6708 owner = "nvim-telescope";

6709 repo = "telescope-project.nvim";

6709 repo = "telescope-project.nvim";

6710− rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae";

6710+ rev = "d317c3cef6917d650d9a638c627b54d3e1173031";

6711− sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7";

6711+ sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7";

6712 };

6712 };

6713 meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";

6713 meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";

6714 };

6714 };

@@ -6727,12 +6727,12 @@ final: prev:

6727

6727

6728 telescope-ui-select-nvim = buildVimPluginFrom2Nix {

6728 telescope-ui-select-nvim = buildVimPluginFrom2Nix {

6729 pname = "telescope-ui-select.nvim";

6729 pname = "telescope-ui-select.nvim";

6730− version = "2022-04-30";

6730+ version = "2022-03-20";

6731 src = fetchFromGitHub {

6731 src = fetchFromGitHub {

6732 owner = "nvim-telescope";

6732 owner = "nvim-telescope";

6733 repo = "telescope-ui-select.nvim";

6733 repo = "telescope-ui-select.nvim";

6734− rev = "62ea5e58c7bbe191297b983a9e7e89420f581369";

6734+ rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939";

6735− sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw";

6735+ sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb";

6736 };

6736 };

6737 meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";

6737 meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";

6738 };

6738 };

@@ -6787,12 +6787,12 @@ final: prev:

6787

6787

6788 telescope-nvim = buildVimPluginFrom2Nix {

6788 telescope-nvim = buildVimPluginFrom2Nix {

6789 pname = "telescope.nvim";

6789 pname = "telescope.nvim";

6790− version = "2022-05-02";

6790+ version = "2022-04-18";

6791 src = fetchFromGitHub {

6791 src = fetchFromGitHub {

6792 owner = "nvim-telescope";

6792 owner = "nvim-telescope";

6793 repo = "telescope.nvim";

6793 repo = "telescope.nvim";

6794− rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe";

6794+ rev = "6e7ed1b9638f09661fcb3a6db68f3ad77c8036be";

6795− sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn";

6795+ sha256 = "11p5byic4qb9cgaffnrwa4s0qdzvxl6313phz5qdll78hwjw2fmy";

6796 };

6796 };

6797 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

6797 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

6798 };

6798 };

@@ -6968,12 +6968,12 @@ final: prev:

6968

6968

6969 toggleterm-nvim = buildVimPluginFrom2Nix {

6969 toggleterm-nvim = buildVimPluginFrom2Nix {

6970 pname = "toggleterm.nvim";

6970 pname = "toggleterm.nvim";

6971− version = "2022-04-25";

6971+ version = "2022-04-18";

6972 src = fetchFromGitHub {

6972 src = fetchFromGitHub {

6973 owner = "akinsho";

6973 owner = "akinsho";

6974 repo = "toggleterm.nvim";

6974 repo = "toggleterm.nvim";

6975− rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6";

6975+ rev = "dca8f4d9516270cb41c147ed692f3ee420c5e515";

6976− sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131";

6976+ sha256 = "0ajypqnx9kglqh5h3vwyy9ccmazq8gjgb84hjrabr9hgvcnyj5hq";

6977 };

6977 };

6978 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";

6978 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";

6979 };

6979 };

@@ -7088,12 +7088,12 @@ final: prev:

7088

7088

7089 ultisnips = buildVimPluginFrom2Nix {

7089 ultisnips = buildVimPluginFrom2Nix {

7090 pname = "ultisnips";

7090 pname = "ultisnips";

7091− version = "2022-04-23";

7091+ version = "2022-04-19";

7092 src = fetchFromGitHub {

7092 src = fetchFromGitHub {

7093 owner = "SirVer";

7093 owner = "SirVer";

7094 repo = "ultisnips";

7094 repo = "ultisnips";

7095− rev = "f5ccf0977c611ffd774ca180774959301baaffad";

7095+ rev = "e1ae43e44fb6b53144a5a8703a3d6cf10492a4a0";

7096− sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb";

7096+ sha256 = "1rzhv8dma9ijf6g9z5drbi45bngzh4ccr3h4i0b8x3w4ab97p17q";

7097 };

7097 };

7098 meta.homepage = "https://github.com/SirVer/ultisnips/";

7098 meta.homepage = "https://github.com/SirVer/ultisnips/";

7099 };

7099 };

@@ -7136,12 +7136,12 @@ final: prev:

7136

7136

7137 urlview-nvim = buildVimPluginFrom2Nix {

7137 urlview-nvim = buildVimPluginFrom2Nix {

7138 pname = "urlview.nvim";

7138 pname = "urlview.nvim";

7139− version = "2022-04-25";

7139+ version = "2022-04-20";

7140 src = fetchFromGitHub {

7140 src = fetchFromGitHub {

7141 owner = "axieax";

7141 owner = "axieax";

7142 repo = "urlview.nvim";

7142 repo = "urlview.nvim";

7143− rev = "3b637651d5f0de185a0ceac783582692e204b053";

7143+ rev = "fcd59fc3a49e75993c3828c49df18bf3da51f45d";

7144− sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4";

7144+ sha256 = "16y3hicljn9y60jzvq7xmhhp7r3y0v5v4f1i16hj65rly96wziq7";

7145 };

7145 };

7146 meta.homepage = "https://github.com/axieax/urlview.nvim/";

7146 meta.homepage = "https://github.com/axieax/urlview.nvim/";

7147 };

7147 };

@@ -7184,12 +7184,12 @@ final: prev:

7184

7184

7185 venn-nvim = buildVimPluginFrom2Nix {

7185 venn-nvim = buildVimPluginFrom2Nix {

7186 pname = "venn.nvim";

7186 pname = "venn.nvim";

7187− version = "2022-04-27";

7187+ version = "2021-10-19";

7188 src = fetchFromGitHub {

7188 src = fetchFromGitHub {

7189 owner = "jbyuki";

7189 owner = "jbyuki";

7190 repo = "venn.nvim";

7190 repo = "venn.nvim";

7191− rev = "71856b548e3206e33bad10acea294ca8b44327ee";

7191+ rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f";

7192− sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc";

7192+ sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06";

7193 };

7193 };

7194 meta.homepage = "https://github.com/jbyuki/venn.nvim/";

7194 meta.homepage = "https://github.com/jbyuki/venn.nvim/";

7195 };

7195 };

@@ -7688,12 +7688,12 @@ final: prev:

7688

7688

7689 vim-autoformat = buildVimPluginFrom2Nix {

7689 vim-autoformat = buildVimPluginFrom2Nix {

7690 pname = "vim-autoformat";

7690 pname = "vim-autoformat";

7691− version = "2022-04-21";

7691+ version = "2021-11-07";

7692 src = fetchFromGitHub {

7692 src = fetchFromGitHub {

7693 owner = "vim-autoformat";

7693 owner = "vim-autoformat";

7694 repo = "vim-autoformat";

7694 repo = "vim-autoformat";

7695− rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9";

7695+ rev = "bb11f30377985e45e2eecef570856d42dbabb8b0";

7696− sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p";

7696+ sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087";

7697 };

7697 };

7698 meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";

7698 meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";

7699 };

7699 };

@@ -7880,12 +7880,12 @@ final: prev:

7880

7880

7881 vim-ccls = buildVimPluginFrom2Nix {

7881 vim-ccls = buildVimPluginFrom2Nix {

7882 pname = "vim-ccls";

7882 pname = "vim-ccls";

7883− version = "2022-04-23";

7883+ version = "2022-01-29";

7884 src = fetchFromGitHub {

7884 src = fetchFromGitHub {

7885 owner = "m-pilia";

7885 owner = "m-pilia";

7886 repo = "vim-ccls";

7886 repo = "vim-ccls";

7887− rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424";

7887+ rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886";

7888− sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08";

7888+ sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k";

7889 };

7889 };

7890 meta.homepage = "https://github.com/m-pilia/vim-ccls/";

7890 meta.homepage = "https://github.com/m-pilia/vim-ccls/";

7891 };

7891 };

@@ -7916,12 +7916,12 @@ final: prev:

7916

7916

7917 vim-clap = buildVimPluginFrom2Nix {

7917 vim-clap = buildVimPluginFrom2Nix {

7918 pname = "vim-clap";

7918 pname = "vim-clap";

7919− version = "2022-04-27";

7919+ version = "2022-04-08";

7920 src = fetchFromGitHub {

7920 src = fetchFromGitHub {

7921 owner = "liuchengxu";

7921 owner = "liuchengxu";

7922 repo = "vim-clap";

7922 repo = "vim-clap";

7923− rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15";

7923+ rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44";

7924− sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5";

7924+ sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65";

7925 };

7925 };

7926 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

7926 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

7927 };

7927 };

@@ -8204,12 +8204,12 @@ final: prev:

8204

8204

8205 vim-dadbod-ui = buildVimPluginFrom2Nix {

8205 vim-dadbod-ui = buildVimPluginFrom2Nix {

8206 pname = "vim-dadbod-ui";

8206 pname = "vim-dadbod-ui";

8207− version = "2022-05-02";

8207+ version = "2022-03-06";

8208 src = fetchFromGitHub {

8208 src = fetchFromGitHub {

8209 owner = "kristijanhusak";

8209 owner = "kristijanhusak";

8210 repo = "vim-dadbod-ui";

8210 repo = "vim-dadbod-ui";

8211− rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7";

8211+ rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37";

8212− sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw";

8212+ sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q";

8213 };

8213 };

8214 meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";

8214 meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";

8215 };

8215 };

@@ -8276,12 +8276,12 @@ final: prev:

8276

8276

8277 vim-dirvish = buildVimPluginFrom2Nix {

8277 vim-dirvish = buildVimPluginFrom2Nix {

8278 pname = "vim-dirvish";

8278 pname = "vim-dirvish";

8279− version = "2022-04-26";

8279+ version = "2022-03-27";

8280 src = fetchFromGitHub {

8280 src = fetchFromGitHub {

8281 owner = "justinmk";

8281 owner = "justinmk";

8282 repo = "vim-dirvish";

8282 repo = "vim-dirvish";

8283− rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00";

8283+ rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3";

8284− sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y";

8284+ sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq";

8285 };

8285 };

8286 meta.homepage = "https://github.com/justinmk/vim-dirvish/";

8286 meta.homepage = "https://github.com/justinmk/vim-dirvish/";

8287 };

8287 };

@@ -8492,24 +8492,24 @@ final: prev:

8492

8492

8493 vim-erlang-tags = buildVimPluginFrom2Nix {

8493 vim-erlang-tags = buildVimPluginFrom2Nix {

8494 pname = "vim-erlang-tags";

8494 pname = "vim-erlang-tags";

8495− version = "2022-04-02";

8495+ version = "2021-02-19";

8496 src = fetchFromGitHub {

8496 src = fetchFromGitHub {

8497 owner = "vim-erlang";

8497 owner = "vim-erlang";

8498 repo = "vim-erlang-tags";

8498 repo = "vim-erlang-tags";

8499− rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139";

8499+ rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611";

8500− sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw";

8500+ sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0";

8501 };

8501 };

8502 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";

8502 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";

8503 };

8503 };

8504

8504

8505 vim-eunuch = buildVimPluginFrom2Nix {

8505 vim-eunuch = buildVimPluginFrom2Nix {

8506 pname = "vim-eunuch";

8506 pname = "vim-eunuch";

8507− version = "2022-05-01";

8507+ version = "2022-04-19";

8508 src = fetchFromGitHub {

8508 src = fetchFromGitHub {

8509 owner = "tpope";

8509 owner = "tpope";

8510 repo = "vim-eunuch";

8510 repo = "vim-eunuch";

8511− rev = "73b5e3fccfb5295e38546318c0d3139874c25efb";

8511+ rev = "c1ee64a9775b4adff8d4e052b158f380682bc249";

8512− sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2";

8512+ sha256 = "17m1632a4nwilg0d29gx7gsng8f1w82q049iynm4gy1aqczlwgxh";

8513 };

8513 };

8514 meta.homepage = "https://github.com/tpope/vim-eunuch/";

8514 meta.homepage = "https://github.com/tpope/vim-eunuch/";

8515 };

8515 };

@@ -8588,12 +8588,12 @@ final: prev:

8588

8588

8589 vim-flagship = buildVimPluginFrom2Nix {

8589 vim-flagship = buildVimPluginFrom2Nix {

8590 pname = "vim-flagship";

8590 pname = "vim-flagship";

8591− version = "2022-04-21";

8591+ version = "2021-12-07";

8592 src = fetchFromGitHub {

8592 src = fetchFromGitHub {

8593 owner = "tpope";

8593 owner = "tpope";

8594 repo = "vim-flagship";

8594 repo = "vim-flagship";

8595− rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b";

8595+ rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087";

8596− sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06";

8596+ sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp";

8597 };

8597 };

8598 meta.homepage = "https://github.com/tpope/vim-flagship/";

8598 meta.homepage = "https://github.com/tpope/vim-flagship/";

8599 };

8599 };

@@ -8696,12 +8696,12 @@ final: prev:

8696

8696

8697 vim-fugitive = buildVimPluginFrom2Nix {

8697 vim-fugitive = buildVimPluginFrom2Nix {

8698 pname = "vim-fugitive";

8698 pname = "vim-fugitive";

8699− version = "2022-04-26";

8699+ version = "2022-04-14";

8700 src = fetchFromGitHub {

8700 src = fetchFromGitHub {

8701 owner = "tpope";

8701 owner = "tpope";

8702 repo = "vim-fugitive";

8702 repo = "vim-fugitive";

8703− rev = "b7287bd5421da62986d9abf9131509b2c9f918e4";

8703+ rev = "4b0f2b604562e9681ae3b80c2665f168ac637cea";

8704− sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz";

8704+ sha256 = "0amph3kjqq0hl74akpp5czjw2gk6mh6l2zz113mrb95nri0bz73q";

8705 };

8705 };

8706 meta.homepage = "https://github.com/tpope/vim-fugitive/";

8706 meta.homepage = "https://github.com/tpope/vim-fugitive/";

8707 };

8707 };

@@ -8792,12 +8792,12 @@ final: prev:

8792

8792

8793 vim-gitgutter = buildVimPluginFrom2Nix {

8793 vim-gitgutter = buildVimPluginFrom2Nix {

8794 pname = "vim-gitgutter";

8794 pname = "vim-gitgutter";

8795− version = "2022-04-25";

8795+ version = "2022-04-15";

8796 src = fetchFromGitHub {

8796 src = fetchFromGitHub {

8797 owner = "airblade";

8797 owner = "airblade";

8798 repo = "vim-gitgutter";

8798 repo = "vim-gitgutter";

8799− rev = "988a6dbad9a9777cd94aab18ba7821a41068685b";

8799+ rev = "d5bae104031bb1633cb5c5178dc7d4ac422b422a";

8800− sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi";

8800+ sha256 = "1k6bn3wm9chaqhkaw382169ia5ycbbnw00hwyaabx7fbzc8zf7zw";

8801 };

8801 };

8802 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

8802 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

8803 };

8803 };

@@ -8840,12 +8840,12 @@ final: prev:

8840

8840

8841 vim-go = buildVimPluginFrom2Nix {

8841 vim-go = buildVimPluginFrom2Nix {

8842 pname = "vim-go";

8842 pname = "vim-go";

8843− version = "2022-04-23";

8843+ version = "2022-04-15";

8844 src = fetchFromGitHub {

8844 src = fetchFromGitHub {

8845 owner = "fatih";

8845 owner = "fatih";

8846 repo = "vim-go";

8846 repo = "vim-go";

8847− rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308";

8847+ rev = "687eb72bb6e84012ef2b0b2474175e46243e43b0";

8848− sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7";

8848+ sha256 = "0llf81fh166xvdvy0vj93a964hp2clb3lqdy2sp3fhzldzyv0bab";

8849 };

8849 };

8850 meta.homepage = "https://github.com/fatih/vim-go/";

8850 meta.homepage = "https://github.com/fatih/vim-go/";

8851 };

8851 };

@@ -9538,24 +9538,24 @@ final: prev:

9538

9538

9539 vim-lsc = buildVimPluginFrom2Nix {

9539 vim-lsc = buildVimPluginFrom2Nix {

9540 pname = "vim-lsc";

9540 pname = "vim-lsc";

9541− version = "2022-04-30";

9541+ version = "2021-04-28";

9542 src = fetchFromGitHub {

9542 src = fetchFromGitHub {

9543 owner = "natebosch";

9543 owner = "natebosch";

9544 repo = "vim-lsc";

9544 repo = "vim-lsc";

9545− rev = "39ec72353c2170db2caf797072800c513647e9c5";

9545+ rev = "4b0fc48037c628f14209f30616a19287d9e54823";

9546− sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx";

9546+ sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv";

9547 };

9547 };

9548 meta.homepage = "https://github.com/natebosch/vim-lsc/";

9548 meta.homepage = "https://github.com/natebosch/vim-lsc/";

9549 };

9549 };

9550

9550

9551 vim-lsp = buildVimPluginFrom2Nix {

9551 vim-lsp = buildVimPluginFrom2Nix {

9552 pname = "vim-lsp";

9552 pname = "vim-lsp";

9553− version = "2022-04-21";

9553+ version = "2022-04-17";

9554 src = fetchFromGitHub {

9554 src = fetchFromGitHub {

9555 owner = "prabirshrestha";

9555 owner = "prabirshrestha";

9556 repo = "vim-lsp";

9556 repo = "vim-lsp";

9557− rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d";

9557+ rev = "8df4aa40191717b34f5da8d3c8e90dc0f1f62e0b";

9558− sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy";

9558+ sha256 = "0nx63rn86cjprwbvqpzarxxn1id6jndvww9n10ssdf5cfkw697b7";

9559 };

9559 };

9560 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

9560 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

9561 };

9561 };

@@ -9586,12 +9586,12 @@ final: prev:

9586

9586

9587 vim-maktaba = buildVimPluginFrom2Nix {

9587 vim-maktaba = buildVimPluginFrom2Nix {

9588 pname = "vim-maktaba";

9588 pname = "vim-maktaba";

9589− version = "2022-04-22";

9589+ version = "2021-08-09";

9590 src = fetchFromGitHub {

9590 src = fetchFromGitHub {

9591 owner = "google";

9591 owner = "google";

9592 repo = "vim-maktaba";

9592 repo = "vim-maktaba";

9593− rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb";

9593+ rev = "f5127b339a9d776f220cc0393783c55def9d8ce0";

9594− sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8";

9594+ sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg";

9595 };

9595 };

9596 meta.homepage = "https://github.com/google/vim-maktaba/";

9596 meta.homepage = "https://github.com/google/vim-maktaba/";

9597 };

9597 };

@@ -9610,24 +9610,24 @@ final: prev:

9610

9610

9611 vim-markbar = buildVimPluginFrom2Nix {

9611 vim-markbar = buildVimPluginFrom2Nix {

9612 pname = "vim-markbar";

9612 pname = "vim-markbar";

9613− version = "2022-04-27";

9613+ version = "2020-08-31";

9614 src = fetchFromGitHub {

9614 src = fetchFromGitHub {

9615 owner = "Yilin-Yang";

9615 owner = "Yilin-Yang";

9616 repo = "vim-markbar";

9616 repo = "vim-markbar";

9617− rev = "b9b87339bca7572ffc506165069242b6c06c210b";

9617+ rev = "df13c3abe88c01a716b1099de953dcfa1679e663";

9618− sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59";

9618+ sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9";

9619 };

9619 };

9620 meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";

9620 meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";

9621 };

9621 };

9622

9622

9623 vim-markdown = buildVimPluginFrom2Nix {

9623 vim-markdown = buildVimPluginFrom2Nix {

9624 pname = "vim-markdown";

9624 pname = "vim-markdown";

9625− version = "2022-04-26";

9625+ version = "2022-04-13";

9626 src = fetchFromGitHub {

9626 src = fetchFromGitHub {

9627 owner = "preservim";

9627 owner = "preservim";

9628 repo = "vim-markdown";

9628 repo = "vim-markdown";

9629− rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3";

9629+ rev = "c031a3e65c50d6aa0bfc81f8be9d248f9644426d";

9630− sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf";

9630+ sha256 = "0l8ginadb4jxnrggd1lvia8kan397x02jf3v6sgkcyxawwpgfl0x";

9631 };

9631 };

9632 meta.homepage = "https://github.com/preservim/vim-markdown/";

9632 meta.homepage = "https://github.com/preservim/vim-markdown/";

9633 };

9633 };

@@ -9659,12 +9659,12 @@ final: prev:

9659

9659

9660 vim-matchup = buildVimPluginFrom2Nix {

9660 vim-matchup = buildVimPluginFrom2Nix {

9661 pname = "vim-matchup";

9661 pname = "vim-matchup";

9662− version = "2022-04-20";

9662+ version = "2022-04-19";

9663 src = fetchFromGitHub {

9663 src = fetchFromGitHub {

9664 owner = "andymass";

9664 owner = "andymass";

9665 repo = "vim-matchup";

9665 repo = "vim-matchup";

9666− rev = "1cb069f2a526682b3ce69610cf7c05511295ad37";

9666+ rev = "bb04f9fa64b96bd3d6c4c146c6f9c55a69587fac";

9667− sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1";

9667+ sha256 = "1wrgxsdv3q2px0q7w6jf5dnj2abr0vf1pfq5f53zq784h08m07hq";

9668 };

9668 };

9669 meta.homepage = "https://github.com/andymass/vim-matchup/";

9669 meta.homepage = "https://github.com/andymass/vim-matchup/";

9670 };

9670 };

@@ -9863,12 +9863,12 @@ final: prev:

9863

9863

9864 vim-nix = buildVimPluginFrom2Nix {

9864 vim-nix = buildVimPluginFrom2Nix {

9865 pname = "vim-nix";

9865 pname = "vim-nix";

9866− version = "2022-04-25";

9866+ version = "2021-05-28";

9867 src = fetchFromGitHub {

9867 src = fetchFromGitHub {

9868 owner = "LnL7";

9868 owner = "LnL7";

9869 repo = "vim-nix";

9869 repo = "vim-nix";

9870− rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee";

9870+ rev = "63b47b39c8d481ebca3092822ca8972e08df769b";

9871− sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av";

9871+ sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361";

9872 };

9872 };

9873 meta.homepage = "https://github.com/LnL7/vim-nix/";

9873 meta.homepage = "https://github.com/LnL7/vim-nix/";

9874 };

9874 };

@@ -10211,12 +10211,12 @@ final: prev:

10211

10211

10212 vim-plug = buildVimPluginFrom2Nix {

10212 vim-plug = buildVimPluginFrom2Nix {

10213 pname = "vim-plug";

10213 pname = "vim-plug";

10214− version = "2022-04-21";

10214+ version = "2022-04-04";

10215 src = fetchFromGitHub {

10215 src = fetchFromGitHub {

10216 owner = "junegunn";

10216 owner = "junegunn";

10217 repo = "vim-plug";

10217 repo = "vim-plug";

10218− rev = "be55ec46b5ab031805487a9c3e895db57f53010b";

10218+ rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe";

10219− sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh";

10219+ sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv";

10220 };

10220 };

10221 meta.homepage = "https://github.com/junegunn/vim-plug/";

10221 meta.homepage = "https://github.com/junegunn/vim-plug/";

10222 };

10222 };

@@ -10235,12 +10235,12 @@ final: prev:

10235

10235

10236 vim-polyglot = buildVimPluginFrom2Nix {

10236 vim-polyglot = buildVimPluginFrom2Nix {

10237 pname = "vim-polyglot";

10237 pname = "vim-polyglot";

10238− version = "2022-04-30";

10238+ version = "2022-04-18";

10239 src = fetchFromGitHub {

10239 src = fetchFromGitHub {

10240 owner = "sheerun";

10240 owner = "sheerun";

10241 repo = "vim-polyglot";

10241 repo = "vim-polyglot";

10242− rev = "38282d58387cff48ac203f6912c05e4c8686141b";

10242+ rev = "db7bb8ba22f5798bf3abe9f786bc6e6d002725f8";

10243− sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569";

10243+ sha256 = "1fjy26ncql66fn7jdmggkndad1ib9csblvyq42sq9qcdci0lb9jx";

10244 };

10244 };

10245 meta.homepage = "https://github.com/sheerun/vim-polyglot/";

10245 meta.homepage = "https://github.com/sheerun/vim-polyglot/";

10246 };

10246 };

@@ -10307,12 +10307,12 @@ final: prev:

10307

10307

10308 vim-projectionist = buildVimPluginFrom2Nix {

10308 vim-projectionist = buildVimPluginFrom2Nix {

10309 pname = "vim-projectionist";

10309 pname = "vim-projectionist";

10310− version = "2022-04-27";

10310+ version = "2022-04-19";

10311 src = fetchFromGitHub {

10311 src = fetchFromGitHub {

10312 owner = "tpope";

10312 owner = "tpope";

10313 repo = "vim-projectionist";

10313 repo = "vim-projectionist";

10314− rev = "df1e28dba36e69288173fdcdce122d98538ae782";

10314+ rev = "8fb9440ad4cea6ffea8efc3efa4d8d64e7fb9785";

10315− sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq";

10315+ sha256 = "0nlsi05r2gvmwzzrrcifvx1rq09d16mnfa3gl2qif5dgmrj7qzni";

10316 };

10316 };

10317 meta.homepage = "https://github.com/tpope/vim-projectionist/";

10317 meta.homepage = "https://github.com/tpope/vim-projectionist/";

10318 };

10318 };

@@ -10475,12 +10475,12 @@ final: prev:

10475

10475

10476 vim-rails = buildVimPluginFrom2Nix {

10476 vim-rails = buildVimPluginFrom2Nix {

10477 pname = "vim-rails";

10477 pname = "vim-rails";

10478− version = "2022-04-27";

10478+ version = "2022-04-16";

10479 src = fetchFromGitHub {

10479 src = fetchFromGitHub {

10480 owner = "tpope";

10480 owner = "tpope";

10481 repo = "vim-rails";

10481 repo = "vim-rails";

10482− rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed";

10482+ rev = "d38f1bf8575b920042153689492721b80252ae41";

10483− sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l";

10483+ sha256 = "18c3maypsl265f3a03602mnq4lky5w786i9iaphv5x5rlnfwj8wa";

10484 };

10484 };

10485 meta.homepage = "https://github.com/tpope/vim-rails/";

10485 meta.homepage = "https://github.com/tpope/vim-rails/";

10486 };

10486 };

@@ -10547,12 +10547,12 @@ final: prev:

10547

10547

10548 vim-ruby = buildVimPluginFrom2Nix {

10548 vim-ruby = buildVimPluginFrom2Nix {

10549 pname = "vim-ruby";

10549 pname = "vim-ruby";

10550− version = "2022-04-27";

10550+ version = "2022-03-22";

10551 src = fetchFromGitHub {

10551 src = fetchFromGitHub {

10552 owner = "vim-ruby";

10552 owner = "vim-ruby";

10553 repo = "vim-ruby";

10553 repo = "vim-ruby";

10554− rev = "811d8060f390837c49e8625e29c69672cdc56ec3";

10554+ rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1";

10555− sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva";

10555+ sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz";

10556 };

10556 };

10557 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";

10557 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";

10558 };

10558 };

@@ -10631,12 +10631,12 @@ final: prev:

10631

10631

10632 vim-search-pulse = buildVimPluginFrom2Nix {

10632 vim-search-pulse = buildVimPluginFrom2Nix {

10633 pname = "vim-search-pulse";

10633 pname = "vim-search-pulse";

10634− version = "2022-04-26";

10634+ version = "2017-01-05";

10635 src = fetchFromGitHub {

10635 src = fetchFromGitHub {

10636 owner = "inside";

10636 owner = "inside";

10637 repo = "vim-search-pulse";

10637 repo = "vim-search-pulse";

10638− rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445";

10638+ rev = "9f8f473e3813bd76ecb66e8d6182d96bda39b6df";

10639− sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx";

10639+ sha256 = "1xr90a8wvjfkgw1yrh0zcvpvp9ma6z0wqkl8v8pabf20vckgy2q0";

10640 };

10640 };

10641 meta.homepage = "https://github.com/inside/vim-search-pulse/";

10641 meta.homepage = "https://github.com/inside/vim-search-pulse/";

10642 };

10642 };

@@ -10739,12 +10739,12 @@ final: prev:

10739

10739

10740 vim-sleuth = buildVimPluginFrom2Nix {

10740 vim-sleuth = buildVimPluginFrom2Nix {

10741 pname = "vim-sleuth";

10741 pname = "vim-sleuth";

10742− version = "2022-04-28";

10742+ version = "2022-04-14";

10743 src = fetchFromGitHub {

10743 src = fetchFromGitHub {

10744 owner = "tpope";

10744 owner = "tpope";

10745 repo = "vim-sleuth";

10745 repo = "vim-sleuth";

10746− rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8";

10746+ rev = "e116c2cc2555b09aee9b18eba405b925c8b7eaf9";

10747− sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs";

10747+ sha256 = "02ljdb3p7fp0h3nf6rxv5kgsxqdvgkwrwgb01x4xn100spkv6y6i";

10748 };

10748 };

10749 meta.homepage = "https://github.com/tpope/vim-sleuth/";

10749 meta.homepage = "https://github.com/tpope/vim-sleuth/";

10750 };

10750 };

@@ -10835,12 +10835,12 @@ final: prev:

10835

10835

10836 vim-snippets = buildVimPluginFrom2Nix {

10836 vim-snippets = buildVimPluginFrom2Nix {

10837 pname = "vim-snippets";

10837 pname = "vim-snippets";

10838− version = "2022-04-30";

10838+ version = "2022-04-20";

10839 src = fetchFromGitHub {

10839 src = fetchFromGitHub {

10840 owner = "honza";

10840 owner = "honza";

10841 repo = "vim-snippets";

10841 repo = "vim-snippets";

10842− rev = "45c8e00d0bae9056713097ea655d76d463b66f10";

10842+ rev = "0decc32aad4564452c2f8a5cbfe387195f1a8bba";

10843− sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd";

10843+ sha256 = "1ycmls9xpkfzkrws2aby88zmsv1489d659sllrgmbmh04g0pq8vy";

10844 };

10844 };

10845 meta.homepage = "https://github.com/honza/vim-snippets/";

10845 meta.homepage = "https://github.com/honza/vim-snippets/";

10846 };

10846 };

@@ -10979,12 +10979,12 @@ final: prev:

10979

10979

10980 vim-surround = buildVimPluginFrom2Nix {

10980 vim-surround = buildVimPluginFrom2Nix {

10981 pname = "vim-surround";

10981 pname = "vim-surround";

10982− version = "2022-04-22";

10982+ version = "2022-04-10";

10983 src = fetchFromGitHub {

10983 src = fetchFromGitHub {

10984 owner = "tpope";

10984 owner = "tpope";

10985 repo = "vim-surround";

10985 repo = "vim-surround";

10986− rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea";

10986+ rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7";

10987− sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la";

10987+ sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i";

10988 };

10988 };

10989 meta.homepage = "https://github.com/tpope/vim-surround/";

10989 meta.homepage = "https://github.com/tpope/vim-surround/";

10990 };

10990 };

@@ -11340,12 +11340,12 @@ final: prev:

11340

11340

11341 vim-unimpaired = buildVimPluginFrom2Nix {

11341 vim-unimpaired = buildVimPluginFrom2Nix {

11342 pname = "vim-unimpaired";

11342 pname = "vim-unimpaired";

11343− version = "2022-04-29";

11343+ version = "2022-04-10";

11344 src = fetchFromGitHub {

11344 src = fetchFromGitHub {

11345 owner = "tpope";

11345 owner = "tpope";

11346 repo = "vim-unimpaired";

11346 repo = "vim-unimpaired";

11347− rev = "98427183e2b35acee15c7628b1cd587b98025719";

11347+ rev = "80ab990c7ff7251f43262aae4b60ff6eff2ef3a4";

11348− sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk";

11348+ sha256 = "0qmxzk0vcglyrvx2hpxm6qgr6mcc1xnf6srw77ga9g0aazjr2hxc";

11349 };

11349 };

11350 meta.homepage = "https://github.com/tpope/vim-unimpaired/";

11350 meta.homepage = "https://github.com/tpope/vim-unimpaired/";

11351 };

11351 };

@@ -11424,12 +11424,12 @@ final: prev:

11424

11424

11425 vim-vsnip = buildVimPluginFrom2Nix {

11425 vim-vsnip = buildVimPluginFrom2Nix {

11426 pname = "vim-vsnip";

11426 pname = "vim-vsnip";

11427− version = "2022-04-22";

11427+ version = "2022-02-26";

11428 src = fetchFromGitHub {

11428 src = fetchFromGitHub {

11429 owner = "hrsh7th";

11429 owner = "hrsh7th";

11430 repo = "vim-vsnip";

11430 repo = "vim-vsnip";

11431− rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9";

11431+ rev = "70a1131d64d75150ece513b983b0f42939bcb03c";

11432− sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai";

11432+ sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2";

11433 };

11433 };

11434 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

11434 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

11435 };

11435 };

@@ -11460,12 +11460,12 @@ final: prev:

11460

11460

11461 vim-wakatime = buildVimPluginFrom2Nix {

11461 vim-wakatime = buildVimPluginFrom2Nix {

11462 pname = "vim-wakatime";

11462 pname = "vim-wakatime";

11463− version = "2022-04-29";

11463+ version = "2022-04-13";

11464 src = fetchFromGitHub {

11464 src = fetchFromGitHub {

11465 owner = "wakatime";

11465 owner = "wakatime";

11466 repo = "vim-wakatime";

11466 repo = "vim-wakatime";

11467− rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996";

11467+ rev = "9cf2f1910d5cd7f25657176fe60b1745a310f1b3";

11468− sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj";

11468+ sha256 = "0jxkfiq5553ad7zabxlgwzwwsgwznkn0rahfmr79r1dvvqm9m1a6";

11469 };

11469 };

11470 meta.homepage = "https://github.com/wakatime/vim-wakatime/";

11470 meta.homepage = "https://github.com/wakatime/vim-wakatime/";

11471 };

11471 };

@@ -11520,12 +11520,12 @@ final: prev:

11520

11520

11521 vim-wordmotion = buildVimPluginFrom2Nix {

11521 vim-wordmotion = buildVimPluginFrom2Nix {

11522 pname = "vim-wordmotion";

11522 pname = "vim-wordmotion";

11523− version = "2022-04-23";

11523+ version = "2021-12-28";

11524 src = fetchFromGitHub {

11524 src = fetchFromGitHub {

11525 owner = "chaoren";

11525 owner = "chaoren";

11526 repo = "vim-wordmotion";

11526 repo = "vim-wordmotion";

11527− rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c";

11527+ rev = "0d810cc943a858a570a482055188b5e69c4c8724";

11528− sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz";

11528+ sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl";

11529 };

11529 };

11530 meta.homepage = "https://github.com/chaoren/vim-wordmotion/";

11530 meta.homepage = "https://github.com/chaoren/vim-wordmotion/";

11531 };

11531 };

@@ -11748,12 +11748,12 @@ final: prev:

11748

11748

11749 vimspector = buildVimPluginFrom2Nix {

11749 vimspector = buildVimPluginFrom2Nix {

11750 pname = "vimspector";

11750 pname = "vimspector";

11751− version = "2022-05-01";

11751+ version = "2022-04-13";

11752 src = fetchFromGitHub {

11752 src = fetchFromGitHub {

11753 owner = "puremourning";

11753 owner = "puremourning";

11754 repo = "vimspector";

11754 repo = "vimspector";

11755− rev = "960f0444d21ebb20303e1796e4b478df042c3bd3";

11755+ rev = "ebeebc121423a5ab9a31c996f9881880b658c644";

11756− sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi";

11756+ sha256 = "0npcra2k49rz9ij4kc6dyb8dpmfi6kivpp89ggmpnd0989vn9i56";

11757 fetchSubmodules = true;

11757 fetchSubmodules = true;

11758 };

11758 };

11759 meta.homepage = "https://github.com/puremourning/vimspector/";

11759 meta.homepage = "https://github.com/puremourning/vimspector/";

@@ -11761,12 +11761,12 @@ final: prev:

11761

11761

11762 vimtex = buildVimPluginFrom2Nix {

11762 vimtex = buildVimPluginFrom2Nix {

11763 pname = "vimtex";

11763 pname = "vimtex";

11764− version = "2022-05-02";

11764+ version = "2022-04-10";

11765 src = fetchFromGitHub {

11765 src = fetchFromGitHub {

11766 owner = "lervag";

11766 owner = "lervag";

11767 repo = "vimtex";

11767 repo = "vimtex";

11768− rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898";

11768+ rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48";

11769− sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c";

11769+ sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn";

11770 };

11770 };

11771 meta.homepage = "https://github.com/lervag/vimtex/";

11771 meta.homepage = "https://github.com/lervag/vimtex/";

11772 };

11772 };

@@ -11869,12 +11869,12 @@ final: prev:

11869

11869

11870 wilder-nvim = buildVimPluginFrom2Nix {

11870 wilder-nvim = buildVimPluginFrom2Nix {

11871 pname = "wilder.nvim";

11871 pname = "wilder.nvim";

11872− version = "2022-04-23";

11872+ version = "2022-04-17";

11873 src = fetchFromGitHub {

11873 src = fetchFromGitHub {

11874 owner = "gelguy";

11874 owner = "gelguy";

11875 repo = "wilder.nvim";

11875 repo = "wilder.nvim";

11876− rev = "777b163e394ba658ef288292efb533b25610ef9d";

11876+ rev = "a9ea0c69b37850752d5f8431b7be6bf8f1a0254c";

11877− sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh";

11877+ sha256 = "0vd01sjj4q26a653wv9icfyd7g34rnl4whbnl3ic6pvb9cvj72wk";

11878 };

11878 };

11879 meta.homepage = "https://github.com/gelguy/wilder.nvim/";

11879 meta.homepage = "https://github.com/gelguy/wilder.nvim/";

11880 };

11880 };

@@ -12038,12 +12038,12 @@ final: prev:

12038

12038

12039 zig-vim = buildVimPluginFrom2Nix {

12039 zig-vim = buildVimPluginFrom2Nix {

12040 pname = "zig.vim";

12040 pname = "zig.vim";

12041− version = "2022-05-01";

12041+ version = "2022-03-15";

12042 src = fetchFromGitHub {

12042 src = fetchFromGitHub {

12043 owner = "ziglang";

12043 owner = "ziglang";

12044 repo = "zig.vim";

12044 repo = "zig.vim";

12045− rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3";

12045+ rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac";

12046− sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7";

12046+ sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4";

12047 };

12047 };

12048 meta.homepage = "https://github.com/ziglang/zig.vim/";

12048 meta.homepage = "https://github.com/ziglang/zig.vim/";

12049 };

12049 };

@@ -12086,12 +12086,12 @@ final: prev:

12086

12086

12087 chad = buildVimPluginFrom2Nix {

12087 chad = buildVimPluginFrom2Nix {

12088 pname = "chad";

12088 pname = "chad";

12089− version = "2022-05-02";

12089+ version = "2022-04-20";

12090 src = fetchFromGitHub {

12090 src = fetchFromGitHub {

12091 owner = "ms-jpq";

12091 owner = "ms-jpq";

12092 repo = "chadtree";

12092 repo = "chadtree";

12093− rev = "820c1913a77a12d080e3436e60a491327664589b";

12093+ rev = "d9a84322624d14c1e249e9a8a4573c9d205a9bc9";

12094− sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza";

12094+ sha256 = "16lha28fmi463snf71w0nz6ll0yiiiz7xrh2v7irkgx214q1gh6z";

12095 };

12095 };

12096 meta.homepage = "https://github.com/ms-jpq/chadtree/";

12096 meta.homepage = "https://github.com/ms-jpq/chadtree/";

12097 };

12097 };

@@ -12122,12 +12122,12 @@ final: prev:

12122

12122

12123 gruvbox-community = buildVimPluginFrom2Nix {

12123 gruvbox-community = buildVimPluginFrom2Nix {

12124 pname = "gruvbox-community";

12124 pname = "gruvbox-community";

12125− version = "2022-04-29";

12125+ version = "2022-03-06";

12126 src = fetchFromGitHub {

12126 src = fetchFromGitHub {

12127 owner = "gruvbox-community";

12127 owner = "gruvbox-community";

12128 repo = "gruvbox";

12128 repo = "gruvbox";

12129− rev = "34ad436b234c5095d46bb065c5b32780618df83f";

12129+ rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";

12130− sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8";

12130+ sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";

12131 };

12131 };

12132 meta.homepage = "https://github.com/gruvbox-community/gruvbox/";

12132 meta.homepage = "https://github.com/gruvbox-community/gruvbox/";

12133 };

12133 };

@@ -12158,12 +12158,12 @@ final: prev:

12158

12158

12159 rose-pine = buildVimPluginFrom2Nix {

12159 rose-pine = buildVimPluginFrom2Nix {

12160 pname = "rose-pine";

12160 pname = "rose-pine";

12161− version = "2022-04-25";

12161+ version = "2022-04-19";

12162 src = fetchFromGitHub {

12162 src = fetchFromGitHub {

12163 owner = "rose-pine";

12163 owner = "rose-pine";

12164 repo = "neovim";

12164 repo = "neovim";

12165− rev = "da67a549cf5d67e15618cc3001f1e07724a1597f";

12165+ rev = "758568b92e0a17c3618f71d43cce96a3a5436985";

12166− sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2";

12166+ sha256 = "0zxyyjp1527681rrw25f8vzx1d6djqac04zcay02hxi2rcnjpan5";

12167 };

12167 };

12168 meta.homepage = "https://github.com/rose-pine/neovim/";

12168 meta.homepage = "https://github.com/rose-pine/neovim/";

12169 };

12169 };

@@ -12180,5 +12180,4 @@ final: prev:

12180 meta.homepage = "https://github.com/jhradilek/vim-snippets/";

12180 meta.homepage = "https://github.com/jhradilek/vim-snippets/";

12181 };

12181 };

12182

12182

12183−

12184}

12183}

pkgs/applications/editors/vim/plugins/update.py+16−47

@@ -26,24 +26,19 @@ from typing import List, Tuple

26from pathlib import Path

26from pathlib import Path

27

27

28log = logging.getLogger()

28log = 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())

34

30

35# Import plugin update library from maintainers/scripts/pluginupdate.py

31# Import plugin update library from maintainers/scripts/pluginupdate.py

36ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

32ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

37# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree

33# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree

38sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))

34sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))

39import pluginupdate

35import pluginupdate

40−from pluginupdate import run_nix_expr, PluginDesc

41

36

42GET_PLUGINS = f"""(with import <localpkgs> {{}};

37GET_PLUGINS = f"""(with import <localpkgs> {{}};

43let

38let

44− inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

39+ inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix;

45 generated = callPackage {ROOT}/generated.nix {{

40 generated = callPackage {ROOT}/generated.nix {{

46− inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

41+ inherit buildVimPluginFrom2Nix;

47 }};

42 }};

48 hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;

43 hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;

49 getChecksum = name: value:

44 getChecksum = name: value:

@@ -55,69 +50,43 @@ let

55 checksums = lib.mapAttrs getChecksum generated;

50 checksums = lib.mapAttrs getChecksum generated;

56in lib.filterAttrs (n: v: v != null) checksums)"""

51in lib.filterAttrs (n: v: v != null) checksums)"""

57

52

58−GET_PLUGINS_LUA = """

59−with import <localpkgs> {};

60−lib.attrNames lua51Packages"""

61−

62HEADER = (

53HEADER = (

63 "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"

54 "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"

64)

55)

65

56

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−

77

57

78class VimEditor(pluginupdate.Editor):

58class 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):

80 sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())

60 sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())

81

61

82 with open(outfile, "w+") as f:

62 with open(outfile, "w+") as f:

83 f.write(HEADER)

63 f.write(HEADER)

84 f.write(textwrap.dedent("""

64 f.write(textwrap.dedent("""

85− { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

65+ { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

86

66

87 final: prev:

67 final: prev:

88− {

89− """

68+ {"""

90 ))

69 ))

91 for pdesc, plugin in sorted_plugins:

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

98

71

99− repo = pdesc.repo

72+ repo = pdesc.repo

100− isNeovim = isNeovimPlugin(plugin)

73+ src_nix = repo.as_nix(plugin)

101−

74+ f.write(

75+ f"""

102− content = f" {plugin.normalized_name} = "

76+ {plugin.normalized_name} = buildVimPluginFrom2Nix {{

103− src_nix = repo.as_nix(plugin)

104− content += """{buildFn} {{

105 pname = "{plugin.name}";

77 pname = "{plugin.name}";

106 version = "{plugin.version}";

78 version = "{plugin.version}";

107 src = {src_nix};

79 src = {src_nix};

108 meta.homepage = "{repo.uri}";

80 meta.homepage = "{repo.uri}";

109 }};

81 }};

82+"""

83+ )

84+ f.write("\n}\n")

85+ print(f"updated {outfile}")

110

86

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():

117

87

118− global luaPlugins

119− luaPlugins = run_nix_expr(GET_PLUGINS_LUA)

120

88

89+def main():

121 editor = VimEditor("vim", ROOT, GET_PLUGINS)

90 editor = VimEditor("vim", ROOT, GET_PLUGINS)

122 parser = editor.create_parser()

91 parser = editor.create_parser()

123 args = parser.parse_args()

92 args = parser.parse_args()

pkgs/applications/editors/vim/plugins/vim-utils.nix−5

@@ -535,11 +535,6 @@ rec {

535 inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;

535 inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;

536 }) buildVimPlugin buildVimPluginFrom2Nix;

536 }) buildVimPlugin buildVimPluginFrom2Nix;

537

537

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−

543 # used to figure out which python dependencies etc. neovim needs

538 # used to figure out which python dependencies etc. neovim needs

544 requiredPlugins = {

539 requiredPlugins = {

545 packages ? {},

540 packages ? {},

pkgs/applications/gis/qgis/unwrapped-ltr.nix+2−2

@@ -69,14 +69,14 @@ let

69 six

69 six

70 ];

70 ];

71in mkDerivation rec {

71in mkDerivation rec {

72− version = "3.22.6";

72+ version = "3.22.5";

73 pname = "qgis-ltr-unwrapped";

73 pname = "qgis-ltr-unwrapped";

74

74

75 src = fetchFromGitHub {

75 src = fetchFromGitHub {

76 owner = "qgis";

76 owner = "qgis";

77 repo = "QGIS";

77 repo = "QGIS";

78 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

78 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

79− sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY=";

79+ sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o=";

80 };

80 };

81

81

82 passthru = {

82 passthru = {

pkgs/applications/gis/qgis/unwrapped.nix+2−2

@@ -69,14 +69,14 @@ let

69 six

69 six

70 ];

70 ];

71in mkDerivation rec {

71in mkDerivation rec {

72− version = "3.24.2";

72+ version = "3.24.1";

73 pname = "qgis-unwrapped";

73 pname = "qgis-unwrapped";

74

74

75 src = fetchFromGitHub {

75 src = fetchFromGitHub {

76 owner = "qgis";

76 owner = "qgis";

77 repo = "QGIS";

77 repo = "QGIS";

78 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

78 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

79− sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo=";

79+ sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg=";

80 };

80 };

81

81

82 passthru = {

82 passthru = {

pkgs/applications/misc/bottles/default.nix+2−2

@@ -20,13 +20,13 @@ let

20in

20in

21python3Packages.buildPythonApplication rec {

21python3Packages.buildPythonApplication rec {

22 pname = "bottles";

22 pname = "bottles";

23− version = "2022.5.2-trento";

23+ version = "2022.4.28-trento";

24

24

25 src = fetchFromGitHub {

25 src = fetchFromGitHub {

26 owner = "bottlesdevs";

26 owner = "bottlesdevs";

27 repo = pname;

27 repo = pname;

28 rev = version;

28 rev = version;

29− sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84=";

29+ sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w=";

30 };

30 };

31

31

32 postPatch = ''

32 postPatch = ''

pkgs/applications/misc/hello/default.nix+5−8

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

1−{ callPackage

2−, lib

1+{ lib

3, stdenv

2, stdenv

4, fetchurl

3, fetchurl

5, nixos

4, nixos

@@ -7,12 +6,12 @@

7, hello

6, hello

8}:

7}:

9

8

10−stdenv.mkDerivation (finalAttrs: {

9+stdenv.mkDerivation rec {

11 pname = "hello";

10 pname = "hello";

12 version = "2.12";

11 version = "2.12";

13

12

14 src = fetchurl {

13 src = fetchurl {

15− url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";

14+ url = "mirror://gnu/hello/${pname}-${version}.tar.gz";

16 sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";

15 sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";

17 };

16 };

18

17

@@ -28,8 +27,6 @@ stdenv.mkDerivation (finalAttrs: {

28 (nixos { environment.noXlibs = true; }).pkgs.hello;

27 (nixos { environment.noXlibs = true; }).pkgs.hello;

29 };

28 };

30

29

31− passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };

32−

33 meta = with lib; {

30 meta = with lib; {

34 description = "A program that produces a familiar, friendly greeting";

31 description = "A program that produces a familiar, friendly greeting";

35 longDescription = ''

32 longDescription = ''

@@ -37,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: {

37 It is fully customizable.

34 It is fully customizable.

38 '';

35 '';

39 homepage = "https://www.gnu.org/software/hello/manual/";

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

41 license = licenses.gpl3Plus;

38 license = licenses.gpl3Plus;

42 maintainers = [ maintainers.eelco ];

39 maintainers = [ maintainers.eelco ];

43 platforms = platforms.all;

40 platforms = platforms.all;

44 };

41 };

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

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "kiln";

4 pname = "kiln";

5− version = "0.3.0";

5+ version = "0.2.1";

6

6

7 src = fetchFromSourcehut {

7 src = fetchFromSourcehut {

8 owner = "~adnano";

8 owner = "~adnano";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";

11+ hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";

12 };

12 };

13

13

14 nativeBuildInputs = [ scdoc ];

14 nativeBuildInputs = [ scdoc ];

15

15

16− vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";

16+ vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";

17

17

18 installPhase = ''

18 installPhase = ''

19 runHook preInstall

19 runHook preInstall

pkgs/applications/misc/libosmocore/default.nix+6−21

@@ -1,25 +1,16 @@

1−{ lib, stdenv

2−, autoreconfHook

3−, fetchFromGitHub

1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config

4−, gnutls

2+, pcsclite, talloc, python2, gnutls

5−, libmnl

6−, libusb1

7−, lksctp-tools

8−, pcsclite

9−, pkg-config

10−, python3

11−, talloc

12}:

3}:

13

4

14stdenv.mkDerivation rec {

5stdenv.mkDerivation rec {

15 pname = "libosmocore";

6 pname = "libosmocore";

16− version = "1.6.0";

7+ version = "1.2.0";

17

8

18 src = fetchFromGitHub {

9 src = fetchFromGitHub {

19 owner = "osmocom";

10 owner = "osmocom";

20 repo = "libosmocore";

11 repo = "libosmocore";

21 rev = version;

12 rev = version;

22− hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";

13+ sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";

23 };

14 };

24

15

25 propagatedBuildInputs = [

16 propagatedBuildInputs = [

@@ -27,17 +18,11 @@ stdenv.mkDerivation rec {

27 ];

18 ];

28

19

29 nativeBuildInputs = [

20 nativeBuildInputs = [

30− autoreconfHook

21+ autoreconfHook pkg-config

31− pkg-config

32− python3

33 ];

22 ];

34

23

35 buildInputs = [

24 buildInputs = [

36− gnutls

37− libmnl

38− libusb1

39− lksctp-tools

40− pcsclite

25+ pcsclite python2 gnutls

41 ];

26 ];

42

27

43 enableParallelBuilding = true;

28 enableParallelBuilding = true;

pkgs/applications/misc/opencpn/default.nix+16−85

@@ -1,100 +1,31 @@

1−{ stdenv, lib

1+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,

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

2+ gettext, glib, portaudio }:

32−, sqlite

33−, tinyxml

34−, udev

35−, util-linux

36−, wxGTK31-gtk3

37−, xorg

38−}:

39

3

40stdenv.mkDerivation rec {

4stdenv.mkDerivation rec {

41− pname = "opencpn";

5+ pname = "opencpn-unstable";

42− version = "5.6.2";

6+ version = "2019-11-21";

43

7

44 src = fetchFromGitHub {

8 src = fetchFromGitHub {

45 owner = "OpenCPN";

9 owner = "OpenCPN";

46 repo = "OpenCPN";

10 repo = "OpenCPN";

47− rev = "Release_${version}";

11+ rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";

48− hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";

12+ sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";

49 };

13 };

50

14

51− nativeBuildInputs = [ cmake lsb-release pkg-config ];

15+ nativeBuildInputs = [ cmake pkg-config ];

52− buildInputs = [

16+ buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext

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

17+ glib portaudio ];

79− sqlite

80− tinyxml

81− udev

82− util-linux

83− wxGTK31-gtk3

84− xorg.libXdmcp

85− xorg.libXtst

86− ];

87−

88

18

89− cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];

19+ cmakeFlags = [

90−

20+ "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

91− doCheck = true;

21+ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

22+ ];

92

23

93− meta = with lib; {

24+ meta = {

94 description = "A concise ChartPlotter/Navigator";

25 description = "A concise ChartPlotter/Navigator";

95− maintainers = with maintainers; [ kragniz lovesegfault ];

26+ maintainers = [ lib.maintainers.kragniz ];

96 platforms = [ "x86_64-linux" ];

27 platforms = [ "x86_64-linux" ];

97− license = licenses.gpl2;

28+ license = lib.licenses.gpl2;

98 homepage = "https://opencpn.org/";

29 homepage = "https://opencpn.org/";

99 };

30 };

100}

31}

pkgs/applications/misc/skytemple/default.nix+2−5

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

2

2

3python3Packages.buildPythonApplication rec {

3python3Packages.buildPythonApplication rec {

4 pname = "skytemple";

4 pname = "skytemple";

5− version = "1.3.10";

5+ version = "1.3.2";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "SkyTemple";

8 owner = "SkyTemple";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";

11+ sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";

12 };

12 };

13

13

14 buildInputs = [

14 buildInputs = [

@@ -26,10 +26,7 @@ python3Packages.buildPythonApplication rec {

26 packaging

26 packaging

27 pycairo

27 pycairo

28 pygal

28 pygal

29− psutil

30− gbulb

31 pypresence

29 pypresence

32− sentry-sdk

33 setuptools

30 setuptools

34 skytemple-dtef

31 skytemple-dtef

35 skytemple-eventserver

32 skytemple-eventserver

pkgs/applications/misc/tut/default.nix+2−2

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

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "tut";

4 pname = "tut";

5− version = "0.0.46";

5+ version = "0.0.42";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "RasmusLindroth";

8 owner = "RasmusLindroth";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w=";

11+ sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";

12 };

12 };

13

13

14 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";

14 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";

pkgs/applications/misc/udiskie/default.nix+25−30

@@ -1,47 +1,42 @@

1{ lib

1{ lib

2−, asciidoc

3, fetchFromGitHub

2, fetchFromGitHub

3+, buildPythonApplication

4+, asciidoc-full

5+, docopt

6+, gettext

4, gobject-introspection

7, gobject-introspection

5, gtk3

8, gtk3

6−, installShellFiles

9+, keyutils

7, libappindicator-gtk3

10, libappindicator-gtk3

8, libnotify

11, libnotify

9, librsvg

12, librsvg

10−, python3

13+, nose

14+, pygobject3

15+, pyyaml

11, udisks2

16, udisks2

12, wrapGAppsHook

17, wrapGAppsHook

13}:

18}:

14

19

15−python3.pkgs.buildPythonApplication rec {

20+buildPythonApplication rec {

16 pname = "udiskie";

21 pname = "udiskie";

17− version = "2.4.2";

22+ version = "2.4.0";

18−

19− format = "setuptools";

20

23

21 src = fetchFromGitHub {

24 src = fetchFromGitHub {

22 owner = "coldfix";

25 owner = "coldfix";

23 repo = "udiskie";

26 repo = "udiskie";

24 rev = "v${version}";

27 rev = "v${version}";

25− hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";

28+ hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";

26 };

29 };

27

30

28− patches = [

31+ outputs = [ "out" "man" ];

29− ./locale-path.patch

30− ];

31−

32− postPatch = ''

33− substituteInPlace udiskie/locale.py --subst-var out

34− '';

35

32

36 nativeBuildInputs = [

33 nativeBuildInputs = [

37− asciidoc # Man page

34+ asciidoc-full # Man page

35+ gettext

38 gobject-introspection

36 gobject-introspection

39− installShellFiles

40 wrapGAppsHook

37 wrapGAppsHook

41 ];

38 ];

42

39

43− dontWrapGApps = true;

44−

45 buildInputs = [

40 buildInputs = [

46 gobject-introspection

41 gobject-introspection

47 gtk3

42 gtk3

@@ -51,9 +46,8 @@ python3.pkgs.buildPythonApplication rec {

51 udisks2

46 udisks2

52 ];

47 ];

53

48

54− propagatedBuildInputs = with python3.pkgs; [

49+ propagatedBuildInputs = [

55 docopt

50 docopt

56− keyutils

57 pygobject3

51 pygobject3

58 pyyaml

52 pyyaml

59 ];

53 ];

@@ -63,20 +57,21 @@ python3.pkgs.buildPythonApplication rec {

63 '';

57 '';

64

58

65 postInstall = ''

59 postInstall = ''

60+ mkdir -p $man/share/man/man8

66− installManPage doc/udiskie.8

61+ cp -v doc/udiskie.8 $man/share/man/man8/

67 '';

62 '';

68

63

69− preFixup = ''

70− makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

71− '';

72−

73− checkInputs = with python3.pkgs; [

64+ checkInputs = [

74− pytestCheckHook

65+ keyutils

66+ nose

75 ];

67 ];

76

68

69+ checkPhase = ''

70+ nosetests

71+ '';

72+

77 meta = with lib; {

73 meta = with lib; {

78 homepage = "https://github.com/coldfix/udiskie";

74 homepage = "https://github.com/coldfix/udiskie";

79− changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";

80 description = "Removable disk automounter for udisks";

75 description = "Removable disk automounter for udisks";

81 longDescription = ''

76 longDescription = ''

82 udiskie is a udisks2 front-end that allows to manage removeable media such

77 udiskie is a udisks2 front-end that allows to manage removeable media such

@@ -93,6 +88,6 @@ python3.pkgs.buildPythonApplication rec {

93 - password caching (requires python keyutils 0.3)

88 - password caching (requires python keyutils 0.3)

94 '';

89 '';

95 license = licenses.mit;

90 license = licenses.mit;

96− maintainers = with maintainers; [ AndersonTorres dotlambda ];

91+ maintainers = with maintainers; [ AndersonTorres ];

97 };

92 };

98}

93}

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

6

6

7stdenv.mkDerivation rec {

7stdenv.mkDerivation rec {

8 pname = "upwork";

8 pname = "upwork";

9− version = "5.6.10.13";

9+ version = "5.6.10.7";

10

10

11 src = fetchurl {

11 src = fetchurl {

12− url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";

12+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";

13− sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";

13+ sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";

14 };

14 };

15

15

16 nativeBuildInputs = [

16 nativeBuildInputs = [

pkgs/applications/misc/xpdf/default.nix+2−2

@@ -12,11 +12,11 @@ assert enablePrinting -> cups != null;

12

12

13stdenv.mkDerivation rec {

13stdenv.mkDerivation rec {

14 pname = "xpdf";

14 pname = "xpdf";

15− version = "4.04";

15+ version = "4.03";

16

16

17 src = fetchzip {

17 src = fetchzip {

18 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";

18 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";

19− hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY=";

19+ sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";

20 };

20 };

21

21

22 # Fix "No known features for CXX compiler", see

22 # Fix "No known features for CXX compiler", see

pkgs/applications/misc/xplr/default.nix+3−3

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

2

2

3rustPlatform.buildRustPackage rec {

3rustPlatform.buildRustPackage rec {

4 pname = "xplr";

4 pname = "xplr";

5− version = "0.17.6";

5+ version = "0.17.3";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "sayanarijit";

8 owner = "sayanarijit";

9 repo = pname;

9 repo = pname;

10 rev = "v${version}";

10 rev = "v${version}";

11− sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";

11+ sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";

12 };

12 };

13

13

14 buildInputs = lib.optional stdenv.isDarwin libiconv;

14 buildInputs = lib.optional stdenv.isDarwin libiconv;

15

15

16− cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";

16+ cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";

17

17

18 meta = with lib; {

18 meta = with lib; {

19 description = "A hackable, minimal, fast TUI file explorer";

19 description = "A hackable, minimal, fast TUI file explorer";

pkgs/applications/networking/browsers/brave/default.nix+5−8

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

49, pulseSupport ? stdenv.isLinux

49, pulseSupport ? stdenv.isLinux

50, libpulseaudio

50, libpulseaudio

51

51

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

53−, libGL

54−

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

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

56, libvaSupport ? stdenv.isLinux

53, libvaSupport ? stdenv.isLinux

57, libva

54, libva

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

69

66

70 deps = [

67 deps = [

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

68 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

73 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

70 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

74 libXext libXfixes libXi libXrandr libXrender libxshmfence

71 libXext libXfixes libXi libXrandr libXrender libxshmfence

75 libXtst libuuid mesa nspr nss pango pipewire udev wayland

72 libXtst libuuid mesa nspr nss pango pipewire udev wayland

@@ -131,9 +128,9 @@ stdenv.mkDerivation rec {

131 ln -sf $BINARYWRAPPER $out/bin/brave

128 ln -sf $BINARYWRAPPER $out/bin/brave

132

129

133 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do

130 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do

134− patchelf \

131+ patchelf \

135− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

132+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

136− --set-rpath "${rpath}" $exe

133+ --set-rpath "${rpath}" $exe

137 done

134 done

138

135

139 # Fix paths

136 # Fix paths

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

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

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

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

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

175 ''}

172 ''}

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

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

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

177 ${optionalString vulkanSupport ''

175 ${optionalString vulkanSupport ''

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

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

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

180 ''}

177 ''}

181 )

178 )

182 '';

179 '';

pkgs/applications/networking/browsers/chromium/upstream-info.json+5−5

@@ -45,9 +45,9 @@

45 }

45 }

46 },

46 },

47 "ungoogled-chromium": {

47 "ungoogled-chromium": {

48− "version": "101.0.4951.54",

48+ "version": "101.0.4951.41",

49− "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",

49+ "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",

50− "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",

50+ "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",

51 "deps": {

51 "deps": {

52 "gn": {

52 "gn": {

53 "version": "2022-03-14",

53 "version": "2022-03-14",

@@ -56,8 +56,8 @@

56 "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"

56 "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"

57 },

57 },

58 "ungoogled-patches": {

58 "ungoogled-patches": {

59− "rev": "101.0.4951.54-1",

59+ "rev": "101.0.4951.41-1",

60− "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"

60+ "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"

61 }

61 }

62 }

62 }

63 }

63 }

pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393

@@ -1,985 +1,985 @@

1{

1{

2− version = "101.0b2";

2+ version = "100.0b6";

3 sources = [

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

5 locale = "ach";

5 locale = "ach";

6 arch = "linux-x86_64";

6 arch = "linux-x86_64";

7− sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6";

7+ sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085";

8 }

8 }

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

10 locale = "af";

10 locale = "af";

11 arch = "linux-x86_64";

11 arch = "linux-x86_64";

12− sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82";

12+ sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790";

13 }

13 }

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

15 locale = "an";

15 locale = "an";

16 arch = "linux-x86_64";

16 arch = "linux-x86_64";

17− sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1";

17+ sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f";

18 }

18 }

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

20 locale = "ar";

20 locale = "ar";

21 arch = "linux-x86_64";

21 arch = "linux-x86_64";

22− sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50";

22+ sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e";

23 }

23 }

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

25 locale = "ast";

25 locale = "ast";

26 arch = "linux-x86_64";

26 arch = "linux-x86_64";

27− sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e";

27+ sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb";

28 }

28 }

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

30 locale = "az";

30 locale = "az";

31 arch = "linux-x86_64";

31 arch = "linux-x86_64";

32− sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c";

32+ sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701";

33 }

33 }

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

35 locale = "be";

35 locale = "be";

36 arch = "linux-x86_64";

36 arch = "linux-x86_64";

37− sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2";

37+ sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3";

38 }

38 }

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

40 locale = "bg";

40 locale = "bg";

41 arch = "linux-x86_64";

41 arch = "linux-x86_64";

42− sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2";

42+ sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3";

43 }

43 }

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

45 locale = "bn";

45 locale = "bn";

46 arch = "linux-x86_64";

46 arch = "linux-x86_64";

47− sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb";

47+ sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b";

48 }

48 }

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

50 locale = "br";

50 locale = "br";

51 arch = "linux-x86_64";

51 arch = "linux-x86_64";

52− sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267";

52+ sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130";

53 }

53 }

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

55 locale = "bs";

55 locale = "bs";

56 arch = "linux-x86_64";

56 arch = "linux-x86_64";

57− sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3";

57+ sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61";

58 }

58 }

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

60 locale = "ca-valencia";

60 locale = "ca-valencia";

61 arch = "linux-x86_64";

61 arch = "linux-x86_64";

62− sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99";

62+ sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a";

63 }

63 }

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

65 locale = "ca";

65 locale = "ca";

66 arch = "linux-x86_64";

66 arch = "linux-x86_64";

67− sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc";

67+ sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4";

68 }

68 }

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

70 locale = "cak";

70 locale = "cak";

71 arch = "linux-x86_64";

71 arch = "linux-x86_64";

72− sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014";

72+ sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a";

73 }

73 }

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

75 locale = "cs";

75 locale = "cs";

76 arch = "linux-x86_64";

76 arch = "linux-x86_64";

77− sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c";

77+ sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35";

78 }

78 }

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

80 locale = "cy";

80 locale = "cy";

81 arch = "linux-x86_64";

81 arch = "linux-x86_64";

82− sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae";

82+ sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2";

83 }

83 }

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

85 locale = "da";

85 locale = "da";

86 arch = "linux-x86_64";

86 arch = "linux-x86_64";

87− sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781";

87+ sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25";

88 }

88 }

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

90 locale = "de";

90 locale = "de";

91 arch = "linux-x86_64";

91 arch = "linux-x86_64";

92− sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360";

92+ sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee";

93 }

93 }

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

95 locale = "dsb";

95 locale = "dsb";

96 arch = "linux-x86_64";

96 arch = "linux-x86_64";

97− sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc";

97+ sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a";

98 }

98 }

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

100 locale = "el";

100 locale = "el";

101 arch = "linux-x86_64";

101 arch = "linux-x86_64";

102− sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa";

102+ sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac";

103 }

103 }

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

105 locale = "en-CA";

105 locale = "en-CA";

106 arch = "linux-x86_64";

106 arch = "linux-x86_64";

107− sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e";

107+ sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587";

108 }

108 }

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

110 locale = "en-GB";

110 locale = "en-GB";

111 arch = "linux-x86_64";

111 arch = "linux-x86_64";

112− sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23";

112+ sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab";

113 }

113 }

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

115 locale = "en-US";

115 locale = "en-US";

116 arch = "linux-x86_64";

116 arch = "linux-x86_64";

117− sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0";

117+ sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e";

118 }

118 }

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

120 locale = "eo";

120 locale = "eo";

121 arch = "linux-x86_64";

121 arch = "linux-x86_64";

122− sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95";

122+ sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5";

123 }

123 }

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

125 locale = "es-AR";

125 locale = "es-AR";

126 arch = "linux-x86_64";

126 arch = "linux-x86_64";

127− sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf";

127+ sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946";

128 }

128 }

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

130 locale = "es-CL";

130 locale = "es-CL";

131 arch = "linux-x86_64";

131 arch = "linux-x86_64";

132− sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb";

132+ sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff";

133 }

133 }

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

135 locale = "es-ES";

135 locale = "es-ES";

136 arch = "linux-x86_64";

136 arch = "linux-x86_64";

137− sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4";

137+ sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5";

138 }

138 }

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

140 locale = "es-MX";

140 locale = "es-MX";

141 arch = "linux-x86_64";

141 arch = "linux-x86_64";

142− sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200";

142+ sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026";

143 }

143 }

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

145 locale = "et";

145 locale = "et";

146 arch = "linux-x86_64";

146 arch = "linux-x86_64";

147− sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375";

147+ sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322";

148 }

148 }

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

150 locale = "eu";

150 locale = "eu";

151 arch = "linux-x86_64";

151 arch = "linux-x86_64";

152− sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b";

152+ sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9";

153 }

153 }

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

155 locale = "fa";

155 locale = "fa";

156 arch = "linux-x86_64";

156 arch = "linux-x86_64";

157− sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624";

157+ sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d";

158 }

158 }

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

160 locale = "ff";

160 locale = "ff";

161 arch = "linux-x86_64";

161 arch = "linux-x86_64";

162− sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80";

162+ sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234";

163 }

163 }

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

165 locale = "fi";

165 locale = "fi";

166 arch = "linux-x86_64";

166 arch = "linux-x86_64";

167− sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0";

167+ sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4";

168 }

168 }

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

170 locale = "fr";

170 locale = "fr";

171 arch = "linux-x86_64";

171 arch = "linux-x86_64";

172− sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198";

172+ sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c";

173 }

173 }

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

175 locale = "fy-NL";

175 locale = "fy-NL";

176 arch = "linux-x86_64";

176 arch = "linux-x86_64";

177− sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584";

177+ sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d";

178 }

178 }

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

180 locale = "ga-IE";

180 locale = "ga-IE";

181 arch = "linux-x86_64";

181 arch = "linux-x86_64";

182− sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657";

182+ sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc";

183 }

183 }

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

185 locale = "gd";

185 locale = "gd";

186 arch = "linux-x86_64";

186 arch = "linux-x86_64";

187− sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49";

187+ sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c";

188 }

188 }

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

190 locale = "gl";

190 locale = "gl";

191 arch = "linux-x86_64";

191 arch = "linux-x86_64";

192− sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e";

192+ sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2";

193 }

193 }

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

195 locale = "gn";

195 locale = "gn";

196 arch = "linux-x86_64";

196 arch = "linux-x86_64";

197− sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de";

197+ sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634";

198 }

198 }

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

200 locale = "gu-IN";

200 locale = "gu-IN";

201 arch = "linux-x86_64";

201 arch = "linux-x86_64";

202− sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499";

202+ sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7";

203 }

203 }

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

205 locale = "he";

205 locale = "he";

206 arch = "linux-x86_64";

206 arch = "linux-x86_64";

207− sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4";

207+ sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5";

208 }

208 }

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

210 locale = "hi-IN";

210 locale = "hi-IN";

211 arch = "linux-x86_64";

211 arch = "linux-x86_64";

212− sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f";

212+ sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09";

213 }

213 }

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

215 locale = "hr";

215 locale = "hr";

216 arch = "linux-x86_64";

216 arch = "linux-x86_64";

217− sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270";

217+ sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945";

218 }

218 }

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

220 locale = "hsb";

220 locale = "hsb";

221 arch = "linux-x86_64";

221 arch = "linux-x86_64";

222− sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f";

222+ sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c";

223 }

223 }

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

225 locale = "hu";

225 locale = "hu";

226 arch = "linux-x86_64";

226 arch = "linux-x86_64";

227− sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10";

227+ sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03";

228 }

228 }

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

230 locale = "hy-AM";

230 locale = "hy-AM";

231 arch = "linux-x86_64";

231 arch = "linux-x86_64";

232− sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e";

232+ sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5";

233 }

233 }

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

235 locale = "ia";

235 locale = "ia";

236 arch = "linux-x86_64";

236 arch = "linux-x86_64";

237− sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6";

237+ sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098";

238 }

238 }

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

240 locale = "id";

240 locale = "id";

241 arch = "linux-x86_64";

241 arch = "linux-x86_64";

242− sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3";

242+ sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b";

243 }

243 }

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

245 locale = "is";

245 locale = "is";

246 arch = "linux-x86_64";

246 arch = "linux-x86_64";

247− sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab";

247+ sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733";

248 }

248 }

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

250 locale = "it";

250 locale = "it";

251 arch = "linux-x86_64";

251 arch = "linux-x86_64";

252− sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c";

252+ sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2";

253 }

253 }

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

255 locale = "ja";

255 locale = "ja";

256 arch = "linux-x86_64";

256 arch = "linux-x86_64";

257− sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378";

257+ sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921";

258 }

258 }

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

260 locale = "ka";

260 locale = "ka";

261 arch = "linux-x86_64";

261 arch = "linux-x86_64";

262− sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c";

262+ sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9";

263 }

263 }

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

265 locale = "kab";

265 locale = "kab";

266 arch = "linux-x86_64";

266 arch = "linux-x86_64";

267− sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712";

267+ sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f";

268 }

268 }

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

270 locale = "kk";

270 locale = "kk";

271 arch = "linux-x86_64";

271 arch = "linux-x86_64";

272− sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05";

272+ sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab";

273 }

273 }

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

275 locale = "km";

275 locale = "km";

276 arch = "linux-x86_64";

276 arch = "linux-x86_64";

277− sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f";

277+ sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d";

278 }

278 }

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

280 locale = "kn";

280 locale = "kn";

281 arch = "linux-x86_64";

281 arch = "linux-x86_64";

282− sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5";

282+ sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0";

283 }

283 }

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

285 locale = "ko";

285 locale = "ko";

286 arch = "linux-x86_64";

286 arch = "linux-x86_64";

287− sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094";

287+ sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630";

288 }

288 }

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

290 locale = "lij";

290 locale = "lij";

291 arch = "linux-x86_64";

291 arch = "linux-x86_64";

292− sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4";

292+ sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8";

293 }

293 }

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

295 locale = "lt";

295 locale = "lt";

296 arch = "linux-x86_64";

296 arch = "linux-x86_64";

297− sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31";

297+ sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d";

298 }

298 }

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

300 locale = "lv";

300 locale = "lv";

301 arch = "linux-x86_64";

301 arch = "linux-x86_64";

302− sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29";

302+ sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9";

303 }

303 }

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

305 locale = "mk";

305 locale = "mk";

306 arch = "linux-x86_64";

306 arch = "linux-x86_64";

307− sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b";

307+ sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d";

308 }

308 }

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

310 locale = "mr";

310 locale = "mr";

311 arch = "linux-x86_64";

311 arch = "linux-x86_64";

312− sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c";

312+ sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5";

313 }

313 }

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

315 locale = "ms";

315 locale = "ms";

316 arch = "linux-x86_64";

316 arch = "linux-x86_64";

317− sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b";

317+ sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949";

318 }

318 }

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

320 locale = "my";

320 locale = "my";

321 arch = "linux-x86_64";

321 arch = "linux-x86_64";

322− sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031";

322+ sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9";

323 }

323 }

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

325 locale = "nb-NO";

325 locale = "nb-NO";

326 arch = "linux-x86_64";

326 arch = "linux-x86_64";

327− sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2";

327+ sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284";

328 }

328 }

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

330 locale = "ne-NP";

330 locale = "ne-NP";

331 arch = "linux-x86_64";

331 arch = "linux-x86_64";

332− sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d";

332+ sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b";

333 }

333 }

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

335 locale = "nl";

335 locale = "nl";

336 arch = "linux-x86_64";

336 arch = "linux-x86_64";

337− sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d";

337+ sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51";

338 }

338 }

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

340 locale = "nn-NO";

340 locale = "nn-NO";

341 arch = "linux-x86_64";

341 arch = "linux-x86_64";

342− sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b";

342+ sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd";

343 }

343 }

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

345 locale = "oc";

345 locale = "oc";

346 arch = "linux-x86_64";

346 arch = "linux-x86_64";

347− sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513";

347+ sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7";

348 }

348 }

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

350 locale = "pa-IN";

350 locale = "pa-IN";

351 arch = "linux-x86_64";

351 arch = "linux-x86_64";

352− sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552";

352+ sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb";

353 }

353 }

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

355 locale = "pl";

355 locale = "pl";

356 arch = "linux-x86_64";

356 arch = "linux-x86_64";

357− sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0";

357+ sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585";

358 }

358 }

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

360 locale = "pt-BR";

360 locale = "pt-BR";

361 arch = "linux-x86_64";

361 arch = "linux-x86_64";

362− sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030";

362+ sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4";

363 }

363 }

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

365 locale = "pt-PT";

365 locale = "pt-PT";

366 arch = "linux-x86_64";

366 arch = "linux-x86_64";

367− sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428";

367+ sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44";

368 }

368 }

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

370 locale = "rm";

370 locale = "rm";

371 arch = "linux-x86_64";

371 arch = "linux-x86_64";

372− sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b";

372+ sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53";

373 }

373 }

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

375 locale = "ro";

375 locale = "ro";

376 arch = "linux-x86_64";

376 arch = "linux-x86_64";

377− sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a";

377+ sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9";

378 }

378 }

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

380 locale = "ru";

380 locale = "ru";

381 arch = "linux-x86_64";

381 arch = "linux-x86_64";

382− sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f";

382+ sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281";

383 }

383 }

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

385 locale = "sco";

385 locale = "sco";

386 arch = "linux-x86_64";

386 arch = "linux-x86_64";

387− sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad";

387+ sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f";

388 }

388 }

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

390 locale = "si";

390 locale = "si";

391 arch = "linux-x86_64";

391 arch = "linux-x86_64";

392− sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75";

392+ sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f";

393 }

393 }

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

395 locale = "sk";

395 locale = "sk";

396 arch = "linux-x86_64";

396 arch = "linux-x86_64";

397− sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db";

397+ sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235";

398 }

398 }

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

400 locale = "sl";

400 locale = "sl";

401 arch = "linux-x86_64";

401 arch = "linux-x86_64";

402− sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49";

402+ sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6";

403 }

403 }

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

405 locale = "son";

405 locale = "son";

406 arch = "linux-x86_64";

406 arch = "linux-x86_64";

407− sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f";

407+ sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa";

408 }

408 }

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

410 locale = "sq";

410 locale = "sq";

411 arch = "linux-x86_64";

411 arch = "linux-x86_64";

412− sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f";

412+ sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6";

413 }

413 }

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

415 locale = "sr";

415 locale = "sr";

416 arch = "linux-x86_64";

416 arch = "linux-x86_64";

417− sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2";

417+ sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad";

418 }

418 }

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

420 locale = "sv-SE";

420 locale = "sv-SE";

421 arch = "linux-x86_64";

421 arch = "linux-x86_64";

422− sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23";

422+ sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b";

423 }

423 }

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

425 locale = "szl";

425 locale = "szl";

426 arch = "linux-x86_64";

426 arch = "linux-x86_64";

427− sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8";

427+ sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970";

428 }

428 }

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

430 locale = "ta";

430 locale = "ta";

431 arch = "linux-x86_64";

431 arch = "linux-x86_64";

432− sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d";

432+ sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587";

433 }

433 }

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

435 locale = "te";

435 locale = "te";

436 arch = "linux-x86_64";

436 arch = "linux-x86_64";

437− sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c";

437+ sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0";

438 }

438 }

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

440 locale = "th";

440 locale = "th";

441 arch = "linux-x86_64";

441 arch = "linux-x86_64";

442− sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349";

442+ sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9";

443 }

443 }

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

445 locale = "tl";

445 locale = "tl";

446 arch = "linux-x86_64";

446 arch = "linux-x86_64";

447− sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408";

447+ sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07";

448 }

448 }

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

450 locale = "tr";

450 locale = "tr";

451 arch = "linux-x86_64";

451 arch = "linux-x86_64";

452− sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa";

452+ sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf";

453 }

453 }

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

455 locale = "trs";

455 locale = "trs";

456 arch = "linux-x86_64";

456 arch = "linux-x86_64";

457− sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597";

457+ sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa";

458 }

458 }

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

460 locale = "uk";

460 locale = "uk";

461 arch = "linux-x86_64";

461 arch = "linux-x86_64";

462− sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d";

462+ sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494";

463 }

463 }

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

465 locale = "ur";

465 locale = "ur";

466 arch = "linux-x86_64";

466 arch = "linux-x86_64";

467− sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e";

467+ sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563";

468 }

468 }

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

470 locale = "uz";

470 locale = "uz";

471 arch = "linux-x86_64";

471 arch = "linux-x86_64";

472− sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49";

472+ sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880";

473 }

473 }

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

475 locale = "vi";

475 locale = "vi";

476 arch = "linux-x86_64";

476 arch = "linux-x86_64";

477− sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e";

477+ sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb";

478 }

478 }

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

480 locale = "xh";

480 locale = "xh";

481 arch = "linux-x86_64";

481 arch = "linux-x86_64";

482− sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce";

482+ sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b";

483 }

483 }

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

485 locale = "zh-CN";

485 locale = "zh-CN";

486 arch = "linux-x86_64";

486 arch = "linux-x86_64";

487− sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0";

487+ sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172";

488 }

488 }

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

490 locale = "zh-TW";

490 locale = "zh-TW";

491 arch = "linux-x86_64";

491 arch = "linux-x86_64";

492− sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c";

492+ sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7";

493 }

493 }

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

495 locale = "ach";

495 locale = "ach";

496 arch = "linux-i686";

496 arch = "linux-i686";

497− sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c";

497+ sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab";

498 }

498 }

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

500 locale = "af";

500 locale = "af";

501 arch = "linux-i686";

501 arch = "linux-i686";

502− sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48";

502+ sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b";

503 }

503 }

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

505 locale = "an";

505 locale = "an";

506 arch = "linux-i686";

506 arch = "linux-i686";

507− sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d";

507+ sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97";

508 }

508 }

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

510 locale = "ar";

510 locale = "ar";

511 arch = "linux-i686";

511 arch = "linux-i686";

512− sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895";

512+ sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc";

513 }

513 }

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

515 locale = "ast";

515 locale = "ast";

516 arch = "linux-i686";

516 arch = "linux-i686";

517− sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124";

517+ sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11";

518 }

518 }

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

520 locale = "az";

520 locale = "az";

521 arch = "linux-i686";

521 arch = "linux-i686";

522− sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e";

522+ sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d";

523 }

523 }

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

525 locale = "be";

525 locale = "be";

526 arch = "linux-i686";

526 arch = "linux-i686";

527− sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81";

527+ sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b";

528 }

528 }

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

530 locale = "bg";

530 locale = "bg";

531 arch = "linux-i686";

531 arch = "linux-i686";

532− sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a";

532+ sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d";

533 }

533 }

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

535 locale = "bn";

535 locale = "bn";

536 arch = "linux-i686";

536 arch = "linux-i686";

537− sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce";

537+ sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d";

538 }

538 }

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

540 locale = "br";

540 locale = "br";

541 arch = "linux-i686";

541 arch = "linux-i686";

542− sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812";

542+ sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e";

543 }

543 }

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

545 locale = "bs";

545 locale = "bs";

546 arch = "linux-i686";

546 arch = "linux-i686";

547− sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86";

547+ sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137";

548 }

548 }

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

550 locale = "ca-valencia";

550 locale = "ca-valencia";

551 arch = "linux-i686";

551 arch = "linux-i686";

552− sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac";

552+ sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e";

553 }

553 }

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

555 locale = "ca";

555 locale = "ca";

556 arch = "linux-i686";

556 arch = "linux-i686";

557− sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07";

557+ sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722";

558 }

558 }

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

560 locale = "cak";

560 locale = "cak";

561 arch = "linux-i686";

561 arch = "linux-i686";

562− sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94";

562+ sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc";

563 }

563 }

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

565 locale = "cs";

565 locale = "cs";

566 arch = "linux-i686";

566 arch = "linux-i686";

567− sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd";

567+ sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db";

568 }

568 }

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

570 locale = "cy";

570 locale = "cy";

571 arch = "linux-i686";

571 arch = "linux-i686";

572− sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad";

572+ sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964";

573 }

573 }

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

575 locale = "da";

575 locale = "da";

576 arch = "linux-i686";

576 arch = "linux-i686";

577− sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a";

577+ sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b";

578 }

578 }

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

580 locale = "de";

580 locale = "de";

581 arch = "linux-i686";

581 arch = "linux-i686";

582− sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649";

582+ sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d";

583 }

583 }

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

585 locale = "dsb";

585 locale = "dsb";

586 arch = "linux-i686";

586 arch = "linux-i686";

587− sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7";

587+ sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae";

588 }

588 }

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

590 locale = "el";

590 locale = "el";

591 arch = "linux-i686";

591 arch = "linux-i686";

592− sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0";

592+ sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad";

593 }

593 }

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

595 locale = "en-CA";

595 locale = "en-CA";

596 arch = "linux-i686";

596 arch = "linux-i686";

597− sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc";

597+ sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc";

598 }

598 }

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

600 locale = "en-GB";

600 locale = "en-GB";

601 arch = "linux-i686";

601 arch = "linux-i686";

602− sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01";

602+ sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a";

603 }

603 }

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

605 locale = "en-US";

605 locale = "en-US";

606 arch = "linux-i686";

606 arch = "linux-i686";

607− sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e";

607+ sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20";

608 }

608 }

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

610 locale = "eo";

610 locale = "eo";

611 arch = "linux-i686";

611 arch = "linux-i686";

612− sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4";

612+ sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca";

613 }

613 }

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

615 locale = "es-AR";

615 locale = "es-AR";

616 arch = "linux-i686";

616 arch = "linux-i686";

617− sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25";

617+ sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e";

618 }

618 }

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

620 locale = "es-CL";

620 locale = "es-CL";

621 arch = "linux-i686";

621 arch = "linux-i686";

622− sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273";

622+ sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b";

623 }

623 }

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

625 locale = "es-ES";

625 locale = "es-ES";

626 arch = "linux-i686";

626 arch = "linux-i686";

627− sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f";

627+ sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10";

628 }

628 }

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

630 locale = "es-MX";

630 locale = "es-MX";

631 arch = "linux-i686";

631 arch = "linux-i686";

632− sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30";

632+ sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea";

633 }

633 }

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

635 locale = "et";

635 locale = "et";

636 arch = "linux-i686";

636 arch = "linux-i686";

637− sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b";

637+ sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b";

638 }

638 }

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

640 locale = "eu";

640 locale = "eu";

641 arch = "linux-i686";

641 arch = "linux-i686";

642− sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be";

642+ sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69";

643 }

643 }

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

645 locale = "fa";

645 locale = "fa";

646 arch = "linux-i686";

646 arch = "linux-i686";

647− sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8";

647+ sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b";

648 }

648 }

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

650 locale = "ff";

650 locale = "ff";

651 arch = "linux-i686";

651 arch = "linux-i686";

652− sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582";

652+ sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce";

653 }

653 }

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

655 locale = "fi";

655 locale = "fi";

656 arch = "linux-i686";

656 arch = "linux-i686";

657− sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed";

657+ sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51";

658 }

658 }

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

660 locale = "fr";

660 locale = "fr";

661 arch = "linux-i686";

661 arch = "linux-i686";

662− sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771";

662+ sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3";

663 }

663 }

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

665 locale = "fy-NL";

665 locale = "fy-NL";

666 arch = "linux-i686";

666 arch = "linux-i686";

667− sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28";

667+ sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6";

668 }

668 }

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

670 locale = "ga-IE";

670 locale = "ga-IE";

671 arch = "linux-i686";

671 arch = "linux-i686";

672− sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1";

672+ sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e";

673 }

673 }

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

675 locale = "gd";

675 locale = "gd";

676 arch = "linux-i686";

676 arch = "linux-i686";

677− sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2";

677+ sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e";

678 }

678 }

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

680 locale = "gl";

680 locale = "gl";

681 arch = "linux-i686";

681 arch = "linux-i686";

682− sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4";

682+ sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604";

683 }

683 }

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

685 locale = "gn";

685 locale = "gn";

686 arch = "linux-i686";

686 arch = "linux-i686";

687− sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612";

687+ sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc";

688 }

688 }

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

690 locale = "gu-IN";

690 locale = "gu-IN";

691 arch = "linux-i686";

691 arch = "linux-i686";

692− sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682";

692+ sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300";

693 }

693 }

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

695 locale = "he";

695 locale = "he";

696 arch = "linux-i686";

696 arch = "linux-i686";

697− sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193";

697+ sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90";

698 }

698 }

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

700 locale = "hi-IN";

700 locale = "hi-IN";

701 arch = "linux-i686";

701 arch = "linux-i686";

702− sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0";

702+ sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6";

703 }

703 }

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

705 locale = "hr";

705 locale = "hr";

706 arch = "linux-i686";

706 arch = "linux-i686";

707− sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490";

707+ sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f";

708 }

708 }

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

710 locale = "hsb";

710 locale = "hsb";

711 arch = "linux-i686";

711 arch = "linux-i686";

712− sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8";

712+ sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1";

713 }

713 }

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

715 locale = "hu";

715 locale = "hu";

716 arch = "linux-i686";

716 arch = "linux-i686";

717− sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45";

717+ sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f";

718 }

718 }

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

720 locale = "hy-AM";

720 locale = "hy-AM";

721 arch = "linux-i686";

721 arch = "linux-i686";

722− sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d";

722+ sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6";

723 }

723 }

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

725 locale = "ia";

725 locale = "ia";

726 arch = "linux-i686";

726 arch = "linux-i686";

727− sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0";

727+ sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6";

728 }

728 }

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

730 locale = "id";

730 locale = "id";

731 arch = "linux-i686";

731 arch = "linux-i686";

732− sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2";

732+ sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690";

733 }

733 }

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

735 locale = "is";

735 locale = "is";

736 arch = "linux-i686";

736 arch = "linux-i686";

737− sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e";

737+ sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c";

738 }

738 }

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

740 locale = "it";

740 locale = "it";

741 arch = "linux-i686";

741 arch = "linux-i686";

742− sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8";

742+ sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80";

743 }

743 }

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

745 locale = "ja";

745 locale = "ja";

746 arch = "linux-i686";

746 arch = "linux-i686";

747− sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c";

747+ sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf";

748 }

748 }

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

750 locale = "ka";

750 locale = "ka";

751 arch = "linux-i686";

751 arch = "linux-i686";

752− sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180";

752+ sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3";

753 }

753 }

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

755 locale = "kab";

755 locale = "kab";

756 arch = "linux-i686";

756 arch = "linux-i686";

757− sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf";

757+ sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01";

758 }

758 }

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

760 locale = "kk";

760 locale = "kk";

761 arch = "linux-i686";

761 arch = "linux-i686";

762− sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60";

762+ sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d";

763 }

763 }

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

765 locale = "km";

765 locale = "km";

766 arch = "linux-i686";

766 arch = "linux-i686";

767− sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2";

767+ sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce";

768 }

768 }

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

770 locale = "kn";

770 locale = "kn";

771 arch = "linux-i686";

771 arch = "linux-i686";

772− sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a";

772+ sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8";

773 }

773 }

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

775 locale = "ko";

775 locale = "ko";

776 arch = "linux-i686";

776 arch = "linux-i686";

777− sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f";

777+ sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039";

778 }

778 }

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

780 locale = "lij";

780 locale = "lij";

781 arch = "linux-i686";

781 arch = "linux-i686";

782− sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72";

782+ sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a";

783 }

783 }

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

785 locale = "lt";

785 locale = "lt";

786 arch = "linux-i686";

786 arch = "linux-i686";

787− sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648";

787+ sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e";

788 }

788 }

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

790 locale = "lv";

790 locale = "lv";

791 arch = "linux-i686";

791 arch = "linux-i686";

792− sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5";

792+ sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34";

793 }

793 }

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

795 locale = "mk";

795 locale = "mk";

796 arch = "linux-i686";

796 arch = "linux-i686";

797− sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640";

797+ sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c";

798 }

798 }

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

800 locale = "mr";

800 locale = "mr";

801 arch = "linux-i686";

801 arch = "linux-i686";

802− sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595";

802+ sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9";

803 }

803 }

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

805 locale = "ms";

805 locale = "ms";

806 arch = "linux-i686";

806 arch = "linux-i686";

807− sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93";

807+ sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad";

808 }

808 }

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

810 locale = "my";

810 locale = "my";

811 arch = "linux-i686";

811 arch = "linux-i686";

812− sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c";

812+ sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe";

813 }

813 }

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

815 locale = "nb-NO";

815 locale = "nb-NO";

816 arch = "linux-i686";

816 arch = "linux-i686";

817− sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353";

817+ sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24";

818 }

818 }

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

820 locale = "ne-NP";

820 locale = "ne-NP";

821 arch = "linux-i686";

821 arch = "linux-i686";

822− sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f";

822+ sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61";

823 }

823 }

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

825 locale = "nl";

825 locale = "nl";

826 arch = "linux-i686";

826 arch = "linux-i686";

827− sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c";

827+ sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12";

828 }

828 }

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

830 locale = "nn-NO";

830 locale = "nn-NO";

831 arch = "linux-i686";

831 arch = "linux-i686";

832− sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58";

832+ sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241";

833 }

833 }

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

835 locale = "oc";

835 locale = "oc";

836 arch = "linux-i686";

836 arch = "linux-i686";

837− sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680";

837+ sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd";

838 }

838 }

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

840 locale = "pa-IN";

840 locale = "pa-IN";

841 arch = "linux-i686";

841 arch = "linux-i686";

842− sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a";

842+ sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f";

843 }

843 }

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

845 locale = "pl";

845 locale = "pl";

846 arch = "linux-i686";

846 arch = "linux-i686";

847− sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29";

847+ sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96";

848 }

848 }

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

850 locale = "pt-BR";

850 locale = "pt-BR";

851 arch = "linux-i686";

851 arch = "linux-i686";

852− sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280";

852+ sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c";

853 }

853 }

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

855 locale = "pt-PT";

855 locale = "pt-PT";

856 arch = "linux-i686";

856 arch = "linux-i686";

857− sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c";

857+ sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3";

858 }

858 }

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

860 locale = "rm";

860 locale = "rm";

861 arch = "linux-i686";

861 arch = "linux-i686";

862− sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c";

862+ sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d";

863 }

863 }

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

865 locale = "ro";

865 locale = "ro";

866 arch = "linux-i686";

866 arch = "linux-i686";

867− sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41";

867+ sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f";

868 }

868 }

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

870 locale = "ru";

870 locale = "ru";

871 arch = "linux-i686";

871 arch = "linux-i686";

872− sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5";

872+ sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4";

873 }

873 }

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

875 locale = "sco";

875 locale = "sco";

876 arch = "linux-i686";

876 arch = "linux-i686";

877− sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd";

877+ sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510";

878 }

878 }

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

880 locale = "si";

880 locale = "si";

881 arch = "linux-i686";

881 arch = "linux-i686";

882− sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d";

882+ sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732";

883 }

883 }

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

885 locale = "sk";

885 locale = "sk";

886 arch = "linux-i686";

886 arch = "linux-i686";

887− sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27";

887+ sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0";

888 }

888 }

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

890 locale = "sl";

890 locale = "sl";

891 arch = "linux-i686";

891 arch = "linux-i686";

892− sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229";

892+ sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9";

893 }

893 }

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

895 locale = "son";

895 locale = "son";

896 arch = "linux-i686";

896 arch = "linux-i686";

897− sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0";

897+ sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16";

898 }

898 }

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

900 locale = "sq";

900 locale = "sq";

901 arch = "linux-i686";

901 arch = "linux-i686";

902− sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1";

902+ sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756";

903 }

903 }

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

905 locale = "sr";

905 locale = "sr";

906 arch = "linux-i686";

906 arch = "linux-i686";

907− sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231";

907+ sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153";

908 }

908 }

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

910 locale = "sv-SE";

910 locale = "sv-SE";

911 arch = "linux-i686";

911 arch = "linux-i686";

912− sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49";

912+ sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0";

913 }

913 }

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

915 locale = "szl";

915 locale = "szl";

916 arch = "linux-i686";

916 arch = "linux-i686";

917− sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd";

917+ sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f";

918 }

918 }

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

920 locale = "ta";

920 locale = "ta";

921 arch = "linux-i686";

921 arch = "linux-i686";

922− sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4";

922+ sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64";

923 }

923 }

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

925 locale = "te";

925 locale = "te";

926 arch = "linux-i686";

926 arch = "linux-i686";

927− sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd";

927+ sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275";

928 }

928 }

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

930 locale = "th";

930 locale = "th";

931 arch = "linux-i686";

931 arch = "linux-i686";

932− sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad";

932+ sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383";

933 }

933 }

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

935 locale = "tl";

935 locale = "tl";

936 arch = "linux-i686";

936 arch = "linux-i686";

937− sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151";

937+ sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9";

938 }

938 }

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

940 locale = "tr";

940 locale = "tr";

941 arch = "linux-i686";

941 arch = "linux-i686";

942− sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e";

942+ sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42";

943 }

943 }

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

945 locale = "trs";

945 locale = "trs";

946 arch = "linux-i686";

946 arch = "linux-i686";

947− sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526";

947+ sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648";

948 }

948 }

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

950 locale = "uk";

950 locale = "uk";

951 arch = "linux-i686";

951 arch = "linux-i686";

952− sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75";

952+ sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2";

953 }

953 }

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

955 locale = "ur";

955 locale = "ur";

956 arch = "linux-i686";

956 arch = "linux-i686";

957− sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837";

957+ sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca";

958 }

958 }

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

960 locale = "uz";

960 locale = "uz";

961 arch = "linux-i686";

961 arch = "linux-i686";

962− sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d";

962+ sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9";

963 }

963 }

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

965 locale = "vi";

965 locale = "vi";

966 arch = "linux-i686";

966 arch = "linux-i686";

967− sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4";

967+ sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061";

968 }

968 }

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

970 locale = "xh";

970 locale = "xh";

971 arch = "linux-i686";

971 arch = "linux-i686";

972− sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77";

972+ sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f";

973 }

973 }

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

975 locale = "zh-CN";

975 locale = "zh-CN";

976 arch = "linux-i686";

976 arch = "linux-i686";

977− sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6";

977+ sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d";

978 }

978 }

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

980 locale = "zh-TW";

980 locale = "zh-TW";

981 arch = "linux-i686";

981 arch = "linux-i686";

982− sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98";

982+ sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac";

983 }

983 }

984 ];

984 ];

985}

985}

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+393−393

@@ -1,985 +1,985 @@

1{

1{

2− version = "100.0";

2+ version = "99.0.1";

3 sources = [

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

5 locale = "ach";

5 locale = "ach";

6 arch = "linux-x86_64";

6 arch = "linux-x86_64";

7− sha256 = "3e85609f0b3e4eb15262cd8567d8973bed2195f6a19199d76a99ed361cc0d0cf";

7+ sha256 = "e2054f03b413f783f287c14fb670ee97415e89181e2ca1f9bbe05a18fb529330";

8 }

8 }

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

10 locale = "af";

10 locale = "af";

11 arch = "linux-x86_64";

11 arch = "linux-x86_64";

12− sha256 = "0950ef9c6c9c386df1e2d9f85312d9f3fe0dbc1668aff6710da54f8a3cdbc5de";

12+ sha256 = "102c4460ae7a8242c770bda09baee07004f84d95a885c621fbe23f2fdb585398";

13 }

13 }

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

15 locale = "an";

15 locale = "an";

16 arch = "linux-x86_64";

16 arch = "linux-x86_64";

17− sha256 = "af97c6a4dcc34e7edd52111c6ba9480f5ecd2765ca972cb43745ecb54ba01d7b";

17+ sha256 = "0f8aeacc3a7abbb5f571aff8a6580c9779336bccb0d30005b46d336447123b10";

18 }

18 }

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

20 locale = "ar";

20 locale = "ar";

21 arch = "linux-x86_64";

21 arch = "linux-x86_64";

22− sha256 = "0f9947456cee9db27baffd0476e62ce529b349213ad1a0c2196bcf6d7f0e582c";

22+ sha256 = "720c5d872243631ddf67102e6a54504912b33f6e21c666d84e73a399f10a2559";

23 }

23 }

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

25 locale = "ast";

25 locale = "ast";

26 arch = "linux-x86_64";

26 arch = "linux-x86_64";

27− sha256 = "c0da6abaaecee287732a5e00520d2bacfd61a3a7ca64a5bffe37830f53cf5d20";

27+ sha256 = "194345cdce1e9c6462a80423d1b97be4c757dc69b1f5a0055ac14e2624d1d145";

28 }

28 }

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

30 locale = "az";

30 locale = "az";

31 arch = "linux-x86_64";

31 arch = "linux-x86_64";

32− sha256 = "1d57a9d3038dff5a354f24e7ebc7d93d11dccc57be72644988dbbb20c734d243";

32+ sha256 = "9936c9d172ddd291d34679c33f28d7ec425e4835abdfb25dd0252e50ab5eca09";

33 }

33 }

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

35 locale = "be";

35 locale = "be";

36 arch = "linux-x86_64";

36 arch = "linux-x86_64";

37− sha256 = "d20e556064f10c5730f094b55b4014816df7b49840d0e9934fe3167e135bd789";

37+ sha256 = "420f519aa954b708da735605e32acf9f11bfa2195e7a9bd2ebd954a58df2db10";

38 }

38 }

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

40 locale = "bg";

40 locale = "bg";

41 arch = "linux-x86_64";

41 arch = "linux-x86_64";

42− sha256 = "2d26cdef7ee0d7c263599c38d5352268380125ccc3f901f48ed60134badae1c7";

42+ sha256 = "2a7cbc2903894934024fb8ea2212e7f23a47c7db707e4c88a33656366b810dfc";

43 }

43 }

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

45 locale = "bn";

45 locale = "bn";

46 arch = "linux-x86_64";

46 arch = "linux-x86_64";

47− sha256 = "61395cb64c519a14ef879b6b1f9444f727a6ac73074d0e67e3e68a89428c7651";

47+ sha256 = "46984d43f628ecdc1674d41f45c57177dfe24eb6dec0e5ae5e6a8efec7157791";

48 }

48 }

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

50 locale = "br";

50 locale = "br";

51 arch = "linux-x86_64";

51 arch = "linux-x86_64";

52− sha256 = "486b59f31c0a63155d04cf0818d5c8629e846b313cd6eabcc762bb0c51adf35a";

52+ sha256 = "1427aaca5903a1ecb3e17aa7e3351334b1a2183a1180c9a4942535b50f64c0db";

53 }

53 }

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

55 locale = "bs";

55 locale = "bs";

56 arch = "linux-x86_64";

56 arch = "linux-x86_64";

57− sha256 = "656911e5fdd030ee191f1bcab6dc9f2a66f888a6fa726007e528716df5d6667e";

57+ sha256 = "8377ad8c27236c5336e370acf70e901f4dbb53dd25142a74dc61f98fd2beab91";

58 }

58 }

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

60 locale = "ca-valencia";

60 locale = "ca-valencia";

61 arch = "linux-x86_64";

61 arch = "linux-x86_64";

62− sha256 = "f31c75df5bf3639bfa4db86cc0237f7602a725b242e6330259ca4cbb61dd715d";

62+ sha256 = "78f8dd650fb9398b1cb999db887bb5764f4b015539c3aac0eee2fdd05477bf3e";

63 }

63 }

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

65 locale = "ca";

65 locale = "ca";

66 arch = "linux-x86_64";

66 arch = "linux-x86_64";

67− sha256 = "7f53e06ccec188fb5e85a33c7968ba90c88bf1d3a782aee179e3fef5010a33b4";

67+ sha256 = "18b0acda5e75ec1412273a016d2cc36f6c65b68ebae5251ef13289cf73ef00d6";

68 }

68 }

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

70 locale = "cak";

70 locale = "cak";

71 arch = "linux-x86_64";

71 arch = "linux-x86_64";

72− sha256 = "a1b8349ffe436cce151c5358b2e1d5a928a0ef3e623ef2c98e9f55b0ce2f405b";

72+ sha256 = "505c3f2c8f39aeea7ca4f8285d59fcef995e5c6c64d318d7b143e7060982d7a7";

73 }

73 }

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

75 locale = "cs";

75 locale = "cs";

76 arch = "linux-x86_64";

76 arch = "linux-x86_64";

77− sha256 = "b11f724a20c13ccec73c9058e90387a031e6a9b22e02ae4ab59357d8f191ce65";

77+ sha256 = "d33f7f5adf068743a523f54fb2dec1edf7302993ef3684dd86cbab25b96c3247";

78 }

78 }

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

80 locale = "cy";

80 locale = "cy";

81 arch = "linux-x86_64";

81 arch = "linux-x86_64";

82− sha256 = "71e1faa584d6c9243ab806f694e548fec92672f44d6239828fb7f3c5363850b8";

82+ sha256 = "8a0d5e3a4ad8650d4e8e77e92c24b27da1d5c0b44878e97462ec94597020e548";

83 }

83 }

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

85 locale = "da";

85 locale = "da";

86 arch = "linux-x86_64";

86 arch = "linux-x86_64";

87− sha256 = "e811e13df31bf0e55904a696b69ca0fd0785c7e60f9bc79fae920cc7bb55ee39";

87+ sha256 = "c9c8355c3cab4e189a4ba322f4a7e2a189617786e912930f0c17b217ff89c1c6";

88 }

88 }

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

90 locale = "de";

90 locale = "de";

91 arch = "linux-x86_64";

91 arch = "linux-x86_64";

92− sha256 = "22c6c8d312db6b64dabc7d401751ce7aecd3b5889eb8e5538433bbf5aeb55d5f";

92+ sha256 = "83468180a67fae5a5df8810e3b7bfdc6b01faaf60dd18a0914715ac89531c7a4";

93 }

93 }

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

95 locale = "dsb";

95 locale = "dsb";

96 arch = "linux-x86_64";

96 arch = "linux-x86_64";

97− sha256 = "76d7d9ba4483c6b727568dfbf497940dc38871cc18f5cf6823cdbd539d9f559d";

97+ sha256 = "feeda2e3f021d459c98371e244d29b9e6e6fdaa6250a8a6700b34a981f3dcf13";

98 }

98 }

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

100 locale = "el";

100 locale = "el";

101 arch = "linux-x86_64";

101 arch = "linux-x86_64";

102− sha256 = "59f4fab29a3888a7b86b8f50281eff8d3c7ed512a92fbceb5ab3ebfaaa4faad6";

102+ sha256 = "4fc65f4b6d84a01c79165ee9e058c980659089e86da72b016cfc5efbe973e592";

103 }

103 }

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

105 locale = "en-CA";

105 locale = "en-CA";

106 arch = "linux-x86_64";

106 arch = "linux-x86_64";

107− sha256 = "1c493929d5ab703f59b2e6e6ca86004725dcda7ca23c3a2b34de425e6a969cad";

107+ sha256 = "10e324101932b7290814ea2ab747657363023a88857ca90e25d54f89115ffbcf";

108 }

108 }

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

110 locale = "en-GB";

110 locale = "en-GB";

111 arch = "linux-x86_64";

111 arch = "linux-x86_64";

112− sha256 = "2e48068db4bed6722568a35d7a2aaa84b68a8e18304744940c36437cf88b10d4";

112+ sha256 = "83ba931e4f6afd0d0c32b3bf0db55a7ff0fdfda080e906bb3ada5b4e61a4c3f1";

113 }

113 }

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

115 locale = "en-US";

115 locale = "en-US";

116 arch = "linux-x86_64";

116 arch = "linux-x86_64";

117− sha256 = "528845df1a15acf081fdc9e1e7276f0b4601acc9df3553324e02c9c6fb9b7d9d";

117+ sha256 = "7bc57f06fc9c52e16815f1a4208c33bc5819423c68da441d001f7c2200591bcd";

118 }

118 }

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

120 locale = "eo";

120 locale = "eo";

121 arch = "linux-x86_64";

121 arch = "linux-x86_64";

122− sha256 = "0fa2f3f4a7cbe7e9e41d0d08ba8649efa84b727d9adb621b408cf7732312fc6f";

122+ sha256 = "3fc945331b62f9998d2adb6a99d3390528975c97b6776f97a4c461eb124da462";

123 }

123 }

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

125 locale = "es-AR";

125 locale = "es-AR";

126 arch = "linux-x86_64";

126 arch = "linux-x86_64";

127− sha256 = "6afb61b7e361735321934a4189063cc5f424c79022b7482b0923a0204160c2b0";

127+ sha256 = "908723c7445b92b4c4e26fc999562681e4bf3ffffee0ea1db6362aed0f615c0e";

128 }

128 }

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

130 locale = "es-CL";

130 locale = "es-CL";

131 arch = "linux-x86_64";

131 arch = "linux-x86_64";

132− sha256 = "382ba75ab94f81ecdaeeb98b41467969b103e9feb73cbbad18b69d5f39013dc0";

132+ sha256 = "77363cfa3c2ce655a9f6203c495f8f54700b44e0b66d021050cea59e2b0e0a3e";

133 }

133 }

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

135 locale = "es-ES";

135 locale = "es-ES";

136 arch = "linux-x86_64";

136 arch = "linux-x86_64";

137− sha256 = "1a09045c93cceb449e6f0dd9d644abcab2ec30bd39f5c9aab091fc49f32a2592";

137+ sha256 = "ee59faf4bd7472a14fd8e420aa7f408abccd72f31d162da0c5f9b530593722f2";

138 }

138 }

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

140 locale = "es-MX";

140 locale = "es-MX";

141 arch = "linux-x86_64";

141 arch = "linux-x86_64";

142− sha256 = "68f0ef188418452de2efc73d3f94a5c1e515bd07b6907168b20b909f7739be84";

142+ sha256 = "732b1edb21462281e029de794ccdb3c20ceea0c6d5c0f1c885ef76ad57df7abf";

143 }

143 }

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

145 locale = "et";

145 locale = "et";

146 arch = "linux-x86_64";

146 arch = "linux-x86_64";

147− sha256 = "7142bcf0d715b73f11cba9f181f3a02cfeef9e07e825dae7120df51b10697765";

147+ sha256 = "b816c47c20a674256dc176a15dbeec830b47f8c3eecde31c615f003260e69668";

148 }

148 }

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

150 locale = "eu";

150 locale = "eu";

151 arch = "linux-x86_64";

151 arch = "linux-x86_64";

152− sha256 = "563fed2bb7c6168aa9d973d1578e59c2ed1e785ca82d796de4aecebb8d6dc404";

152+ sha256 = "4f54fa8f7718bc55b733c6986c8ffa17517afac92383dae03fb972beed876665";

153 }

153 }

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

155 locale = "fa";

155 locale = "fa";

156 arch = "linux-x86_64";

156 arch = "linux-x86_64";

157− sha256 = "f7ec308585ab8aa0e112057cd0af1df524e6712611b7ae93e893e681c8b117c6";

157+ sha256 = "ee716492cc2cc0a11c98ea8e8bd7d142ec21c006e2f12a96707d9dad82bf92b5";

158 }

158 }

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

160 locale = "ff";

160 locale = "ff";

161 arch = "linux-x86_64";

161 arch = "linux-x86_64";

162− sha256 = "d678cc64bba6370a300a64dbdc52343b7eaae73953ddec584038d70dee8f09ed";

162+ sha256 = "36d1c4b3966a807c6bc90c4f6fecbef327442398a463167535dae318f286d222";

163 }

163 }

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

165 locale = "fi";

165 locale = "fi";

166 arch = "linux-x86_64";

166 arch = "linux-x86_64";

167− sha256 = "998746f48e543897806e8024e8e6c6cac3dd63471b3896d83ebd80279d8f026e";

167+ sha256 = "9855e6d25d34d6df614ef2b48b4b1e60d527fe00c0da132a0609ac6262354623";

168 }

168 }

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

170 locale = "fr";

170 locale = "fr";

171 arch = "linux-x86_64";

171 arch = "linux-x86_64";

172− sha256 = "11bd3ad17ad680049dcb262ffa18a477d9d8285040e403b26a2f45a449a63139";

172+ sha256 = "b999d3ed98eb594335e810a4a81de86e7e3466a2c32cc6bef0bc260ae883a6d4";

173 }

173 }

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

175 locale = "fy-NL";

175 locale = "fy-NL";

176 arch = "linux-x86_64";

176 arch = "linux-x86_64";

177− sha256 = "508f784775df7b89e6144d9290f98e05b17b831f43f81fde5f45cadb0355bfcf";

177+ sha256 = "be9fce28930fb80a94cc5c6343b34ff6b05538a08cee657d995d647f3d9dec7d";

178 }

178 }

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

180 locale = "ga-IE";

180 locale = "ga-IE";

181 arch = "linux-x86_64";

181 arch = "linux-x86_64";

182− sha256 = "3185a57d4a065ed4cc85fac6c3ee14597b25b5f3acdf9f0c9232d7b1935ad25b";

182+ sha256 = "92bbd149f59a6c2594d6fe1e2ba8e545bd7f9040ae35ec924414c59d06d0f4c7";

183 }

183 }

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

185 locale = "gd";

185 locale = "gd";

186 arch = "linux-x86_64";

186 arch = "linux-x86_64";

187− sha256 = "580397f6ec486a571768f9eb4b4d1b5b7e10a9e791c90907c7b0be0eccfb355a";

187+ sha256 = "bb2cd80e2d1c9b08363a0025b428473334596f3e34ff321e3d6c69f723fb18f0";

188 }

188 }

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

190 locale = "gl";

190 locale = "gl";

191 arch = "linux-x86_64";

191 arch = "linux-x86_64";

192− sha256 = "485a806aeaafda44d687fc41eab57a276cca691c01a67eae6baf10288e7aec67";

192+ sha256 = "f74e552aea8622136679cfb162b2c192ccefa91705e8352830efdec3cae9a0b1";

193 }

193 }

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

195 locale = "gn";

195 locale = "gn";

196 arch = "linux-x86_64";

196 arch = "linux-x86_64";

197− sha256 = "44a2699e0c3d79bfb2dbf3d4da4bcb92e7a4453daebfd57a53d9a0a6ac3e3248";

197+ sha256 = "261cb7858277e012b8d67f890312b3fa333522542a6a7c71019f06e1340e0349";

198 }

198 }

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

200 locale = "gu-IN";

200 locale = "gu-IN";

201 arch = "linux-x86_64";

201 arch = "linux-x86_64";

202− sha256 = "5d817fdcff89b4c440580facabb01d30915962d8b076e7e79781f7209bf83023";

202+ sha256 = "7a3421aa896d08984f9d2cb38fea3e4bf93d9d0dbcb74bdf06dccb3f5039db44";

203 }

203 }

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

205 locale = "he";

205 locale = "he";

206 arch = "linux-x86_64";

206 arch = "linux-x86_64";

207− sha256 = "1756cb46aa5cae3d4cdedd720441a2ef97dfc5cfb22eed734f0b649eb65a282f";

207+ sha256 = "f734cef92e78b3713e179959c6af917a64c4b16d00d834c776652337d42bc65e";

208 }

208 }

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

210 locale = "hi-IN";

210 locale = "hi-IN";

211 arch = "linux-x86_64";

211 arch = "linux-x86_64";

212− sha256 = "27dcf3edd4b9fa67132c761dc3186d8ddbc0f63b32d5606abd43140a4f2a58b6";

212+ sha256 = "e0694ff508e38ae758a96ef5023e7d7d39cabc2b7bbb56cff2854b51009a0732";

213 }

213 }

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

215 locale = "hr";

215 locale = "hr";

216 arch = "linux-x86_64";

216 arch = "linux-x86_64";

217− sha256 = "1aa433ebcb2b0fc185efd98b8312dc1c5b5315ffb6710e3ab69ceac0d22e1871";

217+ sha256 = "438665aa04f02cb9275c8b76ee5c0ff6d7814fc0c1439f50f714613fb902b9c6";

218 }

218 }

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

220 locale = "hsb";

220 locale = "hsb";

221 arch = "linux-x86_64";

221 arch = "linux-x86_64";

222− sha256 = "a0d343a341c593f6b746acb81eab4386a68cd023a5409e0182d908786243e5e1";

222+ sha256 = "1b17d24231fd22db70f6f7bcfe793d31390a441355275771749352221320d4cd";

223 }

223 }

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

225 locale = "hu";

225 locale = "hu";

226 arch = "linux-x86_64";

226 arch = "linux-x86_64";

227− sha256 = "de0a800eef3f292b7157dda727878d9ed953c1ffff1c7ecdd2cf49c1024dfcf0";

227+ sha256 = "d2be4860a0019e9385f48b989300ad42ced0ab2c3873e8074a6863f3afc4719a";

228 }

228 }

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

230 locale = "hy-AM";

230 locale = "hy-AM";

231 arch = "linux-x86_64";

231 arch = "linux-x86_64";

232− sha256 = "44c824309b419151fcc634d4d20774fee6f514df428c6203990ffbe7cb56e6bd";

232+ sha256 = "b9decd8f427362e1070c17242a906d170122c2bcc17641a2132d87ab24e52467";

233 }

233 }

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

235 locale = "ia";

235 locale = "ia";

236 arch = "linux-x86_64";

236 arch = "linux-x86_64";

237− sha256 = "edf777a9904981d1b345390a7ab06c23e543f600a57d3e0ce0e41ab7dcca2ee0";

237+ sha256 = "97a9ec4317bc432ed6c79f796fd0547fab0a156d9c9c959235f6b941ad4fb6fe";

238 }

238 }

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

240 locale = "id";

240 locale = "id";

241 arch = "linux-x86_64";

241 arch = "linux-x86_64";

242− sha256 = "458ad2e7a89dfb4c50376114f270d36220c9986bad5103ccfdb11eb5452d6f5f";

242+ sha256 = "621add55642a28cf95ff1f0acde8881862c1d4487500e5cc0705bf3ba0055c56";

243 }

243 }

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

245 locale = "is";

245 locale = "is";

246 arch = "linux-x86_64";

246 arch = "linux-x86_64";

247− sha256 = "5bf8868b2dbea3f4d08a4201864dab6682c351912a7cd3622dcda5eb0fc67e20";

247+ sha256 = "9293bce28c6252e9ee561f41e54b39e6a66d916e18e34965d1fec77a2d8088de";

248 }

248 }

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

250 locale = "it";

250 locale = "it";

251 arch = "linux-x86_64";

251 arch = "linux-x86_64";

252− sha256 = "057b3ee3698696b59b49a66a8622d281c50c35c2b900fcfc95aedf4cb06701b4";

252+ sha256 = "aeeface0275cdb426fe851d91bd49014aa8aadc7becf18f4763b44f0526260a4";

253 }

253 }

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

255 locale = "ja";

255 locale = "ja";

256 arch = "linux-x86_64";

256 arch = "linux-x86_64";

257− sha256 = "168207c2ed591603529d9f281f0fba5be8c775d130082fa6016ab77a06e392b4";

257+ sha256 = "dc51a842e0a8aaeea874fc73e99de5978615c250afc17309e7edaf80802acb56";

258 }

258 }

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

260 locale = "ka";

260 locale = "ka";

261 arch = "linux-x86_64";

261 arch = "linux-x86_64";

262− sha256 = "92564e5dda8d74245d00d83ef06c29fbff798db36d665cdd69b88d4e00474299";

262+ sha256 = "85562b0af98292e923c39de4b0c15d2ea0e95cd8fcb7d86c4d941eabdf9a1827";

263 }

263 }

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

265 locale = "kab";

265 locale = "kab";

266 arch = "linux-x86_64";

266 arch = "linux-x86_64";

267− sha256 = "c6641d1b22d9fd07885e18ac4ae6d0770ff6c1f88c04d41c6e43020c774a47cd";

267+ sha256 = "c06e7fd59bcb82a989c90a2095c467eccdd1a98b4e704348befc89061ad9a6da";

268 }

268 }

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

270 locale = "kk";

270 locale = "kk";

271 arch = "linux-x86_64";

271 arch = "linux-x86_64";

272− sha256 = "24dce49c8e0c343f3178b0280e01c34716654fa705cfc16f22b5815f2d4c524b";

272+ sha256 = "d041abeb5f207a234fde69fd265ec98b5bc94a29ba5d231334d74caccd7c1d16";

273 }

273 }

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

275 locale = "km";

275 locale = "km";

276 arch = "linux-x86_64";

276 arch = "linux-x86_64";

277− sha256 = "662aabaa2dfb2d6d217f359979770cc698063816d4f2db28d959cde88931aa4f";

277+ sha256 = "b02b241b7ca07732c26aad728d1d15b637d4bb032673d92b0ff1a65fefca0d80";

278 }

278 }

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

280 locale = "kn";

280 locale = "kn";

281 arch = "linux-x86_64";

281 arch = "linux-x86_64";

282− sha256 = "343213168dd6522af4e206a33c9c6f8872853207ecfa34e85189439a46be6aa3";

282+ sha256 = "0ad5133784a27dec78031db198ee762e4ee0d0514d03dc175130a64eab93d302";

283 }

283 }

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

285 locale = "ko";

285 locale = "ko";

286 arch = "linux-x86_64";

286 arch = "linux-x86_64";

287− sha256 = "31cfa145a16c339911b9374f70b9124fcdc94c7fd630263fd19676279f257ab6";

287+ sha256 = "01adfa538c52df224c6b982cb96ed50a3f19b8e0608d323003f2264e6d1c18c1";

288 }

288 }

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

290 locale = "lij";

290 locale = "lij";

291 arch = "linux-x86_64";

291 arch = "linux-x86_64";

292− sha256 = "7b3cf0ac4286c6ba3dd8167349cefee9f55979651566e82e2d4e979d5f8b47ea";

292+ sha256 = "1cd93f13d9cc732f7b580c611f31ce8a71ba20436bc7acc996fa1d22c4c8b954";

293 }

293 }

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

295 locale = "lt";

295 locale = "lt";

296 arch = "linux-x86_64";

296 arch = "linux-x86_64";

297− sha256 = "47715eb38d43b6cf2c873d7d7c9f643c3e895dc31e64b0481fe46d20ea670572";

297+ sha256 = "fd92972d632c5c3d1822feaf2372bd6a06ea957b0c8a5663b0eda787da53e4c4";

298 }

298 }

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

300 locale = "lv";

300 locale = "lv";

301 arch = "linux-x86_64";

301 arch = "linux-x86_64";

302− sha256 = "77afd745728346eeba893bb8eb7bc2517c69f68ade939fd2273c595607f7a4f1";

302+ sha256 = "cfb5112aca7d7e7af298a0c035ca2d549c849d9ef1536bcc958726df81f64665";

303 }

303 }

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

305 locale = "mk";

305 locale = "mk";

306 arch = "linux-x86_64";

306 arch = "linux-x86_64";

307− sha256 = "2c287aa2b2854e45b3a49df38d3aa8ded24d63a931c7f37ff320bc8d4358e0a5";

307+ sha256 = "bd1c8a1175326fce66cd32ebf394585fe09c5a65cf72e0e0598e572583e46515";

308 }

308 }

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

310 locale = "mr";

310 locale = "mr";

311 arch = "linux-x86_64";

311 arch = "linux-x86_64";

312− sha256 = "4212b8ddb9cd59bc692921d2ab70613ea738ca3a4a23bda0cb038707dda1262e";

312+ sha256 = "9912aff12281b1ec3b4605ae72fba291f24e193ff976658e638fdb35a9d40cd0";

313 }

313 }

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

315 locale = "ms";

315 locale = "ms";

316 arch = "linux-x86_64";

316 arch = "linux-x86_64";

317− sha256 = "a0b878c3171af29ab631b734c20dac581ec7c1cd0487835bdb23db6ca72ca378";

317+ sha256 = "4f155ab0ce5420d272a86eb8b52cb816b90aabf34900bc5ba56d869e44408733";

318 }

318 }

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

320 locale = "my";

320 locale = "my";

321 arch = "linux-x86_64";

321 arch = "linux-x86_64";

322− sha256 = "afeeea7ec03567ec058c5d77e813997f8cda6a654771da1a433a69bc27bf254a";

322+ sha256 = "5b01096123e71ff94e6a44ba44edaf9453d2770f8918019e349f20f55f4fbe04";

323 }

323 }

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

325 locale = "nb-NO";

325 locale = "nb-NO";

326 arch = "linux-x86_64";

326 arch = "linux-x86_64";

327− sha256 = "a359e3b9a83aec399890324ab484c811a9a5f615ee8237bf1a1f58d9140432f5";

327+ sha256 = "2d4b0706d46e92438a3ec1067515ca4eaa37aa168f6c633339a7c78c1e447f62";

328 }

328 }

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

330 locale = "ne-NP";

330 locale = "ne-NP";

331 arch = "linux-x86_64";

331 arch = "linux-x86_64";

332− sha256 = "2aa43032307675ce450c2e35a2e833edddd9ab94626be008785c8226f0d62ecc";

332+ sha256 = "3f6e8d2b081bd23bc0a6425b0f956fbb8431c301b01563d43d1ec976ec5daa32";

333 }

333 }

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

335 locale = "nl";

335 locale = "nl";

336 arch = "linux-x86_64";

336 arch = "linux-x86_64";

337− sha256 = "ca8eaebfbbc6843f1273ff8ae8bca03209a436a3de86784049aafe52d7a3e950";

337+ sha256 = "00d8fb594fd4ced7ab5c7fe3de74bc193630547b5a537f0025a1ac11ec2adc53";

338 }

338 }

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

340 locale = "nn-NO";

340 locale = "nn-NO";

341 arch = "linux-x86_64";

341 arch = "linux-x86_64";

342− sha256 = "5472b83b2e26c8ce88a959cc3e97c140f6e3efdff5f0c9208fb2d599f43081e0";

342+ sha256 = "de3b36fabf65ff0d6f8f24c2dd0490214f08fe4216645c7af0a0f271f443aec5";

343 }

343 }

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

345 locale = "oc";

345 locale = "oc";

346 arch = "linux-x86_64";

346 arch = "linux-x86_64";

347− sha256 = "19552e9822f186ec64e38ce170f0d93f433ba1d15fa25fd7388567af48925bc4";

347+ sha256 = "df7391bdfbf21175f3e935dbdb6985b0fbd3550824d4203c93b91d52ef0841e8";

348 }

348 }

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

350 locale = "pa-IN";

350 locale = "pa-IN";

351 arch = "linux-x86_64";

351 arch = "linux-x86_64";

352− sha256 = "75f3516e0f14233bb158cde3a57be644fcd6b01256ade0a9cef21ad81d434454";

352+ sha256 = "653b0bb83de0787c37985968822c1637e4707a9dd96a521450048e25d220f1fd";

353 }

353 }

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

355 locale = "pl";

355 locale = "pl";

356 arch = "linux-x86_64";

356 arch = "linux-x86_64";

357− sha256 = "2cbb208a9f23b39c66c9e50be0a873d989083f0abf9ab56e48e9b7ada91718e6";

357+ sha256 = "31e861138205a8d69503550dff92e3a530b5d4212bd2f1f905298cceb53dbf40";

358 }

358 }

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

360 locale = "pt-BR";

360 locale = "pt-BR";

361 arch = "linux-x86_64";

361 arch = "linux-x86_64";

362− sha256 = "2b9a5b1d37a000d86fb7cc41977c3ff8444047330ab0b2e10da288e418569905";

362+ sha256 = "20e992c16e7dc1d0c2e641a7ecac46e29fb00bcbe1ddca3a34cfe7a9344eadd1";

363 }

363 }

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

365 locale = "pt-PT";

365 locale = "pt-PT";

366 arch = "linux-x86_64";

366 arch = "linux-x86_64";

367− sha256 = "73de91287952c4bc9dc53099ce911aab140bcda6356788e8bab5c667f1d363c4";

367+ sha256 = "5be572a2928648ba36d1e775c79967ac17810f341dc84a2c69e8d7bad07e3a21";

368 }

368 }

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

370 locale = "rm";

370 locale = "rm";

371 arch = "linux-x86_64";

371 arch = "linux-x86_64";

372− sha256 = "39c934e5c3b08e41889ed47f63e2e9f24a08602e40d20497cc7d9edb42132aff";

372+ sha256 = "47d11d7f4ba7fa8753845f3ab2cb4c36c2a20fa31cd9dd561d7032f3c28a9b22";

373 }

373 }

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

375 locale = "ro";

375 locale = "ro";

376 arch = "linux-x86_64";

376 arch = "linux-x86_64";

377− sha256 = "d23606050f9956d22efd779f09db6cb439cf8624cdc3e509f0ec6a7f0e3c9e46";

377+ sha256 = "c533fb1f8f845970e647a2d612c6ca23962d476b51696d12dde01e143ec50857";

378 }

378 }

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

380 locale = "ru";

380 locale = "ru";

381 arch = "linux-x86_64";

381 arch = "linux-x86_64";

382− sha256 = "b940390f3199cba2de06ef37a48ce6d0a892c8edd6e0125be088d50fa6c2e06b";

382+ sha256 = "571b016d12ec198148d52fa3e8ed25781cde49f3aaf8187ba881764b52d1c3f9";

383 }

383 }

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

385 locale = "sco";

385 locale = "sco";

386 arch = "linux-x86_64";

386 arch = "linux-x86_64";

387− sha256 = "3a1bb5b617b7a1633c79b6d7c80e559de15e6e6c9265d574de89628cc246e2f8";

387+ sha256 = "b30a42bd17bd2ee8843d791a00ac29f3ac91aa3d4de7b70ae603fe6365fc7906";

388 }

388 }

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

390 locale = "si";

390 locale = "si";

391 arch = "linux-x86_64";

391 arch = "linux-x86_64";

392− sha256 = "e90f56c11a25fd023b3fe282858d93504e49cace7c26fd542fef10565f844742";

392+ sha256 = "509f987eac7b593cf24f6446ac7b78b2dc8e43dbf8b29dd82d0a107a596207f0";

393 }

393 }

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

395 locale = "sk";

395 locale = "sk";

396 arch = "linux-x86_64";

396 arch = "linux-x86_64";

397− sha256 = "a33f598ef8e2d9865cc01ef4a03a1a0e6ea96231dec4301ada4d128bb672d35f";

397+ sha256 = "4f44c500b355c5100dc476a807e8b212962e12c45b058b14cc0b5f84abac81b5";

398 }

398 }

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

400 locale = "sl";

400 locale = "sl";

401 arch = "linux-x86_64";

401 arch = "linux-x86_64";

402− sha256 = "939ffbab94871eb84bf36719debfaad1f160e0b10e0481082e5a1cf534537a54";

402+ sha256 = "6ecd0f30d8ecf6e6b63512f59363c7a4a17389f468a21ac1119a98b467ecee39";

403 }

403 }

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

405 locale = "son";

405 locale = "son";

406 arch = "linux-x86_64";

406 arch = "linux-x86_64";

407− sha256 = "ecb166da7e16c925f14cbc3fb4748a039b942f20088ff6f9ba02489f1602c0c4";

407+ sha256 = "ddefd1ef806f3b39a51cd52d33a286f0145fc106c479e3f14a45a9e63c8ee374";

408 }

408 }

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";

410 locale = "sq";

410 locale = "sq";

411 arch = "linux-x86_64";

411 arch = "linux-x86_64";

412− sha256 = "53b31c2c83fd1aab0b54cbbcf77459c38a8d466b4df866a49b1a0474038651d9";

412+ sha256 = "b69459ef0165648ba0b13b6d4ff6b27e80ad81181bf65b415e87574b21a2a021";

413 }

413 }

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";

415 locale = "sr";

415 locale = "sr";

416 arch = "linux-x86_64";

416 arch = "linux-x86_64";

417− sha256 = "15b9b971d1ca2a7ab1422b040b813de9e984c451ea41eab8bad2939c5b9ae604";

417+ sha256 = "8d53bd7943aa99bbea08be26cd4e5465b3889c8ee0dfb718c82f1ab65ce9e2fe";

418 }

418 }

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";

420 locale = "sv-SE";

420 locale = "sv-SE";

421 arch = "linux-x86_64";

421 arch = "linux-x86_64";

422− sha256 = "7f44e7cec1f32a69b173ef832501dcb38002c0b690284af21a53b4862053c596";

422+ sha256 = "d70d78df84a39f921253c613518e0737439d1e516248b64c8b79fe29eadf4520";

423 }

423 }

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";

425 locale = "szl";

425 locale = "szl";

426 arch = "linux-x86_64";

426 arch = "linux-x86_64";

427− sha256 = "df3d1186c2472d0e42e36efedd231b6beef43c1dbf18bcb1a27f86aee47257d2";

427+ sha256 = "c02e86f128049d894f1d2144bc1baa3ceac4b58745c19428f2de5def7dc8ca36";

428 }

428 }

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";

430 locale = "ta";

430 locale = "ta";

431 arch = "linux-x86_64";

431 arch = "linux-x86_64";

432− sha256 = "d14d94ab5bed1b3c2118d5ac1dd31caf950f287b3b40de80e136b3500bdc773c";

432+ sha256 = "18754112a15bd8d25ebc8ee456e43fd7bc97b5af014a8bb6ebc481e0fc18559d";

433 }

433 }

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";

435 locale = "te";

435 locale = "te";

436 arch = "linux-x86_64";

436 arch = "linux-x86_64";

437− sha256 = "e11c66e7eae928a06f3d705ce3024cda3961c52727bed2217ac6dce444367107";

437+ sha256 = "afeb892e3656d2d3c802d548bc78bada5a9a2d4f7300d5dccbb4af0b96902371";

438 }

438 }

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";

440 locale = "th";

440 locale = "th";

441 arch = "linux-x86_64";

441 arch = "linux-x86_64";

442− sha256 = "4b29e95c96b9c8c5ff9fce146c3d85a1313c849a74694b56de177d921173956d";

442+ sha256 = "049baf07a0db7abecdc3477c9965119c4acb0da26a9e8a4201fc2311ae3bc966";

443 }

443 }

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";

445 locale = "tl";

445 locale = "tl";

446 arch = "linux-x86_64";

446 arch = "linux-x86_64";

447− sha256 = "0d9c3749adc06152e7bf8a72f81e1652901a020abee1a46c9e68b1a37009f96c";

447+ sha256 = "9898714292846b9ec1bd277c279d6bc3a33186ad02e1c09a995c766044d168a2";

448 }

448 }

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";

450 locale = "tr";

450 locale = "tr";

451 arch = "linux-x86_64";

451 arch = "linux-x86_64";

452− sha256 = "fea26051836eaec249373404e594329c7a0f357cf94edd93f494989a80e8b6c6";

452+ sha256 = "378a940ecc44d0016f5e1764f667abd60fa2241ac11477811eda477621085475";

453 }

453 }

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";

455 locale = "trs";

455 locale = "trs";

456 arch = "linux-x86_64";

456 arch = "linux-x86_64";

457− sha256 = "cef307d45f53e95ee954731106a66bc313a007dbaf96ec3b670acc392345cea8";

457+ sha256 = "c338b68e0fb85bde3949abe2bb739e127453acd692e0460ffe1914ea4a5cf150";

458 }

458 }

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";

460 locale = "uk";

460 locale = "uk";

461 arch = "linux-x86_64";

461 arch = "linux-x86_64";

462− sha256 = "20b1054ed238bf426ecdc511a86e1a01c946522caed30a21f8d0b470949db921";

462+ sha256 = "2602c70ef4e449e15f95e661e916a4f5b978158f8e2e998f552ef79c4462d319";

463 }

463 }

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";

465 locale = "ur";

465 locale = "ur";

466 arch = "linux-x86_64";

466 arch = "linux-x86_64";

467− sha256 = "3009c02b5983a89dcb331daedc49bfc6bd629161a755a5e29f28405b4706ca32";

467+ sha256 = "bc195325efa7668db62c3307d488b721843c620d804e75754d540789b0545950";

468 }

468 }

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";

470 locale = "uz";

470 locale = "uz";

471 arch = "linux-x86_64";

471 arch = "linux-x86_64";

472− sha256 = "2ecf4078582f805b624f6ac612ceb10c22d1c2c3fd1a855cb86704addb9f9180";

472+ sha256 = "14cff13fe9ba0bc91629b95cc3f2f6df5164b538be5e285acd54cb8d6656e109";

473 }

473 }

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";

475 locale = "vi";

475 locale = "vi";

476 arch = "linux-x86_64";

476 arch = "linux-x86_64";

477− sha256 = "a73072f4a152256972a41a38ebd7dd72f1cae40bbb568bd6384bef2ffa8c7d64";

477+ sha256 = "5852f4eee3136058d7228c5eccc173153706d72b90c61ca632623d926aa84d7b";

478 }

478 }

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";

480 locale = "xh";

480 locale = "xh";

481 arch = "linux-x86_64";

481 arch = "linux-x86_64";

482− sha256 = "eec036004690e9fbd1e1d6934b594787e8e269e2a2a10a818096ea5854da481f";

482+ sha256 = "ca10968059585ceb6bdc0902f94bb69798c9b0666e2dec1cbcf42e5979be97c3";

483 }

483 }

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";

485 locale = "zh-CN";

485 locale = "zh-CN";

486 arch = "linux-x86_64";

486 arch = "linux-x86_64";

487− sha256 = "b65ee16996593d88be41f19fae95f7f5826db828b3f0d7e40f1dbd9c45f43fbc";

487+ sha256 = "f9d5c1a1aef830b4276e0af88c783b419674219d599c52c414bc8da3eb99fd4f";

488 }

488 }

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";

490 locale = "zh-TW";

490 locale = "zh-TW";

491 arch = "linux-x86_64";

491 arch = "linux-x86_64";

492− sha256 = "c3e5b7119b95c3da1145cdecded90b8194b99f722d41855e5282d615ae2a86f9";

492+ sha256 = "6857ee348392d9cedc4f2bbe1c355bcbdaa1a886d4babc65ccfb2c95421219c5";

493 }

493 }

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";

495 locale = "ach";

495 locale = "ach";

496 arch = "linux-i686";

496 arch = "linux-i686";

497− sha256 = "6ada766fccaa1e54ecbf0ee75bd807a42ecbfcedd9f218ff65443aa43f4e18e1";

497+ sha256 = "9b8a8950e770bf53cb85b0fb79f63d6aaed9a09df86421ef2ee30dab3b250ede";

498 }

498 }

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";

500 locale = "af";

500 locale = "af";

501 arch = "linux-i686";

501 arch = "linux-i686";

502− sha256 = "6925ff4e7b2746249c526c11b65a87b95ccfaaa2e3f57dfe38fa5ed8bfde7637";

502+ sha256 = "fd464ccc673892932cf98fc4696146034928078de14f8c5df68a9103c20076df";

503 }

503 }

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";

505 locale = "an";

505 locale = "an";

506 arch = "linux-i686";

506 arch = "linux-i686";

507− sha256 = "bf146035e88c2b2c80bd3e352a251f4bf527089fd0252ef320b13752e045b0d4";

507+ sha256 = "76837e6555079a23fc33e83bbf9e507d4eb6e896501d43ae78cf5b8536e88a62";

508 }

508 }

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";

510 locale = "ar";

510 locale = "ar";

511 arch = "linux-i686";

511 arch = "linux-i686";

512− sha256 = "f891728a186e9746b46b12cdaf7a28e81152bf71a361f49b3fb9e048050b216d";

512+ sha256 = "8346570bb699370f34d19ee93a705c9f81b57164ca14f7758c339be0837e9319";

513 }

513 }

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";

515 locale = "ast";

515 locale = "ast";

516 arch = "linux-i686";

516 arch = "linux-i686";

517− sha256 = "3fe9530affb6eee7fd3c35d8f3274c0659f54ff45a51e04b02d4685b22283d97";

517+ sha256 = "f14088ae65cda0b3ae518cc517d6d786fa4c7a471510ddf4d45f6c268761d324";

518 }

518 }

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";

520 locale = "az";

520 locale = "az";

521 arch = "linux-i686";

521 arch = "linux-i686";

522− sha256 = "7d62e6cb2de5130e24aef684a014ae72db408cfd3227e0b67f080a8395004d71";

522+ sha256 = "e15d3764842a0febc41882c9f82e607b0b4dd875d765ab4079880b1cf8d0f327";

523 }

523 }

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";

525 locale = "be";

525 locale = "be";

526 arch = "linux-i686";

526 arch = "linux-i686";

527− sha256 = "2c7c9285e61e0b74f7fec985462098459475e9932b6e2a44243bf54c649add52";

527+ sha256 = "e7336bcf602bb95697eb5c134da3ef96cdb9229233a4f135e44d7439fbc3d972";

528 }

528 }

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";

530 locale = "bg";

530 locale = "bg";

531 arch = "linux-i686";

531 arch = "linux-i686";

532− sha256 = "31ba288d27f7b045cc7c685e83f49ec8b9b6579745f7c1ab373a18c8e8264aa8";

532+ sha256 = "a5c9d5cb091f4a643293879f7f0f0e2afa4a2e53efe08a97eca1fc8f5c77cb41";

533 }

533 }

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";

535 locale = "bn";

535 locale = "bn";

536 arch = "linux-i686";

536 arch = "linux-i686";

537− sha256 = "927749fadf833f84120c36996e1364e714bf353de6cff38cc68f78af6143390e";

537+ sha256 = "2edcbeebb3a7afdb1322c55ad1ac1a8cd4f2dae7e45a009d113cfee4d159ef2e";

538 }

538 }

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";

540 locale = "br";

540 locale = "br";

541 arch = "linux-i686";

541 arch = "linux-i686";

542− sha256 = "82f398c8b1ae36706b8d5e0e1bd12a568de584d342141eab4d35a40abcf14fcb";

542+ sha256 = "dc78c6a0a71856b42c6654b3f3d2f93bd30808878a90c49dfecf2b724f42532c";

543 }

543 }

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";

545 locale = "bs";

545 locale = "bs";

546 arch = "linux-i686";

546 arch = "linux-i686";

547− sha256 = "01609251ed3198064326e99c9e97b2c9128f1216581971896ccbd692ea9aaefa";

547+ sha256 = "f9ba0d138252aff3abbd8f8447680b59f24f1a9b7a40d6ec753fccb74344a853";

548 }

548 }

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";

550 locale = "ca-valencia";

550 locale = "ca-valencia";

551 arch = "linux-i686";

551 arch = "linux-i686";

552− sha256 = "c35d207480e63f3b2538290e74fe6859e1de3061eeebddc10de4e44d040080b8";

552+ sha256 = "68a8522e03191f286514b648d1cc7d6c9b7d1683638bb7a88d2ba33c3c8031c1";

553 }

553 }

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";

555 locale = "ca";

555 locale = "ca";

556 arch = "linux-i686";

556 arch = "linux-i686";

557− sha256 = "3419b0ce1e30db92646c4675701eb6a7201c0c65b722b3f86bbd90c4cc236ace";

557+ sha256 = "71b29981fe6da252296c9669e3b05bcfa8914282b982455f6c21e1e47fc6c452";

558 }

558 }

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";

560 locale = "cak";

560 locale = "cak";

561 arch = "linux-i686";

561 arch = "linux-i686";

562− sha256 = "3f19b7d4a9ab541b12f2a2156039d38af9c13b10ff2f80a22dc365e41d307d96";

562+ sha256 = "0964328bc005e028371852ecfeefed0b1bb4334840dd9e343ed15b3e0add3cfa";

563 }

563 }

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";

565 locale = "cs";

565 locale = "cs";

566 arch = "linux-i686";

566 arch = "linux-i686";

567− sha256 = "2df78b68ddf8771f5e0bb2b24d024a04972a75b2b4aacfb85ac5d1b122cfc47d";

567+ sha256 = "b72dbc0d7bc48884fb55d1e419680d753175e2d2d7fc91b362337e5963c59339";

568 }

568 }

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";

570 locale = "cy";

570 locale = "cy";

571 arch = "linux-i686";

571 arch = "linux-i686";

572− sha256 = "263fc246ede739f74cdb5d266a871cfc063fc162c42ace9cd111c2522bd7044a";

572+ sha256 = "553ba01218ca17602bf67fc4cd7940d6259fd1cedf1d70665d06053b7336311f";

573 }

573 }

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";

575 locale = "da";

575 locale = "da";

576 arch = "linux-i686";

576 arch = "linux-i686";

577− sha256 = "225a09327f2d8bdcd2084eeb5cba8995b899150fe5a42f97efd34e39ca9b9693";

577+ sha256 = "41c01f3979fdec4823e18031497fcccba3380393a3b5e142ab8b1e59e247c87a";

578 }

578 }

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";

580 locale = "de";

580 locale = "de";

581 arch = "linux-i686";

581 arch = "linux-i686";

582− sha256 = "e636784c7a794d8a18741aa4915c8028dfb8259381c1a0dcccd8a17796a9e340";

582+ sha256 = "7d88786442c856c8502019d494d8c3b5bd09ad9aa0ce1e5a45216594ac915b5b";

583 }

583 }

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";

585 locale = "dsb";

585 locale = "dsb";

586 arch = "linux-i686";

586 arch = "linux-i686";

587− sha256 = "f9bad69c8fda65665c556f736401a4ce522fcc90592aedc7576076fa530a3599";

587+ sha256 = "4b94ebf19d6fdd64e7fd1181bb47f1b89d68f04a5e9b3c29a3cd8e43c36ac898";

588 }

588 }

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";

590 locale = "el";

590 locale = "el";

591 arch = "linux-i686";

591 arch = "linux-i686";

592− sha256 = "b825735e8461779f3dab037360e67fe4fa8d849881f811a179f8db33d49f44f6";

592+ sha256 = "12f61d5b97c906a9532028b14c7d86ef8ee04398460ecdb08496922f4c6abe34";

593 }

593 }

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";

595 locale = "en-CA";

595 locale = "en-CA";

596 arch = "linux-i686";

596 arch = "linux-i686";

597− sha256 = "e944d750a11e9ab1ee653402e058cb3f65b46eadf551a29d31919ee1640b1272";

597+ sha256 = "b5804a8edc39eca3b04ec76fd87f5fc228a3df02b47094ca1a9d2020de0c1c29";

598 }

598 }

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";

600 locale = "en-GB";

600 locale = "en-GB";

601 arch = "linux-i686";

601 arch = "linux-i686";

602− sha256 = "0039ab82d3eb22e9c8d1036f2d3ada46d37faeb192209b447d3e20dbe0450163";

602+ sha256 = "211b7adde34ffc0ef075cc4d34fb5bbc50d00543920747db7e434268c0948e74";

603 }

603 }

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";

605 locale = "en-US";

605 locale = "en-US";

606 arch = "linux-i686";

606 arch = "linux-i686";

607− sha256 = "5013a7a3d601c4f532becf4efad8090e73fab442a1bc8599f4195c65d5813dc0";

607+ sha256 = "da446e05101a645ebc51cb9fb60bb33e68b8570448072c56baea4561b638338a";

608 }

608 }

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";

610 locale = "eo";

610 locale = "eo";

611 arch = "linux-i686";

611 arch = "linux-i686";

612− sha256 = "b05d2600e407bf47c1eeeda8a5154495dfee6f0aa7044f089d5fad558134ff3f";

612+ sha256 = "e217817389a32bfd05272210b7bef6c80547c58e51d7df69b26e2931b2e89ec9";

613 }

613 }

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";

615 locale = "es-AR";

615 locale = "es-AR";

616 arch = "linux-i686";

616 arch = "linux-i686";

617− sha256 = "27e30ab50cf1be112c8dcc625d98de5a14495bdc639de9b0e5d8795eab90f4c3";

617+ sha256 = "5f5c35e50809f33b769344c986fe468a404dad2b5c0a933f5dccf9481bad32c3";

618 }

618 }

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";

620 locale = "es-CL";

620 locale = "es-CL";

621 arch = "linux-i686";

621 arch = "linux-i686";

622− sha256 = "c82b39f32baf5a63bed4ddd4bd97e7c45ba213957d114559506039986cc78c0d";

622+ sha256 = "12434003ff87d5269cbe751adc53ce5396f98f36c8df7ab5535236cf778deb26";

623 }

623 }

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";

625 locale = "es-ES";

625 locale = "es-ES";

626 arch = "linux-i686";

626 arch = "linux-i686";

627− sha256 = "1ca07d869f0f36cfb79b00cc24f374f546f8e8ed9061caeba9ccd82ea1890b62";

627+ sha256 = "eef66f4f53ef38baf4b664b0428528117e376fbc57a743cade265adebe451d62";

628 }

628 }

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";

630 locale = "es-MX";

630 locale = "es-MX";

631 arch = "linux-i686";

631 arch = "linux-i686";

632− sha256 = "8775da0ec29b758d82e2c33defe858c45a50eaeb824c34c1e31f97a07c9a9f48";

632+ sha256 = "e56dfa4f160d60b70d905c4acde1b78d4598dadaa63a0833f638cdadcc850e35";

633 }

633 }

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";

635 locale = "et";

635 locale = "et";

636 arch = "linux-i686";

636 arch = "linux-i686";

637− sha256 = "29655eefbcbb0975f4d73124881c13ce465d0422088d33ea2c62bcc23a94a372";

637+ sha256 = "ab7b3244b55e3d663a89e46f7cf1ee211ab643c6f92112cf921b05343ded25e7";

638 }

638 }

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";

640 locale = "eu";

640 locale = "eu";

641 arch = "linux-i686";

641 arch = "linux-i686";

642− sha256 = "47394c402cbb327335d7ed47670cc3f0c16a875581637d171d3c714d03e859c1";

642+ sha256 = "b626fa244d85a9c266e2c11f311133e6704adfcfcaa0ebd00a7dbf487e0d7a8b";

643 }

643 }

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";

645 locale = "fa";

645 locale = "fa";

646 arch = "linux-i686";

646 arch = "linux-i686";

647− sha256 = "133433694832d6b4d0a03ff93f1a51a52543e67da3b58d171ee9ddf8caf10d24";

647+ sha256 = "743f58643846d3a769da6ba2fec2ba50f7c00a7f4a4447b684ef08f64d8be16d";

648 }

648 }

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";

650 locale = "ff";

650 locale = "ff";

651 arch = "linux-i686";

651 arch = "linux-i686";

652− sha256 = "16078dcca2ef7dff68d20f29cdf941f08df9ca2b3c247be26e0386e88fc1b16e";

652+ sha256 = "3cd80abe0d157427d17cc502cdfb67fb4f48f237de97c7ba9e9d4af5f8ee1fc7";

653 }

653 }

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";

655 locale = "fi";

655 locale = "fi";

656 arch = "linux-i686";

656 arch = "linux-i686";

657− sha256 = "2c2a44c45a3f4e449f270b8eabfbf279c922eaa0596794c0fa80b06d2f17db19";

657+ sha256 = "d7ddda88e29c89e34c56e7467aabd3262430267fda1814933b2b03e1201b549d";

658 }

658 }

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";

660 locale = "fr";

660 locale = "fr";

661 arch = "linux-i686";

661 arch = "linux-i686";

662− sha256 = "59b0f88988d896144cbf6c9f4ed607fc318e8357b2d96c6df6ad3488f73fc9e4";

662+ sha256 = "b442b7cd5b1dafe98fb04ef68ef3d21fdb6a6beeacda3537c0fb2ff26a5d0a67";

663 }

663 }

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";

665 locale = "fy-NL";

665 locale = "fy-NL";

666 arch = "linux-i686";

666 arch = "linux-i686";

667− sha256 = "97a98a714e543c101e159d7f3ca052a970421a1f74e2bcbbfdb9b9755388caa2";

667+ sha256 = "fbbe401d602c88cec32ea608eab714ebfa873ccf70d07102bfd3b8c59bcc39e4";

668 }

668 }

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";

670 locale = "ga-IE";

670 locale = "ga-IE";

671 arch = "linux-i686";

671 arch = "linux-i686";

672− sha256 = "3221dda3f7d232f986e1e111a6cfb945bc1c1768464cc18d0a345ba140eef706";

672+ sha256 = "fe6c9544bf67a30bd8266fafa92c56e1825c0e155d6e30225b5587719a683fe1";

673 }

673 }

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";

675 locale = "gd";

675 locale = "gd";

676 arch = "linux-i686";

676 arch = "linux-i686";

677− sha256 = "c61156527cfe9966916573cfd7005a16313b134e353258b05e2362414ef0d9f8";

677+ sha256 = "d62bad0b209df9b74173e894af3a5e6c48b8d9321a2bbc3ef05e40f24db972e2";

678 }

678 }

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";

680 locale = "gl";

680 locale = "gl";

681 arch = "linux-i686";

681 arch = "linux-i686";

682− sha256 = "16f762ba8291f190b165b05f9980c22d93a1612ed2251d6ec1ec18fa465044b6";

682+ sha256 = "caa93a08ac9fe456f6f1480b514492ba884814dada450845a86cfb486463ef90";

683 }

683 }

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";

685 locale = "gn";

685 locale = "gn";

686 arch = "linux-i686";

686 arch = "linux-i686";

687− sha256 = "c1d51a4e5629a0f04187d76edd1dd94bb5d55ff2e0757932aa218eec3a50027c";

687+ sha256 = "eb44f048ae40e1c5693bcb31f7c2b50644b55c7f7229fb087b3757ad7c232fc3";

688 }

688 }

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";

690 locale = "gu-IN";

690 locale = "gu-IN";

691 arch = "linux-i686";

691 arch = "linux-i686";

692− sha256 = "a3f92bc8d213b0cdd4df2a853951a5f446786ae5d08bebef2799e866fcde06bd";

692+ sha256 = "5a536e35bb8734541b9a8266def5418c8b4eae66a60323c40dca7e0bc11e2ecd";

693 }

693 }

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";

695 locale = "he";

695 locale = "he";

696 arch = "linux-i686";

696 arch = "linux-i686";

697− sha256 = "ea432d8c4cb390f92d42c27101b7b1b3c331d7b1f18a88f6acfbd3ef1b2c1544";

697+ sha256 = "b045e3b0a9789804775fdb9f28cf7c8a1293b12adb06f105afc4001648f22dd9";

698 }

698 }

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";

700 locale = "hi-IN";

700 locale = "hi-IN";

701 arch = "linux-i686";

701 arch = "linux-i686";

702− sha256 = "a6aa3110e9b792398860bbb2ceed29d6fa619a8ac73af96b858813d2d388855e";

702+ sha256 = "955ba8c9936da6b12f1422b0de5a696a849a72a352b994d62818477b07af5890";

703 }

703 }

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";

705 locale = "hr";

705 locale = "hr";

706 arch = "linux-i686";

706 arch = "linux-i686";

707− sha256 = "ea1e36606ac218db3dd39891fb17ce2ac398381ab41102a3dd3170ccc37fd329";

707+ sha256 = "bbbc1d1bd23b49197861fe389d2ab92580def84ce97f1643e50f4cd8de748e8c";

708 }

708 }

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";

710 locale = "hsb";

710 locale = "hsb";

711 arch = "linux-i686";

711 arch = "linux-i686";

712− sha256 = "ec80f48bcc37a517bacc258411da614c472a5179743717cb47561f8968c395e1";

712+ sha256 = "23afed3429959fee426a2e5fc08cb0cba058e2544b5f8c742fbcbdd51ac31afe";

713 }

713 }

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";

715 locale = "hu";

715 locale = "hu";

716 arch = "linux-i686";

716 arch = "linux-i686";

717− sha256 = "d8622685ea6132887d8f9657d2e09d5dbcf6b9571cc7c64a85646219e5c972b0";

717+ sha256 = "2a42af969db30183a5fc547f4cdc75db99a8405550a2791de4303e5604a24133";

718 }

718 }

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";

720 locale = "hy-AM";

720 locale = "hy-AM";

721 arch = "linux-i686";

721 arch = "linux-i686";

722− sha256 = "dd3eb9c5db97fe3e6c6dd0705406eed897e955423a96e773eb842d2e4d65f845";

722+ sha256 = "79d134d0c95fb3be213ded965d02ec898891efe2c07dd82046e02adeb24641e4";

723 }

723 }

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";

725 locale = "ia";

725 locale = "ia";

726 arch = "linux-i686";

726 arch = "linux-i686";

727− sha256 = "7e94b98322ad8cbcbe5ee4bebd84f2ac82a4b78673ed357bbb02a4f0b2c63c6c";

727+ sha256 = "3e9f078057e53822a59509f1658f64b8d5563ffc69528193aa1473668e390f62";

728 }

728 }

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";

730 locale = "id";

730 locale = "id";

731 arch = "linux-i686";

731 arch = "linux-i686";

732− sha256 = "b4bc9b6384b44b392a70144cb71fbd9e6d5afc3cccec4e7c86ad023bcc52dd72";

732+ sha256 = "5133875012d3165d3941740b80addfa3adcd0eec015dc21a6b1261b4d48b824c";

733 }

733 }

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";

735 locale = "is";

735 locale = "is";

736 arch = "linux-i686";

736 arch = "linux-i686";

737− sha256 = "951d6273c916a84e9139f74f916a9db4b4a976f83900d3e5506356b8817943ee";

737+ sha256 = "d59c86f8c71468cbbb7d8d4641e8baa8672fae0ee38a232782a63f29d1ad4d10";

738 }

738 }

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";

740 locale = "it";

740 locale = "it";

741 arch = "linux-i686";

741 arch = "linux-i686";

742− sha256 = "ac5c51fb5e42544696d975d769edf81c07e2a42bd5279eddb016e434c1945f1e";

742+ sha256 = "d583c577d73623e06aec514635c4191a9dbfc14a8cfd88880bc50abb0f5ae308";

743 }

743 }

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";

745 locale = "ja";

745 locale = "ja";

746 arch = "linux-i686";

746 arch = "linux-i686";

747− sha256 = "99c6b533a3e3ddab8dfd9b4a66f6e403bc79ab214027d604671d9f27ae897041";

747+ sha256 = "31fd6b653338050651b8432a84278ae26bccdd7cdf0d4c2674a6208f5a3ad9a0";

748 }

748 }

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";

750 locale = "ka";

750 locale = "ka";

751 arch = "linux-i686";

751 arch = "linux-i686";

752− sha256 = "73eb8f1c4f22fda48ba752982265363730e23d4695fe2296b30cd74191da3c08";

752+ sha256 = "09e6a905151bcf7d373c6b9ec3bb00043361a4e06e08752834d581f6f211a595";

753 }

753 }

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";

755 locale = "kab";

755 locale = "kab";

756 arch = "linux-i686";

756 arch = "linux-i686";

757− sha256 = "a3ee102058a90cc02c745434178fe519aead9ed4552d3923eaddfaed8fbea207";

757+ sha256 = "117bd25831806d7d8774907a49288ea91c8160add23d0decce9d1dd95bd3c918";

758 }

758 }

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";

760 locale = "kk";

760 locale = "kk";

761 arch = "linux-i686";

761 arch = "linux-i686";

762− sha256 = "0858af4f79d5b8592ce18701968331a19ac0d35d50117dc95096bb9f7d3cbca1";

762+ sha256 = "6511f3a53cea4f210b52d37e7298427382c7a5738e1a055b38a4d41b6eb9fe3d";

763 }

763 }

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";

765 locale = "km";

765 locale = "km";

766 arch = "linux-i686";

766 arch = "linux-i686";

767− sha256 = "b4509b98696f18d19850320f6b9e3d97dbcc0f5f55019cf3e0e62581ebd5d747";

767+ sha256 = "af231614cea8b247215d79c101bd59a135ff86965b6aaab2226016215164d240";

768 }

768 }

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";

770 locale = "kn";

770 locale = "kn";

771 arch = "linux-i686";

771 arch = "linux-i686";

772− sha256 = "8b9e139b3e0e98f266a77cba5d5a7deb3ee714176cffd5cb2b8f9e8ae85189e4";

772+ sha256 = "abe0ba12cad7eb53f8592476efe3fbd93a1cf3d1108828db7eb3d9d6d3b639a5";

773 }

773 }

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";

775 locale = "ko";

775 locale = "ko";

776 arch = "linux-i686";

776 arch = "linux-i686";

777− sha256 = "a43471bf0cb5e36f8e8db03e6d9e8be46bf4cb3209f66c6d721cd8ddcaf1b560";

777+ sha256 = "6415de365af3c132afacaf114a804446d4df566693254e6659551d95016ed830";

778 }

778 }

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";

780 locale = "lij";

780 locale = "lij";

781 arch = "linux-i686";

781 arch = "linux-i686";

782− sha256 = "8dadda12fef18c64ed1331eac980c87772a45b821f524f48d73384758a003357";

782+ sha256 = "d882562d34ea5e49cd035cda2aa2489bc75db90b1e777be1a74dedc394d02e8f";

783 }

783 }

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";

785 locale = "lt";

785 locale = "lt";

786 arch = "linux-i686";

786 arch = "linux-i686";

787− sha256 = "93dbe1924d766b5dce326597c7a5557b26bf1137bae68bed6a319ce5caf63ab1";

787+ sha256 = "59add081878210ffbb9445dacf12f999ea6995fddec1444fb11b9c93c615abb5";

788 }

788 }

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";

790 locale = "lv";

790 locale = "lv";

791 arch = "linux-i686";

791 arch = "linux-i686";

792− sha256 = "a161963a911846e93e64beff2eda2db9bf449f266697214a4483dafa97d1a2fb";

792+ sha256 = "d11227308bb407aedc6d2559256d92fe931e5ea34498b511f5e23b8091e91766";

793 }

793 }

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";

795 locale = "mk";

795 locale = "mk";

796 arch = "linux-i686";

796 arch = "linux-i686";

797− sha256 = "77db19a56be146f189436ca7d6c71defa6006ba3e34f2e10a8d1d362526dad71";

797+ sha256 = "34e1a97d0944d241d12b8a5d2f64ff34f7bc7a3c43b23ac05d13d794bf36e960";

798 }

798 }

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";

800 locale = "mr";

800 locale = "mr";

801 arch = "linux-i686";

801 arch = "linux-i686";

802− sha256 = "fbdf4862658eb780d499f089c1fa89b4374945e1990ed8892b2fdbaeffb28ed5";

802+ sha256 = "98746bc7f75898bbd5ca5c38b47f311d09d43a2264da85b0303ea4bd01d7a0fb";

803 }

803 }

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";

805 locale = "ms";

805 locale = "ms";

806 arch = "linux-i686";

806 arch = "linux-i686";

807− sha256 = "16e5dcdba19020f498c767732f3426915cb5f9b8f5b2be3adb2825d0db52a1d4";

807+ sha256 = "48a1a0892ad1ef2ab03e3e66f05401c1d6e231801d5f03ac63a7984225624818";

808 }

808 }

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";

810 locale = "my";

810 locale = "my";

811 arch = "linux-i686";

811 arch = "linux-i686";

812− sha256 = "c19ed3d409233f055ac633b4baa40de0e2be99d731f3091f0cccf772eaa39f2b";

812+ sha256 = "745a7e7c73d3161aff4bcaba915ed9939970d8e4478cbaebbb32f47380f1c029";

813 }

813 }

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";

815 locale = "nb-NO";

815 locale = "nb-NO";

816 arch = "linux-i686";

816 arch = "linux-i686";

817− sha256 = "c36dd328395d5fe3e7907d990e1f8185144e93961da9d8aaf81a1bbede55eed8";

817+ sha256 = "c67804a726c68c534fc763893f0e7cc94ab55b9fd4844113ffffb467cefb63ed";

818 }

818 }

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";

820 locale = "ne-NP";

820 locale = "ne-NP";

821 arch = "linux-i686";

821 arch = "linux-i686";

822− sha256 = "6672d29f0fb08645f7cd4b7b7de2edff850da86e29f078fe7e49c10dbf4c35ca";

822+ sha256 = "69073cf042a8e78184f7f01db3ca88bd3b3d59960a3e51124cb9908150452115";

823 }

823 }

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";

825 locale = "nl";

825 locale = "nl";

826 arch = "linux-i686";

826 arch = "linux-i686";

827− sha256 = "71f9339624aa2014238c35c78142a1fda6762c61f5b199becc0682532c9c8de8";

827+ sha256 = "24d30ce7f9cc2ad445c9aca32616a2efb9a3d392e62f855bbf5709d8160823bd";

828 }

828 }

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";

830 locale = "nn-NO";

830 locale = "nn-NO";

831 arch = "linux-i686";

831 arch = "linux-i686";

832− sha256 = "5f9f59d3ef36aaa01d3b058adb9a08f09e184ed408d1b5b25ec415c3e83b404a";

832+ sha256 = "d3a5034cb8ce135ec245c2ef94e799a31744a8592e6c5ba3935b19a77c087d53";

833 }

833 }

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";

835 locale = "oc";

835 locale = "oc";

836 arch = "linux-i686";

836 arch = "linux-i686";

837− sha256 = "76d7b330ba2f5c7df4df6bdddda7a887a5222f0ba3caa13f77d6ea956ec7e685";

837+ sha256 = "dbe0dfd961a543017ca8dcca6fae7168ca4d85a637f4d2dae7b02b6ea671b28f";

838 }

838 }

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";

840 locale = "pa-IN";

840 locale = "pa-IN";

841 arch = "linux-i686";

841 arch = "linux-i686";

842− sha256 = "569b151ad53b47338ad8f78d4266247e7e7fa4ef207ee58b3606dc299b0f16af";

842+ sha256 = "1bcfb488ec1f3934415ee4af684e7dd40966265be65f43488d3d670d14790124";

843 }

843 }

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";

845 locale = "pl";

845 locale = "pl";

846 arch = "linux-i686";

846 arch = "linux-i686";

847− sha256 = "af4ca741d8eb82e40775b0a2cc9338c2e81854df5107815bab8f4b6188c7189a";

847+ sha256 = "484a8ee788ab6edce6b66f31c94f7fd0e671269ae470569129662ed4b7e9294b";

848 }

848 }

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";

850 locale = "pt-BR";

850 locale = "pt-BR";

851 arch = "linux-i686";

851 arch = "linux-i686";

852− sha256 = "16ed593e6c116418ca5969a07fbcbd9f93af3972edc2227271256d269066b61d";

852+ sha256 = "d764f17b9eb2c8ac61c92490a20bcb4dd83810635b89a6405c4a0389ab15104f";

853 }

853 }

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";

855 locale = "pt-PT";

855 locale = "pt-PT";

856 arch = "linux-i686";

856 arch = "linux-i686";

857− sha256 = "2a5b5a26185ff4560691d5f32fbb29ecd9123df63020492aa2829e0088aa6b1b";

857+ sha256 = "1a9b64665abf305dd38c6441e22448fa0cd5d142a69de96220b2f8683230a341";

858 }

858 }

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";

860 locale = "rm";

860 locale = "rm";

861 arch = "linux-i686";

861 arch = "linux-i686";

862− sha256 = "e80cf9ebb3010c97acd5d2f6cc672aa6ce4fdca930974238a148c2683f8a8dd8";

862+ sha256 = "8870c35cf68d654db389cea3df9951660d371c53804cb2d9fb5d8006155cb82c";

863 }

863 }

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";

865 locale = "ro";

865 locale = "ro";

866 arch = "linux-i686";

866 arch = "linux-i686";

867− sha256 = "4db1842a3ead551700c83be677aacdd00e1957ecb6534f2b8933a19a6eedb38b";

867+ sha256 = "cb72b5316bc807095a64d8767822732ad18a2cec28c7a23bd603dcafbfd08f1a";

868 }

868 }

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";

870 locale = "ru";

870 locale = "ru";

871 arch = "linux-i686";

871 arch = "linux-i686";

872− sha256 = "6f821c7186343dc0bc5860bce1ae24f45c3de253223a0e99d05e582f037e7447";

872+ sha256 = "a5456041bc8cfc22d3f7a96a610c6d37b77bcba32b630fdab7fdb2753e46b40c";

873 }

873 }

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";

875 locale = "sco";

875 locale = "sco";

876 arch = "linux-i686";

876 arch = "linux-i686";

877− sha256 = "e213b13f3ffc309feb993239308053d029f200fa58cb35f27a52e540e544e83c";

877+ sha256 = "539014a44ac79130666c6c4f5205ababf3bbb17d357632a0ba584a73c63bda93";

878 }

878 }

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";

880 locale = "si";

880 locale = "si";

881 arch = "linux-i686";

881 arch = "linux-i686";

882− sha256 = "a59e9a00f0e1b054e08706abb823ec7c6a87ca0975b97444f6cfd265e0c25b22";

882+ sha256 = "5f231e14acf1c896fdb9778d7821dfda13a756d4f861e74076b8fb02848dd08d";

883 }

883 }

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";

885 locale = "sk";

885 locale = "sk";

886 arch = "linux-i686";

886 arch = "linux-i686";

887− sha256 = "b6602ad437d41c679d43cbe7e705bb5ed31909591a8ef51ef4b5604b3a4c884e";

887+ sha256 = "17c32fb881566fa09759d1374e957023c5fc6123b24791d4e8c94d4c2e971405";

888 }

888 }

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";

890 locale = "sl";

890 locale = "sl";

891 arch = "linux-i686";

891 arch = "linux-i686";

892− sha256 = "b82f1f2745235271d7a99ad0c36f664b67826276a447285165100678f4de3030";

892+ sha256 = "d6121d2dcf47504111e924150cdf8360b039a5d7c4cef2a42b80ddb876a47127";

893 }

893 }

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";

895 locale = "son";

895 locale = "son";

896 arch = "linux-i686";

896 arch = "linux-i686";

897− sha256 = "508c90bede375fe243f39a6ee26b972e0ec86bfa2978f3d01d0e83784731cafb";

897+ sha256 = "e83f6e4da3820c91cdb3125d49a71e4417cb37c0e7598fcf1bf138f21d94f485";

898 }

898 }

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";

900 locale = "sq";

900 locale = "sq";

901 arch = "linux-i686";

901 arch = "linux-i686";

902− sha256 = "db2799e56ade9c1b691d41803255a5fd1ddc08c69e199f5c1b253df11249cf67";

902+ sha256 = "dcf6ed239eb78e370db2a60b9fc0eed96f71e741be66f9ac2a537357648304b2";

903 }

903 }

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";

905 locale = "sr";

905 locale = "sr";

906 arch = "linux-i686";

906 arch = "linux-i686";

907− sha256 = "d3502cba898ee0009292f942c2e3fc2ca0225cdd2470667bd943103fa7770201";

907+ sha256 = "d724ad02d8153aa15bfeba33e476bbbc937c5a5210a3747a5ba253ab3605b725";

908 }

908 }

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";

910 locale = "sv-SE";

910 locale = "sv-SE";

911 arch = "linux-i686";

911 arch = "linux-i686";

912− sha256 = "eca5f29ebd1e756206dde952980c03b8d4fb19c544bdf814bdab5ed05ce5fef3";

912+ sha256 = "6c6ce7c4a7bf73b3cc26af264e4d6dfabcf75d88226903ffb11142657cfbf94e";

913 }

913 }

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";

915 locale = "szl";

915 locale = "szl";

916 arch = "linux-i686";

916 arch = "linux-i686";

917− sha256 = "fbc098de33187fde99bbf3d205882d281e404140619d624961d0b8d1af7e3fed";

917+ sha256 = "d9996d12531225e5d181a2304326ca8de19cd6c0f02efedc890f90e4d5d1b72e";

918 }

918 }

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";

920 locale = "ta";

920 locale = "ta";

921 arch = "linux-i686";

921 arch = "linux-i686";

922− sha256 = "a3f3f3472932be60c4f8296a13538bd12b898057a977dd7c33edc12016438dbd";

922+ sha256 = "d4b3776a8728da72a233db501eed0014cb60e87dd0c3b76cb4e5fd834dc323da";

923 }

923 }

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";

925 locale = "te";

925 locale = "te";

926 arch = "linux-i686";

926 arch = "linux-i686";

927− sha256 = "d0b562f554afa76bcc034eca7a167151a7ee38c6e82005d9a47273df08e6c0f5";

927+ sha256 = "8246cfb157b68d09a7e57f910ae33d522495120112a6debc3cfeb60a3e238d92";

928 }

928 }

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";

930 locale = "th";

930 locale = "th";

931 arch = "linux-i686";

931 arch = "linux-i686";

932− sha256 = "c362a365677131af77786b0f6390b62bd224ba26b7f79e69ad1826a6a15800db";

932+ sha256 = "80c37b977ae6eaf6da2647800584a6ff9c430d6fd368ad89713a1ed7166cb197";

933 }

933 }

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";

935 locale = "tl";

935 locale = "tl";

936 arch = "linux-i686";

936 arch = "linux-i686";

937− sha256 = "8249e0d3bb2aaf5c0be9def1842874af417bae275ba224c912371049de62a43d";

937+ sha256 = "f7757f0e751989854f240bf5eb13b8c660a587bdb7f44616ee8e7a41bb71b2d3";

938 }

938 }

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";

940 locale = "tr";

940 locale = "tr";

941 arch = "linux-i686";

941 arch = "linux-i686";

942− sha256 = "82a3a504ba862849c4574ed96bdc5a737479a06a21f011f6cd74b2001bb192ff";

942+ sha256 = "533a04e78947202d86dbd79b170495e9027c81bd2db8be3d5f281d665e3505d6";

943 }

943 }

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";

945 locale = "trs";

945 locale = "trs";

946 arch = "linux-i686";

946 arch = "linux-i686";

947− sha256 = "da6f0d69580df77ae2b1d091aecfbeda640440d3a15348ac38221209c6674079";

947+ sha256 = "eda683d0df13db0de392bd136ed86c3abbaf41a0617d559ee1d308e28f519487";

948 }

948 }

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";

950 locale = "uk";

950 locale = "uk";

951 arch = "linux-i686";

951 arch = "linux-i686";

952− sha256 = "c04848cd11abb05635e33977c98f76b4acda3a6807c8f5bc8b5d2a9b49208f1d";

952+ sha256 = "4c1cce01a785b8fa7c31fd5394337231db614cd96dacfa7963bb612996fc287c";

953 }

953 }

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";

955 locale = "ur";

955 locale = "ur";

956 arch = "linux-i686";

956 arch = "linux-i686";

957− sha256 = "ba779105d6a9dfe3138f4b73ba60078ec66ad9fe8468f2d72f57dd19161fa09c";

957+ sha256 = "628baa7d2e0f200ba2b623aada71bd0e69856b903a92d98c46f0552df8acca4c";

958 }

958 }

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";

960 locale = "uz";

960 locale = "uz";

961 arch = "linux-i686";

961 arch = "linux-i686";

962− sha256 = "190691fd5777153daa29d56542f6792356aa916073d5e842845fe1c9444e632b";

962+ sha256 = "626cc29fd753802c3a57d2521553d5957f985b925561eee6c2046464ded084f4";

963 }

963 }

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";

965 locale = "vi";

965 locale = "vi";

966 arch = "linux-i686";

966 arch = "linux-i686";

967− sha256 = "b5ea01ae5980892d6379eac4ba7d0f3d2643c54ade18452d39be84e44c676c01";

967+ sha256 = "963ea1b4758b64b67fe05a25d6775a1f8601a438d639bdda0d3ed740fe9ad8a5";

968 }

968 }

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";

970 locale = "xh";

970 locale = "xh";

971 arch = "linux-i686";

971 arch = "linux-i686";

972− sha256 = "6c2f218caa8effa6fd6d9553088f7eb9a8ccf6297e3a9cd8c57d0ec5902c4c19";

972+ sha256 = "030f5a08c37ecaae8ef9c59f58e007b3c3484b9eabba33dbae91d89710390d85";

973 }

973 }

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";

975 locale = "zh-CN";

975 locale = "zh-CN";

976 arch = "linux-i686";

976 arch = "linux-i686";

977− sha256 = "61838f9c25bec8dbb0d386ae8412f34be8701e0d6f593503eab51c2009c5e069";

977+ sha256 = "097b3e3912b1b024d7cb615ed400ea244af47ef90cdb0c89d7223915a040108d";

978 }

978 }

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";

980 locale = "zh-TW";

980 locale = "zh-TW";

981 arch = "linux-i686";

981 arch = "linux-i686";

982− sha256 = "48ea7e4ae524dbb9ef83aada60b597524091be85a1dfc3665d1fdc9dba16498b";

982+ sha256 = "ca10fd6cafa25cdbd12b4e087d80a8212c947099a848b0b9f754ec6dbe8c6be9";

983 }

983 }

984 ];

984 ];

985}

985}

pkgs/applications/networking/browsers/firefox/common.nix+9

@@ -19,6 +19,7 @@

19

19

20{ lib

20{ lib

21, stdenv

21, stdenv

22+, fetchpatch

22

23

23# build time

24# build time

24, autoconf

25, autoconf

@@ -177,6 +178,14 @@ buildStdenv.mkDerivation ({

177 ];

178 ];

178

179

179 patches = [

180 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+ })

180 ]

189 ]

181 ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

190 ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

182 ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch

191 ++ 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 @@

1{

1{

2− "packageVersion": "100.0-1",

2+ "packageVersion": "99.0.1-4",

3 "source": {

3 "source": {

4− "rev": "100.0-1",

4+ "rev": "99.0.1-4",

5− "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla"

5+ "sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni"

6 },

6 },

7 "firefox": {

7 "firefox": {

8− "version": "100.0",

8+ "version": "99.0.1",

9− "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"

9+ "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"

10 }

10 }

11}

11}

pkgs/applications/networking/browsers/firefox/packages.nix+4−4

@@ -7,10 +7,10 @@ in

7rec {

7rec {

8 firefox = common rec {

8 firefox = common rec {

9 pname = "firefox";

9 pname = "firefox";

10− version = "100.0";

10+ version = "99.0.1";

11 src = fetchurl {

11 src = fetchurl {

12 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

12 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

13− sha512 = "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa";

13+ sha512 = "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f";

14 };

14 };

15

15

16 meta = {

16 meta = {

@@ -32,10 +32,10 @@ rec {

32

32

33 firefox-esr-91 = common rec {

33 firefox-esr-91 = common rec {

34 pname = "firefox-esr";

34 pname = "firefox-esr";

35− version = "91.9.0esr";

35+ version = "91.8.0esr";

36 src = fetchurl {

36 src = fetchurl {

37 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

37 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

38− sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133";

38+ sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";

39 };

39 };

40

40

41 meta = {

41 meta = {

pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6

@@ -1,20 +1,20 @@

1{

1{

2 beta = import ./browser.nix {

2 beta = import ./browser.nix {

3 channel = "beta";

3 channel = "beta";

4− version = "101.0.1210.19";

4+ version = "99.0.1150.16";

5 revision = "1";

5 revision = "1";

6− sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";

6+ sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";

7 };

7 };

8 dev = import ./browser.nix {

8 dev = import ./browser.nix {

9 channel = "dev";

9 channel = "dev";

10− version = "102.0.1227.0";

10+ version = "100.0.1163.1";

11 revision = "1";

11 revision = "1";

12− sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";

12+ sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";

13 };

13 };

14 stable = import ./browser.nix {

14 stable = import ./browser.nix {

15 channel = "stable";

15 channel = "stable";

16− version = "100.0.1185.44";

16+ version = "98.0.1108.56";

17 revision = "1";

17 revision = "1";

18− sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";

18+ sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";

19 };

19 };

20}

20}

pkgs/applications/networking/browsers/vivaldi/default.nix+2−2

@@ -20,11 +20,11 @@ let

20 vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

20 vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

21in stdenv.mkDerivation rec {

21in stdenv.mkDerivation rec {

22 pname = "vivaldi";

22 pname = "vivaldi";

23− version = "5.2.2623.41-1";

23+ version = "5.2.2623.39-1";

24

24

25 src = fetchurl {

25 src = fetchurl {

26 url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

26 url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

27− sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d";

27+ sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk";

28 };

28 };

29

29

30 unpackPhase = ''

30 unpackPhase = ''

pkgs/applications/networking/cloudflared/default.nix+2−2

@@ -2,13 +2,13 @@

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "cloudflared";

4 pname = "cloudflared";

5− version = "2022.5.0";

5+ version = "2022.4.1";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "cloudflare";

8 owner = "cloudflare";

9 repo = "cloudflared";

9 repo = "cloudflared";

10 rev = version;

10 rev = version;

11− hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";

11+ hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";

12 };

12 };

13

13

14 vendorSha256 = null;

14 vendorSha256 = null;

pkgs/applications/networking/cluster/fluxcd/default.nix+5−5

@@ -1,9 +1,9 @@

1{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

1{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

2

2

3let

3let

4− version = "0.30.2";

4+ version = "0.29.5";

5− sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";

5+ sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";

6− manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";

6+ manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";

7

7

8 manifests = fetchzip {

8 manifests = fetchzip {

9 url =

9 url =

@@ -23,7 +23,7 @@ in buildGoModule rec {

23 inherit sha256;

23 inherit sha256;

24 };

24 };

25

25

26− vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";

26+ vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";

27

27

28 postUnpack = ''

28 postUnpack = ''

29 cp -r ${manifests} source/cmd/flux/manifests

29 cp -r ${manifests} source/cmd/flux/manifests

@@ -65,6 +65,6 @@ in buildGoModule rec {

65 '';

65 '';

66 homepage = "https://fluxcd.io";

66 homepage = "https://fluxcd.io";

67 license = licenses.asl20;

67 license = licenses.asl20;

68− maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];

68+ maintainers = with maintainers; [ jlesquembre bryanasdev000 ];

69 };

69 };

70}

70}

pkgs/applications/networking/cluster/fluxcd/update.sh+1−1

@@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then

35 fi

35 fi

36

36

37 # `git` flag here is to be used by local maintainers to speed up the bump process

37 # `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

39 git switch -c "package-fluxcd-${LATEST_VERSION}"

39 git switch -c "package-fluxcd-${LATEST_VERSION}"

40 git add "$FLUXCD_PATH"/default.nix

40 git add "$FLUXCD_PATH"/default.nix

41 git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"

41 git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"

pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3

@@ -1,13 +1,13 @@

1{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:

1{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:

2let

2let

3− ver = "1.2.312.0";

3+ ver = "1.2.54.0";

4 source =

4 source =

5 if stdenv.isDarwin then {

5 if stdenv.isDarwin then {

6 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";

6 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";

7− sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";

7+ sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";

8 } else {

8 } else {

9 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";

9 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";

10− sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";

10+ sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";

11 };

11 };

12 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";

12 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";

13in

13in

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 @@

6

6

7buildGoModule rec {

7buildGoModule rec {

8 pname = "gmailctl";

8 pname = "gmailctl";

9+ # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232

10+ # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f

9− version = "0.10.2";

11+ version = "unstable-2022-03-24";

10

12

11 src = fetchFromGitHub {

13 src = fetchFromGitHub {

12 owner = "mbrt";

14 owner = "mbrt";

13 repo = "gmailctl";

15 repo = "gmailctl";

14− rev = "v${version}";

16+ rev = "484bb689866987580e0576165180ef06375a543f";

15− sha256 = "sha256-tj+jKJuKwuqic/qfaUbf+Tao1X2FW0VVoGwqyx3q+go=";

17+ sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA=";

16 };

18 };

17

19

18− vendorSha256 = "sha256-aBw9C488a3Wxde3QCCU0eiagiRYOS9mkjcCsB2Mrdr0=";

20+ vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo=";

19

21

20 nativeBuildInputs = [

22 nativeBuildInputs = [

21 installShellFiles

23 installShellFiles

pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3

@@ -1,7 +1,7 @@

1{ lib, callPackage, stdenvNoCC }:

1{ lib, callPackage, stdenvNoCC }:

2let

2let

3 pname = "caprine";

3 pname = "caprine";

4− version = "2.55.4";

4+ version = "2.55.2";

5 metaCommon = with lib; {

5 metaCommon = with lib; {

6 description = "An elegant Facebook Messenger desktop app";

6 description = "An elegant Facebook Messenger desktop app";

7 homepage = "https://sindresorhus.com/caprine";

7 homepage = "https://sindresorhus.com/caprine";

@@ -10,11 +10,11 @@ let

10 };

10 };

11 x86_64-appimage = callPackage ./build-from-appimage.nix {

11 x86_64-appimage = callPackage ./build-from-appimage.nix {

12 inherit pname version metaCommon;

12 inherit pname version metaCommon;

13− sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";

13+ sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";

14 };

14 };

15 x86_64-dmg = callPackage ./build-from-dmg.nix {

15 x86_64-dmg = callPackage ./build-from-dmg.nix {

16 inherit pname version metaCommon;

16 inherit pname version metaCommon;

17− sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";

17+ sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA=";

18 };

18 };

19in

19in

20(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {

20(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;

43

43

44mkDerivation rec {

44mkDerivation rec {

45 pname = "psi-plus";

45 pname = "psi-plus";

46− version = "1.5.1618";

46+ version = "1.5.1615";

47

47

48 src = fetchFromGitHub {

48 src = fetchFromGitHub {

49 owner = "psi-plus";

49 owner = "psi-plus";

50 repo = "psi-plus-snapshots";

50 repo = "psi-plus-snapshots";

51 rev = version;

51 rev = version;

52− sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A=";

52+ sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI=";

53 };

53 };

54

54

55 cmakeFlags = [

55 cmakeFlags = [

pkgs/applications/networking/instant-messengers/teams/default.nix+1−1

@@ -134,7 +134,7 @@ let

134

134

135 src = fetchurl {

135 src = fetchurl {

136 url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg";

136 url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg";

137− hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810=";

137+ sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0";

138 };

138 };

139

139

140 buildInputs = [ xar cpio makeWrapper ];

140 buildInputs = [ xar cpio makeWrapper ];

pkgs/applications/networking/irc/senpai/default.nix+4−4

@@ -2,16 +2,16 @@

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "senpai";

4 pname = "senpai";

5− version = "unstable-2022-04-29";

5+ version = "unstable-2021-12-14";

6

6

7 src = fetchFromSourcehut {

7 src = fetchFromSourcehut {

8 owner = "~taiite";

8 owner = "~taiite";

9 repo = "senpai";

9 repo = "senpai";

10− rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";

10+ rev = "8091752a67781273944e7a79a803b7a671378313";

11− sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";

11+ sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";

12 };

12 };

13

13

14− vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";

14+ vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

15

15

16 subPackages = [

16 subPackages = [

17 "cmd/senpai"

17 "cmd/senpai"

pkgs/applications/networking/modem-manager-gui/default.nix−15

@@ -2,7 +2,6 @@

2, pkg-config

2, pkg-config

3, python3

3, python3

4, fetchFromGitLab

4, fetchFromGitLab

5−, fetchpatch

6, gtk3

5, gtk3

7, glib

6, glib

8, gdbm

7, gdbm

@@ -45,20 +44,6 @@ stdenv.mkDerivation rec {

45 libayatana-appindicator-gtk3

44 libayatana-appindicator-gtk3

46 ];

45 ];

47

46

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−

62 postPatch = ''

47 postPatch = ''

63 patchShebangs man/manhelper.py

48 patchShebangs man/manhelper.py

64 '';

49 '';

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

@@ -23,11 +23,11 @@

23

23

24stdenv.mkDerivation rec {

24stdenv.mkDerivation rec {

25 pname = "liferea";

25 pname = "liferea";

26− version = "1.13.8";

26+ version = "1.12.9";

27

27

28 src = fetchurl {

28 src = fetchurl {

29 url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";

29 url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";

30− sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h";

30+ sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q";

31 };

31 };

32

32

33 nativeBuildInputs = [

33 nativeBuildInputs = [

pkgs/applications/networking/nextcloud-client/default.nix+2−2

@@ -26,7 +26,7 @@

26

26

27mkDerivation rec {

27mkDerivation rec {

28 pname = "nextcloud-client";

28 pname = "nextcloud-client";

29− version = "3.5.0";

29+ version = "3.4.4";

30

30

31 outputs = [ "out" "dev" ];

31 outputs = [ "out" "dev" ];

32

32

@@ -34,7 +34,7 @@ mkDerivation rec {

34 owner = "nextcloud";

34 owner = "nextcloud";

35 repo = "desktop";

35 repo = "desktop";

36 rev = "v${version}";

36 rev = "v${version}";

37− sha256 = "sha256-eFtBdnwHaLirzZaHDw6SRfmsqO3dmBB8Y9csJuiTf1A=";

37+ sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ=";

38 };

38 };

39

39

40 patches = [

40 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+}:

4+

5+let

6+ twisterHTML = srcOnly {

7+ name = "twister-html";

8+ src = fetchFromGitHub {

9+ owner = "miguelfreitas";

10+ repo = "twister-html";

11+ rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

12+ sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

13+ };

14+ };

15+

16+ boostPython = boost.override {

17+ enablePython = true;

18+ python = python2;

19+ };

20+

21+in stdenv.mkDerivation rec {

22+ pname = "twister";

23+ version = "2019-08-19";

24+

25+ src = fetchFromGitHub {

26+ owner = "miguelfreitas";

27+ repo = "twister-core";

28+ rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";

29+ sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";

30+ };

31+

32+ configureFlags = [

33+ "--with-libgeoip"

34+ "--with-libiconv"

35+ "--disable-deprecated-functions"

36+ "--enable-tests"

37+ "--enable-python-binding"

38+ "--with-boost-libdir=${boostPython.out}/lib"

39+ ];

40+

41+ nativeBuildInputs = [ pkg-config automake autoconf ];

42+ buildInputs = [

43+ libtool python2

44+ boostPython db openssl geoip miniupnpc libiconv

45+ ];

46+

47+ postPatch = ''

48+ sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \

49+ src/init.cpp

50+ sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \

51+ src/util.cpp

52+ '';

53+

54+ preConfigure = ''

55+ sh autotool.sh

56+ '';

57+

58+ installPhase = ''

59+ install -vD twisterd "$out/bin/twisterd"

60+ '';

61+

62+ enableParallelBuilding = true;

63+

64+ meta = {

65+ homepage = "http://www.twister.net.co/";

66+ description = "Peer-to-peer microblogging";

67+ license = lib.licenses.mit;

68+ platforms = lib.platforms.linux;

69+ };

70+}

pkgs/applications/networking/seafile-client/default.nix+1−3

@@ -9,9 +9,7 @@ mkDerivation rec {

9 src = fetchFromGitHub {

9 src = fetchFromGitHub {

10 owner = "haiwen";

10 owner = "haiwen";

11 repo = "seafile-client";

11 repo = "seafile-client";

12− # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state

12+ rev = "v${version}";

13− # that fails to link properly

14− rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";

15 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

13 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

16 };

14 };

17

15

pkgs/applications/networking/sync/onedrive/default.nix+2−2

@@ -14,13 +14,13 @@

14

14

15stdenv.mkDerivation rec {

15stdenv.mkDerivation rec {

16 pname = "onedrive";

16 pname = "onedrive";

17− version = "2.4.17";

17+ version = "2.4.16";

18

18

19 src = fetchFromGitHub {

19 src = fetchFromGitHub {

20 owner = "abraunegg";

20 owner = "abraunegg";

21 repo = pname;

21 repo = pname;

22 rev = "v${version}";

22 rev = "v${version}";

23− hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA=";

23+ sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I=";

24 };

24 };

25

25

26 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

26 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

pkgs/applications/networking/zerobin/default.nix+1−1

@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {

40 # relax version constraints of some dependencies

40 # relax version constraints of some dependencies

41 substituteInPlace setup.cfg \

41 substituteInPlace setup.cfg \

42 --replace "clize==4.1.1" "clize" \

42 --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" \

44 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \

44 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \

45 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"

45 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"

46 '';

46 '';

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

1+{ libreoffice, runCommand, dbus, bash }:

2−, libreoffice, dbus, bash, substituteAll

2+let

3−, dolphinTemplates ? true

3+ jdk = libreoffice.jdk;

4−}:

4+in

5−runCommand libreoffice.name {

5+(runCommand libreoffice.name {

6− inherit (libreoffice) jdk meta;

7− inherit dbus libreoffice bash;

6+ inherit dbus libreoffice jdk bash;

8−} (''

7+} ''

9 mkdir -p "$out/bin"

8 mkdir -p "$out/bin"

9+ ln -s "${libreoffice}/share" "$out/share"

10 substituteAll "${./wrapper.sh}" "$out/bin/soffice"

10 substituteAll "${./wrapper.sh}" "$out/bin/soffice"

11 chmod a+x "$out/bin/soffice"

11 chmod a+x "$out/bin/soffice"

12

12

13 for i in $(ls "${libreoffice}/bin/"); do

13 for i in $(ls "${libreoffice}/bin/"); do

14 test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"

14 test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"

15 done

15 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−'')

16+'') // {

32−

17+ inherit libreoffice dbus;

18+ meta = libreoffice.meta;

19+}

pkgs/applications/office/qownnotes/default.nix+2−2

@@ -5,13 +5,13 @@

5

5

6mkDerivation rec {

6mkDerivation rec {

7 pname = "qownnotes";

7 pname = "qownnotes";

8− version = "22.5.0";

8+ version = "22.4.1";

9

9

10 src = fetchurl {

10 src = fetchurl {

11 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

11 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

12 # Fetch the checksum of current version with curl:

12 # Fetch the checksum of current version with curl:

13 # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

13 # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

14− sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";

14+ sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da";

15 };

15 };

16

16

17 nativeBuildInputs = [ qmake qttools ];

17 nativeBuildInputs = [ qmake qttools ];

pkgs/applications/office/tusk/default.nix+2−3

@@ -21,8 +21,7 @@ let

21 };

21 };

22

22

23in appimageTools.wrapType2 rec {

23in appimageTools.wrapType2 rec {

24− inherit pname version;

24+ name = "${pname}-v${version}";

25−

26 src = fetchurl {

25 src = fetchurl {

27 url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";

26 url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";

28 sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky";

27 sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky";

@@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {

37 multiPkgs = null; # no 32bit needed

36 multiPkgs = null; # no 32bit needed

38 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

37 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

39 extraInstallCommands = ''

38 extraInstallCommands = ''

40− mv $out/bin/{${pname}-${version},${pname}}

39+ mv $out/bin/{${name},${pname}}

41 mkdir "$out/share"

40 mkdir "$out/share"

42 ln -s "${desktopItem}/share/applications" "$out/share/"

41 ln -s "${desktopItem}/share/applications" "$out/share/"

43 '';

42 '';

pkgs/applications/science/biology/bwa/default.nix−2

@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {

17 sed -i '/^CC/d' Makefile

17 sed -i '/^CC/d' Makefile

18 '';

18 '';

19

19

20− makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

21−

22 # it's unclear which headers are intended to be part of the public interface

20 # it's unclear which headers are intended to be part of the public interface

23 # so we may find ourselves having to add more here over time

21 # so we may find ourselves having to add more here over time

24 installPhase = ''

22 installPhase = ''

pkgs/applications/science/biology/megahit/default.nix−3

@@ -14,9 +14,6 @@ stdenv.mkDerivation rec {

14 nativeBuildInputs = [ cmake ];

14 nativeBuildInputs = [ cmake ];

15 buildInputs = [ zlib ];

15 buildInputs = [ zlib ];

16

16

17− cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [

18− "-DSTATIC_BUILD=ON"

19− ];

20 meta = with lib; {

17 meta = with lib; {

21 description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";

18 description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";

22 license = licenses.gpl3;

19 license = licenses.gpl3;

pkgs/applications/science/biology/samtools/default.nix+1−8

@@ -22,15 +22,8 @@ stdenv.mkDerivation rec {

22

22

23 buildInputs = [ zlib ncurses htslib ];

23 buildInputs = [ zlib ncurses htslib ];

24

24

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−

30 configureFlags = [ "--with-htslib=${htslib}" ]

25 configureFlags = [ "--with-htslib=${htslib}" ]

31− ++ lib.optional (ncurses == null) "--without-curses"

26+ ++ lib.optional (ncurses == null) "--without-curses";

32− ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ]

33− ;

34

27

35 preCheck = ''

28 preCheck = ''

36 patchShebangs test/

29 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 @@

5

5

6python3.pkgs.buildPythonApplication rec {

6python3.pkgs.buildPythonApplication rec {

7 pname = "snakemake";

7 pname = "snakemake";

8− version = "7.6.1";

8+ version = "7.5.0";

9 format = "setuptools";

9 format = "setuptools";

10

10

11 src = fetchFromGitHub {

11 src = fetchFromGitHub {

12 owner = "snakemake";

12 owner = "snakemake";

13 repo = pname;

13 repo = pname;

14− rev = "refs/tags/v${version}";

14+ rev = "v${version}";

15− hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

15+ hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE=";

16 };

16 };

17

17

18 propagatedBuildInputs = with python3.pkgs; [

18 propagatedBuildInputs = with python3.pkgs; [

pkgs/applications/terminal-emulators/foot/default.nix+2−3

@@ -27,7 +27,7 @@

27}:

27}:

28

28

29let

29let

30− version = "1.12.1";

30+ version = "1.11.0";

31

31

32 # build stimuli file for PGO build and the script to generate it

32 # build stimuli file for PGO build and the script to generate it

33 # independently of the foot's build, so we can cache the result

33 # independently of the foot's build, so we can cache the result

@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {

99 owner = "dnkl";

99 owner = "dnkl";

100 repo = pname;

100 repo = pname;

101 rev = version;

101 rev = version;

102− sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk";

102+ sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn";

103 };

103 };

104

104

105 depsBuildBuild = [

105 depsBuildBuild = [

@@ -144,7 +144,6 @@ stdenv.mkDerivation rec {

144 mesonBuildType = "release";

144 mesonBuildType = "release";

145

145

146 # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options

146 # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options

147− # TODO(@sternenseemann): install systemd user units

148 mesonFlags = [

147 mesonFlags = [

149 # Use lto

148 # Use lto

150 "-Db_lto=true"

149 "-Db_lto=true"

pkgs/applications/version-management/git-repo/default.nix+2−2

@@ -4,13 +4,13 @@

4

4

5stdenv.mkDerivation rec {

5stdenv.mkDerivation rec {

6 pname = "git-repo";

6 pname = "git-repo";

7− version = "2.25";

7+ version = "2.24.1";

8

8

9 src = fetchFromGitHub {

9 src = fetchFromGitHub {

10 owner = "android";

10 owner = "android";

11 repo = "tools_repo";

11 repo = "tools_repo";

12 rev = "v${version}";

12 rev = "v${version}";

13− sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os=";

13+ sha256 = "sha256-mYCKmvI15a0ohQwxPIG8IuzNt4QvEs6Q35oMO+e5hbg=";

14 };

14 };

15

15

16 # Fix 'NameError: name 'ssl' is not defined'

16 # Fix 'NameError: name 'ssl' is not defined'

pkgs/applications/version-management/gitlab/data.json+5−5

@@ -1,14 +1,14 @@

1{

1{

2− "version": "14.10.1",

2+ "version": "14.10.0",

3− "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp",

3+ "repo_hash": "0j4dx32d4i8b44zfmqshkc19g3g9a2c2rg1r8mifjv67p7hvacnx",

4 "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",

4 "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc",

5 "owner": "gitlab-org",

5 "owner": "gitlab-org",

6 "repo": "gitlab",

6 "repo": "gitlab",

7− "rev": "v14.10.1-ee",

7+ "rev": "v14.10.0-ee",

8 "passthru": {

8 "passthru": {

9− "GITALY_SERVER_VERSION": "14.10.1",

9+ "GITALY_SERVER_VERSION": "14.10.0",

10 "GITLAB_PAGES_VERSION": "1.56.1",

10 "GITLAB_PAGES_VERSION": "1.56.1",

11 "GITLAB_SHELL_VERSION": "13.25.1",

11 "GITLAB_SHELL_VERSION": "13.25.1",

12− "GITLAB_WORKHORSE_VERSION": "14.10.1"

12+ "GITLAB_WORKHORSE_VERSION": "14.10.0"

13 }

13 }

14}

14}

pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2

@@ -11,7 +11,7 @@ let

11 gemdir = ./.;

11 gemdir = ./.;

12 };

12 };

13

13

14− version = "14.10.1";

14+ version = "14.10.0";

15 gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";

15 gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";

16in

16in

17

17

@@ -23,7 +23,7 @@ buildGoModule {

23 owner = "gitlab-org";

23 owner = "gitlab-org";

24 repo = "gitaly";

24 repo = "gitaly";

25 rev = "v${version}";

25 rev = "v${version}";

26− sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI=";

26+ sha256 = "sha256-E0tIbcm/yI1oSn4CD8oZo8WfZVJNAZBUw2QRlhAujTI=";

27 };

27 };

28

28

29 vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";

29 vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0=";

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+1−1

@@ -5,7 +5,7 @@ in

5buildGoModule rec {

5buildGoModule rec {

6 pname = "gitlab-workhorse";

6 pname = "gitlab-workhorse";

7

7

8− version = "14.10.1";

8+ version = "14.10.0";

9

9

10 src = fetchFromGitLab {

10 src = fetchFromGitLab {

11 owner = data.owner;

11 owner = data.owner;

pkgs/applications/video/vdr/plugins.nix+80−5

@@ -238,19 +238,94 @@ in {

238 };

238 };

239 };

239 };

240

240

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+

241− fritzbox = stdenv.mkDerivation rec {

310+ in stdenv.mkDerivation rec {

242 pname = "vdr-fritzbox";

311 pname = "vdr-fritzbox";

243− version = "1.5.4";

312+ version = "1.5.3";

244

313

245 src = fetchFromGitHub {

314 src = fetchFromGitHub {

246 owner = "jowi24";

315 owner = "jowi24";

247 repo = "vdr-fritz";

316 repo = "vdr-fritz";

248 rev = version;

317 rev = version;

249− sha256 = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o=";

318+ sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8";

250− fetchSubmodules = true;

251 };

319 };

252

320

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+

253− buildInputs = [ vdr boost libgcrypt ];

328+ buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ];

254

329

255 installFlags = [ "DESTDIR=$(out)" ];

330 installFlags = [ "DESTDIR=$(out)" ];

256

331

pkgs/applications/video/vlc/default.nix+2−2

@@ -82,11 +82,11 @@ let

82in

82in

83stdenv.mkDerivation rec {

83stdenv.mkDerivation rec {

84 pname = "${optionalString onlyLibVLC "lib"}vlc";

84 pname = "${optionalString onlyLibVLC "lib"}vlc";

85− version = "3.0.17.3";

85+ version = "3.0.17";

86

86

87 src = fetchurl {

87 src = fetchurl {

88 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

88 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

89− sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ=";

89+ sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";

90 };

90 };

91

91

92 # VLC uses a *ton* of libraries for various pieces of functionality, many of

92 # 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 @@

10

10

11buildGoModule rec {

11buildGoModule rec {

12 pname = "containerd";

12 pname = "containerd";

13− version = "1.6.4";

13+ version = "1.6.3";

14

14

15 src = fetchFromGitHub {

15 src = fetchFromGitHub {

16 owner = "containerd";

16 owner = "containerd";

17 repo = "containerd";

17 repo = "containerd";

18 rev = "v${version}";

18 rev = "v${version}";

19− sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";

19+ sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA=";

20 };

20 };

21

21

22 vendorSha256 = null;

22 vendorSha256 = null;

pkgs/applications/virtualization/podman/default.nix−1

@@ -88,7 +88,6 @@ buildGoModule rec {

88 podman-tls-ghostunnel

88 podman-tls-ghostunnel

89 podman-dnsname

89 podman-dnsname

90 ;

90 ;

91− oci-containers-podman = nixosTests.oci-containers.podman;

92 };

91 };

93

92

94 meta = with lib; {

93 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 }:

2

2

3rustPlatform.buildRustPackage {

3rustPlatform.buildRustPackage {

4 pname = "make-initrd-ng";

4 pname = "make-initrd-ng";

@@ -6,11 +6,4 @@ rustPlatform.buildRustPackage {

6

6

7 src = ./make-initrd-ng;

7 src = ./make-initrd-ng;

8 cargoLock.lockFile = ./make-initrd-ng/Cargo.lock;

8 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− '';

16}

9}

pkgs/build-support/kernel/make-initrd-ng.nix+2−2

@@ -8,7 +8,7 @@ let

8 # compression type and filename extension.

8 # compression type and filename extension.

9 compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;

9 compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;

10in

10in

11−{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand

11+{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand, glibc

12# Name of the derivation (not of the resulting file!)

12# Name of the derivation (not of the resulting file!)

13, name ? "initrd"

13, name ? "initrd"

14

14

@@ -72,7 +72,7 @@ in

72 passAsFile = ["contents"];

72 passAsFile = ["contents"];

73 contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n";

73 contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n";

74

74

75− nativeBuildInputs = [makeInitrdNGTool patchelf cpio] ++ lib.optional makeUInitrd ubootTools;

75+ nativeBuildInputs = [makeInitrdNGTool patchelf glibc cpio] ++ lib.optional makeUInitrd ubootTools;

76} ''

76} ''

77 mkdir ./root

77 mkdir ./root

78 make-initrd-ng "$contentsPath" ./root

78 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;

6use std::io::{BufReader, BufRead, Error, ErrorKind};

6use std::io::{BufReader, BufRead, Error, ErrorKind};

7use std::os::unix;

7use std::os::unix;

8use std::path::{Component, Path, PathBuf};

8use std::path::{Component, Path, PathBuf};

9−use std::process::Command;

9+use std::process::{Command, Stdio};

10

10

11struct NonRepeatingQueue<T> {

11struct NonRepeatingQueue<T> {

12 queue: VecDeque<T>,

12 queue: VecDeque<T>,

@@ -42,6 +42,7 @@ fn patch_elf<S: AsRef<OsStr>, P: AsRef<OsStr>>(mode: S, path: P) -> Result<Strin

42 let output = Command::new("patchelf")

42 let output = Command::new("patchelf")

43 .arg(&mode)

43 .arg(&mode)

44 .arg(&path)

44 .arg(&path)

45+ .stderr(Stdio::inherit())

45 .output()?;

46 .output()?;

46 if output.status.success() {

47 if output.status.success() {

47 Ok(String::from_utf8(output.stdout).expect("Failed to parse output"))

48 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

50 }

51 }

51}

52}

52

53

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>>(

54 source: P,

55 source: P,

55 target: S,

56 target: S,

56 queue: &mut NonRepeatingQueue<Box<Path>>,

57 queue: &mut NonRepeatingQueue<Box<Path>>,

57) -> Result<(), Error> {

58) -> Result<(), Error> {

58− fs::copy(&source, &target)?;

59+ fs::copy(&source, target)?;

59

60

60 if !Command::new("ldd").arg(&source).output()?.status.success() {

61 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));

62 return Ok(());

64 return Ok(());

63 }

65 }

64

66

@@ -89,17 +91,6 @@ fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(

89 }

91 }

90 }

92 }

91

93

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−

103 Ok(())

94 Ok(())

104}

95}

105

96

@@ -209,6 +200,7 @@ fn main() -> Result<(), Error> {

209 }

200 }

210 }

201 }

211 while let Some(obj) = queue.pop_front() {

202 while let Some(obj) = queue.pop_front() {

203+ println!("{:?}", obj);

212 handle_path(out_path, &*obj, &mut queue)?;

204 handle_path(out_path, &*obj, &mut queue)?;

213 }

205 }

214

206

pkgs/data/fonts/uni-vga/default.nix+6−4

@@ -2,6 +2,8 @@

2, libfaketime, fonttosfnt, mkfontscale

2, libfaketime, fonttosfnt, mkfontscale

3}:

3}:

4

4

5+with lib;

6+

5stdenv.mkDerivation {

7stdenv.mkDerivation {

6 name = "uni-vga";

8 name = "uni-vga";

7

9

@@ -13,7 +15,7 @@ stdenv.mkDerivation {

13 nativeBuildInputs =

15 nativeBuildInputs =

14 [ bdftopcf libfaketime

16 [ bdftopcf libfaketime

15 fonttosfnt mkfontscale

17 fonttosfnt mkfontscale

16− ] ++ lib.optionals stdenv.isLinux [ perl kbd ];

18+ ] ++ optionals stdenv.isLinux [ perl kbd ];

17

19

18 postPatch = "patchShebangs .";

20 postPatch = "patchShebangs .";

19

21

@@ -24,7 +26,7 @@ stdenv.mkDerivation {

24 # convert bdf font to otb

26 # convert bdf font to otb

25 faketime -f "1970-01-01 00:00:01" \

27 faketime -f "1970-01-01 00:00:01" \

26 fonttosfnt -v -o u_vga16.otb u_vga16.bdf

28 fonttosfnt -v -o u_vga16.otb u_vga16.bdf

27− '' + lib.optionalString stdenv.isLinux ''

29+ '' + optionalString stdenv.isLinux ''

28 # convert font to compressed psf

30 # convert font to compressed psf

29 ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \

31 ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \

30 | psfaddtable - UniCyrX.sfm - \

32 | psfaddtable - UniCyrX.sfm - \

@@ -40,14 +42,14 @@ stdenv.mkDerivation {

40 install -m 644 -D *.bdf -t "$bdf/share/fonts"

42 install -m 644 -D *.bdf -t "$bdf/share/fonts"

41 mkfontdir "$bdf/share/fonts"

43 mkfontdir "$bdf/share/fonts"

42

44

43− '' + lib.optionalString stdenv.isLinux ''

45+ '' + optionalString stdenv.isLinux ''

44 # install psf (for linux virtual terminal)

46 # install psf (for linux virtual terminal)

45 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"

47 install -m 644 -D *.psf.gz -t "$out/share/consolefonts"

46 '';

48 '';

47

49

48 outputs = [ "out" "bdf" ];

50 outputs = [ "out" "bdf" ];

49

51

50− meta = with lib; {

52+ meta = {

51 description = "Unicode VGA font";

53 description = "Unicode VGA font";

52 maintainers = [ maintainers.ftrvxmtrx ];

54 maintainers = [ maintainers.ftrvxmtrx ];

53 homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";

55 homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/";

pkgs/desktops/pantheon/apps/switchboard/default.nix+15−2

@@ -1,6 +1,7 @@

1{ lib

1{ lib

2, stdenv

2, stdenv

3, fetchFromGitHub

3, fetchFromGitHub

4+, fetchpatch

4, nix-update-script

5, nix-update-script

5, pkg-config

6, pkg-config

6, meson

7, meson

@@ -17,13 +18,13 @@

17

18

18stdenv.mkDerivation rec {

19stdenv.mkDerivation rec {

19 pname = "switchboard";

20 pname = "switchboard";

20− version = "6.0.1";

21+ version = "6.0.0";

21

22

22 src = fetchFromGitHub {

23 src = fetchFromGitHub {

23 owner = "elementary";

24 owner = "elementary";

24 repo = pname;

25 repo = pname;

25 rev = version;

26 rev = version;

26− sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M=";

27+ sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";

27 };

28 };

28

29

29 nativeBuildInputs = [

30 nativeBuildInputs = [

@@ -45,6 +46,18 @@ stdenv.mkDerivation rec {

45

46

46 patches = [

47 patches = [

47 ./plugs-path-env.patch

48 ./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+ })

48 ];

61 ];

49

62

50 postPatch = ''

63 postPatch = ''

pkgs/development/compilers/chicken/5/eggs.nix−414

@@ -2,38 +2,6 @@

2rec {

2rec {

3 inherit (pkgs) eggDerivation fetchegg;

3 inherit (pkgs) eggDerivation fetchegg;

4

4

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−

37 args = eggDerivation {

5 args = eggDerivation {

38 name = "args-1.6.0";

6 name = "args-1.6.0";

39

7

@@ -50,125 +18,6 @@ rec {

50 ];

18 ];

51 };

19 };

52

20

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−

172 matchable = eggDerivation {

21 matchable = eggDerivation {

173 name = "matchable-1.1";

22 name = "matchable-1.1";

174

23

@@ -199,142 +48,6 @@ rec {

199 ];

48 ];

200 };

49 };

201

50

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−

338 srfi-1 = eggDerivation {

51 srfi-1 = eggDerivation {

339 name = "srfi-1-0.5.1";

52 name = "srfi-1-0.5.1";

340

53

@@ -407,20 +120,6 @@ rec {

407 ];

120 ];

408 };

121 };

409

122

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−

424 srfi-37 = eggDerivation {

123 srfi-37 = eggDerivation {

425 name = "srfi-37-1.4";

124 name = "srfi-37-1.4";

426

125

@@ -434,118 +133,5 @@ rec {

434

133

435 ];

134 ];

436 };

135 };

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− };

550}

136}

551

137

pkgs/development/compilers/chicken/5/eggs.scm−5

@@ -1,11 +1,6 @@

1;; Eggs used by egg2nix

1;; Eggs used by egg2nix

2args

2args

3matchable

3matchable

4−apropos

5−spiffy

6−json

7−tcp6

8−sha2

9

4

10;; other eggs to include in nixpkgs

5;; other eggs to include in nixpkgs

11srfi-189

6srfi-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 }:

2

2

3# from justinwoo/easy-purescript-nix

3# from justinwoo/easy-purescript-nix

4# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

4# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

@@ -35,7 +35,9 @@ in stdenv.mkDerivation rec {

35 };

35 };

36

36

37

37

38− buildInputs = [ zlib gmp ];

38+ buildInputs = [ zlib

39+ gmp

40+ ncurses5 ];

39 libPath = lib.makeLibraryPath buildInputs;

41 libPath = lib.makeLibraryPath buildInputs;

40 dontStrip = true;

42 dontStrip = true;

41

43

pkgs/development/compilers/solc/default.nix+8−28

@@ -1,5 +1,4 @@

1{ lib, gccStdenv, fetchzip

1{ lib, gccStdenv, fetchzip

2−, pkgs

3, boost

2, boost

4, cmake

3, cmake

5, coreutils

4, coreutils

@@ -42,17 +41,9 @@ let

42 sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";

41 sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";

43 };

42 };

44

43

44+ solc = gccStdenv.mkDerivation rec {

45− pname = "solc";

45+ pname = "solc";

46− version = "0.8.13";

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;

56

47

57 # upstream suggests avoid using archive generated by github

48 # upstream suggests avoid using archive generated by github

58 src = fetchzip {

49 src = fetchzip {

@@ -114,24 +105,13 @@ let

114 passthru.tests = {

105 passthru.tests = {

115 solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });

106 solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });

116 };

107 };

117− } else gccStdenv.mkDerivation rec {

118− inherit pname version meta;

119

108

120− src = pkgs.fetchurl {

109+ meta = with lib; {

110+ description = "Compiler for Ethereum smart contract language Solidity";

121− url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";

111+ homepage = "https://github.com/ethereum/solidity";

122− sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o=";

112+ license = licenses.gpl3;

113+ maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];

123 };

114 };

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− '';

135 };

115 };

136in

116in

137 solc

117 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: ({

251 # Otherwise impure gcc is used, which is Apple's weird wrapper

251 # Otherwise impure gcc is used, which is Apple's weird wrapper

252 c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;

252 c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;

253

253

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+

254 http-client-tls = overrideCabal (drv: {

261 http-client-tls = overrideCabal (drv: {

255 postPatch = ''

262 postPatch = ''

256 # This comment has been inserted, so the derivation hash changes, forcing

263 # 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 }:

4+

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+}:

4+

5+stdenv.mkDerivation rec {

6+ pname = "dust";

7+ version = "0-91";

8+

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]))

8+

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

5+

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 {

169 name = "wheel-unpack-hook.sh";

169 name = "wheel-unpack-hook.sh";

170 deps = [ wheel ];

170 deps = [ wheel ];

171 } ./wheel-unpack-hook.sh) {};

171 } ./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) {};

178}

172}

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 }:

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 version = "0.6.3";

4 version = "0.6.3";

@@ -11,15 +11,7 @@ stdenv.mkDerivation rec {

11 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

11 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

12 };

12 };

13

13

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 ];

23

15

24 cmakeFlags = ["-DWITH_TESTS=ON"];

16 cmakeFlags = ["-DWITH_TESTS=ON"];

25

17

pkgs/development/libraries/doctest/default.nix+5−5

@@ -2,19 +2,19 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "doctest";

4 pname = "doctest";

5− version = "2.4.8";

5+ version = "2.4.7";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8− owner = "doctest";

8+ owner = "onqtam";

9 repo = "doctest";

9 repo = "doctest";

10− rev = "v${version}";

10+ rev = version;

11− sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ=";

11+ sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0=";

12 };

12 };

13

13

14 nativeBuildInputs = [ cmake ];

14 nativeBuildInputs = [ cmake ];

15

15

16 meta = with lib; {

16 meta = with lib; {

17− homepage = "https://github.com/doctest/doctest";

17+ homepage = "https://github.com/onqtam/doctest";

18 description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";

18 description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";

19 platforms = platforms.all;

19 platforms = platforms.all;

20 license = licenses.mit;

20 license = licenses.mit;

pkgs/development/libraries/fcft/default.nix+2−2

@@ -20,14 +20,14 @@ in

20

20

21stdenv.mkDerivation rec {

21stdenv.mkDerivation rec {

22 pname = "fcft";

22 pname = "fcft";

23− version = "3.1.1";

23+ version = "3.0.1";

24

24

25 src = fetchFromGitea {

25 src = fetchFromGitea {

26 domain = "codeberg.org";

26 domain = "codeberg.org";

27 owner = "dnkl";

27 owner = "dnkl";

28 repo = "fcft";

28 repo = "fcft";

29 rev = version;

29 rev = version;

30− sha256 = "1b43sqp5hah374ns62pcrmbiriqsdisb60hp1nwqz3ny3rfjvn15";

30+ sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx";

31 };

31 };

32

32

33 depsBuildBuild = [ pkg-config ];

33 depsBuildBuild = [ pkg-config ];

pkgs/development/libraries/glibmm/default.nix+2−2

@@ -2,11 +2,11 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "glibmm";

4 pname = "glibmm";

5− version = "2.66.3";

5+ version = "2.66.2";

6

6

7 src = fetchurl {

7 src = fetchurl {

8 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

8 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

9− sha256 = "sha256-r7liAkkUhdP0QQLZghmhctotP563j848+5JVm6SW5Jk=";

9+ sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0=";

10 };

10 };

11

11

12 outputs = [ "out" "dev" ];

12 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 }:

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "goocanvas";

4 pname = "goocanvas";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

11 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";

11 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";

12 };

12 };

13

13

14− nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];

14+ nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];

15 buildInputs = [ gtk3 cairo glib gobject-introspection ];

15 buildInputs = [ gtk3 cairo glib gobject-introspection ];

16

16

17 configureFlags = [

17 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 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "htmlcxx";

4 pname = "htmlcxx";

5− version = "0.87";

5+ version = "0.86";

6

6

7 src = fetchurl {

7 src = fetchurl {

8− url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz";

8+ url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";

9− sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";

9+ sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";

10 };

10 };

11

11

12 buildInputs = [ libiconv ];

12 buildInputs = [ libiconv ];

13− patches = [

14− ./ptrdiff.patch

13+ patches = [ ./ptrdiff.patch ];

15− ./c++17.patch

16− ];

17

14

18 meta = with lib; {

15 meta = with lib; {

19 homepage = "http://htmlcxx.sourceforge.net/";

16 homepage = "http://htmlcxx.sourceforge.net/";

pkgs/development/libraries/inih/default.nix+3−3

@@ -2,12 +2,12 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "inih";

4 pname = "inih";

5− version = "53";

5+ version = "r53";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "benhoyt";

8 owner = "benhoyt";

9 repo = pname;

9 repo = pname;

10− rev = "r${version}";

10+ rev = version;

11 sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6";

11 sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6";

12 };

12 };

13

13

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

16 meta = with lib; {

16 meta = with lib; {

17 description = "Simple .INI file parser in C, good for embedded systems";

17 description = "Simple .INI file parser in C, good for embedded systems";

18 homepage = "https://github.com/benhoyt/inih";

18 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}";

20 license = licenses.bsd3;

20 license = licenses.bsd3;

21 maintainers = with maintainers; [ TredwellGit ];

21 maintainers = with maintainers; [ TredwellGit ];

22 platforms = platforms.all;

22 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

2, qca-qt5, kauth, kio, polkit-qt, qtbase

2, qca-qt5, kauth, kio, polkit-qt, qtbase

3, util-linux

3, util-linux

4}:

4}:

@@ -6,14 +6,25 @@

6stdenv.mkDerivation rec {

6stdenv.mkDerivation rec {

7 pname = "kpmcore";

7 pname = "kpmcore";

8 # NOTE: When changing this version, also change the version of `partition-manager`.

8 # NOTE: When changing this version, also change the version of `partition-manager`.

9− version = "22.04.0";

9+ version = "4.2.0";

10

10

11 src = fetchurl {

11 src = fetchurl {

12− url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

12+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

13− hash = "sha256-sO8WUJL6072H1ghMZd7j0xNMwEn4bJF5PXMhfEb2jbs=";

13+ hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54=";

14 };

14 };

15

15

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+ ];

17

28

18 buildInputs = [

29 buildInputs = [

19 qca-qt5

30 qca-qt5

@@ -24,12 +35,9 @@ stdenv.mkDerivation rec {

24 util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)

35 util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)

25 ];

36 ];

26

37

27− dontWrapQtApps = true;

38+ nativeBuildInputs = [ extra-cmake-modules ];

28

39

29− preConfigure = ''

40+ dontWrapQtApps = true;

30− substituteInPlace src/util/CMakeLists.txt \

31− --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions

32− '';

33

41

34 meta = with lib; {

42 meta = with lib; {

35 description = "KDE Partition Manager core library";

43 description = "KDE Partition Manager core library";

pkgs/development/libraries/libdeltachat/default.nix+3−3

@@ -16,13 +16,13 @@

16

16

17stdenv.mkDerivation rec {

17stdenv.mkDerivation rec {

18 pname = "libdeltachat";

18 pname = "libdeltachat";

19− version = "1.79.0";

19+ version = "1.78.0";

20

20

21 src = fetchFromGitHub {

21 src = fetchFromGitHub {

22 owner = "deltachat";

22 owner = "deltachat";

23 repo = "deltachat-core-rust";

23 repo = "deltachat-core-rust";

24 rev = version;

24 rev = version;

25− hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ=";

25+ hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";

26 };

26 };

27

27

28 patches = [

28 patches = [

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

32 cargoDeps = rustPlatform.fetchCargoTarball {

32 cargoDeps = rustPlatform.fetchCargoTarball {

33 inherit src;

33 inherit src;

34 name = "${pname}-${version}";

34 name = "${pname}-${version}";

35− hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU=";

35+ hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";

36 };

36 };

37

37

38 nativeBuildInputs = [

38 nativeBuildInputs = [

pkgs/development/libraries/libinjection/default.nix+4−12

@@ -1,5 +1,5 @@

1−{ lib, stdenv, fetchFromGitHub, fetchpatch

1+{ lib, stdenv, fetchFromGitHub

2−, python3

2+, python2

3}:

3}:

4

4

5stdenv.mkDerivation rec {

5stdenv.mkDerivation rec {

@@ -13,19 +13,11 @@ stdenv.mkDerivation rec {

13 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

13 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

14 };

14 };

15

15

16− nativeBuildInputs = [ python3 ];

16+ nativeBuildInputs = [ python2 ];

17

17

18 strictDeps = true;

18 strictDeps = true;

19

19

20− patches = [

20+ patchPhase = ''

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 = ''

29 patchShebangs src

21 patchShebangs src

30 substituteInPlace src/Makefile \

22 substituteInPlace src/Makefile \

31 --replace /usr/local $out

23 --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 {

62

62

63 patches = [

63 patches = [

64 # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch

64 # 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

65+ ./85_security_load.patch

67− else

68− ./85_security_load_3.77+.patch

69− )

70 ./ckpem.patch

66 ./ckpem.patch

71 ./fix-cross-compilation.patch

67 ./fix-cross-compilation.patch

72 ];

68 ];

pkgs/development/libraries/nss/latest.nix+2−2

@@ -5,6 +5,6 @@

5# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

5# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

6

6

7import ./generic.nix {

7import ./generic.nix {

8− version = "3.78";

8+ version = "3.76.1";

9− sha256 = "sha256-9FXzQeeHwRZzKOgKhPd7mlV9WVBm3aZIahh01y2miAA=";

9+ sha256 = "0ai37ncg50n4s5243bfvsip8isqq1y6w2swg1n4xgqg2fk1h8cg1";

10}

10}

pkgs/development/libraries/openssl/default.nix+2−2

@@ -193,8 +193,8 @@ in {

193 };

193 };

194

194

195 openssl_3_0 = common {

195 openssl_3_0 = common {

196− version = "3.0.3";

196+ version = "3.0.2";

197− sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs=";

197+ sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M=";

198 patches = [

198 patches = [

199 ./3.0/nix-ssl-cert-file.patch

199 ./3.0/nix-ssl-cert-file.patch

200

200

pkgs/development/libraries/science/biology/htslib/default.nix+2−18

@@ -14,25 +14,9 @@ stdenv.mkDerivation rec {

14

14

15 buildInputs = [ zlib bzip2 xz curl ];

15 buildInputs = [ zlib bzip2 xz curl ];

16

16

17− configureFlags = if ! stdenv.hostPlatform.isStatic

18− then [ "--enable-libcurl" ] # optional but strongly recommended

17+ configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended

19− else [ "--disable-libcurl" "--disable-plugins" ];

20

18

21−

19+ installFlags = [ "prefix=$(out)" ];

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− '';

36

20

37 preCheck = ''

21 preCheck = ''

38 patchShebangs test/

22 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"

9+

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++/**

7++ * Copyright (c) 2016-present, Facebook, Inc.

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 {

21

21

22 cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]

22 cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]

23 ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"

23 ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"

24− ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"

24+ ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";

25− ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";

26

25

27 outputs = [ "out" "dev" ];

26 outputs = [ "out" "dev" ];

28

27

pkgs/development/libraries/wolfssl/default.nix+2−2

@@ -7,13 +7,13 @@

7

7

8stdenv.mkDerivation rec {

8stdenv.mkDerivation rec {

9 pname = "wolfssl";

9 pname = "wolfssl";

10− version = "5.3.0";

10+ version = "5.2.0";

11

11

12 src = fetchFromGitHub {

12 src = fetchFromGitHub {

13 owner = "wolfSSL";

13 owner = "wolfSSL";

14 repo = "wolfssl";

14 repo = "wolfssl";

15 rev = "v${version}-stable";

15 rev = "v${version}-stable";

16− sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA=";

16+ sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k";

17 };

17 };

18

18

19 postPatch = ''

19 postPatch = ''

pkgs/development/lua-modules/generated-packages.nix−25

@@ -1952,31 +1952,6 @@ buildLuarocksPackage {

1952 };

1952 };

1953}) {};

1953}) {};

1954

1954

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−

1980luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

1955luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast

1981, fetchurl, lua

1956, fetchurl, lua

1982}:

1957}:

pkgs/development/lua-modules/overrides.nix−6

@@ -254,12 +254,6 @@ with prev;

254 ];

254 ];

255 });

255 });

256

256

257− luaunbound = prev.lib.overrideLuarocks prev.luaunbound(drv: {

258− externalDeps = [

259− { name = "libunbound"; dep = pkgs.unbound; }

260− ];

261− });

262−

263 luuid = (prev.lib.overrideLuarocks prev.luuid (drv: {

257 luuid = (prev.lib.overrideLuarocks prev.luuid (drv: {

264 externalDeps = [

258 externalDeps = [

265 { name = "LIBUUID"; dep = pkgs.libuuid; }

259 { name = "LIBUUID"; dep = pkgs.libuuid; }

pkgs/development/ocaml-modules/uuuu/default.nix+9−6

@@ -1,19 +1,20 @@

1{ angstrom

1{ angstrom

2, buildDunePackage

2, buildDunePackage

3−, fetchurl

3+, fetchzip

4, findlib

4, findlib

5, lib

5, lib

6+, menhir

6, ocaml

7, ocaml

7, re

8, re

8}:

9}:

9

10

10buildDunePackage rec {

11buildDunePackage rec {

11 pname = "uuuu";

12 pname = "uuuu";

12− version = "0.3.0";

13+ version = "0.2.0";

13

14

14− src = fetchurl {

15+ src = fetchzip {

15− url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-${version}.tbz";

16+ url = "https://github.com/mirage/uuuu/releases/download/v${version}/uuuu-v${version}.tbz";

16− sha256 = "sha256:19n39yc7spgzpk9i70r0nhkwsb0bfbvbgpf8d863p0a3wgryhzkb";

17+ sha256 = "0457qcxvakbbc56frsh8a5v4y4l0raj9p4zz7jx3brn9255j1mw3";

17 };

18 };

18

19

19 postPatch = ''

20 postPatch = ''

@@ -21,7 +22,9 @@ buildDunePackage rec {

21 'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '

22 'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '

22 '';

23 '';

23

24

25+ useDune2 = true;

26+

24− nativeBuildInputs = [ findlib ];

27+ nativeBuildInputs = [ menhir findlib ];

25

28

26 buildInputs = [ angstrom ];

29 buildInputs = [ angstrom ];

27

30

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 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "afsapi";

13 pname = "afsapi";

14− version = "0.2.4";

14+ version = "0.2.3";

15 format = "setuptools";

15 format = "setuptools";

16

16

17 disabled = pythonOlder "3.8";

17 disabled = pythonOlder "3.8";

@@ -19,8 +19,8 @@ buildPythonPackage rec {

19 src = fetchFromGitHub {

19 src = fetchFromGitHub {

20 owner = "wlcrs";

20 owner = "wlcrs";

21 repo = "python-afsapi";

21 repo = "python-afsapi";

22− rev = "refs/tags/${version}";

22+ rev = version;

23− hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U=";

23+ hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY=";

24 };

24 };

25

25

26 SETUPTOOLS_SCM_PRETEND_VERSION = version;

26 SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/aioairzone/default.nix+2−2

@@ -7,7 +7,7 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "aioairzone";

9 pname = "aioairzone";

10− version = "0.4.2";

10+ version = "0.3.4";

11 format = "setuptools";

11 format = "setuptools";

12

12

13 disabled = pythonOlder "3.8";

13 disabled = pythonOlder "3.8";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

16 owner = "Noltari";

16 owner = "Noltari";

17 repo = pname;

17 repo = pname;

18 rev = "refs/tags/${version}";

18 rev = "refs/tags/${version}";

19− hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";

19+ hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/aiooncue/default.nix+2−2

@@ -7,7 +7,7 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "aiooncue";

9 pname = "aiooncue";

10− version = "0.3.4";

10+ version = "0.3.3";

11 format = "setuptools";

11 format = "setuptools";

12

12

13 disabled = pythonOlder "3.7";

13 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

16 owner = "bdraco";

16 owner = "bdraco";

17 repo = pname;

17 repo = pname;

18 rev = version;

18 rev = version;

19− hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg=";

19+ hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/aioslimproto/default.nix+4−11

@@ -1,13 +1,12 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchFromGitHub

3, fetchFromGitHub

4−, pytestCheckHook

5, pythonOlder

4, pythonOlder

6}:

5}:

7

6

8buildPythonPackage rec {

7buildPythonPackage rec {

9 pname = "aioslimproto";

8 pname = "aioslimproto";

10− version = "2.0.1";

9+ version = "1.0.1";

11 format = "setuptools";

10 format = "setuptools";

12

11

13 disabled = pythonOlder "3.9";

12 disabled = pythonOlder "3.9";

@@ -16,17 +15,11 @@ buildPythonPackage rec {

16 owner = "home-assistant-libs";

15 owner = "home-assistant-libs";

17 repo = pname;

16 repo = pname;

18 rev = version;

17 rev = version;

19− hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";

18+ hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E=";

20 };

19 };

21

20

22− checkInputs = [

21+ # Module has no tests

23− pytestCheckHook

22+ doCheck = false;

24− ];

25−

26− disabledTests = [

27− # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']

28− "test_msg_instantiation"

29− ];

30

23

31 pythonImportsCheck = [

24 pythonImportsCheck = [

32 "aioslimproto"

25 "aioslimproto"

pkgs/development/python-modules/androidtv/default.nix+2−2

@@ -11,7 +11,7 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "androidtv";

13 pname = "androidtv";

14− version = "0.0.67";

14+ version = "0.0.66";

15 format = "setuptools";

15 format = "setuptools";

16

16

17 disabled = pythonOlder "3.7";

17 disabled = pythonOlder "3.7";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

20 owner = "JeffLIrion";

20 owner = "JeffLIrion";

21 repo = "python-androidtv";

21 repo = "python-androidtv";

22 rev = "v${version}";

22 rev = "v${version}";

23− hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";

23+ hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";

24 };

24 };

25

25

26 propagatedBuildInputs = [

26 propagatedBuildInputs = [

pkgs/development/python-modules/ansible-later/default.nix+2−2

@@ -21,7 +21,7 @@

21

21

22buildPythonPackage rec {

22buildPythonPackage rec {

23 pname = "ansible-later";

23 pname = "ansible-later";

24− version = "2.0.12";

24+ version = "2.0.11";

25 format = "pyproject";

25 format = "pyproject";

26

26

27 disabled = pythonOlder "3.8";

27 disabled = pythonOlder "3.8";

@@ -30,7 +30,7 @@ buildPythonPackage rec {

30 owner = "thegeeklab";

30 owner = "thegeeklab";

31 repo = pname;

31 repo = pname;

32 rev = "refs/tags/v${version}";

32 rev = "refs/tags/v${version}";

33− hash = "sha256-0N/BER7tV8Hv1pvHaf/46BKnzZfHBGuEaPPex/CDQe0=";

33+ hash = "sha256-K4GResTKKWXQ0OHpBwqTLnptQ8ipuQ9iaGZDlPqRUaI=";

34 };

34 };

35

35

36 nativeBuildInputs = [

36 nativeBuildInputs = [

pkgs/development/python-modules/ansible/default.nix+2−3

@@ -20,7 +20,7 @@

20

20

21let

21let

22 pname = "ansible";

22 pname = "ansible";

23− version = "5.7.1";

23+ version = "5.7.0";

24in

24in

25buildPythonPackage {

25buildPythonPackage {

26 inherit pname version;

26 inherit pname version;

@@ -30,7 +30,7 @@ buildPythonPackage {

30

30

31 src = fetchPypi {

31 src = fetchPypi {

32 inherit pname version;

32 inherit pname version;

33− sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";

33+ sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y=";

34 };

34 };

35

35

36 postPatch = ''

36 postPatch = ''

@@ -78,7 +78,6 @@ buildPythonPackage {

78 meta = with lib; {

78 meta = with lib; {

79 description = "Radically simple IT automation";

79 description = "Radically simple IT automation";

80 homepage = "https://www.ansible.com";

80 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";

82 license = licenses.gpl3Plus;

81 license = licenses.gpl3Plus;

83 maintainers = with maintainers; [ hexa ];

82 maintainers = with maintainers; [ hexa ];

84 };

83 };

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

@@ -14,7 +14,7 @@

14

14

15buildPythonPackage rec {

15buildPythonPackage rec {

16 pname = "async-upnp-client";

16 pname = "async-upnp-client";

17− version = "0.29.0";

17+ version = "0.28.0";

18 format = "setuptools";

18 format = "setuptools";

19

19

20 disabled = pythonOlder "3.7";

20 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

23 owner = "StevenLooman";

23 owner = "StevenLooman";

24 repo = "async_upnp_client";

24 repo = "async_upnp_client";

25 rev = version;

25 rev = version;

26− sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";

26+ sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";

27 };

27 };

28

28

29 propagatedBuildInputs = [

29 propagatedBuildInputs = [

pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3

@@ -10,7 +10,7 @@

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "aws-lambda-builders";

12 pname = "aws-lambda-builders";

13− version = "1.15.0";

13+ version = "1.14.0";

14 format = "setuptools";

14 format = "setuptools";

15

15

16 disabled = pythonOlder "3.7";

16 disabled = pythonOlder "3.7";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

18 src = fetchFromGitHub {

18 src = fetchFromGitHub {

19 owner = "awslabs";

19 owner = "awslabs";

20 repo = "aws-lambda-builders";

20 repo = "aws-lambda-builders";

21− rev = "refs/tags/v${version}";

21+ rev = "v${version}";

22− sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk=";

22+ sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc=";

23 };

23 };

24

24

25 propagatedBuildInputs = [

25 propagatedBuildInputs = [

pkgs/development/python-modules/beautifulsoup4/default.nix−3

@@ -6,14 +6,12 @@

6, pytestCheckHook

6, pytestCheckHook

7, pythonOlder

7, pythonOlder

8, soupsieve

8, soupsieve

9−, sphinxHook

10}:

9}:

11

10

12buildPythonPackage rec {

11buildPythonPackage rec {

13 pname = "beautifulsoup4";

12 pname = "beautifulsoup4";

14 version = "4.11.1";

13 version = "4.11.1";

15 format = "setuptools";

14 format = "setuptools";

16− outputs = ["out" "doc"];

17

15

18 disabled = pythonOlder "3.6";

16 disabled = pythonOlder "3.6";

19

17

@@ -31,7 +29,6 @@ buildPythonPackage rec {

31 checkInputs = [

29 checkInputs = [

32 pytestCheckHook

30 pytestCheckHook

33 ];

31 ];

34− nativeBuildInputs = [ sphinxHook ];

35

32

36 pythonImportsCheck = [

33 pythonImportsCheck = [

37 "bs4"

34 "bs4"

pkgs/development/python-modules/bleach/default.nix+2−2

@@ -11,12 +11,12 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "bleach";

13 pname = "bleach";

14− version = "5.0.0";

14+ version = "4.1.0";

15 disabled = pythonOlder "3.6";

15 disabled = pythonOlder "3.6";

16

16

17 src = fetchPypi {

17 src = fetchPypi {

18 inherit pname version;

18 inherit pname version;

19− hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";

19+ sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/bpython/default.nix+2−16

@@ -3,12 +3,10 @@

3, fetchPypi

3, fetchPypi

4, curtsies

4, curtsies

5, cwcwidth

5, cwcwidth

6−, dataclasses

7, greenlet

6, greenlet

8, jedi

7, jedi

9, pygments

8, pygments

10, pytestCheckHook

9, pytestCheckHook

11−, pythonOlder

12, pyperclip

10, pyperclip

13, pyxdg

11, pyxdg

14, requests

12, requests

@@ -21,13 +19,10 @@

21buildPythonPackage rec {

19buildPythonPackage rec {

22 pname = "bpython";

20 pname = "bpython";

23 version = "0.22.1";

21 version = "0.22.1";

24− format = "setuptools";

25−

26− disabled = pythonOlder "3.6";

27

22

28 src = fetchPypi {

23 src = fetchPypi {

29 inherit pname version;

24 inherit pname version;

30− hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA=";

25+ sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200";

31 };

26 };

32

27

33 propagatedBuildInputs = [

28 propagatedBuildInputs = [

@@ -42,8 +37,6 @@ buildPythonPackage rec {

42 typing-extensions

37 typing-extensions

43 urwid

38 urwid

44 watchdog

39 watchdog

45− ] ++ lib.optionals (pythonOlder "3.7") [

46− dataclasses

47 ];

40 ];

48

41

49 postInstall = ''

42 postInstall = ''

@@ -55,14 +48,7 @@ buildPythonPackage rec {

55 pytestCheckHook

48 pytestCheckHook

56 ];

49 ];

57

50

58− pythonImportsCheck = [

51+ pythonImportsCheck = [ "bpython" ];

59− "bpython"

60− ];

61−

62− disabledTests = [

63− # Check for syntax error ends with an AssertionError

64− "test_syntaxerror"

65− ];

66

52

67 meta = with lib; {

53 meta = with lib; {

68 description = "A fancy curses interface to the Python interactive interpreter";

54 description = "A fancy curses interface to the Python interactive interpreter";

pkgs/development/python-modules/breezy/default.nix+5−20

@@ -3,36 +3,23 @@

3, fetchPypi

3, fetchPypi

4, configobj

4, configobj

5, patiencediff

5, patiencediff

6−, fastbencode

6+, six

7, fastimport

7, fastimport

8, dulwich

8, dulwich

9, launchpadlib

9, launchpadlib

10, testtools

10, testtools

11−, pythonOlder

12−, installShellFiles

13}:

11}:

14

12

15buildPythonPackage rec {

13buildPythonPackage rec {

16 pname = "breezy";

14 pname = "breezy";

17− version = "3.2.2";

15+ version = "3.2.1";

18−

19− disabled = pythonOlder "3.5";

20

16

21 src = fetchPypi {

17 src = fetchPypi {

22 inherit pname version;

18 inherit pname version;

23− sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";

19+ sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";

24 };

20 };

25

21

26− nativeBuildInputs = [ installShellFiles ];

27−

28− propagatedBuildInputs = [

22+ propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

29− configobj

30− fastbencode

31− patiencediff

32− fastimport

33− dulwich

34− launchpadlib

35− ];

36

23

37 checkInputs = [ testtools ];

24 checkInputs = [ testtools ];

38

25

@@ -42,8 +29,6 @@ buildPythonPackage rec {

42 # symlink for bazaar compatibility

29 # symlink for bazaar compatibility

43 postInstall = ''

30 postInstall = ''

44 ln -s "$out/bin/brz" "$out/bin/bzr"

31 ln -s "$out/bin/brz" "$out/bin/bzr"

45−

46− installShellCompletion --cmd brz --bash contrib/bash/brz

47 '';

32 '';

48

33

49 pythonImportsCheck = [ "breezy" ];

34 pythonImportsCheck = [ "breezy" ];

@@ -51,7 +36,7 @@ buildPythonPackage rec {

51 meta = with lib; {

36 meta = with lib; {

52 description = "Friendly distributed version control system";

37 description = "Friendly distributed version control system";

53 homepage = "https://www.breezy-vcs.org/";

38 homepage = "https://www.breezy-vcs.org/";

54− license = licenses.gpl2Only;

39+ license = licenses.gpl2;

55 maintainers = [ maintainers.marsam ];

40 maintainers = [ maintainers.marsam ];

56 };

41 };

57}

42}

pkgs/development/python-modules/canonicaljson/default.nix+3−3

@@ -9,14 +9,14 @@

9

9

10buildPythonPackage rec {

10buildPythonPackage rec {

11 pname = "canonicaljson";

11 pname = "canonicaljson";

12− version = "1.6.1";

12+ version = "1.6.0";

13 format = "setuptools";

13 format = "setuptools";

14

14

15− disabled = pythonOlder "3.7";

15+ disabled = pythonOlder "3.6";

16

16

17 src = fetchPypi {

17 src = fetchPypi {

18 inherit pname version;

18 inherit pname version;

19− hash = "sha256-qTZk9phVbb1Lq5w/xPs1g0zyU12h6gC2t3WNj+K7uCQ=";

19+ hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/cert-chain-resolver/default.nix+7−22

@@ -1,50 +1,35 @@

1{ lib

1{ lib

2−, buildPythonPackage

3−, cryptography

4, fetchFromGitHub

2, fetchFromGitHub

3+, buildPythonPackage

5, pytestCheckHook

4, pytestCheckHook

6, pytest-mock

5, pytest-mock

7−, pythonOlder

6+, cryptography

8−, six

9}:

7}:

10

8

11buildPythonPackage rec {

9buildPythonPackage rec {

12 pname = "cert-chain-resolver";

10 pname = "cert-chain-resolver";

13 version = "1.0.1";

11 version = "1.0.1";

14− format = "setuptools";

15−

16− disabled = pythonOlder "3.7";

17

12

18 src = fetchFromGitHub {

13 src = fetchFromGitHub {

19 owner = "rkoopmans";

14 owner = "rkoopmans";

20 repo = "python-certificate-chain-resolver";

15 repo = "python-certificate-chain-resolver";

21 rev = version;

16 rev = version;

22− hash = "sha256-NLTRx6J6pjs7lyschHN5KtgrnpQpEyvZ2zz0pSd5sc4=";

17+ sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l";

23 };

18 };

24

19

25− propagatedBuildInputs = [

20+ propagatedBuildInputs = [ cryptography ];

26− cryptography

27− ];

28

21

29− checkInputs = [

30− pytestCheckHook

22+ checkInputs = [ pytestCheckHook pytest-mock ];

31− pytest-mock

32− six

33− ];

34

23

24+ # online tests

35 disabledTests = [

25 disabledTests = [

36− # Tests require network access

37 "test_cert_returns_completed_chain"

26 "test_cert_returns_completed_chain"

38 "test_display_flag_is_properly_formatted"

27 "test_display_flag_is_properly_formatted"

39 ];

28 ];

40

29

41− pythonImportsCheck = [

42− "cert_chain_resolver"

43− ];

44−

45 meta = with lib; {

30 meta = with lib; {

46− description = "Resolve / obtain the certificate intermediates of a x509 certificate";

47 homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver";

31 homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver";

32+ description = "Resolve / obtain the certificate intermediates of a x509 certificate";

48 license = licenses.mit;

33 license = licenses.mit;

49 maintainers = with maintainers; [ veehaitch ];

34 maintainers = with maintainers; [ veehaitch ];

50 };

35 };

pkgs/development/python-modules/dropbox/default.nix−3

@@ -8,7 +8,6 @@

8, mock

8, mock

9, pytest-mock

9, pytest-mock

10, pytestCheckHook

10, pytestCheckHook

11−, sphinxHook

12}:

11}:

13

12

14buildPythonPackage rec {

13buildPythonPackage rec {

@@ -17,7 +16,6 @@ buildPythonPackage rec {

17 format = "setuptools";

16 format = "setuptools";

18

17

19 disabled = pythonOlder "3.7";

18 disabled = pythonOlder "3.7";

20− outputs = ["out" "doc"];

21

19

22 src = fetchFromGitHub {

20 src = fetchFromGitHub {

23 owner = "dropbox";

21 owner = "dropbox";

@@ -48,7 +46,6 @@ buildPythonPackage rec {

48 pythonImportsCheck = [

46 pythonImportsCheck = [

49 "dropbox"

47 "dropbox"

50 ];

48 ];

51− nativeBuildInputs = [ sphinxHook ];

52

49

53 # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.

50 # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.

54 disabledTests = [

51 disabledTests = [

pkgs/development/python-modules/dungeon-eos/default.nix+2−2

@@ -2,13 +2,13 @@

2

2

3buildPythonPackage rec {

3buildPythonPackage rec {

4 pname = "dungeon-eos";

4 pname = "dungeon-eos";

5− version = "0.0.5";

5+ version = "0.0.4";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "SkyTemple";

8 owner = "SkyTemple";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";

11+ sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";

12 };

12 };

13

13

14 doCheck = false; # there are no tests

14 doCheck = false; # there are no tests

pkgs/development/python-modules/envs/default.nix+11−15

@@ -1,29 +1,29 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3−, click

4, fetchPypi

3, fetchPypi

4+, fetchpatch

5+, click

5, jinja2

6, jinja2

7+, terminaltables

6, mock

8, mock

7, nose

9, nose

8−, poetry-core

9−, pythonOlder

10−, terminaltables

11}:

10}:

12

11

13buildPythonPackage rec {

12buildPythonPackage rec {

14 pname = "envs";

13 pname = "envs";

15− version = "1.4";

14+ version = "1.3";

16− format = "pyproject";

17−

18− disabled = pythonOlder "3.7";

19

15

20 src = fetchPypi {

16 src = fetchPypi {

21 inherit pname version;

17 inherit pname version;

22− hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g=";

18+ sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42";

23 };

19 };

24

20

25− nativeBuildInputs = [

21+ patches = [

26− poetry-core

22+ # https://github.com/capless/envs/pull/19

23+ (fetchpatch {

24+ url = "https://github.com/capless/envs/commit/6947043fa9120a7b17094fd43ee0e1edf808f42b.patch";

25+ sha256 = "0zswg8kp2g922mkc7x34ps37qli1d1mjwna2jfrbnsq2fg4mk818";

26+ })

27 ];

27 ];

28

28

29 propagatedBuildInputs = [

29 propagatedBuildInputs = [

@@ -45,10 +45,6 @@ buildPythonPackage rec {

45 runHook postCheck

45 runHook postCheck

46 '';

46 '';

47

47

48− pythonImportsCheck = [

49− "envs"

50− ];

51−

52 meta = with lib; {

48 meta = with lib; {

53 description = "Easy access to environment variables from Python";

49 description = "Easy access to environment variables from Python";

54 homepage = "https://github.com/capless/envs";

50 homepage = "https://github.com/capless/envs";

pkgs/development/python-modules/exceptiongroup/default.nix+2−2

@@ -8,14 +8,14 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "exceptiongroup";

10 pname = "exceptiongroup";

11− version = "1.0.0rc5";

11+ version = "1.0.0rc2";

12 format = "flit";

12 format = "flit";

13

13

14 disabled = pythonOlder "3.7";

14 disabled = pythonOlder "3.7";

15

15

16 src = fetchPypi {

16 src = fetchPypi {

17 inherit pname version;

17 inherit pname version;

18− hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4=";

18+ hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM=";

19 };

19 };

20

20

21 nativeBuildInputs = [

21 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 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchPypi

3, fetchPypi

4−, pytestCheckHook

4+, python

5−, pythonOlder

6}:

5}:

7

6

8buildPythonPackage rec {

7buildPythonPackage rec {

9 pname = "filetype";

8 pname = "filetype";

10− version = "1.0.13";

9+ version = "1.0.10";

11− format = "setuptools";

12−

13− disabled = pythonOlder "3.7";

14

10

15 src = fetchPypi {

11 src = fetchPypi {

16 inherit pname version;

12 inherit pname version;

17− hash = "sha256-ahBHYv6T11XJYqqWyz2TCkj5GgdhBHEmxe6tIVPjOwM=";

13+ sha256 = "sha256-MjoTUAcxtsZaJTvDkwu86aVt+6cekLYP/ZaKtp2a6Tc=";

18 };

14 };

19

15

20− checkInputs = [

16+ checkPhase = ''

21− pytestCheckHook

17+ ${python.interpreter} -m unittest discover

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− ];

18+ '';

39

19

40 meta = with lib; {

20 meta = with lib; {

41 description = "Infer file type and MIME type of any file/buffer";

21 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

1+{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }:

3−, fetchPypi

4−, flask

5−, pyjwt

6−, pytestCheckHook

7−, python-dateutil

8−, pythonOlder

9−, werkzeug

10−}:

11

2

12buildPythonPackage rec {

3buildPythonPackage rec {

13− pname = "flask-jwt-extended";

4+ pname = "Flask-JWT-Extended";

14− version = "4.4.0";

5+ version = "4.3.1";

15− format = "setuptools";

16−

17− disabled = pythonOlder "3.7";

18

6

19 src = fetchPypi {

7 src = fetchPypi {

20− pname = "Flask-JWT-Extended";

21− inherit version;

8+ inherit pname version;

22− hash = "sha256-P+gVBL3JGtjxy5db0tlexgElHzG94YQRXjn8fm7SPqY=";

9+ sha256 = "ad6977b07c54e51c13b5981afc246868b9901a46715d9b9827898bfd916aae88";

23 };

10 };

24

11

25− propagatedBuildInputs = [

12+ propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ];

26− flask

27− pyjwt

28− python-dateutil

29− werkzeug

30− ];

31−

32− checkInputs = [

13+ checkInputs = [ pytest ];

33− pytestCheckHook

34− ];

35

14

36− pythonImportsCheck = [

15+ checkPhase = ''

37− "flask_jwt_extended"

16+ pytest tests/

38− ];

17+ '';

39

18

40 meta = with lib; {

19 meta = with lib; {

41 description = "JWT extension for Flask";

20 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 @@

13, sphinx

13, sphinx

14, pytestCheckHook

14, pytestCheckHook

15, glibcLocales

15, glibcLocales

16−, setuptools-scm

17}:

16}:

18

17

19buildPythonPackage rec {

18buildPythonPackage rec {

20 pname = "fonttools";

19 pname = "fonttools";

21− version = "4.33.3";

20+ version = "4.30.0";

22

21

23 disabled = pythonOlder "3.7";

22 disabled = pythonOlder "3.7";

24

23

@@ -26,11 +25,9 @@ buildPythonPackage rec {

26 owner = pname;

25 owner = pname;

27 repo = pname;

26 repo = pname;

28 rev = version;

27 rev = version;

29− sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM=";

28+ sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9";

30 };

29 };

31

30

32− nativeBuildInputs = [ setuptools-scm ];

33−

34 # all dependencies are optional, but

31 # all dependencies are optional, but

35 # we run the checks with them

32 # we run the checks with them

36

33

@@ -54,8 +51,6 @@ buildPythonPackage rec {

54 unicodedata2

51 unicodedata2

55 ];

52 ];

56

53

57− pythonImportsCheck = [ "fontTools" ];

58−

59 preCheck = ''

54 preCheck = ''

60 # tests want to execute the "fonttools" executable from $PATH

55 # tests want to execute the "fonttools" executable from $PATH

61 export PATH="$out/bin:$PATH"

56 export PATH="$out/bin:$PATH"

@@ -77,6 +72,7 @@ buildPythonPackage rec {

77 "Tests/ufoLib"

72 "Tests/ufoLib"

78 ];

73 ];

79

74

75+

80 meta = with lib; {

76 meta = with lib; {

81 homepage = "https://github.com/fonttools/fonttools";

77 homepage = "https://github.com/fonttools/fonttools";

82 description = "A library to manipulate font files from Python";

78 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 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "glances-api";

13 pname = "glances-api";

14− version = "0.3.5";

14+ version = "0.3.4";

15 format = "pyproject";

15 format = "pyproject";

16

16

17 disabled = pythonOlder "3.8";

17 disabled = pythonOlder "3.8";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

20 owner = "home-assistant-ecosystem";

20 owner = "home-assistant-ecosystem";

21 repo = "python-glances-api";

21 repo = "python-glances-api";

22 rev = version;

22 rev = version;

23− sha256 = "sha256-8NWrsiiKevIMeD++C2weRdG0FPm5T4fHMUSJM4J+AOo=";

23+ sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o=";

24 };

24 };

25

25

26 nativeBuildInputs = [

26 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 @@

14

14

15buildPythonPackage rec {

15buildPythonPackage rec {

16 pname = "hahomematic";

16 pname = "hahomematic";

17− version = "1.2.2";

17+ version = "1.2.1";

18 format = "pyproject";

18 format = "pyproject";

19

19

20 disabled = pythonOlder "3.9";

20 disabled = pythonOlder "3.9";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

23 owner = "danielperna84";

23 owner = "danielperna84";

24 repo = pname;

24 repo = pname;

25 rev = "refs/tags/${version}";

25 rev = "refs/tags/${version}";

26− sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ=";

26+ sha256 = "sha256-INhw7d+hbVCfeB7vr9QhCgaLOpIl0OHhgrYN6o6E1YI=";

27 };

27 };

28

28

29 propagatedBuildInputs = [

29 propagatedBuildInputs = [

pkgs/development/python-modules/howdoi/default.nix+2−16

@@ -10,21 +10,17 @@

10, pyquery

10, pyquery

11, requests

11, requests

12, pytestCheckHook

12, pytestCheckHook

13−, pythonOlder

14}:

13}:

15

14

16buildPythonPackage rec {

15buildPythonPackage rec {

17 pname = "howdoi";

16 pname = "howdoi";

18 version = "2.0.19";

17 version = "2.0.19";

19− format = "setuptools";

20−

21− disabled = pythonOlder "3.7";

22

18

23 src = fetchFromGitHub {

19 src = fetchFromGitHub {

24 owner = "gleitz";

20 owner = "gleitz";

25 repo = pname;

21 repo = pname;

26 rev = "v${version}";

22 rev = "v${version}";

27− hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I=";

23+ sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";

28 };

24 };

29

25

30 propagatedBuildInputs = [

26 propagatedBuildInputs = [

@@ -50,16 +46,6 @@ buildPythonPackage rec {

50 # AssertionError: "The...

46 # AssertionError: "The...

51 "test_get_text_with_one_link"

47 "test_get_text_with_one_link"

52 "test_get_text_without_links"

48 "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"

63 ];

49 ];

64

50

65 pythonImportsCheck = [

51 pythonImportsCheck = [

@@ -68,7 +54,7 @@ buildPythonPackage rec {

68

54

69 meta = with lib; {

55 meta = with lib; {

70 description = "Instant coding answers via the command line";

56 description = "Instant coding answers via the command line";

71− homepage = "https://github.com/gleitz/howdoi";

57+ homepage = "https://pypi.python.org/pypi/howdoi";

72 license = licenses.mit;

58 license = licenses.mit;

73 maintainers = with maintainers; [ costrouc ];

59 maintainers = with maintainers; [ costrouc ];

74 };

60 };

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

1+{ lib, buildPythonPackage, fetchPypi, nose, numpy

4−, fetchPypi

5−, numpy

6−, pytestCheckHook

7−, pythonOlder

8−, pyyaml

2+, bottle, pyyaml, redis, six

9−, redis

3+, zlib

10−}:

4+, pytestCheckHook }:

11

5

12buildPythonPackage rec {

6buildPythonPackage rec {

13− pname = "jug";

7+ 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;

8+ version = "2.1.1";

22− hash = "sha256-2Y9xRr5DyV9UqG6tiq9rYET2Z7LaPXfzwYKKGwR3OSs=";

9+ buildInputs = [ nose numpy ];

23− };

24−

25 propagatedBuildInputs = [

10 propagatedBuildInputs = [

26 bottle

11 bottle

27− ];

28−

29− checkInputs = [

30− numpy

31− pytestCheckHook

32 pyyaml

12 pyyaml

33 redis

13 redis

34− ];

14+ six

35

15

36− pythonImportsCheck = [

16+ zlib

37− "jug"

38 ];

17 ];

39

18

19+ src = fetchPypi {

20+ inherit pname version;

21+ sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1";

22+ };

23+

24+ checkInputs = [ pytestCheckHook ];

25+ pythonImportsCheck = [ "jug" ];

26+

40 meta = with lib; {

27 meta = with lib; {

41 description = "A Task-Based Parallelization Framework";

28 description = "A Task-Based Parallelization Framework";

42− homepage = "https://jug.readthedocs.io/";

43 license = licenses.mit;

29 license = licenses.mit;

30+ homepage = "https://jug.readthedocs.io/";

44 maintainers = with maintainers; [ luispedro ];

31 maintainers = with maintainers; [ luispedro ];

45 };

32 };

46}

33}

pkgs/development/python-modules/lektor/default.nix+2−2

@@ -27,7 +27,7 @@

27

27

28buildPythonPackage rec {

28buildPythonPackage rec {

29 pname = "lektor";

29 pname = "lektor";

30− version = "3.3.4";

30+ version = "3.3.3";

31 format = "pyproject";

31 format = "pyproject";

32

32

33 disabled = pythonOlder "3.7";

33 disabled = pythonOlder "3.7";

@@ -36,7 +36,7 @@ buildPythonPackage rec {

36 owner = "lektor";

36 owner = "lektor";

37 repo = pname;

37 repo = pname;

38 rev = "refs/tags/v${version}";

38 rev = "refs/tags/v${version}";

39− hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw=";

39+ hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";

40 };

40 };

41

41

42 propagatedBuildInputs = [

42 propagatedBuildInputs = [

pkgs/development/python-modules/loopy/default.nix → pkgs/development/python-modules/loo-py/default.nixrenamed+24−28

@@ -1,55 +1,51 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3−, codepy

3+, fetchPypi

4−, cgen

4+, pytools

5−, colorama

5+, pymbolic

6−, fetchFromGitHub

7, genpy

6, genpy

7+, cgen

8, islpy

8, islpy

9+, six

10+, colorama

9, mako

11, mako

10−, numpy

11−, pymbolic

12, pyopencl

12, pyopencl

13−, pyrsistent

13+, pytest

14−, pythonOlder

15−, pytools

16}:

14}:

17

15

18buildPythonPackage rec {

16buildPythonPackage rec {

19− pname = "loopy";

17+ pname = "loo-py";

20− version = "2020.2.1";

18+ version = "2020.2";

21− format = "setuptools";

22−

23− disabled = pythonOlder "3.7";

24

19

25− src = fetchFromGitHub {

20+ src = fetchPypi {

26− owner = "inducer";

27− repo = pname;

21+ pname = "loo.py";

28− rev = "v${version}";

22+ inherit version;

29− hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g=";

23+ sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f";

30 };

24 };

31

25

26+ checkInputs = [ pytest ];

32 propagatedBuildInputs = [

27 propagatedBuildInputs = [

33− codepy

28+ pytools

34− cgen

29+ pymbolic

35− colorama

36 genpy

30 genpy

31+ cgen

37 islpy

32 islpy

33+ six

34+ colorama

38 mako

35 mako

39− numpy

40− pymbolic

41 pyopencl

36 pyopencl

42− pyrsistent

43− pytools

44 ];

37 ];

45

38

46 # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR

39 # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR

47 doCheck = false;

40 doCheck = false;

41+ checkPhase = ''

42+ HOME=$(mktemp -d) pytest test

43+ '';

48

44

49 meta = with lib; {

45 meta = with lib; {

50 description = "A code generator for array-based code on CPUs and GPUs";

46 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";

52 license = licenses.mit;

48 license = licenses.mit;

53− maintainers = with maintainers; [ costrouc ];

49+ maintainers = [ maintainers.costrouc ];

54 };

50 };

55}

51}

pkgs/development/python-modules/luxtronik/default.nix+2−2

@@ -8,7 +8,7 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "luxtronik";

10 pname = "luxtronik";

11− version = "0.3.13";

11+ version = "0.3.12";

12 format = "setuptools";

12 format = "setuptools";

13

13

14 disabled = pythonOlder "3.7";

14 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

17 owner = "Bouni";

17 owner = "Bouni";

18 repo = "python-luxtronik";

18 repo = "python-luxtronik";

19 rev = version;

19 rev = version;

20− sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY=";

20+ sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY=";

21 };

21 };

22

22

23 # Project has no tests

23 # Project has no tests

pkgs/development/python-modules/mat2/default.nix+2−2

@@ -22,7 +22,7 @@

22

22

23buildPythonPackage rec {

23buildPythonPackage rec {

24 pname = "mat2";

24 pname = "mat2";

25− version = "0.12.4";

25+ version = "0.12.3";

26

26

27 disabled = pythonOlder "3.5";

27 disabled = pythonOlder "3.5";

28

28

@@ -31,7 +31,7 @@ buildPythonPackage rec {

31 owner = "jvoisin";

31 owner = "jvoisin";

32 repo = "mat2";

32 repo = "mat2";

33 rev = version;

33 rev = version;

34− hash = "sha256-HjPr4pb0x2Sdq8ALaZeQRnGHmNAoEV8XUGbhOjY00jc=";

34+ hash = "sha256-TW+FwlZ+J1tanPL5WuwXtZJmtYB9LaimeIaPlN/jzqo=";

35 };

35 };

36

36

37 patches = [

37 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 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "mypy-boto3-s3";

10 pname = "mypy-boto3-s3";

11− version = "1.22.6";

11+ version = "1.22.0.post1";

12 format = "setuptools";

12 format = "setuptools";

13

13

14 disabled = pythonOlder "3.6";

14 disabled = pythonOlder "3.6";

15

15

16 src = fetchPypi {

16 src = fetchPypi {

17 inherit pname version;

17 inherit pname version;

18− hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4=";

18+ hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4=";

19 };

19 };

20

20

21 propagatedBuildInputs = [

21 propagatedBuildInputs = [

pkgs/development/python-modules/namedlist/default.nix+9−30

@@ -1,54 +1,33 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchPypi

3, fetchPypi

4−, fetchpatch

4+, pytest

5−, pytestCheckHook

6−, pythonOlder

7}:

5}:

8

6

9buildPythonPackage rec {

7buildPythonPackage rec {

10 pname = "namedlist";

8 pname = "namedlist";

11 version = "1.8";

9 version = "1.8";

12− format = "setuptools";

13−

14− disabled = pythonOlder "3.7";

15

10

16 src = fetchPypi {

11 src = fetchPypi {

17 inherit pname version;

12 inherit pname version;

18− hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8=";

13+ sha256 = "34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef";

19 };

14 };

20

15

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−

33 # Test file has a `unittest.main()` at the bottom that fails the tests;

16 # Test file has a `unittest.main()` at the bottom that fails the tests;

34 # py.test can run the tests without it.

17 # py.test can run the tests without it.

35 postPatch = ''

18 postPatch = ''

36 substituteInPlace test/test_namedlist.py --replace "unittest.main()" ""

19 substituteInPlace test/test_namedlist.py --replace "unittest.main()" ""

37 '';

20 '';

38

21

39− pythonImportsCheck = [

22+ checkInputs = [ pytest ];

40− "namedlist"

23+ checkPhase = ''

41− ];

24+ py.test

42−

43− disabledTests = [

44− # AttributeError: module 'collections' has no attribute 'Container'

45− "test_ABC"

46− ];

25+ '';

47

26

48− meta = with lib; {

27+ meta = {

49 description = "Similar to namedtuple, but instances are mutable";

28 description = "Similar to namedtuple, but instances are mutable";

50 homepage = "https://gitlab.com/ericvsmith/namedlist";

29 homepage = "https://gitlab.com/ericvsmith/namedlist";

51− license = licenses.asl20;

30+ license = lib.licenses.asl20;

52− maintainers = with maintainers; [ ivan ];

31+ maintainers = with lib.maintainers; [ ivan ];

53 };

32 };

54}

33}

pkgs/development/python-modules/nbclient/default.nix+10−33

@@ -1,50 +1,27 @@

1−{ lib

2−, buildPythonPackage

1+{ lib, buildPythonPackage, fetchPypi, pythonOlder,

3−, fetchPypi

4−, pythonOlder

5−, async_generator

2+ async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,

6−, traitlets

7−, nbformat

8−, nest-asyncio

9−, jupyter-client

10−, pytestCheckHook

11−, xmltodict

12−, nbconvert

13−, ipywidgets

3+ pytest, xmltodict, nbconvert, ipywidgets

4+, doCheck ? true

14}:

5}:

15

6

16−let nbclient = buildPythonPackage rec {

7+buildPythonPackage rec {

17 pname = "nbclient";

8 pname = "nbclient";

18− version = "0.6.2";

9+ version = "0.5.13";

19− format = "setuptools";

20−

21 disabled = pythonOlder "3.7";

10 disabled = pythonOlder "3.7";

22

11

23 src = fetchPypi {

12 src = fetchPypi {

24 inherit pname version;

13 inherit pname version;

25− hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";

14+ sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";

26 };

15 };

27

16

17+ inherit doCheck;

18+ checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

28 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

19 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

29

20

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−

43 meta = with lib; {

21 meta = with lib; {

44 homepage = "https://github.com/jupyter/nbclient";

22 homepage = "https://github.com/jupyter/nbclient";

45 description = "A client library for executing notebooks";

23 description = "A client library for executing notebooks";

46 license = licenses.bsd3;

24 license = licenses.bsd3;

47 maintainers = [ maintainers.erictapen ];

25 maintainers = [ maintainers.erictapen ];

48 };

26 };

49−};

27+}

50−in nbclient

pkgs/development/python-modules/nbconvert/default.nix+7−8

@@ -5,11 +5,13 @@

5, glibcLocales

5, glibcLocales

6, entrypoints

6, entrypoints

7, bleach

7, bleach

8+, beautifulsoup4

8, mistune

9, mistune

9, nbclient

10, nbclient

10, jinja2

11, jinja2

11, pygments

12, pygments

12, traitlets

13, traitlets

14+, testpath

13, jupyter_core

15, jupyter_core

14, jupyterlab-pygments

16, jupyterlab-pygments

15, nbformat

17, nbformat

@@ -18,18 +20,15 @@

18, tornado

20, tornado

19, jupyter-client

21, jupyter-client

20, defusedxml

22, defusedxml

21−, tinycss2

22−, beautifulsoup4

23}:

23}:

24

24

25buildPythonPackage rec {

25buildPythonPackage rec {

26 pname = "nbconvert";

26 pname = "nbconvert";

27− version = "6.5.0";

27+ version = "6.4.5";

28− format = "setuptools";

29

28

30 src = fetchPypi {

29 src = fetchPypi {

31 inherit pname version;

30 inherit pname version;

32− hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";

31+ sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";

33 };

32 };

34

33

35 # Add $out/share/jupyter to the list of paths that are used to search for

34 # Add $out/share/jupyter to the list of paths that are used to search for

@@ -45,10 +44,10 @@ buildPythonPackage rec {

45 checkInputs = [ pytestCheckHook glibcLocales ];

44 checkInputs = [ pytestCheckHook glibcLocales ];

46

45

47 propagatedBuildInputs = [

46 propagatedBuildInputs = [

48− entrypoints bleach mistune jinja2 pygments traitlets

47+ entrypoints bleach mistune jinja2 pygments traitlets testpath

49 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

48 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

50− defusedxml tinycss2 beautifulsoup4

49+ defusedxml beautifulsoup4

51− nbclient

50+ (nbclient.override { doCheck = false; }) # avoid infinite recursion

52 jupyterlab-pygments

51 jupyterlab-pygments

53 ];

52 ];

54

53

pkgs/development/python-modules/nvchecker/default.nix+2−2

@@ -20,7 +20,7 @@

20

20

21buildPythonPackage rec {

21buildPythonPackage rec {

22 pname = "nvchecker";

22 pname = "nvchecker";

23− version = "2.8";

23+ version = "2.7";

24 format = "setuptools";

24 format = "setuptools";

25

25

26 disabled = pythonOlder "3.7";

26 disabled = pythonOlder "3.7";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

29 owner = "lilydjwg";

29 owner = "lilydjwg";

30 repo = pname;

30 repo = pname;

31 rev = "v${version}";

31 rev = "v${version}";

32− hash = "sha256-ikpjR1fEZBsSOE20jxTyarb9Pqn3Fz+TYOzXp0g4G9c=";

32+ hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";

33 };

33 };

34

34

35 nativeBuildInputs = [

35 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 @@

6

6

7buildPythonPackage rec {

7buildPythonPackage rec {

8 pname = "peaqevcore";

8 pname = "peaqevcore";

9− version = "0.0.22";

9+ version = "0.0.21";

10 format = "setuptools";

10 format = "setuptools";

11

11

12 disabled = pythonOlder "3.7";

12 disabled = pythonOlder "3.7";

13

13

14 src = fetchPypi {

14 src = fetchPypi {

15 inherit pname version;

15 inherit pname version;

16− hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0=";

16+ hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";

17 };

17 };

18

18

19 postPatch = ''

19 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 @@

1{ lib

1{ lib

2−, stdenv

3, buildPythonPackage

2, buildPythonPackage

4, fetchFromGitHub

3, fetchFromGitHub

5, pythonOlder

4, pythonOlder

6−, substituteAll

7, bcrypt

5, bcrypt

8, pyopenssl

6, pyopenssl

9, python-gnupg

7, python-gnupg

10−, pytestCheckHook

11, requests

8, requests

12, openssl

9, openssl

13}:

10}:

@@ -33,21 +30,14 @@ buildPythonPackage rec {

33

30

34 buildInputs = [ openssl ];

31 buildInputs = [ openssl ];

35

32

36− patches = [

33+ # This patch is supposed to indicate where to load OpenSSL library,

37− # Patches library by fixing the openssl path

34+ # but it is not working as intended.

38− (substituteAll {

35+ #patchPhase = ''

39− src = ./0001-OpenSSL-path-fix.patch;

36+ # substituteInPlace proton/srp/_ctsrp.py --replace \

40− openssl = openssl.out;

37+ # "ctypes.cdll.LoadLibrary('libssl.so.10')" "'${lib.getLib openssl}/lib/libssl.so'"

41− ext = stdenv.hostPlatform.extensions.sharedLibrary;

38+ #'';

42− })

39+ # Regarding the issue above, I'm disabling tests for now

43− ];

40+ doCheck = false;

44−

45− checkInputs = [ pytestCheckHook ];

46−

47− disabledTests = [

48− #ValueError: Invalid modulus

49− "test_modulus_verification"

50− ];

51

41

52 pythonImportsCheck = [ "proton" ];

42 pythonImportsCheck = [ "proton" ];

53

43

pkgs/development/python-modules/py-desmume/default.nix+14−3

@@ -3,18 +3,29 @@

3, alsa-lib, soundtouch, openal

3, alsa-lib, soundtouch, openal

4}:

4}:

5

5

6+let

7+ desmume = fetchFromGitHub {

8+ owner = "SkyTemple";

9+ repo = "desmume";

10+ rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7";

11+ sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842";

12+ };

13+in

6buildPythonPackage rec {

14buildPythonPackage rec {

7 pname = "py-desmume";

15 pname = "py-desmume";

8− version = "0.0.4.post2";

16+ version = "0.0.3.post2";

9

17

10 src = fetchFromGitHub {

18 src = fetchFromGitHub {

11 owner = "SkyTemple";

19 owner = "SkyTemple";

12 repo = pname;

20 repo = pname;

13 rev = version;

21 rev = version;

14− sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";

22+ sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1";

15− fetchSubmodules = true;

16 };

23 };

17

24

25+ postPatch = ''

26+ cp -R --no-preserve=mode ${desmume} __build_desmume

27+ '';

28+

18 buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];

29 buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];

19 nativeBuildInputs = [ meson ninja pkg-config ];

30 nativeBuildInputs = [ meson ninja pkg-config ];

20 propagatedBuildInputs = [ pillow pygobject3 ];

31 propagatedBuildInputs = [ pillow pygobject3 ];

pkgs/development/python-modules/pychromecast/default.nix+2−2

@@ -10,7 +10,7 @@

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "pychromecast";

12 pname = "pychromecast";

13− version = "12.0.0";

13+ version = "11.0.0";

14 format = "setuptools";

14 format = "setuptools";

15

15

16 disabled = !isPy3k;

16 disabled = !isPy3k;

@@ -18,7 +18,7 @@ buildPythonPackage rec {

18 src = fetchPypi {

18 src = fetchPypi {

19 pname = "PyChromecast";

19 pname = "PyChromecast";

20 inherit version;

20 inherit version;

21− sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";

21+ sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";

22 };

22 };

23

23

24 propagatedBuildInputs = [

24 propagatedBuildInputs = [

pkgs/development/python-modules/pydeconz/default.nix+4−6

@@ -1,7 +1,6 @@

1{ lib

1{ lib

2, aiohttp

2, aiohttp

3, aioresponses

3, aioresponses

4−, async-timeout

5, buildPythonPackage

4, buildPythonPackage

6, fetchFromGitHub

5, fetchFromGitHub

7, pytest-aiohttp

6, pytest-aiohttp

@@ -11,21 +10,20 @@

11

10

12buildPythonPackage rec {

11buildPythonPackage rec {

13 pname = "pydeconz";

12 pname = "pydeconz";

14− version = "91";

13+ version = "87";

15 format = "setuptools";

14 format = "setuptools";

16

15

17− disabled = pythonOlder "3.9";

16+ disabled = pythonOlder "3.7";

18

17

19 src = fetchFromGitHub {

18 src = fetchFromGitHub {

20 owner = "Kane610";

19 owner = "Kane610";

21 repo = "deconz";

20 repo = "deconz";

22− rev = "refs/tags/v${version}";

21+ rev = "v${version}";

23− hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";

22+ sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";

24 };

23 };

25

24

26 propagatedBuildInputs = [

25 propagatedBuildInputs = [

27 aiohttp

26 aiohttp

28− async-timeout

29 ];

27 ];

30

28

31 checkInputs = [

29 checkInputs = [

pkgs/development/python-modules/pyeapi/default.nix+8−36

@@ -1,11 +1,10 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3+, pythonAtLeast

3, fetchFromGitHub

4, fetchFromGitHub

4−, fetchpatch

5−, mock

6, netaddr

5, netaddr

7, pytestCheckHook

6, pytestCheckHook

8−, pythonOlder

7+, mock

9}:

8}:

10

9

11buildPythonPackage rec {

10buildPythonPackage rec {

@@ -13,7 +12,8 @@ buildPythonPackage rec {

13 version = "0.8.4";

12 version = "0.8.4";

14 format = "pyproject";

13 format = "pyproject";

15

14

15+ # https://github.com/arista-eosplus/pyeapi/issues/189

16− disabled = pythonOlder "3.7";

16+ disabled = pythonAtLeast "3.10";

17

17

18 src = fetchFromGitHub {

18 src = fetchFromGitHub {

19 owner = "arista-eosplus";

19 owner = "arista-eosplus";

@@ -22,49 +22,21 @@ buildPythonPackage rec {

22 sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";

22 sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";

23 };

23 };

24

24

25− propagatedBuildInputs = [

25+ propagatedBuildInputs = [ netaddr ];

26− netaddr

27− ];

28

26

29 checkInputs = [

27 checkInputs = [

30 mock

28 mock

31 pytestCheckHook

29 pytestCheckHook

32 ];

30 ];

33

31

34− patches = [

32+ pytestFlagsArray = [ "test/unit" ];

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− ];

55

33

56− pytestFlagsArray = [

57− "test/unit"

58− ];

59−

60− pythonImportsCheck = [

34+ pythonImportsCheck = [ "pyeapi" ];

61− "pyeapi"

62− ];

63

35

64 meta = with lib; {

36 meta = with lib; {

65 description = "Client for Arista eAPI";

37 description = "Client for Arista eAPI";

66 homepage = "https://github.com/arista-eosplus/pyeapi";

38 homepage = "https://github.com/arista-eosplus/pyeapi";

67 license = licenses.bsd3;

39 license = licenses.bsd3;

68− maintainers = with maintainers; [ astro ];

40+ maintainers = [ maintainers.astro ];

69 };

41 };

70}

42}

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

@@ -8,7 +8,7 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "pyevilgenius";

10 pname = "pyevilgenius";

11− version = "2.0.0";

11+ version = "1.0.0";

12 format = "setuptools";

12 format = "setuptools";

13

13

14 disabled = pythonOlder "3.8";

14 disabled = pythonOlder "3.8";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

17 owner = "home-assistant-libs";

17 owner = "home-assistant-libs";

18 repo = pname;

18 repo = pname;

19 rev = version;

19 rev = version;

20− sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";

20+ sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";

21 };

21 };

22

22

23 propagatedBuildInputs = [

23 propagatedBuildInputs = [

pkgs/development/python-modules/pyinfra/default.nix+2−2

@@ -17,14 +17,14 @@

17

17

18buildPythonPackage rec {

18buildPythonPackage rec {

19 pname = "pyinfra";

19 pname = "pyinfra";

20− version = "2.0.2";

20+ version = "2.0.1";

21 format = "setuptools";

21 format = "setuptools";

22

22

23 disabled = pythonOlder "3.7";

23 disabled = pythonOlder "3.7";

24

24

25 src = fetchPypi {

25 src = fetchPypi {

26 inherit pname version;

26 inherit pname version;

27− sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0=";

27+ sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE=";

28 };

28 };

29

29

30 propagatedBuildInputs = [

30 propagatedBuildInputs = [

pkgs/development/python-modules/pyinsteon/default.nix+3−3

@@ -16,7 +16,7 @@

16

16

17buildPythonPackage rec {

17buildPythonPackage rec {

18 pname = "pyinsteon";

18 pname = "pyinsteon";

19− version = "1.1.0";

19+ version = "1.0.16";

20 format = "setuptools";

20 format = "setuptools";

21

21

22 disabled = pythonOlder "3.6";

22 disabled = pythonOlder "3.6";

@@ -24,8 +24,8 @@ buildPythonPackage rec {

24 src = fetchFromGitHub {

24 src = fetchFromGitHub {

25 owner = pname;

25 owner = pname;

26 repo = pname;

26 repo = pname;

27− rev = "refs/tags/${version}";

27+ rev = version;

28− hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";

28+ hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";

29 };

29 };

30

30

31 propagatedBuildInputs = [

31 propagatedBuildInputs = [

pkgs/development/python-modules/pykulersky/default.nix+2−2

@@ -11,7 +11,7 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "pykulersky";

13 pname = "pykulersky";

14− version = "0.5.4";

14+ version = "0.5.3";

15 format = "setuptools";

15 format = "setuptools";

16

16

17 disabled = pythonOlder "3.6";

17 disabled = pythonOlder "3.6";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

20 owner = "emlove";

20 owner = "emlove";

21 repo = pname;

21 repo = pname;

22 rev = version;

22 rev = version;

23− sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg=";

23+ sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k=";

24 };

24 };

25

25

26 propagatedBuildInputs = [

26 propagatedBuildInputs = [

pkgs/development/python-modules/pymyq/default.nix+3−3

@@ -9,14 +9,14 @@

9

9

10buildPythonPackage rec {

10buildPythonPackage rec {

11 pname = "pymyq";

11 pname = "pymyq";

12− version = "3.1.5";

12+ version = "3.1.4";

13 disabled = pythonOlder "3.8";

13 disabled = pythonOlder "3.8";

14

14

15 src = fetchFromGitHub {

15 src = fetchFromGitHub {

16 owner = "arraylabs";

16 owner = "arraylabs";

17 repo = pname;

17 repo = pname;

18− rev = "refs/tags/v${version}";

18+ rev = "v${version}";

19− sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw=";

19+ sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/pynetgear/default.nix+2−2

@@ -7,7 +7,7 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "pynetgear";

9 pname = "pynetgear";

10− version = "0.10.0";

10+ version = "0.9.4";

11 format = "setuptools";

11 format = "setuptools";

12

12

13 disabled = pythonOlder "3.7";

13 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

16 owner = "MatMaul";

16 owner = "MatMaul";

17 repo = pname;

17 repo = pname;

18 rev = "refs/tags/${version}";

18 rev = "refs/tags/${version}";

19− sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI=";

19+ sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08=";

20 };

20 };

21

21

22 propagatedBuildInputs = [

22 propagatedBuildInputs = [

pkgs/development/python-modules/pynws/default.nix+2−2

@@ -13,14 +13,14 @@

13

13

14buildPythonPackage rec {

14buildPythonPackage rec {

15 pname = "pynws";

15 pname = "pynws";

16− version = "1.4.1";

16+ version = "1.3.2";

17 disabled = pythonOlder "3.6";

17 disabled = pythonOlder "3.6";

18

18

19 src = fetchFromGitHub {

19 src = fetchFromGitHub {

20 owner = "MatthewFlamm";

20 owner = "MatthewFlamm";

21 repo = pname;

21 repo = pname;

22 rev = "v${version}";

22 rev = "v${version}";

23− sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y=";

23+ sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";

24 };

24 };

25

25

26 propagatedBuildInputs = [

26 propagatedBuildInputs = [

pkgs/development/python-modules/pyomo/default.nix+22−34

@@ -1,60 +1,48 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchFromGitHub

3, fetchFromGitHub

4−, parameterized

4+, isPy27

5+, pyutilib

6+, appdirs

5, ply

7, ply

6−, pytestCheckHook

8+, six

7−, pythonOlder

9+, nose

10+, glpk

8}:

11}:

9

12

10buildPythonPackage rec {

13buildPythonPackage rec {

11 pname = "pyomo";

14 pname = "pyomo";

12− version = "6.4.0";

15+ version = "6.3.0";

13− format = "setuptools";

16+ disabled = isPy27; # unable to import pyutilib.th

14−

15− disabled = pythonOlder "3.7";

16

17

17 src = fetchFromGitHub {

18 src = fetchFromGitHub {

18 repo = "pyomo";

19 repo = "pyomo";

19 owner = "pyomo";

20 owner = "pyomo";

20 rev = version;

21 rev = version;

21− hash = "sha256-FdUhne5Dn5hTIXMce1G6Zu6nx+AuP/JdK0a5fCE3hg8=";

22+ sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs=";

22 };

23 };

23

24

25+ checkInputs = [ nose glpk ];

24 propagatedBuildInputs = [

26 propagatedBuildInputs = [

27+ pyutilib

28+ appdirs

25 ply

29 ply

30+ six

26 ];

31 ];

27

32

28− checkInputs = [

33+ checkPhase = ''

29− parameterized

34+ rm pyomo/bilevel/tests/test_blp.py \

30− pytestCheckHook

35+ pyomo/version/tests/test_installer.py \

31− ];

36+ pyomo/common/tests/test_download.py \

32−

37+ pyomo/core/tests/examples/test_pyomo.py

33− pythonImportsCheck = [

34− "pyomo"

35− ];

36−

37− preCheck = ''

38− export HOME=$(mktemp -d);

38+ export HOME=$TMPDIR

39+ nosetests

39 '';

40 '';

40

41

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−

54 meta = with lib; {

42 meta = with lib; {

55− description = "Python Optimization Modeling Objects";

43+ description = "Pyomo: Python Optimization Modeling Objects";

56 homepage = "http://pyomo.org";

44 homepage = "http://pyomo.org";

57 license = licenses.bsd3;

45 license = licenses.bsd3;

58− maintainers = with maintainers; [ costrouc ];

46+ maintainers = [ maintainers.costrouc ];

59 };

47 };

60}

48}

pkgs/development/python-modules/pyrogram/default.nix+2−2

@@ -12,7 +12,7 @@

12

12

13buildPythonPackage rec {

13buildPythonPackage rec {

14 pname = "pyrogram";

14 pname = "pyrogram";

15− version = "2.0.16";

15+ version = "2.0.14";

16

16

17 disabled = pythonOlder "3.7";

17 disabled = pythonOlder "3.7";

18

18

@@ -20,7 +20,7 @@ buildPythonPackage rec {

20 owner = "pyrogram";

20 owner = "pyrogram";

21 repo = "pyrogram";

21 repo = "pyrogram";

22 rev = "v${version}";

22 rev = "v${version}";

23− hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg=";

23+ hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg=";

24 };

24 };

25

25

26 propagatedBuildInputs = [

26 propagatedBuildInputs = [

pkgs/development/python-modules/pytenable/default.nix+2−2

@@ -20,7 +20,7 @@

20

20

21buildPythonPackage rec {

21buildPythonPackage rec {

22 pname = "pytenable";

22 pname = "pytenable";

23− version = "1.4.6";

23+ version = "1.4.4";

24 format = "setuptools";

24 format = "setuptools";

25

25

26 disabled = pythonOlder "3.7";

26 disabled = pythonOlder "3.7";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

29 owner = "tenable";

29 owner = "tenable";

30 repo = "pyTenable";

30 repo = "pyTenable";

31 rev = version;

31 rev = version;

32− hash = "sha256-0isXHh0b2l8Br4XXR1y8A+zu8vkJjEsJ6faNNEx12lM=";

32+ hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc=";

33 };

33 };

34

34

35 propagatedBuildInputs = [

35 propagatedBuildInputs = [

pkgs/development/python-modules/python-sql/default.nix+8−24

@@ -1,34 +1,18 @@

1−{ lib

2−, fetchPypi

3−, buildPythonPackage

1+{ lib, fetchPypi, buildPythonPackage }:

4−, pytestCheckHook

5−, pythonOlder

6−}:

7

2

8buildPythonPackage rec {

3buildPythonPackage rec {

9 pname = "python-sql";

4 pname = "python-sql";

10− version = "1.4.0";

5+ version = "1.3.0";

11− format = "setuptools";

12−

13− disabled = pythonOlder "3.7";

14

6

15 src = fetchPypi {

7 src = fetchPypi {

16 inherit pname version;

8 inherit pname version;

17− hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY=";

9+ sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176";

18 };

10 };

19

11

20− checkInputs = [

21− pytestCheckHook

22− ];

23−

24− pythonImportsCheck = [

25− "sql"

26− ];

27−

28− meta = with lib; {

12+ meta = {

13+ homepage = "https://python-sql.tryton.org/";

29− description = "Library to write SQL queries in a pythonic way";

14+ description = "A library to write SQL queries in a pythonic way";

30− homepage = "https://pypi.org/project/python-sql/";

15+ maintainers = with lib.maintainers; [ johbo ];

31− license = licenses.bsd3;

16+ license = lib.licenses.bsd3;

32− maintainers = with maintainers; [ johbo ];

33 };

17 };

34}

18}

pkgs/development/python-modules/pytomorrowio/default.nix+2−4

@@ -3,20 +3,19 @@

3, pythonOlder

3, pythonOlder

4, fetchPypi

4, fetchPypi

5, aiohttp

5, aiohttp

6−, pytest-aiohttp

7, pytest-asyncio

6, pytest-asyncio

8, pytestCheckHook

7, pytestCheckHook

9}:

8}:

10

9

11buildPythonPackage rec {

10buildPythonPackage rec {

12 pname = "pytomorrowio";

11 pname = "pytomorrowio";

13− version = "0.3.3";

12+ version = "0.2.1";

14

13

15 disabled = pythonOlder "3.7";

14 disabled = pythonOlder "3.7";

16

15

17 src = fetchPypi {

16 src = fetchPypi {

18 inherit pname version;

17 inherit pname version;

19− sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";

18+ sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";

20 };

19 };

21

20

22 propagatedBuildInputs = [

21 propagatedBuildInputs = [

@@ -24,7 +23,6 @@ buildPythonPackage rec {

24 ];

23 ];

25

24

26 checkInputs = [

25 checkInputs = [

27− pytest-aiohttp

28 pytest-asyncio

26 pytest-asyncio

29 pytestCheckHook

27 pytestCheckHook

30 ];

28 ];

pkgs/development/python-modules/pywinrm/default.nix+12−28

@@ -1,10 +1,10 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchPypi

3, fetchPypi

4−, pythonOlder

4+, isPy38

5, kerberos

5, kerberos

6, mock

6, mock

7−, pytestCheckHook

7+, pytest

8, requests

8, requests

9, requests_ntlm

9, requests_ntlm

10, six

10, six

@@ -13,41 +13,25 @@

13

13

14buildPythonPackage rec {

14buildPythonPackage rec {

15 pname = "pywinrm";

15 pname = "pywinrm";

16− version = "0.4.3";

16+ version = "0.4.2";

17− format = "setuptools";

18−

19− disabled = pythonOlder "3.8";

17+ disabled = isPy38;

20

18

21 src = fetchPypi {

19 src = fetchPypi {

22 inherit pname version;

20 inherit pname version;

23− hash = "sha256-mVZ0v1rGSyViycVlQEcxCeUw02veEMJi1aUpYSGtVWU=";

21+ sha256 = "e7865ec5e46e7fedb859c656cfaba4fcf669de7c042b5a7d8a759544636bcfb7";

24 };

22 };

25

23

24+ checkInputs = [ mock pytest ];

26− propagatedBuildInputs = [

25+ propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ];

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− ];

46

26

47 meta = with lib; {

27 meta = with lib; {

48 description = "Python library for Windows Remote Management";

28 description = "Python library for Windows Remote Management";

49 homepage = "https://github.com/diyan/pywinrm";

29 homepage = "https://github.com/diyan/pywinrm";

50 license = licenses.mit;

30 license = licenses.mit;

51− maintainers = with maintainers; [ elasticdog kamadorueda ];

31+ maintainers = with maintainers; [

32+ elasticdog

33+ kamadorueda

34+ ];

35+ platforms = platforms.all;

52 };

36 };

53}

37}

pkgs/development/python-modules/ropper/default.nix+15−26

@@ -1,43 +1,32 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3−, fetchFromGitHub

3+, fetchPypi

4, capstone

4, capstone

5, filebytes

5, filebytes

6−, pytestCheckHook

6+, pytest

7−, pythonOlder

8}:

7}:

9

8

10buildPythonPackage rec {

9buildPythonPackage rec {

11 pname = "ropper";

10 pname = "ropper";

12− version = "1.13.7";

11+ version = "1.13.6";

13− format = "setuptools";

14

12

15− disabled = pythonOlder "3.7";

13+ src = fetchPypi {

16−

17− src = fetchFromGitHub {

18− owner = "sashs";

19− repo = "Ropper";

20− rev = "v${version}";

14+ inherit pname version;

21− hash = "sha256-3tWWIYqh/G/b7Z6BMua5bRvtSh4SibT6pv/NArhmqPE=";

15+ sha256 = "6e4226f5ef01951c7df87029535e051c6deb3f156f7511613fb69e8a7f4801fb";

22 };

16 };

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

23

23

24+ checkInputs = [pytest];

24− propagatedBuildInputs = [

25+ propagatedBuildInputs = [ capstone filebytes ];

25− capstone

26− filebytes

27− ];

28−

29− checkInputs = [

30− pytestCheckHook

31− ];

32−

33− pythonImportsCheck = [

34− "ropper"

35− ];

36−

37 meta = with lib; {

26 meta = with lib; {

38− description = "Show information about files in different file formats";

39 homepage = "https://scoding.de/ropper/";

27 homepage = "https://scoding.de/ropper/";

40 license = licenses.bsd3;

28 license = licenses.bsd3;

29+ description = "Show information about files in different file formats";

41 maintainers = with maintainers; [ bennofs ];

30 maintainers = with maintainers; [ bennofs ];

42 };

31 };

43}

32}

pkgs/development/python-modules/scmrepo/default.nix+2−2

@@ -14,7 +14,7 @@

14

14

15buildPythonPackage rec {

15buildPythonPackage rec {

16 pname = "scmrepo";

16 pname = "scmrepo";

17− version = "0.0.20";

17+ version = "0.0.19";

18 format = "pyproject";

18 format = "pyproject";

19

19

20 disabled = pythonOlder "3.7";

20 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

23 owner = "iterative";

23 owner = "iterative";

24 repo = pname;

24 repo = pname;

25 rev = "refs/tags/${version}";

25 rev = "refs/tags/${version}";

26− hash = "sha256-3gNHWncP9laevuX3EcnmNJ825eQehoLp75WJ5V5/R9w=";

26+ hash = "sha256-f/KV3NfIumkZcg9r421QhdyPU/274aAU4b78myi+fFY=";

27 };

27 };

28

28

29 propagatedBuildInputs = [

29 propagatedBuildInputs = [

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

@@ -41,7 +41,7 @@

41

41

42buildPythonPackage rec {

42buildPythonPackage rec {

43 pname = "sentry-sdk";

43 pname = "sentry-sdk";

44− version = "1.5.11";

44+ version = "1.5.10";

45 format = "setuptools";

45 format = "setuptools";

46

46

47 disabled = pythonOlder "3.7";

47 disabled = pythonOlder "3.7";

@@ -50,7 +50,7 @@ buildPythonPackage rec {

50 owner = "getsentry";

50 owner = "getsentry";

51 repo = "sentry-python";

51 repo = "sentry-python";

52 rev = version;

52 rev = version;

53− hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0=";

53+ hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0=";

54 };

54 };

55

55

56 propagatedBuildInputs = [

56 propagatedBuildInputs = [

pkgs/development/python-modules/signedjson/default.nix+18−31

@@ -1,53 +1,40 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3−, canonicaljson

4, fetchPypi

3, fetchPypi

5−, importlib-metadata

4+, fetchpatch

5+, canonicaljson

6+, unpaddedbase64

6, pynacl

7, pynacl

7−, pytestCheckHook

8−, pythonOlder

9−, setuptools-scm

10, typing-extensions

8, typing-extensions

11−, unpaddedbase64

9+, setuptools-scm

10+, importlib-metadata

11+, pythonOlder

12}:

12}:

13

13

14buildPythonPackage rec {

14buildPythonPackage rec {

15 pname = "signedjson";

15 pname = "signedjson";

16− version = "1.1.4";

16+ version = "1.1.1";

17− format = "setuptools";

18−

19− disabled = pythonOlder "3.7";

20

17

21 src = fetchPypi {

18 src = fetchPypi {

22 inherit pname version;

19 inherit pname version;

23− hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI=";

20+ sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m";

24 };

21 };

25

22

26− nativeBuildInputs = [

23+ patches = [

27− setuptools-scm

24+ # Do not require importlib_metadata on python 3.8

28− ];

25+ (fetchpatch {

29−

26+ url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch";

30− propagatedBuildInputs = [

27+ sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1";

31− canonicaljson

28+ })

32− unpaddedbase64

33− pynacl

34− ] ++ lib.optionals (pythonOlder "3.8") [

35− importlib-metadata

36− typing-extensions

37− ];

38−

39− checkInputs = [

40− pytestCheckHook

41 ];

29 ];

42

30

43− pythonImportsCheck = [

31+ nativeBuildInputs = [ setuptools-scm ];

44− "signedjson"

32+ propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]

45− ];

33+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

46

34

47 meta = with lib; {

35 meta = with lib; {

36+ homepage = "https://pypi.org/project/signedjson/";

48 description = "Sign JSON with Ed25519 signatures";

37 description = "Sign JSON with Ed25519 signatures";

49− homepage = "https://github.com/matrix-org/python-signedjson";

50 license = licenses.asl20;

38 license = licenses.asl20;

51− maintainers = with maintainers; [ ];

52 };

39 };

53}

40}

pkgs/development/python-modules/simplisafe-python/default.nix+2−6

@@ -3,7 +3,6 @@

3, aresponses

3, aresponses

4, asynctest

4, asynctest

5, backoff

5, backoff

6−, beautifulsoup4

7, buildPythonPackage

6, buildPythonPackage

8, docutils

7, docutils

9, fetchFromGitHub

8, fetchFromGitHub

@@ -20,7 +19,7 @@

20

19

21buildPythonPackage rec {

20buildPythonPackage rec {

22 pname = "simplisafe-python";

21 pname = "simplisafe-python";

23− version = "2022.05.0";

22+ version = "2022.03.3";

24 format = "pyproject";

23 format = "pyproject";

25

24

26 disabled = pythonOlder "3.8";

25 disabled = pythonOlder "3.8";

@@ -29,7 +28,7 @@ buildPythonPackage rec {

29 owner = "bachya";

28 owner = "bachya";

30 repo = pname;

29 repo = pname;

31 rev = version;

30 rev = version;

32− sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";

31+ sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw=";

33 };

32 };

34

33

35 nativeBuildInputs = [

34 nativeBuildInputs = [

@@ -39,7 +38,6 @@ buildPythonPackage rec {

39 propagatedBuildInputs = [

38 propagatedBuildInputs = [

40 aiohttp

39 aiohttp

41 backoff

40 backoff

42− beautifulsoup4

43 docutils

41 docutils

44 pytz

42 pytz

45 voluptuous

43 voluptuous

@@ -64,8 +62,6 @@ buildPythonPackage rec {

64 # simplipy/api.py:253: InvalidCredentialsError

62 # simplipy/api.py:253: InvalidCredentialsError

65 "test_request_error_failed_retry"

63 "test_request_error_failed_retry"

66 "test_update_error"

64 "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"

69 ];

65 ];

70

66

71 disabledTestPaths = [

67 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 @@

4

4

5buildPythonPackage rec {

5buildPythonPackage rec {

6 pname = "skytemple-files";

6 pname = "skytemple-files";

7− version = "1.3.9";

7+ version = "1.3.3";

8

8

9 src = fetchFromGitHub {

9 src = fetchFromGitHub {

10 owner = "SkyTemple";

10 owner = "SkyTemple";

11 repo = pname;

11 repo = pname;

12 rev = version;

12 rev = version;

13− sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";

13+ sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws";

14 fetchSubmodules = true;

14 fetchSubmodules = true;

15 };

15 };

16

16

pkgs/development/python-modules/skytemple-rust/default.nix+6−15

@@ -1,34 +1,25 @@

1−{ lib

1+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:

2−, stdenv

3−, buildPythonPackage

4−, fetchFromGitHub

5−, libiconv

6−, Foundation

7−, rustPlatform

8−, setuptools-rust }:

9

2

10buildPythonPackage rec {

3buildPythonPackage rec {

11 pname = "skytemple-rust";

4 pname = "skytemple-rust";

12− version = "1.3.7";

5+ version = "unstable-2021-08-11";

13

6

14 src = fetchFromGitHub {

7 src = fetchFromGitHub {

15 owner = "SkyTemple";

8 owner = "SkyTemple";

16 repo = pname;

9 repo = pname;

17− rev = version;

10+ rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd";

18− sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";

11+ sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml";

19 };

12 };

20

13

21 cargoDeps = rustPlatform.fetchCargoTarball {

14 cargoDeps = rustPlatform.fetchCargoTarball {

22 inherit src;

15 inherit src;

23 name = "${pname}-${version}";

16 name = "${pname}-${version}";

24− sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";

17+ sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873";

25 };

18 };

26

19

27− buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

20+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

28 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

21 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

29

22

30− GETTEXT_SYSTEM = true;

31−

32 doCheck = false; # there are no tests

23 doCheck = false; # there are no tests

33 pythonImportsCheck = [ "skytemple_rust" ];

24 pythonImportsCheck = [ "skytemple_rust" ];

34

25

pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2

@@ -5,13 +5,13 @@

5

5

6buildPythonPackage rec {

6buildPythonPackage rec {

7 pname = "skytemple-ssb-debugger";

7 pname = "skytemple-ssb-debugger";

8− version = "1.3.8.post2";

8+ version = "1.3.0";

9

9

10 src = fetchFromGitHub {

10 src = fetchFromGitHub {

11 owner = "SkyTemple";

11 owner = "SkyTemple";

12 repo = pname;

12 repo = pname;

13 rev = version;

13 rev = version;

14− sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";

14+ sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";

15 };

15 };

16

16

17 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

17 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

pkgs/development/python-modules/slack-sdk/default.nix+3−3

@@ -20,7 +20,7 @@

20

20

21buildPythonPackage rec {

21buildPythonPackage rec {

22 pname = "slack-sdk";

22 pname = "slack-sdk";

23− version = "3.16.0";

23+ version = "3.15.2";

24 format = "setuptools";

24 format = "setuptools";

25

25

26 disabled = pythonOlder "3.6";

26 disabled = pythonOlder "3.6";

@@ -28,8 +28,8 @@ buildPythonPackage rec {

28 src = fetchFromGitHub {

28 src = fetchFromGitHub {

29 owner = "slackapi";

29 owner = "slackapi";

30 repo = "python-slack-sdk";

30 repo = "python-slack-sdk";

31− rev = "refs/tags/v${version}";

31+ rev = "v${version}";

32− sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0=";

32+ sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4=";

33 };

33 };

34

34

35 propagatedBuildInputs = [

35 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 {

39 src = ./hardcode-gnupg-path.patch;

39 src = ./hardcode-gnupg-path.patch;

40 inherit gnupg;

40 inherit gnupg;

41 })

41 })

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

44 ];

42 ];

45

43

46 disabledTestPaths = [

44 disabledTestPaths = [

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

@@ -24,12 +24,12 @@

24

24

25buildPythonPackage rec {

25buildPythonPackage rec {

26 pname = "snowflake-connector-python";

26 pname = "snowflake-connector-python";

27− version = "2.7.7";

27+ version = "2.7.6";

28 disabled = pythonOlder "3.6";

28 disabled = pythonOlder "3.6";

29

29

30 src = fetchPypi {

30 src = fetchPypi {

31 inherit pname version;

31 inherit pname version;

32− sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";

32+ sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";

33 };

33 };

34

34

35 postPatch = ''

35 postPatch = ''

pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3

@@ -10,7 +10,7 @@

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "sqlalchemy-mixins";

12 pname = "sqlalchemy-mixins";

13− version = "1.5.3";

13+ version = "1.5.1";

14 format = "setuptools";

14 format = "setuptools";

15

15

16 disabled = pythonOlder "3.8";

16 disabled = pythonOlder "3.8";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

18 src = fetchFromGitHub {

18 src = fetchFromGitHub {

19 owner = "absent1706";

19 owner = "absent1706";

20 repo = pname;

20 repo = pname;

21− rev = "refs/tags/v${version}";

21+ rev = "v${version}";

22− sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M=";

22+ sha256 = "sha256-HZiv7F0/UatgY3KlILgzywrK5NJE/tDe6B8/smeYwlM=";

23 };

23 };

24

24

25 propagatedBuildInputs = [

25 propagatedBuildInputs = [

pkgs/development/python-modules/sqlmap/default.nix+2−2

@@ -7,11 +7,11 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "sqlmap";

9 pname = "sqlmap";

10− version = "1.6.5";

10+ version = "1.6.4";

11

11

12 src = fetchPypi {

12 src = fetchPypi {

13 inherit pname version;

13 inherit pname version;

14− sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg=";

14+ sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";

15 };

15 };

16

16

17 postPatch = ''

17 postPatch = ''

pkgs/development/python-modules/stripe/default.nix+2−2

@@ -7,14 +7,14 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "stripe";

9 pname = "stripe";

10− version = "2.75.0";

10+ version = "2.74.0";

11 format = "setuptools";

11 format = "setuptools";

12

12

13 disabled = pythonOlder "3.7";

13 disabled = pythonOlder "3.7";

14

14

15 src = fetchPypi {

15 src = fetchPypi {

16 inherit pname version;

16 inherit pname version;

17− hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME=";

17+ hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA=";

18 };

18 };

19

19

20 propagatedBuildInputs = [

20 propagatedBuildInputs = [

pkgs/development/python-modules/superqt/default.nix+3−3

@@ -11,13 +11,13 @@

11

11

12buildPythonPackage rec {

12buildPythonPackage rec {

13 pname = "superqt";

13 pname = "superqt";

14− version = "0.3.2";

14+ version = "0.3.1";

15

15

16 src = fetchFromGitHub {

16 src = fetchFromGitHub {

17 owner = "napari";

17 owner = "napari";

18 repo = pname;

18 repo = pname;

19− rev = "refs/tags/v${version}";

19+ rev = "v${version}";

20− sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc=";

20+ sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4=";

21 };

21 };

22 format = "pyproject";

22 format = "pyproject";

23 nativeBuildInputs = [ setuptools-scm ];

23 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/python-modules/teslajsonpy/default.nix+2−2

@@ -15,7 +15,7 @@

15

15

16buildPythonPackage rec {

16buildPythonPackage rec {

17 pname = "teslajsonpy";

17 pname = "teslajsonpy";

18− version = "2.2.0";

18+ version = "2.1.0";

19 format = "pyproject";

19 format = "pyproject";

20

20

21 disabled = pythonOlder "3.7";

21 disabled = pythonOlder "3.7";

@@ -24,7 +24,7 @@ buildPythonPackage rec {

24 owner = "zabuldon";

24 owner = "zabuldon";

25 repo = pname;

25 repo = pname;

26 rev = "refs/tags/v${version}";

26 rev = "refs/tags/v${version}";

27− sha256 = "sha256-/y+ZXNqNbSIjQeTDacu3/Fd+6FrDrW3Nigptj0f5KTg=";

27+ sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk=";

28 };

28 };

29

29

30 nativeBuildInputs = [

30 nativeBuildInputs = [

pkgs/development/python-modules/textual/default.nix+13−16

@@ -1,34 +1,38 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3, fetchFromGitHub

3, fetchFromGitHub

4+, fetchpatch

4, poetry-core

5, poetry-core

5, rich

6, rich

6, typing-extensions

7, typing-extensions

7, pytestCheckHook

8, pytestCheckHook

8−, pythonOlder

9}:

9}:

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "textual";

12 pname = "textual";

13− version = "0.1.18";

13+ version = "0.1.15";

14 format = "pyproject";

14 format = "pyproject";

15

15

16− disabled = pythonOlder "3.7";

17−

18 src = fetchFromGitHub {

16 src = fetchFromGitHub {

19 owner = "Textualize";

17 owner = "Textualize";

20 repo = pname;

18 repo = pname;

21 rev = "v${version}";

19 rev = "v${version}";

22− sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";

20+ sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";

23 };

21 };

24

22

25− nativeBuildInputs = [

23+ patches = [

26− poetry-core

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+ })

27 ];

30 ];

28

31

32+ nativeBuildInputs = [ poetry-core ];

33+

29 propagatedBuildInputs = [

34 propagatedBuildInputs = [

30 rich

35 rich

31− ] ++ lib.optionals (pythonOlder "3.9") [

32 typing-extensions

36 typing-extensions

33 ];

37 ];

34

38

@@ -36,14 +40,7 @@ buildPythonPackage rec {

36 pytestCheckHook

40 pytestCheckHook

37 ];

41 ];

38

42

39− postPatch = ''

40− substituteInPlace pyproject.toml \

41− --replace 'rich = "^12.3.0"' 'rich = "*"'

42− '';

43−

44− pythonImportsCheck = [

43+ pythonImportsCheck = [ "textual" ];

45− "textual"

46− ];

47

44

48 meta = with lib; {

45 meta = with lib; {

49 description = "TUI framework for Python inspired by modern web development";

46 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 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "total-connect-client";

10 pname = "total-connect-client";

11− version = "2022.3";

11+ version = "2022.2.1";

12 format = "setuptools";

12 format = "setuptools";

13

13

14 disabled = pythonOlder "3.7";

14 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

17 owner = "craigjmidwinter";

17 owner = "craigjmidwinter";

18 repo = "total-connect-client";

18 repo = "total-connect-client";

19 rev = version;

19 rev = version;

20− hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";

20+ hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";

21 };

21 };

22

22

23 propagatedBuildInputs = [

23 propagatedBuildInputs = [

pkgs/development/python-modules/types-paramiko/default.nix+2−2

@@ -6,11 +6,11 @@

6

6

7buildPythonPackage rec {

7buildPythonPackage rec {

8 pname = "types-paramiko";

8 pname = "types-paramiko";

9− version = "2.10.0";

9+ version = "2.8.21";

10

10

11 src = fetchPypi {

11 src = fetchPypi {

12 inherit pname version;

12 inherit pname version;

13− sha256 = "sha256-q2iT1fzl7QaWTWGTntanFoqxSVKUWpCZWmKKXoKl4WE=";

13+ sha256 = "sha256-ZAyFCsqK3EGw1aIl7jaseBJonhpDcMMS+OS5Ks7I5AU=";

14 };

14 };

15

15

16 pythonImportsCheck = [

16 pythonImportsCheck = [

pkgs/development/python-modules/ufo2ft/default.nix+2−2

@@ -12,13 +12,13 @@

12

12

13buildPythonPackage rec {

13buildPythonPackage rec {

14 pname = "ufo2ft";

14 pname = "ufo2ft";

15− version = "2.27.0";

15+ version = "2.26.0";

16

16

17 format = "setuptools";

17 format = "setuptools";

18

18

19 src = fetchPypi {

19 src = fetchPypi {

20 inherit pname version;

20 inherit pname version;

21− sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE=";

21+ sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg=";

22 };

22 };

23

23

24 patches = [

24 patches = [

pkgs/development/python-modules/ufoLib2/default.nix−3

@@ -5,7 +5,6 @@

5, fonttools

5, fonttools

6, pytestCheckHook

6, pytestCheckHook

7, fs

7, fs

8−, setuptools-scm

9}:

8}:

10

9

11buildPythonPackage rec {

10buildPythonPackage rec {

@@ -26,8 +25,6 @@ buildPythonPackage rec {

26 fs

25 fs

27 ];

26 ];

28

27

29− nativeBuildInputs = [ setuptools-scm ];

30−

31 checkInputs = [

28 checkInputs = [

32 pytestCheckHook

29 pytestCheckHook

33 ];

30 ];

pkgs/development/python-modules/voluptuous/default.nix+11−15

@@ -1,31 +1,27 @@

1{ lib

1{ lib

2, buildPythonPackage

2, buildPythonPackage

3−, fetchFromGitHub

3+, fetchPypi

4−, pytestCheckHook

4+, nose

5}:

5}:

6

6

7buildPythonPackage rec {

7buildPythonPackage rec {

8 pname = "voluptuous";

8 pname = "voluptuous";

9− version = "0.13.1";

9+ version = "0.13.0";

10

10

11− src = fetchFromGitHub {

11+ src = fetchPypi {

12− owner = "alecthomas";

13− repo = pname;

14− rev = version;

12+ inherit pname version;

15− hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";

13+ sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";

16 };

14 };

17

15

18 checkInputs = [

16 checkInputs = [

19− pytestCheckHook

17+ nose

20 ];

18 ];

21

19

22− pythonImportsCheck = [

20+ checkPhase = ''

23− "voluptuous"

21+ nosetests

24− ];

22+ '';

25

23

26− pytestFlagsArray = [

27− "voluptuous/tests/"

24+ pythonImportsCheck = [ "voluptuous" ];

28− ];

29

25

30 meta = with lib; {

26 meta = with lib; {

31 description = "Python data validation library";

27 description = "Python data validation library";

pkgs/development/python-modules/wandb/default.nix+12−20

@@ -12,7 +12,6 @@

12, jsonref

12, jsonref

13, jsonschema

13, jsonschema

14, matplotlib

14, matplotlib

15−, nbconvert

16, nbformat

15, nbformat

17, pandas

16, pandas

18, pathtools

17, pathtools

@@ -37,7 +36,7 @@

37

36

38buildPythonPackage rec {

37buildPythonPackage rec {

39 pname = "wandb";

38 pname = "wandb";

40− version = "0.12.16";

39+ version = "0.12.15";

41 format = "setuptools";

40 format = "setuptools";

42

41

43 disabled = pythonOlder "3.6";

42 disabled = pythonOlder "3.6";

@@ -46,7 +45,7 @@ buildPythonPackage rec {

46 owner = pname;

45 owner = pname;

47 repo = "client";

46 repo = "client";

48 rev = "v${version}";

47 rev = "v${version}";

49− hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";

48+ hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo=";

50 };

49 };

51

50

52 # setuptools is necessary since pkg_resources is required at runtime.

51 # setuptools is necessary since pkg_resources is required at runtime.

@@ -67,20 +66,6 @@ buildPythonPackage rec {

67 shortuuid

66 shortuuid

68 ];

67 ];

69

68

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−

84 checkInputs = [

69 checkInputs = [

85 azure-core

70 azure-core

86 bokeh

71 bokeh

@@ -88,9 +73,6 @@ buildPythonPackage rec {

88 jsonref

73 jsonref

89 jsonschema

74 jsonschema

90 matplotlib

75 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

94 nbformat

76 nbformat

95 pandas

77 pandas

96 pydantic

78 pydantic

@@ -101,6 +83,16 @@ buildPythonPackage rec {

101 tqdm

83 tqdm

102 ];

84 ];

103

85

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+

104 disabledTestPaths = [

96 disabledTestPaths = [

105 # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.

97 # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.

106 "tests/test_cli.py"

98 "tests/test_cli.py"

pkgs/development/python-modules/webssh/default.nix+2−2

@@ -8,12 +8,12 @@

8

8

9buildPythonPackage rec {

9buildPythonPackage rec {

10 pname = "webssh";

10 pname = "webssh";

11− version = "1.6.0";

11+ version = "1.5.3";

12 format = "setuptools";

12 format = "setuptools";

13

13

14 src = fetchPypi {

14 src = fetchPypi {

15 inherit pname version;

15 inherit pname version;

16− hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94=";

16+ hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4=";

17 };

17 };

18

18

19 propagatedBuildInputs = [

19 propagatedBuildInputs = [

pkgs/development/python-modules/xknx/default.nix+2−2

@@ -12,7 +12,7 @@

12

12

13buildPythonPackage rec {

13buildPythonPackage rec {

14 pname = "xknx";

14 pname = "xknx";

15− version = "0.21.2";

15+ version = "0.21.1";

16 format = "setuptools";

16 format = "setuptools";

17

17

18 disabled = pythonOlder "3.8";

18 disabled = pythonOlder "3.8";

@@ -21,7 +21,7 @@ buildPythonPackage rec {

21 owner = "XKNX";

21 owner = "XKNX";

22 repo = pname;

22 repo = pname;

23 rev = "refs/tags/${version}";

23 rev = "refs/tags/${version}";

24− sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w=";

24+ sha256 = "sha256-QNy/jUh/kIj6sabWnmC5L00ikBTrVmOEp6mFBya29WM=";

25 };

25 };

26

26

27 propagatedBuildInputs = [

27 propagatedBuildInputs = [

pkgs/development/python-modules/youtube-search-python/default.nix+2−2

@@ -7,14 +7,14 @@

7

7

8buildPythonPackage rec {

8buildPythonPackage rec {

9 pname = "youtube-search-python";

9 pname = "youtube-search-python";

10− version = "1.6.5";

10+ version = "1.6.4";

11 format = "setuptools";

11 format = "setuptools";

12

12

13 disabled = pythonOlder "3.6";

13 disabled = pythonOlder "3.6";

14

14

15 src = fetchPypi {

15 src = fetchPypi {

16 inherit pname version;

16 inherit pname version;

17− hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8=";

17+ hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0=";

18 };

18 };

19

19

20 propagatedBuildInputs = [

20 propagatedBuildInputs = [

pkgs/development/python-modules/zeroconf/default.nix+2−4

@@ -10,7 +10,7 @@

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "zeroconf";

12 pname = "zeroconf";

13− version = "0.38.5";

13+ version = "0.38.4";

14 format = "setuptools";

14 format = "setuptools";

15

15

16 disabled = pythonOlder "3.7";

16 disabled = pythonOlder "3.7";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

19 owner = "jstasiak";

19 owner = "jstasiak";

20 repo = "python-zeroconf";

20 repo = "python-zeroconf";

21 rev = version;

21 rev = version;

22− hash = "sha256-QmmVxrvBPEwsmD/XJZClNQj4PUX+7X+75ZWSOO4/C24=";

22+ sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw=";

23 };

23 };

24

24

25 propagatedBuildInputs = [

25 propagatedBuildInputs = [

@@ -39,8 +39,6 @@ buildPythonPackage rec {

39 "test_launch_and_close_v4_v6"

39 "test_launch_and_close_v4_v6"

40 "test_launch_and_close_v6_only"

40 "test_launch_and_close_v6_only"

41 "test_integration_with_listener_ipv6"

41 "test_integration_with_listener_ipv6"

42− # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')]

43− "test_service_browser_expire_callbacks"

44 ] ++ lib.optionals stdenv.isDarwin [

42 ] ++ lib.optionals stdenv.isDarwin [

45 "test_lots_of_names"

43 "test_lots_of_names"

46 ];

44 ];

pkgs/development/python-modules/zigpy/default.nix+2−4

@@ -4,7 +4,6 @@

4, asynctest

4, asynctest

5, buildPythonPackage

5, buildPythonPackage

6, crccheck

6, crccheck

7−, cryptography

8, fetchFromGitHub

7, fetchFromGitHub

9, pycryptodome

8, pycryptodome

10, pytest-aiohttp

9, pytest-aiohttp

@@ -16,7 +15,7 @@

16

15

17buildPythonPackage rec {

16buildPythonPackage rec {

18 pname = "zigpy";

17 pname = "zigpy";

19− version = "0.45.1";

18+ version = "0.44.2";

20 format = "setuptools";

19 format = "setuptools";

21

20

22 disabled = pythonOlder "3.7";

21 disabled = pythonOlder "3.7";

@@ -25,14 +24,13 @@ buildPythonPackage rec {

25 owner = "zigpy";

24 owner = "zigpy";

26 repo = "zigpy";

25 repo = "zigpy";

27 rev = version;

26 rev = version;

28− sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";

27+ sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";

29 };

28 };

30

29

31 propagatedBuildInputs = [

30 propagatedBuildInputs = [

32 aiohttp

31 aiohttp

33 aiosqlite

32 aiosqlite

34 crccheck

33 crccheck

35− cryptography

36 pycryptodome

34 pycryptodome

37 voluptuous

35 voluptuous

38 ];

36 ];

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

@@ -10,7 +10,7 @@

10

10

11buildPythonPackage rec {

11buildPythonPackage rec {

12 pname = "zwave-js-server-python";

12 pname = "zwave-js-server-python";

13− version = "0.36.1";

13+ version = "0.35.3";

14 format = "setuptools";

14 format = "setuptools";

15

15

16 disabled = pythonOlder "3.8";

16 disabled = pythonOlder "3.8";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

19 owner = "home-assistant-libs";

19 owner = "home-assistant-libs";

20 repo = pname;

20 repo = pname;

21 rev = version;

21 rev = version;

22− sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";

22+ sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";

23 };

23 };

24

24

25 propagatedBuildInputs = [

25 propagatedBuildInputs = [

pkgs/development/quickemu/default.nix+2−2

@@ -11,7 +11,7 @@

11, cdrtools

11, cdrtools

12, usbutils

12, usbutils

13, util-linux

13, util-linux

14−, spice-gtk

14+, spicy

15, swtpm

15, swtpm

16, wget

16, wget

17, xdg-user-dirs

17, xdg-user-dirs

@@ -32,7 +32,7 @@ let

32 cdrtools

32 cdrtools

33 usbutils

33 usbutils

34 util-linux

34 util-linux

35− spice-gtk

35+ spicy

36 swtpm

36 swtpm

37 wget

37 wget

38 xdg-user-dirs

38 xdg-user-dirs

pkgs/development/tools/analysis/checkov/default.nix+2−3

@@ -32,13 +32,13 @@ with py.pkgs;

32

32

33buildPythonApplication rec {

33buildPythonApplication rec {

34 pname = "checkov";

34 pname = "checkov";

35− version = "2.0.1110";

35+ version = "2.0.1102";

36

36

37 src = fetchFromGitHub {

37 src = fetchFromGitHub {

38 owner = "bridgecrewio";

38 owner = "bridgecrewio";

39 repo = pname;

39 repo = pname;

40 rev = version;

40 rev = version;

41− hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI=";

41+ hash = "sha256-OPYlgj8jdgCQJddy9UUXMjHJtQcoMrZbghgPUdyUV5Y=";

42 };

42 };

43

43

44 nativeBuildInputs = with py.pkgs; [

44 nativeBuildInputs = with py.pkgs; [

@@ -89,7 +89,6 @@ buildPythonApplication rec {

89 pytest-mock

89 pytest-mock

90 pytest-xdist

90 pytest-xdist

91 pytestCheckHook

91 pytestCheckHook

92− responses

93 ];

92 ];

94

93

95 postPatch = ''

94 postPatch = ''

pkgs/development/tools/analysis/codeql/default.nix+2−2

@@ -2,7 +2,7 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "codeql";

4 pname = "codeql";

5− version = "2.8.5";

5+ version = "2.8.2";

6

6

7 dontConfigure = true;

7 dontConfigure = true;

8 dontBuild = true;

8 dontBuild = true;

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

10

10

11 src = fetchzip {

11 src = fetchzip {

12 url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";

12 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=";

14 };

14 };

15

15

16 nativeBuildInputs = [

16 nativeBuildInputs = [

pkgs/development/tools/analysis/cvehound/default.nix+12−17

@@ -1,34 +1,30 @@

1−{ lib

2−, fetchFromGitHub

1+{ lib, fetchFromGitHub, coccinelle, gnugrep, python3Packages }:

3−, coccinelle

2+

4−, gnugrep

3+with python3Packages;

5−, python3

4+

6−}:

7−

8−python3.pkgs.buildPythonApplication rec {

5+buildPythonApplication rec {

9 pname = "cvehound";

6 pname = "cvehound";

10− version = "1.0.9";

7+ version = "1.0.4";

11

8

12 src = fetchFromGitHub {

9 src = fetchFromGitHub {

13 owner = "evdenis";

10 owner = "evdenis";

14 repo = "cvehound";

11 repo = "cvehound";

15 rev = version;

12 rev = version;

16− hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM=";

13+ sha256 = "sha256-m8vpea02flQ8elSvGWv9FqBhsEcBzRYjcUk+dc4kb2M=";

17 };

14 };

18

15

19 makeWrapperArgs = [

16 makeWrapperArgs = [

20 "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}"

17 "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}"

21 ];

18 ];

22

19

23− propagatedBuildInputs = with python3.pkgs; [

20+ propagatedBuildInputs = [

24− lxml

21+ psutil

25 setuptools

22 setuptools

26 sympy

23 sympy

27 ];

24 ];

28

25

29− checkInputs = with python3.pkgs; [

26+ checkInputs = [

30 GitPython

27 GitPython

31− psutil

32 pytestCheckHook

28 pytestCheckHook

33 ];

29 ];

34

30

@@ -36,11 +32,10 @@ python3.pkgs.buildPythonApplication rec {

36 doCheck = false;

32 doCheck = false;

37

33

38 meta = with lib; {

34 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";

40 homepage = "https://github.com/evdenis/cvehound";

36 homepage = "https://github.com/evdenis/cvehound";

41− changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog";

42 # See https://github.com/evdenis/cvehound/issues/22

37 # See https://github.com/evdenis/cvehound/issues/22

43− license = with licenses; [ gpl2Only gpl3Plus ];

38+ license = with licenses; [ gpl2Only gpl3Only ];

44 maintainers = with maintainers; [ ambroisie ];

39 maintainers = with maintainers; [ ambroisie ];

45 };

40 };

46}

41}

pkgs/development/tools/build-managers/bloop/default.nix+46−16

@@ -1,5 +1,6 @@

1{ stdenv

1{ stdenv

2, fetchurl

2, fetchurl

3+, coursier

3, autoPatchelfHook

4, autoPatchelfHook

4, installShellFiles

5, installShellFiles

5, makeWrapper

6, makeWrapper

@@ -10,34 +11,58 @@

10

11

11stdenv.mkDerivation rec {

12stdenv.mkDerivation rec {

12 pname = "bloop";

13 pname = "bloop";

13− version = "1.5.0";

14+ version = "1.4.13";

14

15

15− platform =

16+ bloop-coursier-channel = fetchurl {

16− if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

17+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";

17− else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"

18+ sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo=";

18− else throw "unsupported platform";

19+ };

19

20

20 bloop-bash = fetchurl {

21 bloop-bash = fetchurl {

21 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";

22 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=";

23 };

24 };

24

25

25 bloop-fish = fetchurl {

26 bloop-fish = fetchurl {

26 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";

27 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";

27− sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

28+ sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

28 };

29 };

29

30

30 bloop-zsh = fetchurl {

31 bloop-zsh = fetchurl {

31 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";

32 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";

32− sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

33+ sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

33 };

34 };

34

35

35− bloop-binary = fetchurl rec {

36+ bloop-coursier = stdenv.mkDerivation rec {

36− url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";

37+ name = "${pname}-coursier-${version}";

37− sha256 =

38+

38− if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE="

39+ platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

39− else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0="

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="

40− else throw "unsupported platform";

65+ else throw "unsupported platform";

41 };

66 };

42

67

43 dontUnpack = true;

68 dontUnpack = true;

@@ -49,9 +74,14 @@ stdenv.mkDerivation rec {

49 installPhase = ''

74 installPhase = ''

50 runHook preInstall

75 runHook preInstall

51

76

77+ export COURSIER_CACHE=$(pwd)

78+ export COURSIER_JVM_CACHE=$(pwd)

79+

52− install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped

80+ install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped

53

81

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

55

85

56 #Install completions

86 #Install completions

57 installShellCompletion --name bloop --bash ${bloop-bash}

87 installShellCompletion --name bloop --bash ${bloop-bash}

pkgs/development/tools/build-managers/scala-cli/default.nix+3−3

@@ -1,15 +1,15 @@

1{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:

1{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:

2

2

3let

3let

4− version = "0.1.5";

4+ version = "0.1.4";

5 assets = {

5 assets = {

6 x86_64-darwin = {

6 x86_64-darwin = {

7 asset = "scala-cli-x86_64-apple-darwin.gz";

7 asset = "scala-cli-x86_64-apple-darwin.gz";

8− sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl";

8+ sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy";

9 };

9 };

10 x86_64-linux = {

10 x86_64-linux = {

11 asset = "scala-cli-x86_64-pc-linux.gz";

11 asset = "scala-cli-x86_64-pc-linux.gz";

12− sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v";

12+ sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9";

13 };

13 };

14 };

14 };

15in

15in

pkgs/development/tools/database/liquibase/default.nix+1−1

@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {

66 ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}

66 ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}

67

67

68 ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \

68 ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \

69− liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"}

69+ liquibase.integration.commandline.Main \''${1+"\$@"}

70 EOF

70 EOF

71 chmod +x $out/bin/liquibase

71 chmod +x $out/bin/liquibase

72 '';

72 '';

pkgs/development/tools/dive/default.nix+2

@@ -13,6 +13,8 @@ buildGoModule rec {

13

13

14 vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";

14 vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";

15

15

16+ doCheck = false;

17+

16 nativeBuildInputs = [ pkg-config ];

18 nativeBuildInputs = [ pkg-config ];

17

19

18 buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];

20 buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];

pkgs/development/tools/gosec/default.nix+2

@@ -20,6 +20,8 @@ buildGoModule rec {

20 "cmd/gosec"

20 "cmd/gosec"

21 ];

21 ];

22

22

23+ doCheck = false;

24+

23 ldflags = [

25 ldflags = [

24 "-s"

26 "-s"

25 "-w"

27 "-w"

pkgs/development/tools/just/default.nix+3−3

@@ -10,16 +10,16 @@

10

10

11rustPlatform.buildRustPackage rec {

11rustPlatform.buildRustPackage rec {

12 pname = "just";

12 pname = "just";

13− version = "1.1.3";

13+ version = "1.1.2";

14

14

15 src = fetchFromGitHub {

15 src = fetchFromGitHub {

16 owner = "casey";

16 owner = "casey";

17 repo = pname;

17 repo = pname;

18 rev = version;

18 rev = version;

19− sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";

19+ sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";

20 };

20 };

21

21

22− cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";

22+ cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";

23

23

24 nativeBuildInputs = [ installShellFiles ];

24 nativeBuildInputs = [ installShellFiles ];

25 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

25 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 }:

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "metals";

4 pname = "metals";

5− version = "0.11.4";

5+ version = "0.11.2";

6

6

7 deps = stdenv.mkDerivation {

7 deps = stdenv.mkDerivation {

8 name = "${pname}-deps-${version}";

8 name = "${pname}-deps-${version}";

9 buildCommand = ''

9 buildCommand = ''

10 export COURSIER_CACHE=$(pwd)

10 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} \

12 -r bintray:scalacenter/releases \

12 -r bintray:scalacenter/releases \

13 -r sonatype:snapshots > deps

13 -r sonatype:snapshots > deps

14 mkdir -p $out/share/java

14 mkdir -p $out/share/java

@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {

16 '';

16 '';

17 outputHashMode = "recursive";

17 outputHashMode = "recursive";

18 outputHashAlgo = "sha256";

18 outputHashAlgo = "sha256";

19− outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y=";

19+ outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U=";

20 };

20 };

21

21

22− nativeBuildInputs = [ makeWrapper setJavaClassPath ];

22+ nativeBuildInputs = [ makeWrapper ];

23− buildInputs = [ deps ];

23+ buildInputs = [ jdk deps ];

24

24

25 dontUnpack = true;

25 dontUnpack = true;

26

26

@@ -32,19 +32,24 @@ stdenv.mkDerivation rec {

32 # This variant is not targeted at any particular client, clients are

32 # This variant is not targeted at any particular client, clients are

33 # expected to declare their supported features in initialization options.

33 # expected to declare their supported features in initialization options.

34 makeWrapper ${jre}/bin/java $out/bin/metals \

34 makeWrapper ${jre}/bin/java $out/bin/metals \

35+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

35 --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"

36 --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"

36

37

37 # Further variants targeted at clients with featuresets pre-set.

38 # Further variants targeted at clients with featuresets pre-set.

38 makeWrapper ${jre}/bin/java $out/bin/metals-emacs \

39 makeWrapper ${jre}/bin/java $out/bin/metals-emacs \

40+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

39 --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main"

41 --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main"

40

42

41 makeWrapper ${jre}/bin/java $out/bin/metals-vim \

43 makeWrapper ${jre}/bin/java $out/bin/metals-vim \

44+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

42 --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main"

45 --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main"

43

46

44 makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \

47 makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \

48+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

45 --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main"

49 --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main"

46

50

47 makeWrapper ${jre}/bin/java $out/bin/metals-sublime \

51 makeWrapper ${jre}/bin/java $out/bin/metals-sublime \

52+ --prefix PATH : ${lib.makeBinPath [ jdk ]} \

48 --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"

53 --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"

49 '';

54 '';

50

55

pkgs/development/tools/misc/clojure-lsp/default.nix+3−3

@@ -2,18 +2,18 @@

2

2

3buildGraalvmNativeImage rec {

3buildGraalvmNativeImage rec {

4 pname = "clojure-lsp";

4 pname = "clojure-lsp";

5− version = "2022.05.03-12.35.40";

5+ version = "2022.04.18-00.59.32";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = pname;

8 owner = pname;

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc=";

11+ sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE=";

12 };

12 };

13

13

14 jar = fetchurl {

14 jar = fetchurl {

15 url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";

15 url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";

16− sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf";

16+ sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e";

17 };

17 };

18

18

19 extraNativeImageBuildArgs = [

19 extraNativeImageBuildArgs = [

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+2−10

@@ -5,7 +5,7 @@

5}:

5}:

6let

6let

7 # Poetry2nix version

7 # Poetry2nix version

8− version = "1.28.0";

8+ version = "1.27.1";

9

9

10 inherit (poetryLib) isCompatible readTOML moduleName;

10 inherit (poetryLib) isCompatible readTOML moduleName;

11

11

@@ -287,20 +287,12 @@ lib.makeScope pkgs.newScope (self: {

287 (name: value: projectDir + "/${value.path}")

287 (name: value: projectDir + "/${value.path}")

288 (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);

288 (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);

289

289

290− excludedEditablePackageNames = builtins.filter

291− (pkg: editablePackageSources."${pkg}" == null)

290+ editablePackageSources' = (

292− (builtins.attrNames editablePackageSources);

293−

294− allEditablePackageSources = (

295 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

291 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

296 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

292 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

297 // editablePackageSources

293 // editablePackageSources

298 );

294 );

299

295

300− editablePackageSources' = builtins.removeAttrs

301− allEditablePackageSources

302− excludedEditablePackageNames;

303−

304 poetryPython = self.mkPoetryPackages {

296 poetryPython = self.mkPoetryPackages {

305 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

297 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

306 editablePackageSources = editablePackageSources';

298 editablePackageSources = editablePackageSources';

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

@@ -180,7 +180,7 @@ let

180 hasGitIgnore = builtins.pathExists gitIgnore;

180 hasGitIgnore = builtins.pathExists gitIgnore;

181 gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];

181 gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];

182 in

182 in

183− lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

183+ lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

184

184

185 /*

185 /*

186 Provides a source filtering mechanism that:

186 Provides a source filtering mechanism that:

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+5−153

@@ -29,9 +29,6 @@

29 "aioflo": [

29 "aioflo": [

30 "poetry-core"

30 "poetry-core"

31 ],

31 ],

32− "aiogithubapi": [

33− "poetry-core"

34− ],

35 "aioguardian": [

32 "aioguardian": [

36 "poetry-core"

33 "poetry-core"

37 ],

34 ],

@@ -92,21 +89,9 @@

92 "amqtt": [

89 "amqtt": [

93 "poetry-core"

90 "poetry-core"

94 ],

91 ],

95− "ansible-doctor": [

96− "poetry-core"

97− ],

98− "ansible-later": [

99− "poetry-core"

100− ],

101− "ansible-runner": [

102− "pbr"

103− ],

104 "apache-beam": [

92 "apache-beam": [

105 "cython"

93 "cython"

106 ],

94 ],

107− "aplpy": [

108− "cython"

109− ],

110 "argon2_cffi": [

95 "argon2_cffi": [

111 "flitBuildHook"

96 "flitBuildHook"

112 ],

97 ],

@@ -129,24 +114,15 @@

129 "atomman": [

114 "atomman": [

130 "cython"

115 "cython"

131 ],

116 ],

132− "atpublic": [

133− "pdm-pep517"

134− ],

135 "autarco": [

117 "autarco": [

136 "poetry-core"

118 "poetry-core"

137 ],

119 ],

138 "authcaptureproxy": [

120 "authcaptureproxy": [

139 "poetry-core"

121 "poetry-core"

140 ],

122 ],

141− "av": [

142− "cython"

143− ],

144 "awesomeversion": [

123 "awesomeversion": [

145 "poetry-core"

124 "poetry-core"

146 ],

125 ],

147− "aws-adfs": [

148− "poetry-core"

149− ],

150 "aws-error-utils": [

126 "aws-error-utils": [

151 "poetry"

127 "poetry"

152 ],

128 ],

@@ -171,9 +147,6 @@

171 "boltztrap2": [

147 "boltztrap2": [

172 "cython"

148 "cython"

173 ],

149 ],

174− "bsblan": [

175− "poetry-core"

176− ],

177 "build": [

150 "build": [

178 "flit-core"

151 "flit-core"

179 ],

152 ],

@@ -210,9 +183,6 @@

210 "clikit": [

183 "clikit": [

211 "poetry-core"

184 "poetry-core"

212 ],

185 ],

213− "cloudflare-dyndns": [

214− "poetry"

215− ],

216 "collections-extended": [

186 "collections-extended": [

217 "poetry-core"

187 "poetry-core"

218 ],

188 ],

@@ -240,8 +210,7 @@

240 "poetry-core"

210 "poetry-core"

241 ],

211 ],

242 "cssselect2": [

212 "cssselect2": [

243− "flit",

213+ "flit"

244− "flit-core"

245 ],

214 ],

246 "cwcwidth": [

215 "cwcwidth": [

247 "cython"

216 "cython"

@@ -255,15 +224,9 @@

255 "cypari2": [

224 "cypari2": [

256 "cython"

225 "cython"

257 ],

226 ],

258− "cypherpunkpay": [

259− "poetry-core"

260− ],

261 "cysignals": [

227 "cysignals": [

262 "cython"

228 "cython"

263 ],

229 ],

264− "datadog": [

265− "hatchling"

266− ],

267 "datrie": [

230 "datrie": [

268 "cython"

231 "cython"

269 ],

232 ],

@@ -297,9 +260,6 @@

297 "doc8": [

260 "doc8": [

298 "pbr"

261 "pbr"

299 ],

262 ],

300− "docstring-parser": [

301− "poetry-core"

302− ],

303 "dtlssocket": [

263 "dtlssocket": [

304 "cython"

264 "cython"

305 ],

265 ],

@@ -341,8 +301,7 @@

341 "poetry-core"

301 "poetry-core"

342 ],

302 ],

343 "entrypoints": [

303 "entrypoints": [

344− "flit",

304+ "flit"

345− "flit-core"

346 ],

305 ],

347 "enturclient": [

306 "enturclient": [

348 "poetry-core"

307 "poetry-core"

@@ -350,13 +309,6 @@

350 "enumatch": [

309 "enumatch": [

351 "poetry"

310 "poetry"

352 ],

311 ],

353− "exceptiongroup": [

354− "flit-core",

355− "flitBuildHook"

356− ],

357− "falcon": [

358− "cython"

359− ],

360 "fastapi": [

312 "fastapi": [

361 "flitBuildHook"

313 "flitBuildHook"

362 ],

314 ],

@@ -426,9 +378,6 @@

426 "generic": [

378 "generic": [

427 "poetry-core"

379 "poetry-core"

428 ],

380 ],

429− "gensim": [

430− "cython"

431− ],

432 "glances-api": [

381 "glances-api": [

433 "poetry-core"

382 "poetry-core"

434 ],

383 ],

@@ -543,15 +492,9 @@

543 "ipwhl": [

492 "ipwhl": [

544 "flitBuildHook"

493 "flitBuildHook"

545 ],

494 ],

546− "iso8601": [

547− "poetry-core"

548− ],

549 "isort": [

495 "isort": [

550 "poetry-core"

496 "poetry-core"

551 ],

497 ],

552− "jarowinkler": [

553− "cython"

554− ],

555 "jedi-language-server": [

498 "jedi-language-server": [

556 "poetry"

499 "poetry"

557 ],

500 ],

@@ -576,12 +519,6 @@

576 "jupyterlab": [

519 "jupyterlab": [

577 "jupyter-packaging"

520 "jupyter-packaging"

578 ],

521 ],

579− "jupyterlab-code-formatter": [

580− "jupyter-packaging"

581− ],

582− "jupyterlab-pygments": [

583− "jupyter-packaging"

584− ],

585 "keystoneauth1": [

522 "keystoneauth1": [

586 "pbr"

523 "pbr"

587 ],

524 ],

@@ -600,9 +537,6 @@

600 "ldappool": [

537 "ldappool": [

601 "pbr"

538 "pbr"

602 ],

539 ],

603− "levenshtein": [

604− "cython"

605− ],

606 "libgpuarray": [

540 "libgpuarray": [

607 "cython"

541 "cython"

608 ],

542 ],

@@ -630,9 +564,6 @@

630 "lockfile": [

564 "lockfile": [

631 "pbr"

565 "pbr"

632 ],

566 ],

633− "lsassy": [

634− "poetry-core"

635− ],

636 "luftdaten": [

567 "luftdaten": [

637 "poetry-core"

568 "poetry-core"

638 ],

569 ],

@@ -654,9 +585,6 @@

654 "marisa-trie": [

585 "marisa-trie": [

655 "cython"

586 "cython"

656 ],

587 ],

657− "markdown-it-py": [

658− "flit-core"

659− ],

660 "mask-rcnn": [

588 "mask-rcnn": [

661 "cython"

589 "cython"

662 ],

590 ],

@@ -679,9 +607,6 @@

679 "memory-allocator": [

607 "memory-allocator": [

680 "cython"

608 "cython"

681 ],

609 ],

682− "meteofrance-api": [

683− "poetry"

684− ],

685 "metprint": [

610 "metprint": [

686 "poetry-core"

611 "poetry-core"

687 ],

612 ],

@@ -693,7 +618,6 @@

693 "poetry"

618 "poetry"

694 ],

619 ],

695 "mkdocs-jupyter": [

620 "mkdocs-jupyter": [

696− "ipython_genutils",

697 "poetry-core"

621 "poetry-core"

698 ],

622 ],

699 "mkdocs-literate-nav": [

623 "mkdocs-literate-nav": [

@@ -750,9 +674,6 @@

750 "netdata": [

674 "netdata": [

751 "poetry-core"

675 "poetry-core"

752 ],

676 ],

753− "netutils": [

754− "poetry-core"

755− ],

756 "newversion": [

677 "newversion": [

757 "poetry-core"

678 "poetry-core"

758 ],

679 ],

@@ -768,9 +689,6 @@

768 "nkdfu": [

689 "nkdfu": [

769 "flitBuildHook"

690 "flitBuildHook"

770 ],

691 ],

771− "notebook-shim": [

772− "jupyter-packaging"

773− ],

774 "notus-scanner": [

692 "notus-scanner": [

775 "poetry-core"

693 "poetry-core"

776 ],

694 ],

@@ -810,9 +728,6 @@

810 "openvino": [

728 "openvino": [

811 "cython"

729 "cython"

812 ],

730 ],

813− "ordered-set": [

814− "flit-core"

815− ],

816 "ormar": [

731 "ormar": [

817 "poetry-core"

732 "poetry-core"

818 ],

733 ],

@@ -892,9 +807,6 @@

892 "poetry": [

807 "poetry": [

893 "poetry-core"

808 "poetry-core"

894 ],

809 ],

895− "poetry-dynamic-versioning": [

896− "poetry-core"

897− ],

898 "poetry2conda": [

810 "poetry2conda": [

899 "poetry"

811 "poetry"

900 ],

812 ],

@@ -1018,9 +930,6 @@

1018 "pymaven-patch": [

930 "pymaven-patch": [

1019 "pbr"

931 "pbr"

1020 ],

932 ],

1021− "pymdown-extensions": [

1022− "hatchling"

1023− ],

1024 "pymfy": [

933 "pymfy": [

1025 "poetry-core"

934 "poetry-core"

1026 ],

935 ],

@@ -1045,9 +954,6 @@

1045 "pyoverkiz": [

954 "pyoverkiz": [

1046 "poetry-core"

955 "poetry-core"

1047 ],

956 ],

1048− "pyparsing": [

1049− "flit-core"

1050− ],

1051 "pypass": [

957 "pypass": [

1052 "pbr"

958 "pbr"

1053 ],

959 ],

@@ -1072,21 +978,12 @@

1072 "pyproject-flake8": [

978 "pyproject-flake8": [

1073 "flit-core"

979 "flit-core"

1074 ],

980 ],

1075− "pypsrp": [

1076− "poetry-core"

1077− ],

1078 "pyquil": [

981 "pyquil": [

1079 "poetry-core"

982 "poetry-core"

1080 ],

983 ],

1081− "pyrad": [

1082− "poetry-core"

1083− ],

1084 "pyregion": [

984 "pyregion": [

1085 "cython"

985 "cython"

1086 ],

986 ],

1087− "pyrevolve": [

1088− "cython"

1089− ],

1090 "pyrmvtransport": [

987 "pyrmvtransport": [

1091 "flit"

988 "flit"

1092 ],

989 ],

@@ -1102,9 +999,6 @@

1102 "pysigma": [

999 "pysigma": [

1103 "poetry-core"

1000 "poetry-core"

1104 ],

1001 ],

1105− "pysigma-backend-insightidr": [

1106− "poetry-core"

1107− ],

1108 "pysigma-backend-splunk": [

1002 "pysigma-backend-splunk": [

1109 "poetry-core"

1003 "poetry-core"

1110 ],

1004 ],

@@ -1114,30 +1008,14 @@

1114 "pysigma-pipeline-sysmon": [

1008 "pysigma-pipeline-sysmon": [

1115 "poetry-core"

1009 "poetry-core"

1116 ],

1010 ],

1117− "pysigma-pipeline-windows": [

1118− "poetry-core"

1119− ],

1120− "pyslurm": [

1121− "cython"

1122− ],

1123 "pysmf": [

1011 "pysmf": [

1124 "cython"

1012 "cython"

1125 ],

1013 ],

1126 "pysml": [

1014 "pysml": [

1127 "poetry-core"

1015 "poetry-core"

1128 ],

1016 ],

1129− "pysnmp-pyasn1": [

1130− "poetry-core"

1131− ],

1132− "pysnmp-pysmi": [

1133− "poetry-core"

1134− ],

1135− "pysnmplib": [

1136− "poetry-core"

1137− ],

1138 "pysnow": [

1017 "pysnow": [

1139− "poetry",

1018+ "poetry"

1140− "poetry-core"

1141 ],

1019 ],

1142 "pysptk": [

1020 "pysptk": [

1143 "cython"

1021 "cython"

@@ -1157,9 +1035,6 @@

1157 "pytest-httpserver": [

1035 "pytest-httpserver": [

1158 "poetry-core"

1036 "poetry-core"

1159 ],

1037 ],

1160− "pytest-isort": [

1161− "poetry-core"

1162− ],

1163 "pytest-mockservers": [

1038 "pytest-mockservers": [

1164 "poetry-core"

1039 "poetry-core"

1165 ],

1040 ],

@@ -1222,9 +1097,6 @@

1222 "python-openstackclient": [

1097 "python-openstackclient": [

1223 "pbr"

1098 "pbr"

1224 ],

1099 ],

1225− "python-pae": [

1226− "poetry-core"

1227− ],

1228 "python-pkcs11": [

1100 "python-pkcs11": [

1229 "cython"

1101 "cython"

1230 ],

1102 ],

@@ -1343,8 +1215,7 @@

1343 "poetry-core"

1215 "poetry-core"

1344 ],

1216 ],

1345 "rokuecp": [

1217 "rokuecp": [

1346− "poetry",

1218+ "poetry"

1347− "poetry-core"

1348 ],

1219 ],

1349 "roombapy": [

1220 "roombapy": [

1350 "poetry-core"

1221 "poetry-core"

@@ -1409,9 +1280,6 @@

1409 "sentinel": [

1280 "sentinel": [

1410 "poetry-core"

1281 "poetry-core"

1411 ],

1282 ],

1412− "seventeentrack": [

1413− "poetry-core"

1414− ],

1415 "sfepy": [

1283 "sfepy": [

1416 "cython"

1284 "cython"

1417 ],

1285 ],

@@ -1433,15 +1301,9 @@

1433 "slowapi": [

1301 "slowapi": [

1434 "poetry-core"

1302 "poetry-core"

1435 ],

1303 ],

1436− "socksio": [

1437− "flit-core"

1438− ],

1439 "solo-python": [

1304 "solo-python": [

1440 "flitBuildHook"

1305 "flitBuildHook"

1441 ],

1306 ],

1442− "soupsieve": [

1443− "hatchling"

1444− ],

1445 "spacy-pkuseg": [

1307 "spacy-pkuseg": [

1446 "cython"

1308 "cython"

1447 ],

1309 ],

@@ -1563,8 +1425,7 @@

1563 "cython"

1425 "cython"

1564 ],

1426 ],

1565 "testpath": [

1427 "testpath": [

1566− "flit",

1428+ "flit"

1567− "flit-core"

1568 ],

1429 ],

1569 "testrepository": [

1430 "testrepository": [

1570 "pbr"

1431 "pbr"

@@ -1644,9 +1505,6 @@

1644 "typing-extensions": [

1505 "typing-extensions": [

1645 "flit-core"

1506 "flit-core"

1646 ],

1507 ],

1647− "uharfbuzz": [

1648− "cython"

1649− ],

1650 "unpaddedbase64": [

1508 "unpaddedbase64": [

1651 "poetry-core"

1509 "poetry-core"

1652 ],

1510 ],

@@ -1692,14 +1550,8 @@

1692 "yoda": [

1550 "yoda": [

1693 "cython"

1551 "cython"

1694 ],

1552 ],

1695− "yte": [

1696− "poetry-core"

1697− ],

1698 "zeversolarlocal": [

1553 "zeversolarlocal": [

1699 "flit-core",

1554 "flit-core",

1700 "flitBuildHook"

1555 "flitBuildHook"

1701− ],

1702− "zwave-me-ws": [

1703− "poetry-core"

1704 ]

1556 ]

1705}

1557}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+4−98

@@ -8,14 +8,13 @@ let

8 { self

8 { self

9 , drv

9 , drv

10 , attr

10 , attr

11− , extraAttrs ? [ ]

12 }:

11 }:

13 let

12 let

14 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

13 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

15 in

14 in

16 (

15 (

17 # Flit only works on Python3

16 # 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

19 else

18 else

20 drv.overridePythonAttrs (

19 drv.overridePythonAttrs (

21 old:

20 old:

@@ -24,7 +23,7 @@ let

24 { }

23 { }

25 else

24 else

26 {

25 {

27− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs;

26+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ];

28 }

27 }

29 )

28 )

30 );

29 );

@@ -56,16 +55,6 @@ lib.composeManyExtensions [

56 systems)

55 systems)

57 buildSystems)

56 buildSystems)

58

57

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−

69 # Build fixes

58 # Build fixes

70 (self: super:

59 (self: super:

71 let

60 let

@@ -448,17 +437,6 @@ lib.composeManyExtensions [

448 }

437 }

449 );

438 );

450

439

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−

462 # Environment markers are not always included (depending on how a dep was defined)

440 # Environment markers are not always included (depending on how a dep was defined)

463 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

441 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

464

442

@@ -866,17 +844,6 @@ lib.composeManyExtensions [

866 }

844 }

867 );

845 );

868

846

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−

880 lxml = super.lxml.overridePythonAttrs (

847 lxml = super.lxml.overridePythonAttrs (

881 old: {

848 old: {

882 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

849 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

@@ -1176,26 +1143,6 @@ lib.composeManyExtensions [

1176 }

1143 }

1177 );

1144 );

1178

1145

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−

1199 osqp = super.osqp.overridePythonAttrs (

1146 osqp = super.osqp.overridePythonAttrs (

1200 old: {

1147 old: {

1201 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

1148 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

@@ -1203,29 +1150,6 @@ lib.composeManyExtensions [

1203 }

1150 }

1204 );

1151 );

1205

1152

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−

1229 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

1153 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

1230 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

1154 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

1231 postInstall = old.postInstall or "" + ''

1155 postInstall = old.postInstall or "" + ''

@@ -1272,12 +1196,8 @@ lib.composeManyExtensions [

1272

1196

1273 pillow = super.pillow.overridePythonAttrs (

1197 pillow = super.pillow.overridePythonAttrs (

1274 old: {

1198 old: {

1275− nativeBuildInputs = (old.nativeBuildInputs or [ ])

1276− ++ [ pkg-config self.pytest-runner ];

1199+ nativeBuildInputs = [ pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]);

1277− buildInputs = with pkgs; (old.buildInputs or [ ])

1278− ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]

1200+ buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);

1279− ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]

1280− ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];

1281 }

1201 }

1282 );

1202 );

1283

1203

@@ -1326,14 +1246,6 @@ lib.composeManyExtensions [

1326 }

1246 }

1327 );

1247 );

1328

1248

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−

1337 py-solc-x = super.py-solc-x.overridePythonAttrs (

1249 py-solc-x = super.py-solc-x.overridePythonAttrs (

1338 old: {

1250 old: {

1339 preConfigure = ''

1251 preConfigure = ''

@@ -1948,12 +1860,6 @@ lib.composeManyExtensions [

1948

1860

1949 });

1861 });

1950

1862

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−

1957 systemd-python = super.systemd-python.overridePythonAttrs (old: {

1863 systemd-python = super.systemd-python.overridePythonAttrs (old: {

1958 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

1864 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

1959 nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];

1865 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 @@

2

2

3rustPlatform.buildRustPackage rec {

3rustPlatform.buildRustPackage rec {

4 pname = "cargo-sync-readme";

4 pname = "cargo-sync-readme";

5− version = "1.1";

5+ version = "1.0";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "phaazon";

8 owner = "phaazon";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";

11+ sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

12 };

12 };

13

13

14− cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";

14+ cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";

15

15

16 meta = with lib; {

16 meta = with lib; {

17 description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

17 description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

18 homepage = "https://github.com/phaazon/cargo-sync-readme";

18 homepage = "https://github.com/phaazon/cargo-sync-readme";

19− changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";

20 license = licenses.bsd3;

19 license = licenses.bsd3;

21 maintainers = with maintainers; [ b4dm4n ];

20 maintainers = with maintainers; [ b4dm4n ];

22 };

21 };

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

@@ -11,14 +11,14 @@

11

11

12rustPlatform.buildRustPackage rec {

12rustPlatform.buildRustPackage rec {

13 pname = "rust-analyzer-unwrapped";

13 pname = "rust-analyzer-unwrapped";

14− version = "2022-05-02";

14+ version = "2022-04-11";

15− cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";

15+ cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI=";

16

16

17 src = fetchFromGitHub {

17 src = fetchFromGitHub {

18 owner = "rust-analyzer";

18 owner = "rust-analyzer";

19 repo = "rust-analyzer";

19 repo = "rust-analyzer";

20 rev = version;

20 rev = version;

21− sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

21+ sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY=";

22 };

22 };

23

23

24 patches = [

24 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 }:

2

2

3let

3let

4 baseName = "scalafix";

4 baseName = "scalafix";

5− version = "0.10.0";

5+ version = "0.9.0";

6 deps = stdenv.mkDerivation {

6 deps = stdenv.mkDerivation {

7 name = "${baseName}-deps-${version}";

7 name = "${baseName}-deps-${version}";

8 buildCommand = ''

8 buildCommand = ''

9 export COURSIER_CACHE=$(pwd)

9 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

11 mkdir -p $out/share/java

11 mkdir -p $out/share/java

12 cp $(< deps) $out/share/java/

12 cp $(< deps) $out/share/java/

13 '';

13 '';

14 outputHashMode = "recursive";

14 outputHashMode = "recursive";

15− outputHash = "sha256-lDeg90L484MggtQ2a9OyHv4UcfLPjzG3OJZCaWW2AC8=";

15+ outputHashAlgo = "sha256";

16+ outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0";

16 };

17 };

17in

18in

18stdenv.mkDerivation {

19stdenv.mkDerivation {

19 pname = baseName;

20 pname = baseName;

20 inherit version;

21 inherit version;

21

22

22− nativeBuildInputs = [ makeWrapper installShellFiles setJavaClassPath ];

23+ nativeBuildInputs = [ makeWrapper ];

23− buildInputs = [ deps ];

24+ buildInputs = [ jdk deps ];

24

25

25 dontUnpack = true;

26 dontUnpack = true;

26

27

27 installPhase = ''

28 installPhase = ''

28 makeWrapper ${jre}/bin/java $out/bin/${baseName} \

29 makeWrapper ${jre}/bin/java $out/bin/${baseName} \

29 --add-flags "-cp $CLASSPATH scalafix.cli.Cli"

30 --add-flags "-cp $CLASSPATH scalafix.cli.Cli"

30−

31− installShellCompletion --cmd ${baseName} \

32− --bash <($out/bin/${baseName} --bash) \

33− --zsh <($out/bin/${baseName} --zsh)

34 '';

31 '';

35

32

36 installCheckPhase = ''

33 installCheckPhase = ''

pkgs/development/tools/unityhub/default.nix+6−5

@@ -1,14 +1,15 @@

1{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:

1{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:

2

2

3−appimageTools.wrapType2 rec {

3+let

4− pname = "unityhub";

5 version = "2.3.2";

4 version = "2.3.2";

6−

7 src = fetchurl {

5 src = fetchurl {

8 # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage

6 # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage

9 url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";

7 url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";

10 sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";

8 sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn";

11 };

9 };

10+ name = "unityhub";

11+in appimageTools.wrapType2 rec {

12+ inherit name src;

12

13

13 extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr

14 extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr

14 alsa-lib cups libcap fontconfig freetype pango

15 alsa-lib cups libcap fontconfig freetype pango

@@ -22,11 +23,11 @@ appimageTools.wrapType2 rec {

22 ]);

23 ]);

23

24

24 extraInstallCommands =

25 extraInstallCommands =

25− let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in

26+ let appimageContents = appimageTools.extractType2 { inherit name src; }; in

26 ''

27 ''

27 install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications

28 install -Dm444 ${appimageContents}/unityhub.desktop -t $out/share/applications

28 substituteInPlace $out/share/applications/unityhub.desktop \

29 substituteInPlace $out/share/applications/unityhub.desktop \

29− --replace 'Exec=AppRun' 'Exec=${pname}'

30+ --replace 'Exec=AppRun' 'Exec=${name}'

30 install -m 444 -D ${appimageContents}/unityhub.png \

31 install -m 444 -D ${appimageContents}/unityhub.png \

31 $out/share/icons/hicolor/64x64/apps/unityhub.png

32 $out/share/icons/hicolor/64x64/apps/unityhub.png

32 '';

33 '';

pkgs/development/tools/vulkan-validation-layers/default.nix+3−3

@@ -3,7 +3,7 @@

3, stdenv

3, stdenv

4, fetchFromGitHub

4, fetchFromGitHub

5, cmake

5, cmake

6−, pkg-config

6+, pkgconfig

7, glslang

7, glslang

8, libffi

8, libffi

9, libX11

9, libX11

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

45

45

46 nativeBuildInputs = [

46 nativeBuildInputs = [

47 cmake

47 cmake

48− pkg-config

48+ pkgconfig

49 ];

49 ];

50

50

51 buildInputs = [

51 buildInputs = [

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {

65 "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"

65 "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"

66 "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"

66 "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"

67 "-DBUILD_LAYER_SUPPORT_FILES=ON"

67 "-DBUILD_LAYER_SUPPORT_FILES=ON"

68− "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

68+ "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

69 # Hide dev warnings that are useless for packaging

69 # Hide dev warnings that are useless for packaging

70 "-Wno-dev"

70 "-Wno-dev"

71 ];

71 ];

pkgs/development/tools/wails/default.nix+3−3

@@ -15,16 +15,16 @@

15

15

16buildGoModule rec {

16buildGoModule rec {

17 pname = "wails";

17 pname = "wails";

18− version = "2.0.0-beta.36";

18+ version = "2.0.0-beta.34";

19

19

20 src = fetchFromGitHub {

20 src = fetchFromGitHub {

21 owner = "wailsapp";

21 owner = "wailsapp";

22 repo = pname;

22 repo = pname;

23 rev = "v${version}";

23 rev = "v${version}";

24− sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";

24+ sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";

25 } + "/v2";

25 } + "/v2";

26

26

27− vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";

27+ vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";

28

28

29 proxyVendor = true;

29 proxyVendor = true;

30

30

pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js+1−2

@@ -49,8 +49,7 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) {

49 url = "${url}";

49 url = "${url}";

50 ref = "${branch}";

50 ref = "${branch}";

51 rev = "${rev}";

51 rev = "${rev}";

52− } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then {

52+ } // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then {

53− # workaround for https://github.com/NixOS/nix/issues/5128

54 allRefs = true;

53 allRefs = true;

55 } else {}));

54 } else {}));

56 ` : `

55 ` : `

pkgs/development/web/nodejs/nodejs.nix+2−2

@@ -136,7 +136,7 @@ let

136

136

137 ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

137 ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

138 mkdir -p $out/share/bash-completion/completions/

138 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 || :

140 for dir in "$out/lib/node_modules/npm/man/"*; do

140 for dir in "$out/lib/node_modules/npm/man/"*; do

141 mkdir -p $out/share/man/$(basename "$dir")

141 mkdir -p $out/share/man/$(basename "$dir")

142 for page in "$dir"/*; do

142 for page in "$dir"/*; do

@@ -194,7 +194,7 @@ let

194 maintainers = with maintainers; [ goibhniu gilligan cko marsam ];

194 maintainers = with maintainers; [ goibhniu gilligan cko marsam ];

195 platforms = platforms.linux ++ platforms.darwin;

195 platforms = platforms.linux ++ platforms.darwin;

196 mainProgram = "node";

196 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/.";

198 };

198 };

199

199

200 passthru.python = python; # to ensure nodeEnv uses the same version

200 passthru.python = python; # to ensure nodeEnv uses the same version

pkgs/development/web/nodejs/v14.nix+2−2

@@ -7,7 +7,7 @@ let

7in

7in

8 buildNodejs {

8 buildNodejs {

9 inherit enableNpm;

9 inherit enableNpm;

10− version = "14.19.2";

10+ version = "14.19.1";

11− sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";

11+ sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk=";

12 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

12 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

13 }

13 }

pkgs/development/web/nodejs/v18.nix+2−2

@@ -7,8 +7,8 @@ let

7in

7in

8buildNodejs {

8buildNodejs {

9 inherit enableNpm;

9 inherit enableNpm;

10− version = "18.1.0";

10+ version = "18.0.0";

11− sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";

11+ sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU=";

12 patches = [

12 patches = [

13 ./disable-darwin-v8-system-instrumentation.patch

13 ./disable-darwin-v8-system-instrumentation.patch

14 ];

14 ];

pkgs/games/7kaa/default.nix+10−7

@@ -15,15 +15,17 @@

15}:

15}:

16

16

17let

17let

18− pname = "7kaa";

19− version = "2.15.4p1";

20

18

19+ name = "7kaa";

20+ versionMajor = "2.15";

21+ versionMinor = "4p1";

22+

21− music = stdenv.mkDerivation {

23+ music = stdenv.mkDerivation rec {

22− pname = "7kaa-music";

24+ pname = "${name}-music";

23− version = lib.versions.majorMinor version;

25+ version = "${versionMajor}";

24

26

25 src = fetchurl {

27 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";

27 sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";

29 sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";

28 };

30 };

29

31

@@ -39,7 +41,8 @@ let

39in

41in

40

42

41gccStdenv.mkDerivation rec {

43gccStdenv.mkDerivation rec {

42− inherit pname version;

44+ pname = "${name}";

45+ version = "v${versionMajor}.${versionMinor}";

43

46

44 src = fetchFromGitHub {

47 src = fetchFromGitHub {

45 owner = "the3dfxdude";

48 owner = "the3dfxdude";

pkgs/games/mindustry/default.nix+9−11

@@ -128,6 +128,15 @@ stdenv.mkDerivation rec {

128 rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so

128 rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so

129 '' + cleanupMindustrySrc;

129 '' + cleanupMindustrySrc;

130

130

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+

131 buildInputs = lib.optionals enableClient [

140 buildInputs = lib.optionals enableClient [

132 SDL2

141 SDL2

133 glew

142 glew

@@ -174,17 +183,6 @@ stdenv.mkDerivation rec {

174 makeWrapper ${jdk}/bin/java $out/bin/mindustry \

183 makeWrapper ${jdk}/bin/java $out/bin/mindustry \

175 --add-flags "-jar $out/share/mindustry.jar" \

184 --add-flags "-jar $out/share/mindustry.jar" \

176 --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/

185 --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−

188 install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png

186 install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png

189 '' + optionalString enableServer ''

187 '' + optionalString enableServer ''

190 install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar

188 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

2, SDL2, libGL, curl

2, SDL2, libGL, curl

3+, oggSupport ? true, libogg, libvorbis

3, openalSupport ? true, openal

4, openalSupport ? true, openal

5+, zipSupport ? true, zlib

4, Cocoa, OpenAL

6, Cocoa, OpenAL

5}:

7}:

6

8

7let

9let

8− mkFlag = b: if b then "yes" else "no";

10+ mkFlag = b: if b then "ON" else "OFF";

9

11

10− games = import ./games.nix { inherit stdenv lib fetchFromGitHub; };

12+ games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; };

11

13

12 wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };

14 wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; };

13

15

14 yquake2 = stdenv.mkDerivation rec {

16 yquake2 = stdenv.mkDerivation rec {

15 pname = "yquake2";

17 pname = "yquake2";

16− version = "8.01";

18+ version = "8.00";

17

19

18 src = fetchFromGitHub {

20 src = fetchFromGitHub {

19 owner = "yquake2";

21 owner = "yquake2";

20 repo = "yquake2";

22 repo = "yquake2";

21 rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";

23 rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";

22− sha256 = "1dll5lx4bnls5w5f2zwjhwpcpxa97rjn6ymb2v3vrjm19jbd16yd";

24+ sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w";

23 };

25 };

24

26

25 postPatch = ''

27 postPatch = ''

26− substituteInPlace src/client/curl/qcurl.c \

28+ substituteInPlace src/common/filesystem.c \

27− --replace "\"libcurl.so.3\", \"libcurl.so.4\"" "\"${curl.out}/lib/libcurl.so\", \"libcurl.so.3\", \"libcurl.so.4\""

29+ --replace /usr/share/games/quake2 $out/share/games/quake2

28− '' + lib.optionalString (openalSupport && !stdenv.isDarwin) ''

29− substituteInPlace Makefile \

30− --replace "\"libopenal.so.1\"" "\"${openal}/lib/libopenal.so.1\""

31 '';

30 '';

32

31

32+ nativeBuildInputs = [ cmake ];

33+

33 buildInputs = [ SDL2 libGL curl ]

34 buildInputs = [ SDL2 libGL curl ]

34 ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]

35 ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]

36+ ++ lib.optionals oggSupport [ libogg libvorbis ]

35− ++ lib.optional openalSupport openal;

37+ ++ lib.optional openalSupport openal

36−

38+ ++ lib.optional zipSupport zlib;

37− makeFlags = [

39+

38− "WITH_OPENAL=${mkFlag openalSupport}"

40+ cmakeFlags = [

39− "WITH_SYSTEMWIDE=yes"

41+ "-DCMAKE_BUILD_TYPE=Release"

40− "WITH_SYSTEMDIR=$\{out}/share/games/quake2"

42+ "-DOGG_SUPPORT=${mkFlag oggSupport}"

43+ "-DOPENAL_SUPPORT=${mkFlag openalSupport}"

44+ "-DZIP_SUPPORT=${mkFlag zipSupport}"

45+ "-DSYSTEMWIDE_SUPPORT=ON"

41 ];

46 ];

42

47

43− enableParallelBuilding = true;

48+ preConfigure = ''

49+ # Since we can't expand $out in `cmakeFlags`

50+ cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2"

51+ '';

44

52

45 installPhase = ''

53 installPhase = ''

46 # Yamagi Quake II expects all binaries (executables and libs) to be in the

54 # Yamagi Quake II expects all binaries (executables and libs) to be in the

47 # same directory.

55 # 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

49 cp -r release/* $out/lib/yquake2

57 cp -r release/* $out/lib/yquake2

50 ln -s $out/lib/yquake2/quake2 $out/bin/yquake2

58 ln -s $out/lib/yquake2/quake2 $out/bin/yquake2

51 ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded

59 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

53 '';

61 '';

54

62

55 meta = with lib; {

63 meta = with lib; {

pkgs/games/quake2/yquake2/games.nix+4−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchFromGitHub }:

1+{ stdenv, lib, fetchFromGitHub, cmake }:

2

2

3let

3let

4 games = {

4 games = {

@@ -37,9 +37,11 @@ let

37 rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}";

37 rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}";

38 };

38 };

39

39

40+ nativeBuildInputs = [ cmake ];

41+

40 installPhase = ''

42 installPhase = ''

41 mkdir -p $out/lib/yquake2/${id}

43 mkdir -p $out/lib/yquake2/${id}

42− cp release/* $out/lib/yquake2/${id}

44+ cp Release/* $out/lib/yquake2/${id}

43 '';

45 '';

44

46

45 meta = with lib; {

47 meta = with lib; {

pkgs/misc/platformsh/default.nix+2−2

@@ -2,14 +2,14 @@

2

2

3let

3let

4 pname = "platformsh";

4 pname = "platformsh";

5− version = "3.79.2";

5+ version = "3.79.0";

6in

6in

7stdenv.mkDerivation {

7stdenv.mkDerivation {

8 inherit pname version;

8 inherit pname version;

9

9

10 src = fetchurl {

10 src = fetchurl {

11 url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";

11 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=";

13 };

13 };

14

14

15 dontUnpack = true;

15 dontUnpack = true;

pkgs/misc/rich-cli/default.nix+8−18

@@ -1,20 +1,17 @@

1−{ lib

2−, python3

1+{ lib, python3 }:

3−}:

4

2

5python3.pkgs.buildPythonApplication rec {

3python3.pkgs.buildPythonApplication rec {

6 pname = "rich-cli";

4 pname = "rich-cli";

7− version = "1.7.0";

5+ version = "1.5.1";

8− format = "pyproject";

9

6

10 src = python3.pkgs.fetchPypi {

7 src = python3.pkgs.fetchPypi {

11 inherit pname version;

8 inherit pname version;

12− sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";

9+ sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";

13 };

10 };

14

11

12+ format = "pyproject";

13+

15− nativeBuildInputs = with python3.pkgs; [

14+ nativeBuildInputs = [ python3.pkgs.poetry-core ];

16− poetry-core

17− ];

18

15

19 propagatedBuildInputs = with python3.pkgs; [

16 propagatedBuildInputs = with python3.pkgs; [

20 rich

17 rich

@@ -24,18 +21,11 @@ python3.pkgs.buildPythonApplication rec {

24 rich-rst

21 rich-rst

25 ];

22 ];

26

23

27− postPatch = ''

24+ buildInputs = [ python3 ];

28− substituteInPlace pyproject.toml \

29− --replace 'rich = "^12.3.0"' 'rich = "*"'

30− '';

31−

32− pythonImportsCheck = [

33− "rich_cli"

34− ];

35

25

36 meta = with lib; {

26 meta = with lib; {

37− description = "Command Line Interface to Rich";

38 homepage = "https://github.com/Textualize/rich-cli";

27 homepage = "https://github.com/Textualize/rich-cli";

28+ description = "Command Line Interface to Rich";

39 license = licenses.mit;

29 license = licenses.mit;

40 maintainers = with maintainers; [ jyooru ];

30 maintainers = with maintainers; [ jyooru ];

41 };

31 };

pkgs/os-specific/linux/evdi/default.nix+2−2

@@ -2,13 +2,13 @@

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "evdi";

4 pname = "evdi";

5− version = "1.10.1";

5+ version = "1.10.0";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "DisplayLink";

8 owner = "DisplayLink";

9 repo = pname;

9 repo = pname;

10 rev = "v${version}";

10 rev = "v${version}";

11− sha256 = "sha256-XABpC2g4/e6/2HsHzrBUs6OW1lzgGBYlFAatVcA/vD8=";

11+ sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg=";

12 };

12 };

13

13

14 NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";

14 NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+4−3

@@ -1,9 +1,9 @@

1{ lib

1{ lib

2, fetchpatch

2, fetchpatch

3, kernel

3, kernel

4−, date ? "2022-04-25"

4+, date ? "2022-04-08"

5−, commit ? "bdf6d7c1350497bc7b0be6027a51d9330645672d"

5+, commit ? "6ddf061e68560a2bb263b126af7e894a6c1afb5f"

6−, diffHash ? "09bcbklvfj9i9czjdpix2iz7fvjksmavaljx8l92ay1i9fapjmhc"

6+, diffHash ? "1nkrr1cxavw0rqxlyiz7pf9igvqay0d5kk7194v9ph3fcp9rz5kc"

7, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

7, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage

8, argsOverride ? {}

8, argsOverride ? {}

9, ...

9, ...

@@ -17,6 +17,7 @@

17 extraMeta = {

17 extraMeta = {

18 branch = "master";

18 branch = "master";

19 maintainers = with lib.maintainers; [ davidak Madouura ];

19 maintainers = with lib.maintainers; [ davidak Madouura ];

20+ broken = true;

20 };

21 };

21 } // argsOverride;

22 } // argsOverride;

22

23

pkgs/os-specific/linux/nftables/default.nix+9−7

@@ -8,6 +8,8 @@

8, withXtables ? true , iptables

8, withXtables ? true , iptables

9}:

9}:

10

10

11+with lib;

12+

11stdenv.mkDerivation rec {

13stdenv.mkDerivation rec {

12 version = "1.0.2";

14 version = "1.0.2";

13 pname = "nftables";

15 pname = "nftables";

@@ -26,8 +28,8 @@ stdenv.mkDerivation rec {

26 buildInputs = [

28 buildInputs = [

27 libmnl libnftnl libpcap

29 libmnl libnftnl libpcap

28 gmp jansson libedit

30 gmp jansson libedit

29− ] ++ lib.optional withXtables iptables

31+ ] ++ optional withXtables iptables

30− ++ lib.optional withPython python3;

32+ ++ optional withPython python3;

31

33

32 preConfigure = ''

34 preConfigure = ''

33 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file

35 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file

@@ -44,12 +46,12 @@ stdenv.mkDerivation rec {

44 configureFlags = [

46 configureFlags = [

45 "--with-json"

47 "--with-json"

46 "--with-cli=editline"

48 "--with-cli=editline"

47− ] ++ lib.optional (!withDebugSymbols) "--disable-debug"

49+ ] ++ optional (!withDebugSymbols) "--disable-debug"

48− ++ lib.optional (!withPython) "--disable-python"

50+ ++ optional (!withPython) "--disable-python"

49− ++ lib.optional withPython "--enable-python"

51+ ++ optional withPython "--enable-python"

50− ++ lib.optional withXtables "--with-xtables";

52+ ++ optional withXtables "--with-xtables";

51

53

52− meta = with lib; {

54+ meta = {

53 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

55 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

54 homepage = "https://netfilter.org/projects/nftables/";

56 homepage = "https://netfilter.org/projects/nftables/";

55 license = licenses.gpl2Only;

57 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 @@

2# Do not edit!

2# Do not edit!

3

3

4{

4{

5− version = "2022.5.0";

5+ version = "2022.4.7";

6 components = {

6 components = {

7 "abode" = ps: with ps; [

7 "abode" = ps: with ps; [

8 abodepy

8 abodepy

@@ -157,6 +157,10 @@

157 ];

157 ];

158 "arest" = ps: with ps; [

158 "arest" = ps: with ps; [

159 ];

159 ];

160+ "arlo" = ps: with ps; [

161+ ha-ffmpeg

162+ pyarlo

163+ ];

160 "arris_tg2492lg" = ps: with ps; [

164 "arris_tg2492lg" = ps: with ps; [

161 arris-tg2492lg

165 arris-tg2492lg

162 ];

166 ];

@@ -550,6 +554,8 @@

550 "digital_ocean" = ps: with ps; [

554 "digital_ocean" = ps: with ps; [

551 digital-ocean

555 digital-ocean

552 ];

556 ];

557+ "digitalloggers" = ps: with ps; [

558+ ]; # missing inputs: dlipower

553 "directv" = ps: with ps; [

559 "directv" = ps: with ps; [

554 directv

560 directv

555 ];

561 ];

@@ -987,7 +993,8 @@

987 ];

993 ];

988 "google" = ps: with ps; [

994 "google" = ps: with ps; [

989 aiohttp-cors

995 aiohttp-cors

990− gcal-sync

996+ google-api-python-client

997+ httplib2

991 oauth2client

998 oauth2client

992 ];

999 ];

993 "google_assistant" = ps: with ps; [

1000 "google_assistant" = ps: with ps; [

@@ -1241,15 +1248,9 @@

1241 ];

1248 ];

1242 "insteon" = ps: with ps; [

1249 "insteon" = ps: with ps; [

1243 aiohttp-cors

1250 aiohttp-cors

1244− fnvhash

1245− home-assistant-frontend

1246− insteon-frontend-home-assistant

1247− lru-dict

1248− pillow

1249 pyinsteon

1251 pyinsteon

1250 pyserial

1252 pyserial

1251 pyudev

1253 pyudev

1252− sqlalchemy

1253 ];

1254 ];

1254 "integration" = ps: with ps; [

1255 "integration" = ps: with ps; [

1255 ];

1256 ];

@@ -1390,10 +1391,8 @@

1390 life360

1391 life360

1391 ];

1392 ];

1392 "lifx" = ps: with ps; [

1393 "lifx" = ps: with ps; [

1393− aiohttp-cors

1394 aiolifx

1394 aiolifx

1395 aiolifx-effects

1395 aiolifx-effects

1396− ifaddr

1397 ];

1396 ];

1398 "lifx_cloud" = ps: with ps; [

1397 "lifx_cloud" = ps: with ps; [

1399 ];

1398 ];

@@ -1515,9 +1514,6 @@

1515 "mazda" = ps: with ps; [

1514 "mazda" = ps: with ps; [

1516 pymazda

1515 pymazda

1517 ];

1516 ];

1518− "meater" = ps: with ps; [

1519− meater-python

1520− ];

1521 "media_extractor" = ps: with ps; [

1517 "media_extractor" = ps: with ps; [

1522 aiohttp-cors

1518 aiohttp-cors

1523 youtube-dl-light

1519 youtube-dl-light

@@ -2092,9 +2088,6 @@

2092 ];

2088 ];

2093 "qnap" = ps: with ps; [

2089 "qnap" = ps: with ps; [

2094 ]; # missing inputs: qnapstats

2090 ]; # missing inputs: qnapstats

2095− "qnap_qsw" = ps: with ps; [

2096− aioqsw

2097− ];

2098 "qrcode" = ps: with ps; [

2091 "qrcode" = ps: with ps; [

2099 pillow

2092 pillow

2100 pyzbar

2093 pyzbar

@@ -2316,10 +2309,6 @@

2316 "sentry" = ps: with ps; [

2309 "sentry" = ps: with ps; [

2317 sentry-sdk

2310 sentry-sdk

2318 ];

2311 ];

2319− "senz" = ps: with ps; [

2320− aiohttp-cors

2321− aiosenz

2322− ];

2323 "serial" = ps: with ps; [

2312 "serial" = ps: with ps; [

2324 pyserial-asyncio

2313 pyserial-asyncio

2325 ];

2314 ];

@@ -2393,10 +2382,6 @@

2393 ];

2382 ];

2394 "slide" = ps: with ps; [

2383 "slide" = ps: with ps; [

2395 ]; # missing inputs: goslide-api

2384 ]; # missing inputs: goslide-api

2396− "slimproto" = ps: with ps; [

2397− aiohttp-cors

2398− aioslimproto

2399− ];

2400 "sma" = ps: with ps; [

2385 "sma" = ps: with ps; [

2401 pysma

2386 pysma

2402 ];

2387 ];

@@ -2435,7 +2420,7 @@

2435 paho-mqtt

2420 paho-mqtt

2436 ];

2421 ];

2437 "snmp" = ps: with ps; [

2422 "snmp" = ps: with ps; [

2438− pysnmplib

2423+ pysnmp

2439 ];

2424 ];

2440 "solaredge" = ps: with ps; [

2425 "solaredge" = ps: with ps; [

2441 solaredge

2426 solaredge

@@ -2762,9 +2747,6 @@

2762 pytradfri

2747 pytradfri

2763 ]

2748 ]

2764 ++ pytradfri.extras-require.async;

2749 ++ pytradfri.extras-require.async;

2765− "trafikverket_ferry" = ps: with ps; [

2766− pytrafikverket

2767− ];

2768 "trafikverket_train" = ps: with ps; [

2750 "trafikverket_train" = ps: with ps; [

2769 pytrafikverket

2751 pytrafikverket

2770 ];

2752 ];

@@ -2846,10 +2828,11 @@

2846 ];

2828 ];

2847 "update" = ps: with ps; [

2829 "update" = ps: with ps; [

2848 ];

2830 ];

2831+ "updater" = ps: with ps; [

2832+ ];

2849 "upnp" = ps: with ps; [

2833 "upnp" = ps: with ps; [

2850 aiohttp-cors

2834 aiohttp-cors

2851 async-upnp-client

2835 async-upnp-client

2852− getmac

2853 ifaddr

2836 ifaddr

2854 zeroconf

2837 zeroconf

2855 ];

2838 ];

@@ -3185,6 +3168,7 @@

3185 "apprise"

3168 "apprise"

3186 "aprs"

3169 "aprs"

3187 "arcam_fmj"

3170 "arcam_fmj"

3171+ "arlo"

3188 "aseko_pool_live"

3172 "aseko_pool_live"

3189 "asuswrt"

3173 "asuswrt"

3190 "atag"

3174 "atag"

@@ -3452,7 +3436,6 @@

3452 "manual_mqtt"

3436 "manual_mqtt"

3453 "maxcube"

3437 "maxcube"

3454 "mazda"

3438 "mazda"

3455− "meater"

3456 "media_player"

3439 "media_player"

3457 "media_source"

3440 "media_source"

3458 "melcloud"

3441 "melcloud"

@@ -3557,7 +3540,6 @@

3557 "pvpc_hourly_pricing"

3540 "pvpc_hourly_pricing"

3558 "python_script"

3541 "python_script"

3559 "qld_bushfire"

3542 "qld_bushfire"

3560− "qnap_qsw"

3561 "rachio"

3543 "rachio"

3562 "radarr"

3544 "radarr"

3563 "radio_browser"

3545 "radio_browser"

@@ -3600,7 +3582,6 @@

3600 "sensibo"

3582 "sensibo"

3601 "sensor"

3583 "sensor"

3602 "sentry"

3584 "sentry"

3603− "senz"

3604 "seventeentrack"

3585 "seventeentrack"

3605 "shell_command"

3586 "shell_command"

3606 "shelly"

3587 "shelly"

@@ -3614,7 +3595,6 @@

3614 "siren"

3595 "siren"

3615 "slack"

3596 "slack"

3616 "sleepiq"

3597 "sleepiq"

3617− "slimproto"

3618 "sma"

3598 "sma"

3619 "smappee"

3599 "smappee"

3620 "smart_meter_texas"

3600 "smart_meter_texas"

@@ -3668,7 +3648,6 @@

3668 "tailscale"

3648 "tailscale"

3669 "tankerkoenig"

3649 "tankerkoenig"

3670 "tasmota"

3650 "tasmota"

3671− "tautulli"

3672 "tcp"

3651 "tcp"

3673 "telegram"

3652 "telegram"

3674 "telegram_bot"

3653 "telegram_bot"

@@ -3692,7 +3671,6 @@

3692 "trace"

3671 "trace"

3693 "tractive"

3672 "tractive"

3694 "tradfri"

3673 "tradfri"

3695− "trafikverket_ferry"

3696 "trafikverket_train"

3674 "trafikverket_train"

3697 "trafikverket_weatherstation"

3675 "trafikverket_weatherstation"

3698 "transmission"

3676 "transmission"

@@ -3711,6 +3689,7 @@

3711 "upb"

3689 "upb"

3712 "upcloud"

3690 "upcloud"

3713 "update"

3691 "update"

3692+ "updater"

3714 "upnp"

3693 "upnp"

3715 "uptime"

3694 "uptime"

3716 "uptimerobot"

3695 "uptimerobot"

pkgs/servers/home-assistant/default.nix+4−15

@@ -30,6 +30,7 @@ let

30 defaultOverrides = [

30 defaultOverrides = [

31 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt

31 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt

32 (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")

32 (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")

33+ (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")

33

34

34 # pytest-aiohttp>0.3.0 breaks home-assistant tests

35 # pytest-aiohttp>0.3.0 breaks home-assistant tests

35 (self: super: {

36 (self: super: {

@@ -46,21 +47,9 @@ let

46 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

47 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

47 doCheck = false; # requires aiohttp>=1.0.0

48 doCheck = false; # requires aiohttp>=1.0.0

48 });

49 });

49− gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {

50− doCheck = false; # requires aiohttp>=1.0.0

51− });

52 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

50 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

53 doCheck = false; # requires aiohttp>=1.0.0

51 doCheck = false; # requires aiohttp>=1.0.0

54 });

52 });

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− });

64 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

53 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

65 doCheck = false; # requires pytest-aiohttp>=1.0.0

54 doCheck = false; # requires pytest-aiohttp>=1.0.0

66 });

55 });

@@ -121,7 +110,7 @@ let

121 src = fetchFromGitHub {

110 src = fetchFromGitHub {

122 owner = "ManneW";

111 owner = "ManneW";

123 repo = "vilfo-api-client-python";

112 repo = "vilfo-api-client-python";

124− rev = "v${version}";

113+ rev = "v$version}";

125 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

114 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

126 };

115 };

127 });

116 });

@@ -179,7 +168,7 @@ let

179 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

168 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

180

169

181 # Don't forget to run parse-requirements.py after updating

170 # Don't forget to run parse-requirements.py after updating

182− hassVersion = "2022.5.0";

171+ hassVersion = "2022.4.7";

183

172

184in python.pkgs.buildPythonApplication rec {

173in python.pkgs.buildPythonApplication rec {

185 pname = "homeassistant";

174 pname = "homeassistant";

@@ -197,7 +186,7 @@ in python.pkgs.buildPythonApplication rec {

197 owner = "home-assistant";

186 owner = "home-assistant";

198 repo = "core";

187 repo = "core";

199 rev = version;

188 rev = version;

200− hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";

189+ hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";

201 };

190 };

202

191

203 # leave this in, so users don't have to constantly update their downstream patch handling

192 # 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 {

4 # the frontend version corresponding to a specific home-assistant version can be found here

4 # the frontend version corresponding to a specific home-assistant version can be found here

5 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

5 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

6 pname = "home-assistant-frontend";

6 pname = "home-assistant-frontend";

7− version = "20220504.0";

7+ version = "20220405.0";

8 format = "wheel";

8 format = "wheel";

9

9

10 src = fetchPypi {

10 src = fetchPypi {

@@ -12,7 +12,7 @@ buildPythonPackage rec {

12 pname = "home_assistant_frontend";

12 pname = "home_assistant_frontend";

13 dist = "py3";

13 dist = "py3";

14 python = "py3";

14 python = "py3";

15− sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";

15+ sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";

16 };

16 };

17

17

18 # there is nothing to strip in this package

18 # there is nothing to strip in this package

pkgs/servers/hqplayerd/default.nix+27−30

@@ -1,6 +1,6 @@

1−{ stdenv, lib

1+{ stdenv

2−, addOpenGLRunpath

3, alsa-lib

2, alsa-lib

3+, addOpenGLRunpath

4, autoPatchelfHook

4, autoPatchelfHook

5, cairo

5, cairo

6, fetchurl

6, fetchurl

@@ -8,25 +8,26 @@

8, gcc11

8, gcc11

9, gnome

9, gnome

10, gssdp

10, gssdp

11−, gupnp

12−, gupnp-av

13, lame

11, lame

12+, lib

14, libgmpris

13, libgmpris

15−, libusb-compat-0_1

16, llvmPackages_10

14, llvmPackages_10

17−, meson

18, mpg123

15, mpg123

19−, ninja

20, rpmextract

16, rpmextract

21, wavpack

17, wavpack

18+

19+, gupnp

20+, gupnp-av

21+, meson

22+, ninja

22}:

23}:

23stdenv.mkDerivation rec {

24stdenv.mkDerivation rec {

24 pname = "hqplayerd";

25 pname = "hqplayerd";

25− version = "4.31.0-89";

26+ version = "4.30.3-87";

26

27

27 src = fetchurl {

28 src = fetchurl {

28 url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm";

29 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=";

30 };

31 };

31

32

32 unpackPhase = ''

33 unpackPhase = ''

@@ -46,7 +47,6 @@ stdenv.mkDerivation rec {

46 gupnp-av

47 gupnp-av

47 lame

48 lame

48 libgmpris

49 libgmpris

49− libusb-compat-0_1

50 llvmPackages_10.openmp

50 llvmPackages_10.openmp

51 mpg123

51 mpg123

52 wavpack

52 wavpack

@@ -58,37 +58,34 @@ stdenv.mkDerivation rec {

58 installPhase = ''

58 installPhase = ''

59 runHook preInstall

59 runHook preInstall

60

60

61− # executables

61+ # main executable

62− mkdir -p $out

62+ mkdir -p $out/bin

63− cp -rv ./usr/bin $out/bin

64−

65− # libs

66− mkdir -p $out

67− cp -rv ./opt/hqplayerd/lib $out

63+ cp ./usr/bin/hqplayerd $out/bin

68

64

69− # configuration

65+ # main configuration

70− mkdir -p $out/etc

66+ mkdir -p $out/etc/hqplayer

71− cp -rv ./etc/hqplayer $out/etc/

67+ cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/

72

68

73 # udev rules

69 # udev rules

74− mkdir -p $out/etc/udev

70+ mkdir -p $out/etc/udev/rules.d

75− cp -rv ./etc/udev/rules.d $out/etc/udev/

71+ cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/

76

72

77 # kernel module cfgs

73 # kernel module cfgs

78− mkdir -p $out/etc

74+ mkdir -p $out/etc/modules-load.d

79− cp -rv ./etc/modules-load.d $out/etc/

75+ cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/

80

76

81 # systemd service file

77 # systemd service file

82− mkdir -p $out/lib/systemd

78+ mkdir -p $out/lib/systemd/system

83− cp -rv ./usr/lib/systemd/system $out/lib/systemd/

79+ cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/

84

80

85 # documentation

81 # documentation

86− mkdir -p $out/share/doc

82+ mkdir -p $out/share/doc/hqplayerd

87− cp -rv ./usr/share/doc/hqplayerd $out/share/doc/

83+ cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/

88

84

89 # misc service support files

85 # misc service support files

90− mkdir -p $out/var/lib

86+ mkdir -p $out/var/lib/hqplayer

91− cp -rv ./var/lib/hqplayer $out/var/lib/

87+ cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer

88+

92 runHook postInstall

89 runHook postInstall

93 '';

90 '';

94

91

pkgs/servers/irc/inspircd/default.nix+2−2

@@ -142,13 +142,13 @@ in

142

142

143stdenv.mkDerivation rec {

143stdenv.mkDerivation rec {

144 pname = "inspircd";

144 pname = "inspircd";

145− version = "3.13.0";

145+ version = "3.12.0";

146

146

147 src = fetchFromGitHub {

147 src = fetchFromGitHub {

148 owner = pname;

148 owner = pname;

149 repo = pname;

149 repo = pname;

150 rev = "v${version}";

150 rev = "v${version}";

151− sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl";

151+ sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY=";

152 };

152 };

153

153

154 outputs = [ "bin" "lib" "man" "doc" "out" ];

154 outputs = [ "bin" "lib" "man" "doc" "out" ];

pkgs/servers/keycloak/default.nix+4−4

@@ -13,11 +13,11 @@

13

13

14stdenv.mkDerivation rec {

14stdenv.mkDerivation rec {

15 pname = "keycloak";

15 pname = "keycloak";

16− version = "18.0.0";

16+ version = "17.0.1";

17

17

18 src = fetchzip {

18 src = fetchzip {

19 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

19 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

20− sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";

20+ sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";

21 };

21 };

22

22

23 nativeBuildInputs = [ makeWrapper jre ];

23 nativeBuildInputs = [ makeWrapper jre ];

@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {

57 '';

57 '';

58

58

59 postFixup = ''

59 postFixup = ''

60− substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_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 ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'

61+ substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'

62

62

63 for script in $(find $out/bin -type f -executable); do

63 for script in $(find $out/bin -type f -executable); do

64 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin

64 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin

pkgs/servers/mastodon/default.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

18

18

19 yarnOfflineCache = fetchYarnDeps {

19 yarnOfflineCache = fetchYarnDeps {

20 yarnLock = "${src}/yarn.lock";

20 yarnLock = "${src}/yarn.lock";

21− sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I=";

21+ sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8=";

22 };

22 };

23

23

24 mastodon-gems = bundlerEnv {

24 mastodon-gems = bundlerEnv {

pkgs/servers/mastodon/gemset.nix+72−72

@@ -5,10 +5,10 @@

5 platforms = [];

5 platforms = [];

6 source = {

6 source = {

7 remotes = ["https://rubygems.org"];

7 remotes = ["https://rubygems.org"];

8− sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl";

8+ sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz";

9 type = "gem";

9 type = "gem";

10 };

10 };

11− version = "6.1.5.1";

11+ version = "6.1.5";

12 };

12 };

13 actionmailbox = {

13 actionmailbox = {

14 dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];

14 dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];

@@ -16,10 +16,10 @@

16 platforms = [];

16 platforms = [];

17 source = {

17 source = {

18 remotes = ["https://rubygems.org"];

18 remotes = ["https://rubygems.org"];

19− sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw";

19+ sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh";

20 type = "gem";

20 type = "gem";

21 };

21 };

22− version = "6.1.5.1";

22+ version = "6.1.5";

23 };

23 };

24 actionmailer = {

24 actionmailer = {

25 dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];

25 dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];

@@ -27,10 +27,10 @@

27 platforms = [];

27 platforms = [];

28 source = {

28 source = {

29 remotes = ["https://rubygems.org"];

29 remotes = ["https://rubygems.org"];

30− sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s";

30+ sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf";

31 type = "gem";

31 type = "gem";

32 };

32 };

33− version = "6.1.5.1";

33+ version = "6.1.5";

34 };

34 };

35 actionpack = {

35 actionpack = {

36 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

36 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

@@ -38,10 +38,10 @@

38 platforms = [];

38 platforms = [];

39 source = {

39 source = {

40 remotes = ["https://rubygems.org"];

40 remotes = ["https://rubygems.org"];

41− sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l";

41+ sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w";

42 type = "gem";

42 type = "gem";

43 };

43 };

44− version = "6.1.5.1";

44+ version = "6.1.5";

45 };

45 };

46 actiontext = {

46 actiontext = {

47 dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];

47 dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];

@@ -49,10 +49,10 @@

49 platforms = [];

49 platforms = [];

50 source = {

50 source = {

51 remotes = ["https://rubygems.org"];

51 remotes = ["https://rubygems.org"];

52− sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j";

52+ sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib";

53 type = "gem";

53 type = "gem";

54 };

54 };

55− version = "6.1.5.1";

55+ version = "6.1.5";

56 };

56 };

57 actionview = {

57 actionview = {

58 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

58 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

@@ -60,10 +60,10 @@

60 platforms = [];

60 platforms = [];

61 source = {

61 source = {

62 remotes = ["https://rubygems.org"];

62 remotes = ["https://rubygems.org"];

63− sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv";

63+ sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi";

64 type = "gem";

64 type = "gem";

65 };

65 };

66− version = "6.1.5.1";

66+ version = "6.1.5";

67 };

67 };

68 active_model_serializers = {

68 active_model_serializers = {

69 dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];

69 dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];

@@ -92,10 +92,10 @@

92 platforms = [];

92 platforms = [];

93 source = {

93 source = {

94 remotes = ["https://rubygems.org"];

94 remotes = ["https://rubygems.org"];

95− sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49";

95+ sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws";

96 type = "gem";

96 type = "gem";

97 };

97 };

98− version = "6.1.5.1";

98+ version = "6.1.5";

99 };

99 };

100 activemodel = {

100 activemodel = {

101 dependencies = ["activesupport"];

101 dependencies = ["activesupport"];

@@ -103,10 +103,10 @@

103 platforms = [];

103 platforms = [];

104 source = {

104 source = {

105 remotes = ["https://rubygems.org"];

105 remotes = ["https://rubygems.org"];

106− sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn";

106+ sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195";

107 type = "gem";

107 type = "gem";

108 };

108 };

109− version = "6.1.5.1";

109+ version = "6.1.5";

110 };

110 };

111 activerecord = {

111 activerecord = {

112 dependencies = ["activemodel" "activesupport"];

112 dependencies = ["activemodel" "activesupport"];

@@ -114,10 +114,10 @@

114 platforms = [];

114 platforms = [];

115 source = {

115 source = {

116 remotes = ["https://rubygems.org"];

116 remotes = ["https://rubygems.org"];

117− sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0";

117+ sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939";

118 type = "gem";

118 type = "gem";

119 };

119 };

120− version = "6.1.5.1";

120+ version = "6.1.5";

121 };

121 };

122 activestorage = {

122 activestorage = {

123 dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];

123 dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];

@@ -125,10 +125,10 @@

125 platforms = [];

125 platforms = [];

126 source = {

126 source = {

127 remotes = ["https://rubygems.org"];

127 remotes = ["https://rubygems.org"];

128− sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv";

128+ sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph";

129 type = "gem";

129 type = "gem";

130 };

130 };

131− version = "6.1.5.1";

131+ version = "6.1.5";

132 };

132 };

133 activesupport = {

133 activesupport = {

134 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

134 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

@@ -136,10 +136,10 @@

136 platforms = [];

136 platforms = [];

137 source = {

137 source = {

138 remotes = ["https://rubygems.org"];

138 remotes = ["https://rubygems.org"];

139− sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4";

139+ sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4";

140 type = "gem";

140 type = "gem";

141 };

141 };

142− version = "6.1.5.1";

142+ version = "6.1.5";

143 };

143 };

144 addressable = {

144 addressable = {

145 dependencies = ["public_suffix"];

145 dependencies = ["public_suffix"];

@@ -250,10 +250,10 @@

250 platforms = [];

250 platforms = [];

251 source = {

251 source = {

252 remotes = ["https://rubygems.org"];

252 remotes = ["https://rubygems.org"];

253− sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc";

253+ sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";

254 type = "gem";

254 type = "gem";

255 };

255 };

256− version = "1.582.0";

256+ version = "1.558.0";

257 };

257 };

258 aws-sdk-core = {

258 aws-sdk-core = {

259 dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];

259 dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];

@@ -261,10 +261,10 @@

261 platforms = [];

261 platforms = [];

262 source = {

262 source = {

263 remotes = ["https://rubygems.org"];

263 remotes = ["https://rubygems.org"];

264− sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";

264+ sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";

265 type = "gem";

265 type = "gem";

266 };

266 };

267− version = "3.130.2";

267+ version = "3.127.0";

268 };

268 };

269 aws-sdk-kms = {

269 aws-sdk-kms = {

270 dependencies = ["aws-sdk-core" "aws-sigv4"];

270 dependencies = ["aws-sdk-core" "aws-sigv4"];

@@ -272,10 +272,10 @@

272 platforms = [];

272 platforms = [];

273 source = {

273 source = {

274 remotes = ["https://rubygems.org"];

274 remotes = ["https://rubygems.org"];

275− sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";

275+ sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";

276 type = "gem";

276 type = "gem";

277 };

277 };

278− version = "1.56.0";

278+ version = "1.55.0";

279 };

279 };

280 aws-sdk-s3 = {

280 aws-sdk-s3 = {

281 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];

281 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];

@@ -283,10 +283,10 @@

283 platforms = [];

283 platforms = [];

284 source = {

284 source = {

285 remotes = ["https://rubygems.org"];

285 remotes = ["https://rubygems.org"];

286− sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i";

286+ sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";

287 type = "gem";

287 type = "gem";

288 };

288 };

289− version = "1.113.2";

289+ version = "1.113.0";

290 };

290 };

291 aws-sigv4 = {

291 aws-sigv4 = {

292 dependencies = ["aws-eventstream"];

292 dependencies = ["aws-eventstream"];

@@ -294,10 +294,10 @@

294 platforms = [];

294 platforms = [];

295 source = {

295 source = {

296 remotes = ["https://rubygems.org"];

296 remotes = ["https://rubygems.org"];

297− sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";

297+ sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";

298 type = "gem";

298 type = "gem";

299 };

299 };

300− version = "1.5.0";

300+ version = "1.4.0";

301 };

301 };

302 bcrypt = {

302 bcrypt = {

303 groups = ["default" "pam_authentication"];

303 groups = ["default" "pam_authentication"];

@@ -369,20 +369,20 @@

369 platforms = [];

369 platforms = [];

370 source = {

370 source = {

371 remotes = ["https://rubygems.org"];

371 remotes = ["https://rubygems.org"];

372− sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg";

372+ sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1";

373 type = "gem";

373 type = "gem";

374 };

374 };

375− version = "1.11.1";

375+ version = "1.10.3";

376 };

376 };

377 brakeman = {

377 brakeman = {

378 groups = ["development"];

378 groups = ["development"];

379 platforms = [];

379 platforms = [];

380 source = {

380 source = {

381 remotes = ["https://rubygems.org"];

381 remotes = ["https://rubygems.org"];

382− sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";

382+ sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy";

383 type = "gem";

383 type = "gem";

384 };

384 };

385− version = "5.2.2";

385+ version = "5.2.1";

386 };

386 };

387 browser = {

387 browser = {

388 groups = ["default"];

388 groups = ["default"];

@@ -864,10 +864,10 @@

864 platforms = [];

864 platforms = [];

865 source = {

865 source = {

866 remotes = ["https://rubygems.org"];

866 remotes = ["https://rubygems.org"];

867− sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v";

867+ sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m";

868 type = "gem";

868 type = "gem";

869 };

869 };

870− version = "1.2.7";

870+ version = "1.2.6";

871 };

871 };

872 excon = {

872 excon = {

873 groups = ["default"];

873 groups = ["default"];

@@ -1102,10 +1102,10 @@

1102 platforms = [];

1102 platforms = [];

1103 source = {

1103 source = {

1104 remotes = ["https://rubygems.org"];

1104 remotes = ["https://rubygems.org"];

1105− sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j";

1105+ sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka";

1106 type = "gem";

1106 type = "gem";

1107 };

1107 };

1108− version = "1.5.3";

1108+ version = "1.5.2";

1109 };

1109 };

1110 fuubar = {

1110 fuubar = {

1111 dependencies = ["rspec-core" "ruby-progressbar"];

1111 dependencies = ["rspec-core" "ruby-progressbar"];

@@ -1312,10 +1312,10 @@

1312 platforms = [];

1312 platforms = [];

1313 source = {

1313 source = {

1314 remotes = ["https://rubygems.org"];

1314 remotes = ["https://rubygems.org"];

1315− sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk";

1315+ sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0";

1316 type = "gem";

1316 type = "gem";

1317 };

1317 };

1318− version = "1.0.9";

1318+ version = "1.0.8";

1319 };

1319 };

1320 idn-ruby = {

1320 idn-ruby = {

1321 groups = ["default"];

1321 groups = ["default"];

@@ -1342,10 +1342,10 @@

1342 platforms = [];

1342 platforms = [];

1343 source = {

1343 source = {

1344 remotes = ["https://rubygems.org"];

1344 remotes = ["https://rubygems.org"];

1345− sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";

1345+ sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";

1346 type = "gem";

1346 type = "gem";

1347 };

1347 };

1348− version = "1.6.1";

1348+ version = "1.6.0";

1349 };

1349 };

1350 json = {

1350 json = {

1351 groups = ["default" "test"];

1351 groups = ["default" "test"];

@@ -1545,10 +1545,10 @@

1545 platforms = [];

1545 platforms = [];

1546 source = {

1546 source = {

1547 remotes = ["https://rubygems.org"];

1547 remotes = ["https://rubygems.org"];

1548− sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr";

1548+ sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

1549 type = "gem";

1549 type = "gem";

1550 };

1550 };

1551− version = "2.17.0";

1551+ version = "2.16.0";

1552 };

1552 };

1553 mail = {

1553 mail = {

1554 dependencies = ["mini_mime"];

1554 dependencies = ["mini_mime"];

@@ -1690,10 +1690,10 @@

1690 platforms = [];

1690 platforms = [];

1691 source = {

1691 source = {

1692 remotes = ["https://rubygems.org"];

1692 remotes = ["https://rubygems.org"];

1693− sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";

1693+ sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";

1694 type = "gem";

1694 type = "gem";

1695 };

1695 };

1696− version = "1.5.1";

1696+ version = "1.4.4";

1697 };

1697 };

1698 multi_json = {

1698 multi_json = {

1699 groups = ["default"];

1699 groups = ["default"];

@@ -1762,10 +1762,10 @@

1762 platforms = [];

1762 platforms = [];

1763 source = {

1763 source = {

1764 remotes = ["https://rubygems.org"];

1764 remotes = ["https://rubygems.org"];

1765− sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";

1765+ sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";

1766 type = "gem";

1766 type = "gem";

1767 };

1767 };

1768− version = "1.13.4";

1768+ version = "1.13.3";

1769 };

1769 };

1770 nsa = {

1770 nsa = {

1771 dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];

1771 dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];

@@ -1941,10 +1941,10 @@

1941 platforms = [];

1941 platforms = [];

1942 source = {

1942 source = {

1943 remotes = ["https://rubygems.org"];

1943 remotes = ["https://rubygems.org"];

1944− sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a";

1944+ sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8";

1945 type = "gem";

1945 type = "gem";

1946 };

1946 };

1947− version = "2.8.3";

1947+ version = "2.8.2";

1948 };

1948 };

1949 pkg-config = {

1949 pkg-config = {

1950 groups = ["default"];

1950 groups = ["default"];

@@ -2099,10 +2099,10 @@

2099 platforms = [];

2099 platforms = [];

2100 source = {

2100 source = {

2101 remotes = ["https://rubygems.org"];

2101 remotes = ["https://rubygems.org"];

2102− sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq";

2102+ sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx";

2103 type = "gem";

2103 type = "gem";

2104 };

2104 };

2105− version = "6.6.1";

2105+ version = "6.6.0";

2106 };

2106 };

2107 rack-cors = {

2107 rack-cors = {

2108 dependencies = ["rack"];

2108 dependencies = ["rack"];

@@ -2154,10 +2154,10 @@

2154 platforms = [];

2154 platforms = [];

2155 source = {

2155 source = {

2156 remotes = ["https://rubygems.org"];

2156 remotes = ["https://rubygems.org"];

2157− sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8";

2157+ sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv";

2158 type = "gem";

2158 type = "gem";

2159 };

2159 };

2160− version = "6.1.5.1";

2160+ version = "6.1.5";

2161 };

2161 };

2162 rails-controller-testing = {

2162 rails-controller-testing = {

2163 dependencies = ["actionpack" "actionview" "activesupport"];

2163 dependencies = ["actionpack" "actionview" "activesupport"];

@@ -2220,10 +2220,10 @@

2220 platforms = [];

2220 platforms = [];

2221 source = {

2221 source = {

2222 remotes = ["https://rubygems.org"];

2222 remotes = ["https://rubygems.org"];

2223− sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9";

2223+ sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93";

2224 type = "gem";

2224 type = "gem";

2225 };

2225 };

2226− version = "6.1.5.1";

2226+ version = "6.1.5";

2227 };

2227 };

2228 rainbow = {

2228 rainbow = {

2229 groups = ["default" "development" "test"];

2229 groups = ["default" "development" "test"];

@@ -2293,10 +2293,10 @@

2293 platforms = [];

2293 platforms = [];

2294 source = {

2294 source = {

2295 remotes = ["https://rubygems.org"];

2295 remotes = ["https://rubygems.org"];

2296− sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";

2296+ sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";

2297 type = "gem";

2297 type = "gem";

2298 };

2298 };

2299− version = "2.3.0";

2299+ version = "2.2.1";

2300 };

2300 };

2301 request_store = {

2301 request_store = {

2302 dependencies = ["rack"];

2302 dependencies = ["rack"];

@@ -2399,10 +2399,10 @@

2399 platforms = [];

2399 platforms = [];

2400 source = {

2400 source = {

2401 remotes = ["https://rubygems.org"];

2401 remotes = ["https://rubygems.org"];

2402− sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm";

2402+ sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";

2403 type = "gem";

2403 type = "gem";

2404 };

2404 };

2405− version = "3.11.1";

2405+ version = "3.11.0";

2406 };

2406 };

2407 rspec-rails = {

2407 rspec-rails = {

2408 dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];

2408 dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];

@@ -2410,10 +2410,10 @@

2410 platforms = [];

2410 platforms = [];

2411 source = {

2411 source = {

2412 remotes = ["https://rubygems.org"];

2412 remotes = ["https://rubygems.org"];

2413− sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l";

2413+ sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa";

2414 type = "gem";

2414 type = "gem";

2415 };

2415 };

2416− version = "5.1.2";

2416+ version = "5.1.1";

2417 };

2417 };

2418 rspec-sidekiq = {

2418 rspec-sidekiq = {

2419 dependencies = ["rspec-core" "sidekiq"];

2419 dependencies = ["rspec-core" "sidekiq"];

@@ -2453,10 +2453,10 @@

2453 platforms = [];

2453 platforms = [];

2454 source = {

2454 source = {

2455 remotes = ["https://rubygems.org"];

2455 remotes = ["https://rubygems.org"];

2456− sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";

2456+ sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";

2457 type = "gem";

2457 type = "gem";

2458 };

2458 };

2459− version = "1.27.0";

2459+ version = "1.26.1";

2460 };

2460 };

2461 rubocop-ast = {

2461 rubocop-ast = {

2462 dependencies = ["parser"];

2462 dependencies = ["parser"];

@@ -2464,10 +2464,10 @@

2464 platforms = [];

2464 platforms = [];

2465 source = {

2465 source = {

2466 remotes = ["https://rubygems.org"];

2466 remotes = ["https://rubygems.org"];

2467− sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";

2467+ sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";

2468 type = "gem";

2468 type = "gem";

2469 };

2469 };

2470− version = "1.17.0";

2470+ version = "1.16.0";

2471 };

2471 };

2472 rubocop-rails = {

2472 rubocop-rails = {

2473 dependencies = ["activesupport" "rack" "rubocop"];

2473 dependencies = ["activesupport" "rack" "rubocop"];

@@ -2603,10 +2603,10 @@

2603 platforms = [];

2603 platforms = [];

2604 source = {

2604 source = {

2605 remotes = ["https://rubygems.org"];

2605 remotes = ["https://rubygems.org"];

2606− sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3";

2606+ sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx";

2607 type = "gem";

2607 type = "gem";

2608 };

2608 };

2609− version = "3.2.0";

2609+ version = "3.1.1";

2610 };

2610 };

2611 sidekiq-unique-jobs = {

2611 sidekiq-unique-jobs = {

2612 dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];

2612 dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];

@@ -2614,10 +2614,10 @@

2614 platforms = [];

2614 platforms = [];

2615 source = {

2615 source = {

2616 remotes = ["https://rubygems.org"];

2616 remotes = ["https://rubygems.org"];

2617− sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq";

2617+ sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y";

2618 type = "gem";

2618 type = "gem";

2619 };

2619 };

2620− version = "7.1.21";

2620+ version = "7.1.16";

2621 };

2621 };

2622 simple-navigation = {

2622 simple-navigation = {

2623 dependencies = ["activesupport"];

2623 dependencies = ["activesupport"];

pkgs/servers/mastodon/source.nix+2−2

@@ -2,8 +2,8 @@

2{ fetchgit, applyPatches }: let

2{ fetchgit, applyPatches }: let

3 src = fetchgit {

3 src = fetchgit {

4 url = "https://github.com/mastodon/mastodon.git";

4 url = "https://github.com/mastodon/mastodon.git";

5− rev = "v3.5.2";

5+ rev = "v3.5.1";

6− sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was";

6+ sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0";

7 };

7 };

8in applyPatches {

8in applyPatches {

9 inherit src;

9 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

11with python3.pkgs;

11with python3.pkgs;

12buildPythonApplication rec {

12buildPythonApplication rec {

13 pname = "matrix-synapse";

13 pname = "matrix-synapse";

14− version = "1.58.0";

14+ version = "1.57.0";

15

15

16 src = fetchPypi {

16 src = fetchPypi {

17 inherit pname version;

17 inherit pname version;

18− sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";

18+ sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";

19 };

19 };

20

20

21 buildInputs = [ openssl ];

21 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!

2

2

3{pkgs ? import <nixpkgs> {

3{pkgs ? import <nixpkgs> {

4 inherit system;

4 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!

2

2

3{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

3{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

4

4

@@ -3128,13 +3128,13 @@ let

3128 sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A==";

3128 sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A==";

3129 };

3129 };

3130 };

3130 };

3131− "matrix-org-irc-1.2.1" = {

3131+ "matrix-org-irc-1.2.0" = {

3132 name = "matrix-org-irc";

3132 name = "matrix-org-irc";

3133 packageName = "matrix-org-irc";

3133 packageName = "matrix-org-irc";

3134− version = "1.2.1";

3134+ version = "1.2.0";

3135 src = fetchurl {

3135 src = fetchurl {

3136− url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.1.tgz";

3136+ url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz";

3137− sha512 = "x7SoeIOP+Z6R2s8PJqhM89OZNsS2RO4srx7c3JGa/VN6rtJ1AMLEyW4EPCVh09tGiTvmbit9KJysjLvFQPx9KA==";

3137+ sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ==";

3138 };

3138 };

3139 };

3139 };

3140 "media-typer-0.3.0" = {

3140 "media-typer-0.3.0" = {

@@ -5031,7 +5031,7 @@ let

5031 args = {

5031 args = {

5032 name = "matrix-appservice-irc";

5032 name = "matrix-appservice-irc";

5033 packageName = "matrix-appservice-irc";

5033 packageName = "matrix-appservice-irc";

5034− version = "0.34.0";

5034+ version = "0.33.1";

5035 src = ./.;

5035 src = ./.;

5036 dependencies = [

5036 dependencies = [

5037 sources."@alloc/quick-lru-5.2.0"

5037 sources."@alloc/quick-lru-5.2.0"

@@ -5475,7 +5475,7 @@ let

5475 sources."qs-6.10.3"

5475 sources."qs-6.10.3"

5476 ];

5476 ];

5477 })

5477 })

5478− sources."matrix-org-irc-1.2.1"

5478+ sources."matrix-org-irc-1.2.0"

5479 sources."media-typer-0.3.0"

5479 sources."media-typer-0.3.0"

5480 sources."merge-descriptors-1.0.1"

5480 sources."merge-descriptors-1.0.1"

5481 sources."merge2-1.4.1"

5481 sources."merge2-1.4.1"

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2

@@ -1,6 +1,6 @@

1{

1{

2 "name": "matrix-appservice-irc",

2 "name": "matrix-appservice-irc",

3− "version": "0.34.0",

3+ "version": "0.33.1",

4 "description": "An IRC Bridge for Matrix",

4 "description": "An IRC Bridge for Matrix",

5 "main": "app.js",

5 "main": "app.js",

6 "bin": "./bin/matrix-appservice-irc",

6 "bin": "./bin/matrix-appservice-irc",

@@ -34,7 +34,7 @@

34 "he": "^1.2.0",

34 "he": "^1.2.0",

35 "logform": "^2.4.0",

35 "logform": "^2.4.0",

36 "matrix-appservice-bridge": "^3.2.0",

36 "matrix-appservice-bridge": "^3.2.0",

37− "matrix-org-irc": "^1.2.1",

37+ "matrix-org-irc": "^1.2.0",

38 "matrix-bot-sdk": "0.5.19",

38 "matrix-bot-sdk": "0.5.19",

39 "nopt": "^3.0.1",

39 "nopt": "^3.0.1",

40 "p-queue": "^6.6.2",

40 "p-queue": "^6.6.2",

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4

@@ -1,9 +1,9 @@

1{

1{

2 "url": "https://github.com/matrix-org/matrix-appservice-irc",

2 "url": "https://github.com/matrix-org/matrix-appservice-irc",

3− "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161",

3+ "rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc",

4− "date": "2022-05-04T09:06:31+02:00",

4+ "date": "2022-03-30T14:29:04+01:00",

5− "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc",

5+ "path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc",

6− "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l",

6+ "sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi",

7 "fetchLFS": false,

7 "fetchLFS": false,

8 "fetchSubmodules": false,

8 "fetchSubmodules": false,

9 "deepClone": false,

9 "deepClone": false,

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

@@ -1,19 +1,19 @@

1−{ lib, buildGoModule, fetchFromGitHub }:

1+{ lib, buildGoPackage, fetchFromGitHub }:

2

2

3−buildGoModule rec {

3+buildGoPackage rec {

4 pname = "aws-s3-exporter";

4 pname = "aws-s3-exporter";

5− version = "0.5.0";

5+ version = "0.4.1";

6+

7+ goPackagePath = "github.com/ribbybibby/s3_exporter";

6

8

7 src = fetchFromGitHub {

9 src = fetchFromGitHub {

8 owner = "ribbybibby";

10 owner = "ribbybibby";

9 repo = "s3_exporter";

11 repo = "s3_exporter";

10 rev = "v${version}";

12 rev = "v${version}";

11− sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";

13+ sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";

12 };

14 };

13

15

14− vendorSha256 = null;

16+ doCheck = true;

15−

16− ldflags = [ "-s" "-w" ];

17

17

18 meta = with lib; {

18 meta = with lib; {

19 description = "Exports Prometheus metrics about S3 buckets and objects";

19 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 }:

2

2

3−buildGoModule rec {

3+buildGoPackage rec {

4 pname = "haproxy_exporter";

4 pname = "haproxy_exporter";

5− version = "0.13.0";

5+ version = "0.12.0";

6+

7+ goPackagePath = "github.com/prometheus/haproxy_exporter";

6

8

7 src = fetchFromGitHub {

9 src = fetchFromGitHub {

10+ rev = "v${version}";

8 owner = "prometheus";

11 owner = "prometheus";

9 repo = "haproxy_exporter";

12 repo = "haproxy_exporter";

10− rev = "v${version}";

13+ sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn";

11− sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";

12 };

14 };

13

15

14− vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";

15−

16− ldflags = [ "-s" "-w" ];

17−

18 meta = with lib; {

16 meta = with lib; {

19 description = "HAProxy Exporter for the Prometheus monitoring system";

17 description = "HAProxy Exporter for the Prometheus monitoring system";

20 homepage = "https://github.com/prometheus/haproxy_exporter";

18 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 }:

2+

3+let

4+ inherit (import ./src.nix) version sha256;

5+ owner = "sensu";

6+ repo = "uchiwa";

7+

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

3+

4+set -euo pipefail

5+IFS=$'\n\t'

6+

7+# set -x

8+

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

20 ]);

20 ]);

21in stdenvNoCC.mkDerivation rec {

21in stdenvNoCC.mkDerivation rec {

22 pname = "moonraker";

22 pname = "moonraker";

23− version = "unstable-2022-04-23";

23+ version = "unstable-2022-03-10";

24

24

25 src = fetchFromGitHub {

25 src = fetchFromGitHub {

26 owner = "Arksine";

26 owner = "Arksine";

27 repo = "moonraker";

27 repo = "moonraker";

28− rev = "cd520ba91728abb5a3d959269fbd8e4f40d1eb0b";

28+ rev = "ee312ee9c6597c8d077d7c3208ccea4e696c97ca";

29− sha256 = "sha256-sopX9t+LjYldx+syKwU3I0x/VYy4hLyXfitG0uumayE=";

29+ sha256 = "l0VOQIfKgZ/Je4z+SKhWMgYzxye8WKs9W1GkNs7kABo=";

30 };

30 };

31

31

32 nativeBuildInputs = [ makeWrapper ];

32 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 @@

16}:

16}:

17stdenv.mkDerivation rec {

17stdenv.mkDerivation rec {

18 pname = "roon-server";

18 pname = "roon-server";

19− version = "1.8-935";

19+ version = "1.8-933";

20

20

21 src =

21 src =

22 let

22 let

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

24 in

24 in

25 fetchurl {

25 fetchurl {

26 url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";

26 url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";

27− hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg=";

27+ hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE=";

28 };

28 };

29

29

30 dontConfigure = true;

30 dontConfigure = true;

pkgs/servers/unifi/default.nix+2−2

@@ -65,7 +65,7 @@ in rec {

65 };

65 };

66

66

67 unifi7 = generic {

67 unifi7 = generic {

68− version = "7.1.61";

68+ version = "7.0.25";

69− sha256 = "sha256-7Ac8BjlBLCslSU6IZK0EtheKz4CtH7tcmR8J2rUGYbs=";

69+ sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";

70 };

70 };

71}

71}

pkgs/servers/web-apps/sogo/default.nix+2−2

@@ -1,6 +1,6 @@

1{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir

1{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir

2, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests

2, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests

3−, oath-toolkit }:

3+, oathToolkit }:

4gnustep.stdenv.mkDerivation rec {

4gnustep.stdenv.mkDerivation rec {

5 pname = "SOGo";

5 pname = "SOGo";

6 version = "5.5.0";

6 version = "5.5.0";

@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {

13 };

13 };

14

14

15 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];

15 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 ];

17

17

18 patches = [

18 patches = [

19 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches

19 # 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 @@

4}:

4}:

5

5

6# Point the environment variable $WALLABAG_DATA to a data directory

6# 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

8# wallabag's configuration files with your customized `parameters.yml`.

8# 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.

11# These need to be updated every package upgrade.

9# These need to be updated every package upgrade.

12#

10#

13# After a package upgrade, empty the `var/cache` folder or unexpected

11# After a package upgrade, empty the `var/cache` folder or unexpected

pkgs/servers/xmpp/prosody/default.nix+22−9

@@ -1,5 +1,4 @@

1{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg

1{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg

2−, icu

3, lua

2, lua

4, nixosTests

3, nixosTests

5, withLibevent ? true

4, withLibevent ? true

@@ -14,7 +13,7 @@ with lib;

14

13

15let

14let

16 luaEnv = lua.withPackages(p: with p; [

15 luaEnv = lua.withPackages(p: with p; [

17− luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound

16+ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3

18 ]

17 ]

19 ++ lib.optional withLibevent p.luaevent

18 ++ lib.optional withLibevent p.luaevent

20 ++ lib.optional withDBI p.luadbi

19 ++ lib.optional withDBI p.luadbi

@@ -22,19 +21,21 @@ let

22 );

21 );

23in

22in

24stdenv.mkDerivation rec {

23stdenv.mkDerivation rec {

25− version = "0.12.0"; # also update communityModules

24+ version = "0.11.13"; # also update communityModules

26 pname = "prosody";

25 pname = "prosody";

27 # The following community modules are necessary for the nixos module

26 # The following community modules are necessary for the nixos module

28 # prosody module to comply with XEP-0423 and provide a working

27 # prosody module to comply with XEP-0423 and provide a working

29 # default setup.

28 # default setup.

30 nixosModuleDeps = [

29 nixosModuleDeps = [

30+ "bookmarks"

31 "cloud_notify"

31 "cloud_notify"

32 "vcard_muc"

32 "vcard_muc"

33+ "smacks"

33 "http_upload"

34 "http_upload"

34 ];

35 ];

35 src = fetchurl {

36 src = fetchurl {

36 url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";

37 url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";

37− sha256 = "sha256-dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo=";

38+ sha256 = "sha256-OcYbNGoJtRJbYEy5aeFCBsu8uGyBFW/8a6LWJSfPBDI=";

38 };

39 };

39

40

40 # A note to all those merging automated updates: Please also update this

41 # A note to all those merging automated updates: Please also update this

@@ -42,13 +43,13 @@ stdenv.mkDerivation rec {

42 # version.

43 # version.

43 communityModules = fetchhg {

44 communityModules = fetchhg {

44 url = "https://hg.prosody.im/prosody-modules";

45 url = "https://hg.prosody.im/prosody-modules";

45− rev = "65438e4ba563";

46+ rev = "54fa2116bbf3";

46− sha256 = "sha256-zHOrMzcgHOdBl7nObM+OauifbcmKEOfAuj81MDSoLMk=";

47+ sha256 = "sha256-OKZ7tD75q8/GMXruUQ+r9l0BxzdbPHNf41fZ3fHVQVw=";

47 };

48 };

48

49

49 nativeBuildInputs = [ makeWrapper ];

50 nativeBuildInputs = [ makeWrapper ];

50 buildInputs = [

51 buildInputs = [

51− luaEnv libidn openssl icu

52+ luaEnv libidn openssl

52 ]

53 ]

53 ++ withExtraLibs;

54 ++ withExtraLibs;

54

55

@@ -62,14 +63,26 @@ stdenv.mkDerivation rec {

62 make -C tools/migration

63 make -C tools/migration

63 '';

64 '';

64

65

66+ luaEnvPath = lua.pkgs.lib.genLuaPathAbsStr luaEnv;

67+ luaEnvCPath = lua.pkgs.lib.genLuaCPathAbsStr luaEnv;

68+

65 # the wrapping should go away once lua hook is fixed

69 # the wrapping should go away once lua hook is fixed

66 postInstall = ''

70 postInstall = ''

67 ${concatMapStringsSep "\n" (module: ''

71 ${concatMapStringsSep "\n" (module: ''

68 cp -r $communityModules/mod_${module} $out/lib/prosody/modules/

72 cp -r $communityModules/mod_${module} $out/lib/prosody/modules/

69 '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}

73 '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}

74+ wrapProgram $out/bin/prosody \

75+ --prefix LUA_PATH ';' "$luaEnvPath" \

76+ --prefix LUA_CPATH ';' "$luaEnvCPath"

70 wrapProgram $out/bin/prosodyctl \

77 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+

72 make -C tools/migration install

82 make -C tools/migration install

83+ wrapProgram $out/bin/prosody-migrator \

84+ --prefix LUA_PATH ';' "$luaEnvPath" \

85+ --prefix LUA_CPATH ';' "$luaEnvCPath"

73 '';

86 '';

74

87

75 passthru = {

88 passthru = {

@@ -82,6 +95,6 @@ stdenv.mkDerivation rec {

82 license = licenses.mit;

95 license = licenses.mit;

83 homepage = "https://prosody.im";

96 homepage = "https://prosody.im";

84 platforms = platforms.linux;

97 platforms = platforms.linux;

85− maintainers = with maintainers; [ fpletz globin ];

98+ maintainers = with maintainers; [ fpletz globin ninjatrappeur ];

86 };

99 };

87}

100}

pkgs/stdenv/generic/check-meta.nix+15−40

@@ -7,17 +7,13 @@ let

7 # If we're in hydra, we can dispense with the more verbose error

7 # If we're in hydra, we can dispense with the more verbose error

8 # messages and make problems easier to spot.

8 # messages and make problems easier to spot.

9 inHydra = config.inHydra or false;

9 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−

14 getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");

10 getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");

15

11

16 # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426

12 # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426

17 # for why this defaults to false, but I (@copumpkin) want to default it to true soon.

13 # for why this defaults to false, but I (@copumpkin) want to default it to true soon.

18 shouldCheckMeta = config.checkMeta or false;

14 shouldCheckMeta = config.checkMeta or false;

19

15

20− allowUnfree = config.allowUnfree

16+ allowUnfree = config.allowUnfree or false

21 || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";

17 || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";

22

18

23 allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];

19 allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];

@@ -38,10 +34,10 @@ let

38 hasBlocklistedLicense = assert areLicenseListsValid; attrs:

34 hasBlocklistedLicense = assert areLicenseListsValid; attrs:

39 hasLicense attrs && lib.lists.any (l: builtins.elem l blocklist) (lib.lists.toList attrs.meta.license);

35 hasLicense attrs && lib.lists.any (l: builtins.elem l blocklist) (lib.lists.toList attrs.meta.license);

40

36

41− allowBroken = config.allowBroken

37+ allowBroken = config.allowBroken or false

42 || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";

38 || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1";

43

39

44− allowUnsupportedSystem = config.allowUnsupportedSystem

40+ allowUnsupportedSystem = config.allowUnsupportedSystem or false

45 || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";

41 || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";

46

42

47 isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses;

43 isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses;

@@ -50,9 +46,6 @@ let

50 hasLicense attrs &&

46 hasLicense attrs &&

51 isUnfree (lib.lists.toList attrs.meta.license);

47 isUnfree (lib.lists.toList attrs.meta.license);

52

48

53− hasNoMaintainers = attrs:

54− attrs ? meta.maintainers && (lib.length attrs.meta.maintainers) == 0;

55−

56 isMarkedBroken = attrs: attrs.meta.broken or false;

49 isMarkedBroken = attrs: attrs.meta.broken or false;

57

50

58 hasUnsupportedPlatform = attrs:

51 hasUnsupportedPlatform = attrs:

@@ -98,7 +91,6 @@ let

98 insecure = remediate_insecure;

91 insecure = remediate_insecure;

99 broken-outputs = remediateOutputsToInstall;

92 broken-outputs = remediateOutputsToInstall;

100 unknown-meta = x: "";

93 unknown-meta = x: "";

101− maintainerless = x: "";

102 };

94 };

103 remediation_env_var = allow_attr: {

95 remediation_env_var = allow_attr: {

104 Unfree = "NIXPKGS_ALLOW_UNFREE";

96 Unfree = "NIXPKGS_ALLOW_UNFREE";

@@ -207,14 +199,6 @@ let

207 else throw;

199 else throw;

208 in handler msg;

200 in handler msg;

209

201

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;

218

202

219 metaTypes = with lib.types; rec {

203 metaTypes = with lib.types; rec {

220 # These keys are documented

204 # These keys are documented

@@ -293,37 +277,28 @@ let

293 insecure = isMarkedInsecure attrs;

277 insecure = isMarkedInsecure attrs;

294 }

278 }

295 // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then

279 // (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}’)"; }

297 else if hasBlocklistedLicense attrs then

281 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}’)"; }

299 else if !allowBroken && attrs.meta.broken or false then

283 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"; }

301 else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then

285 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}’"; }

303 else if !(hasAllowedInsecure attrs) then

287 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"; }

305 else if checkOutputsToInstall attrs then

289 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"; }

307 else let res = checkMeta (attrs.meta or {}); in if res != [] then

291 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}"; }

292+ { valid = false; 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"; });

293+ else { valid = true; });

315

294

316 assertValidity = { meta, attrs }: let

295 assertValidity = { meta, attrs }: let

317 validity = checkValidity attrs;

296 validity = checkValidity attrs;

318 in validity // {

297 in validity // {

319− # Throw an error if trying to evaluate a non-valid derivation

298+ # Throw an error if trying to evaluate an non-valid derivation

320− # or, alternatively, just output a warning message.

321− handled =

299+ handled = if !validity.valid

322− {

323− no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; };

300+ then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }

324− warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; };

325− yes = true;

301+ else true;

326− }.${validity.valid};

327 };

302 };

328

303

329in assertValidity

304in assertValidity

pkgs/stdenv/generic/make-derivation.nix+4−69

@@ -9,72 +9,8 @@ let

9 # to build it. This is a bit confusing for cross compilation.

9 # to build it. This is a bit confusing for cross compilation.

10 inherit (stdenv) hostPlatform;

10 inherit (stdenv) hostPlatform;

11 };

11 };

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−

73in

12in

74

13

75−makeOverlayable (overrideAttrs:

76−

77−

78# `mkDerivation` wraps the builtin `derivation` function to

14# `mkDerivation` wraps the builtin `derivation` function to

79# produce derivations that use this stdenv and its shell.

15# produce derivations that use this stdenv and its shell.

80#

16#

@@ -134,7 +70,6 @@ makeOverlayable (overrideAttrs:

134

70

135, # TODO(@Ericson2314): Make always true and remove

71, # TODO(@Ericson2314): Make always true and remove

136 strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform

72 strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform

137−

138, meta ? {}

73, meta ? {}

139, passthru ? {}

74, passthru ? {}

140, pos ? # position used in error messages and for meta.position

75, pos ? # position used in error messages and for meta.position

@@ -435,7 +370,7 @@ else let

435 } // {

370 } // {

436 # Expose the result of the checks for everyone to see.

371 # Expose the result of the checks for everyone to see.

437 inherit (validity) unfree broken unsupported insecure;

372 inherit (validity) unfree broken unsupported insecure;

438− available = validity.valid != "no"

373+ available = validity.valid

439 && (if config.checkMetaRecursively or false

374 && (if config.checkMetaRecursively or false

440 then lib.all (d: d.meta.available or true) references

375 then lib.all (d: d.meta.available or true) references

441 else true);

376 else true);

@@ -446,6 +381,8 @@ in

446lib.extendDerivation

381lib.extendDerivation

447 validity.handled

382 validity.handled

448 ({

383 ({

384+ overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs));

385+

449 # A derivation that always builds successfully and whose runtime

386 # A derivation that always builds successfully and whose runtime

450 # dependencies are the original derivations build time dependencies

387 # dependencies are the original derivations build time dependencies

451 # This allows easy building and distributing of all derivations

388 # This allows easy building and distributing of all derivations

@@ -471,12 +408,10 @@ lib.extendDerivation

471 args = [ "-c" "export > $out" ];

408 args = [ "-c" "export > $out" ];

472 });

409 });

473

410

474− inherit meta passthru overrideAttrs;

411+ inherit meta passthru;

475 } //

412 } //

476 # Pass through extra attributes that are not inputs, but

413 # Pass through extra attributes that are not inputs, but

477 # should be made available to Nix expressions using the

414 # should be made available to Nix expressions using the

478 # derivation (e.g., in assertions).

415 # derivation (e.g., in assertions).

479 passthru)

416 passthru)

480 (derivation derivationArg)

417 (derivation derivationArg)

481−

482−)

pkgs/tools/X11/opentabletdriver/default.nix+2−2

@@ -19,13 +19,13 @@

19

19

20buildDotnetModule rec {

20buildDotnetModule rec {

21 pname = "OpenTabletDriver";

21 pname = "OpenTabletDriver";

22− version = "0.6.0.4";

22+ version = "0.6.0.3";

23

23

24 src = fetchFromGitHub {

24 src = fetchFromGitHub {

25 owner = "OpenTabletDriver";

25 owner = "OpenTabletDriver";

26 repo = "OpenTabletDriver";

26 repo = "OpenTabletDriver";

27 rev = "v${version}";

27 rev = "v${version}";

28− sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";

28+ sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos=";

29 };

29 };

30

30

31 debPkg = fetchurl {

31 debPkg = fetchurl {

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

@@ -20,7 +20,6 @@

20 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

20 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

21 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

21 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

22 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })

22 (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"; })

24 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

23 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

25 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

24 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

26 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

25 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

@@ -28,6 +27,7 @@

28 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

27 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

29 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

28 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

30 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

29 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

30+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

31 (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

31 (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

32 (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

32 (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

33 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })

33 (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 @@

20

20

21buildPythonApplication rec {

21buildPythonApplication rec {

22 pname = "aws-google-auth";

22 pname = "aws-google-auth";

23− version = "0.0.38";

23+ version = "0.0.37";

24

24

25 # Pypi doesn't ship the tests, so we fetch directly from GitHub

25 # Pypi doesn't ship the tests, so we fetch directly from GitHub

26 # https://github.com/cevoaustralia/aws-google-auth/issues/120

26 # https://github.com/cevoaustralia/aws-google-auth/issues/120

27 src = fetchFromGitHub {

27 src = fetchFromGitHub {

28 owner = "cevoaustralia";

28 owner = "cevoaustralia";

29 repo = "aws-google-auth";

29 repo = "aws-google-auth";

30− rev = "refs/tags/${version}";

30+ rev = version;

31− sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4=";

31+ sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd";

32 };

32 };

33

33

34 propagatedBuildInputs = [

34 propagatedBuildInputs = [

pkgs/tools/admin/lxd/default.nix−1

@@ -48,7 +48,6 @@ buildGo118Package rec {

48 '';

48 '';

49

49

50 passthru.tests.lxd = nixosTests.lxd;

50 passthru.tests.lxd = nixosTests.lxd;

51− passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

52

51

53 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

52 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

54 buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

53 buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

pkgs/tools/admin/pgadmin/default.nix+54−87

@@ -1,21 +1,21 @@

1+{ stdenv

1−{ lib

2+, lib

2, python3

3, python3

3, fetchurl

4, fetchurl

4, zlib

5, zlib

5, mkYarnModules

6, mkYarnModules

6, sphinx

7, sphinx

7, nixosTests

8, nixosTests

8−, pkgs

9}:

9}:

10

10

11let

11let

12

12

13 pname = "pgadmin";

13 pname = "pgadmin";

14− version = "6.8";

14+ version = "6.7";

15

15

16 src = fetchurl {

16 src = fetchurl {

17 url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

17 url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

18− sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw=";

18+ sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d";

19 };

19 };

20

20

21 yarnDeps = mkYarnModules {

21 yarnDeps = mkYarnModules {

@@ -25,78 +25,9 @@ let

25 yarnLock = ./yarn.lock;

25 yarnLock = ./yarn.lock;

26 yarnNix = ./yarn.nix;

26 yarnNix = ./yarn.nix;

27 };

27 };

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−

97in

28in

98

29

99−pythonPackages.buildPythonApplication rec {

30+python3.pkgs.buildPythonApplication rec {

100 inherit pname version src;

31 inherit pname version src;

101

32

102 # from Dockerfile

33 # from Dockerfile

@@ -112,19 +43,19 @@ pythonPackages.buildPythonApplication rec {

112 postPatch = ''

43 postPatch = ''

113 # patching Makefile, so it doesn't try to build sphinx documentation here

44 # patching Makefile, so it doesn't try to build sphinx documentation here

114 # (will do so later)

45 # (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"

116 # fix document which refers a non-existing document and fails

47 # fix document which refers a non-existing document and fails

117 substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""

48 substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""

118 patchShebangs .

49 patchShebangs .

119 # relax dependencies

50 # relax dependencies

120 substituteInPlace requirements.txt \

51 substituteInPlace requirements.txt \

52+ --replace "Pillow==8.3.*" "Pillow>=8.3.0" \

121 --replace "psycopg2==2.9.*" "psycopg2>=2.9" \

53 --replace "psycopg2==2.9.*" "psycopg2>=2.9" \

122 --replace "cryptography==3.*" "cryptography>=3.0" \

54 --replace "cryptography==3.*" "cryptography>=3.0" \

123 --replace "requests==2.25.*" "requests>=2.25.0" \

55 --replace "requests==2.25.*" "requests>=2.25.0" \

124 --replace "boto3==1.20.*" "boto3>=1.20" \

56 --replace "boto3==1.20.*" "boto3>=1.20" \

125 --replace "botocore==1.23.*" "botocore>=1.23" \

57 --replace "botocore==1.23.*" "botocore>=1.23" \

126− --replace "pytz==2021.*" "pytz" \

58+ --replace "pytz==2021.*" "pytz"

127− --replace "Werkzeug==2.0.3" "werkzeug>=2.*"

128 # don't use Server Mode (can be overridden later)

59 # don't use Server Mode (can be overridden later)

129 substituteInPlace pkg/pip/setup_pip.py \

60 substituteInPlace pkg/pip/setup_pip.py \

130 --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \

61 --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \

@@ -170,10 +101,10 @@ pythonPackages.buildPythonApplication rec {

170 cp -v ../pkg/pip/setup_pip.py setup.py

101 cp -v ../pkg/pip/setup_pip.py setup.py

171 '';

102 '';

172

103

173− nativeBuildInputs = with pythonPackages; [ cython pip ];

104+ nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ];

174 buildInputs = [

105 buildInputs = [

175 zlib

106 zlib

176− pythonPackages.wheel

107+ python3.pkgs.wheel

177 ];

108 ];

178

109

179 # tests need an own data, log directory

110 # tests need an own data, log directory

@@ -181,21 +112,57 @@ pythonPackages.buildPythonApplication rec {

181 # checks will be run through nixos/tests

112 # checks will be run through nixos/tests

182 doCheck = false;

113 doCheck = false;

183

114

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+ ];

187

157

188− passthru.tests = {

158+ passthru = {

189− standalone = nixosTests.pgadmin4-standalone;

159+ tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; };

190− # regression and function tests of the package itself

191− package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; }));

192 };

160 };

193

161

194 meta = with lib; {

162 meta = with lib; {

195 description = "Administration and development platform for PostgreSQL";

163 description = "Administration and development platform for PostgreSQL";

196 homepage = "https://www.pgadmin.org/";

164 homepage = "https://www.pgadmin.org/";

197 license = licenses.mit;

165 license = licenses.mit;

198− changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html";

199 maintainers = with maintainers; [ gador ];

166 maintainers = with maintainers; [ gador ];

200 };

167 };

201}

168}

pkgs/tools/admin/pgadmin/package.json+4−7

@@ -8,8 +8,8 @@

8 "license": "PostgreSQL",

8 "license": "PostgreSQL",

9 "devDependencies": {

9 "devDependencies": {

10 "@babel/core": "^7.10.2",

10 "@babel/core": "^7.10.2",

11− "@babel/eslint-parser": "^7.17.0",

11+ "@babel/eslint-parser": "^7.12.13",

12− "@babel/eslint-plugin": "^7.17.7",

12+ "@babel/eslint-plugin": "^7.12.13",

13 "@babel/plugin-proposal-object-rest-spread": "^7.10.1",

13 "@babel/plugin-proposal-object-rest-spread": "^7.10.1",

14 "@babel/plugin-syntax-jsx": "^7.16.0",

14 "@babel/plugin-syntax-jsx": "^7.16.0",

15 "@babel/preset-env": "^7.10.2",

15 "@babel/preset-env": "^7.10.2",

@@ -82,12 +82,11 @@

82 "@date-io/core": "^1.3.6",

82 "@date-io/core": "^1.3.6",

83 "@date-io/date-fns": "1.x",

83 "@date-io/date-fns": "1.x",

84 "@emotion/sheet": "^1.0.1",

84 "@emotion/sheet": "^1.0.1",

85+ "@fortawesome/fontawesome-free": "^5.14.0",

85 "@material-ui/core": "4.11.0",

86 "@material-ui/core": "4.11.0",

86 "@material-ui/icons": "^4.11.2",

87 "@material-ui/icons": "^4.11.2",

87 "@material-ui/lab": "4.0.0-alpha.58",

88 "@material-ui/lab": "4.0.0-alpha.58",

88 "@material-ui/pickers": "^3.2.10",

89 "@material-ui/pickers": "^3.2.10",

89− "@mui/icons-material": "^5.4.2",

90− "@mui/material": "^5.4.3",

91 "@projectstorm/react-diagrams": "^6.6.1",

90 "@projectstorm/react-diagrams": "^6.6.1",

92 "@simonwep/pickr": "^1.5.1",

91 "@simonwep/pickr": "^1.5.1",

93 "@szhsin/react-menu": "^2.2.0",

92 "@szhsin/react-menu": "^2.2.0",

@@ -146,7 +145,7 @@

146 "path-fx": "^2.0.0",

145 "path-fx": "^2.0.0",

147 "pathfinding": "^0.4.18",

146 "pathfinding": "^0.4.18",

148 "paths-js": "^0.4.9",

147 "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",

150 "postcss": "^8.2.15",

149 "postcss": "^8.2.15",

151 "raf": "^3.4.1",

150 "raf": "^3.4.1",

152 "rc-dock": "^3.2.9",

151 "rc-dock": "^3.2.9",

@@ -155,8 +154,6 @@

155 "react-checkbox-tree": "^1.7.2",

154 "react-checkbox-tree": "^1.7.2",

156 "react-dom": "^17.0.1",

155 "react-dom": "^17.0.1",

157 "react-draggable": "^4.4.4",

156 "react-draggable": "^4.4.4",

158− "react-rnd": "^10.3.5",

159− "react-router-dom": "^6.2.2",

160 "react-select": "^4.2.1",

157 "react-select": "^4.2.1",

161 "react-table": "^7.6.3",

158 "react-table": "^7.6.3",

162 "react-timer-hook": "^3.0.5",

159 "react-timer-hook": "^3.0.5",

pkgs/tools/admin/pgadmin/yarn.lock+22−231

@@ -91,19 +91,19 @@

91 json5 "^2.1.2"

91 json5 "^2.1.2"

92 semver "^6.3.0"

92 semver "^6.3.0"

93

93

94−"@babel/eslint-parser@^7.17.0":

94+"@babel/eslint-parser@^7.12.13":

95− version "7.17.0"

95+ version "7.13.8"

96− resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"

96+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687"

97− integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==

97+ integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==

98 dependencies:

98 dependencies:

99− eslint-scope "^5.1.1"

99+ eslint-scope "5.1.0"

100− eslint-visitor-keys "^2.1.0"

100+ eslint-visitor-keys "^1.3.0"

101 semver "^6.3.0"

101 semver "^6.3.0"

102

102

103−"@babel/eslint-plugin@^7.17.7":

103+"@babel/eslint-plugin@^7.12.13":

104− version "7.17.7"

104+ version "7.13.0"

105− resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8"

105+ resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b"

106− integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==

106+ integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==

107 dependencies:

107 dependencies:

108 eslint-rule-composer "^0.3.0"

108 eslint-rule-composer "^0.3.0"

109

109

@@ -1741,13 +1741,6 @@

1741 dependencies:

1741 dependencies:

1742 regenerator-runtime "^0.13.4"

1742 regenerator-runtime "^0.13.4"

1743

1743

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−

1751"@babel/template@^7.12.13", "@babel/template@^7.14.5":

1744"@babel/template@^7.12.13", "@babel/template@^7.14.5":

1752 version "7.14.5"

1745 version "7.14.5"

1753 resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"

1746 resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"

@@ -1856,17 +1849,6 @@

1856 "@emotion/weak-memoize" "^0.2.5"

1849 "@emotion/weak-memoize" "^0.2.5"

1857 stylis "^4.0.3"

1850 stylis "^4.0.3"

1858

1851

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−

1870"@emotion/core@^10.0.14":

1852"@emotion/core@^10.0.14":

1871 version "10.1.1"

1853 version "10.1.1"

1872 resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"

1854 resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"

@@ -1900,13 +1882,6 @@

1900 dependencies:

1882 dependencies:

1901 "@emotion/memoize" "0.7.4"

1883 "@emotion/memoize" "0.7.4"

1902

1884

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−

1910"@emotion/memoize@0.7.4":

1885"@emotion/memoize@0.7.4":

1911 version "0.7.4"

1886 version "0.7.4"

1912 resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"

1887 resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"

@@ -1962,11 +1937,6 @@

1962 resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"

1937 resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"

1963 integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==

1938 integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==

1964

1939

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−

1970"@emotion/styled-base@^10.0.27":

1940"@emotion/styled-base@^10.0.27":

1971 version "10.0.31"

1941 version "10.0.31"

1972 resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"

1942 resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"

@@ -2147,93 +2117,6 @@

2147 prop-types "^15.7.2"

2117 prop-types "^15.7.2"

2148 react-is "^16.8.0 || ^17.0.0"

2118 react-is "^16.8.0 || ^17.0.0"

2149

2119

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−

2237"@nodelib/fs.scandir@2.1.4":

2120"@nodelib/fs.scandir@2.1.4":

2238 version "2.1.4"

2121 version "2.1.4"

2239 resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"

2122 resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"

@@ -2276,11 +2159,6 @@

2276 resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"

2159 resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"

2277 integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==

2160 integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==

2278

2161

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−

2284"@popperjs/core@^2.8.3":

2162"@popperjs/core@^2.8.3":

2285 version "2.9.0"

2163 version "2.9.0"

2286 resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"

2164 resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"

@@ -2558,11 +2436,6 @@

2558 resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"

2436 resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"

2559 integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

2437 integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

2560

2438

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−

2566"@types/q@^1.5.1":

2439"@types/q@^1.5.1":

2567 version "1.5.4"

2440 version "1.5.4"

2568 resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"

2441 resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"

@@ -2575,13 +2448,6 @@

2575 dependencies:

2448 dependencies:

2576 "@types/react" "^16"

2449 "@types/react" "^16"

2577

2450

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−

2585"@types/react-transition-group@^4.2.0":

2451"@types/react-transition-group@^4.2.0":

2586 version "4.4.1"

2452 version "4.4.1"

2587 resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"

2453 resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"

@@ -2589,13 +2455,6 @@

2589 dependencies:

2455 dependencies:

2590 "@types/react" "*"

2456 "@types/react" "*"

2591

2457

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−

2599"@types/react@*", "@types/react@^16":

2458"@types/react@*", "@types/react@^16":

2600 version "16.14.10"

2459 version "16.14.10"

2601 resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477"

2460 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:

4681 resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"

4540 resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"

4682 integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==

4541 integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==

4683

4542

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−

4689csstype@^3.0.2:

4543csstype@^3.0.2:

4690 version "3.0.8"

4544 version "3.0.8"

4691 resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"

4545 resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"

@@ -5369,6 +5223,14 @@ eslint-rule-composer@^0.3.0:

5369 resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"

5223 resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"

5370 integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==

5224 integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==

5371

5225

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+

5372eslint-scope@^5.1.1:

5234eslint-scope@^5.1.1:

5373 version "5.1.1"

5235 version "5.1.1"

5374 resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"

5236 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:

5389 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"

5251 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"

5390 integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

5252 integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

5391

5253

5392−eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:

5254+eslint-visitor-keys@^2.0.0:

5393 version "2.1.0"

5255 version "2.1.0"

5394 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"

5256 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"

5395 integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==

5257 integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==

@@ -5458,7 +5320,7 @@ esquery@^1.4.0:

5458 dependencies:

5320 dependencies:

5459 estraverse "^5.1.0"

5321 estraverse "^5.1.0"

5460

5322

5461−esrecurse@^4.3.0:

5323+esrecurse@^4.1.0, esrecurse@^4.3.0:

5462 version "4.3.0"

5324 version "4.3.0"

5463 resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"

5325 resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"

5464 integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==

5326 integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==

@@ -5636,11 +5498,6 @@ fast-levenshtein@^2.0.6:

5636 resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"

5498 resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"

5637 integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=

5499 integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=

5638

5500

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−

5644fast-safe-stringify@^2.0.7:

5501fast-safe-stringify@^2.0.7:

5645 version "2.0.7"

5502 version "2.0.7"

5646 resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"

5503 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:

6202 resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"

6059 resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"

6203 integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

6060 integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

6204

6061

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−

6212hmac-drbg@^1.0.1:

6062hmac-drbg@^1.0.1:

6213 version "1.0.1"

6063 version "1.0.1"

6214 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"

6064 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"

@@ -8501,9 +8351,9 @@ performance-now@^2.1.0:

8501 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

8351 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

8502 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

8352 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

8503

8353

8504−"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613":

8354+"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422":

8505 version "1.0.0"

8355 version "1.0.0"

8506− resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613"

8356+ resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422"

8507 dependencies:

8357 dependencies:

8508 "@types/classnames" "^2.2.6"

8358 "@types/classnames" "^2.2.6"

8509 "@types/react" "^16.7.18"

8359 "@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

9173 react-is "^16.12.0"

9023 react-is "^16.12.0"

9174 shallowequal "^1.1.0"

9024 shallowequal "^1.1.0"

9175

9025

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−

9183react-aspen@^1.1.0, react-aspen@^1.1.1:

9026react-aspen@^1.1.0, react-aspen@^1.1.1:

9184 version "1.1.1"

9027 version "1.1.1"

9185 resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038"

9028 resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038"

@@ -9220,14 +9063,6 @@ react-dom@^17.0.1:

9220 object-assign "^4.1.1"

9063 object-assign "^4.1.1"

9221 scheduler "^0.20.2"

9064 scheduler "^0.20.2"

9222

9065

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−

9231react-draggable@^4.4.4:

9066react-draggable@^4.4.4:

9232 version "4.4.4"

9067 version "4.4.4"

9233 resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"

9068 resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"

@@ -9258,30 +9093,6 @@ react-property@1.0.1:

9258 resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6"

9093 resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6"

9259 integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==

9094 integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==

9260

9095

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−

9285react-select@^4.2.1:

9096react-select@^4.2.1:

9286 version "4.3.1"

9097 version "4.3.1"

9287 resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"

9098 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

9333 loose-envify "^1.4.0"

9144 loose-envify "^1.4.0"

9334 prop-types "^15.6.2"

9145 prop-types "^15.6.2"

9335

9146

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−

9346react-transition-state@^1.1.3:

9147react-transition-state@^1.1.3:

9347 version "1.1.3"

9148 version "1.1.3"

9348 resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f"

9149 resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f"

@@ -10360,11 +10161,6 @@ stylehacks@^5.0.1:

10360 browserslist "^4.16.0"

10161 browserslist "^4.16.0"

10361 postcss-selector-parser "^6.0.4"

10162 postcss-selector-parser "^6.0.4"

10362

10163

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−

10368stylis@^4.0.3, stylis@^4.0.7:

10164stylis@^4.0.3, stylis@^4.0.7:

10369 version "4.0.10"

10165 version "4.0.10"

10370 resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

10166 resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

@@ -10715,11 +10511,6 @@ trim-right@^1.0.1:

10715 resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

10511 resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

10716 integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

10512 integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

10717

10513

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−

10723tslib@^2.2.0:

10514tslib@^2.2.0:

10724 version "2.2.0"

10515 version "2.2.0"

10725 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"

10516 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"

pkgs/tools/admin/pgadmin/yarn.nix+18−226

@@ -74,19 +74,19 @@

74 };

74 };

75 }

75 }

76 {

76 {

77− name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

77+ name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

78 path = fetchurl {

78 path = fetchurl {

79− name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

79+ name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

80− url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz";

80+ url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz";

81− sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==";

81+ sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==";

82 };

82 };

83 }

83 }

84 {

84 {

85− name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

85+ name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

86 path = fetchurl {

86 path = fetchurl {

87− name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

87+ name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

88− url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz";

88+ url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz";

89− sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==";

89+ sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==";

90 };

90 };

91 }

91 }

92 {

92 {

@@ -1577,14 +1577,6 @@

1577 sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";

1577 sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";

1578 };

1578 };

1579 }

1579 }

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− }

1588 {

1580 {

1589 name = "_babel_template___template_7.14.5.tgz";

1581 name = "_babel_template___template_7.14.5.tgz";

1590 path = fetchurl {

1582 path = fetchurl {

@@ -1681,14 +1673,6 @@

1681 sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==";

1673 sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==";

1682 };

1674 };

1683 }

1675 }

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− }

1692 {

1676 {

1693 name = "_emotion_core___core_10.1.1.tgz";

1677 name = "_emotion_core___core_10.1.1.tgz";

1694 path = fetchurl {

1678 path = fetchurl {

@@ -1721,14 +1705,6 @@

1721 sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==";

1705 sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==";

1722 };

1706 };

1723 }

1707 }

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− }

1732 {

1708 {

1733 name = "_emotion_memoize___memoize_0.7.4.tgz";

1709 name = "_emotion_memoize___memoize_0.7.4.tgz";

1734 path = fetchurl {

1710 path = fetchurl {

@@ -1785,14 +1761,6 @@

1785 sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==";

1761 sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==";

1786 };

1762 };

1787 }

1763 }

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− }

1796 {

1764 {

1797 name = "_emotion_styled_base___styled_base_10.0.31.tgz";

1765 name = "_emotion_styled_base___styled_base_10.0.31.tgz";

1798 path = fetchurl {

1766 path = fetchurl {

@@ -1961,70 +1929,6 @@

1961 sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==";

1929 sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==";

1962 };

1930 };

1963 }

1931 }

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− }

2028 {

1932 {

2029 name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz";

1933 name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz";

2030 path = fetchurl {

1934 path = fetchurl {

@@ -2073,14 +1977,6 @@

2073 sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==";

1977 sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==";

2074 };

1978 };

2075 }

1979 }

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− }

2084 {

1980 {

2085 name = "_popperjs_core___core_2.9.0.tgz";

1981 name = "_popperjs_core___core_2.9.0.tgz";

2086 path = fetchurl {

1982 path = fetchurl {

@@ -2417,14 +2313,6 @@

2417 sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";

2313 sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";

2418 };

2314 };

2419 }

2315 }

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− }

2428 {

2316 {

2429 name = "_types_q___q_1.5.4.tgz";

2317 name = "_types_q___q_1.5.4.tgz";

2430 path = fetchurl {

2318 path = fetchurl {

@@ -2441,14 +2329,6 @@

2441 sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==";

2329 sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==";

2442 };

2330 };

2443 }

2331 }

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− }

2452 {

2332 {

2453 name = "_types_react_transition_group___react_transition_group_4.4.1.tgz";

2333 name = "_types_react_transition_group___react_transition_group_4.4.1.tgz";

2454 path = fetchurl {

2334 path = fetchurl {

@@ -2457,14 +2337,6 @@

2457 sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==";

2337 sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==";

2458 };

2338 };

2459 }

2339 }

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− }

2468 {

2340 {

2469 name = "_types_react___react_16.14.10.tgz";

2341 name = "_types_react___react_16.14.10.tgz";

2470 path = fetchurl {

2342 path = fetchurl {

@@ -4601,14 +4473,6 @@

4601 sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";

4473 sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";

4602 };

4474 };

4603 }

4475 }

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− }

4612 {

4476 {

4613 name = "csstype___csstype_3.0.8.tgz";

4477 name = "csstype___csstype_3.0.8.tgz";

4614 path = fetchurl {

4478 path = fetchurl {

@@ -5321,6 +5185,14 @@

5321 sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";

5185 sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";

5322 };

5186 };

5323 }

5187 }

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+ }

5324 {

5196 {

5325 name = "eslint_scope___eslint_scope_5.1.1.tgz";

5197 name = "eslint_scope___eslint_scope_5.1.1.tgz";

5326 path = fetchurl {

5198 path = fetchurl {

@@ -5569,14 +5441,6 @@

5569 sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";

5441 sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";

5570 };

5442 };

5571 }

5443 }

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− }

5580 {

5444 {

5581 name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";

5445 name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";

5582 path = fetchurl {

5446 path = fetchurl {

@@ -6217,14 +6081,6 @@

6217 sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";

6081 sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";

6218 };

6082 };

6219 }

6083 }

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− }

6228 {

6084 {

6229 name = "hmac_drbg___hmac_drbg_1.0.1.tgz";

6085 name = "hmac_drbg___hmac_drbg_1.0.1.tgz";

6230 path = fetchurl {

6086 path = fetchurl {

@@ -8967,8 +8823,8 @@

8967 let

8823 let

8968 repo = fetchgit {

8824 repo = fetchgit {

8969 url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";

8825 url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";

8970− rev = "c966febebcdffaa46f1ccf0769fe5308f179d613";

8826+ rev = "bf7ac7be65898883e3e05c9733426152a1da6422";

8971− sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081";

8827+ sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63";

8972 };

8828 };

8973 in

8829 in

8974 runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''

8830 runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''

@@ -9697,14 +9553,6 @@

9697 sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg==";

9553 sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg==";

9698 };

9554 };

9699 }

9555 }

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− }

9708 {

9556 {

9709 name = "react_aspen___react_aspen_1.1.1.tgz";

9557 name = "react_aspen___react_aspen_1.1.1.tgz";

9710 path = fetchurl {

9558 path = fetchurl {

@@ -9737,14 +9585,6 @@

9737 sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==";

9585 sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==";

9738 };

9586 };

9739 }

9587 }

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− }

9748 {

9588 {

9749 name = "react_draggable___react_draggable_4.4.4.tgz";

9589 name = "react_draggable___react_draggable_4.4.4.tgz";

9750 path = fetchurl {

9590 path = fetchurl {

@@ -9785,30 +9625,6 @@

9785 sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==";

9625 sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==";

9786 };

9626 };

9787 }

9627 }

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− }

9812 {

9628 {

9813 name = "react_select___react_select_4.3.1.tgz";

9629 name = "react_select___react_select_4.3.1.tgz";

9814 path = fetchurl {

9630 path = fetchurl {

@@ -9857,14 +9673,6 @@

9857 sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==";

9673 sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==";

9858 };

9674 };

9859 }

9675 }

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− }

9868 {

9676 {

9869 name = "react_transition_state___react_transition_state_1.1.3.tgz";

9677 name = "react_transition_state___react_transition_state_1.1.3.tgz";

9870 path = fetchurl {

9678 path = fetchurl {

@@ -11057,14 +10865,6 @@

11057 sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==";

10865 sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==";

11058 };

10866 };

11059 }

10867 }

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− }

11068 {

10868 {

11069 name = "stylis___stylis_4.0.10.tgz";

10869 name = "stylis___stylis_4.0.10.tgz";

11070 path = fetchurl {

10870 path = fetchurl {

@@ -11433,14 +11233,6 @@

11433 sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM=";

11233 sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM=";

11434 };

11234 };

11435 }

11235 }

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− }

11444 {

11236 {

11445 name = "tslib___tslib_2.2.0.tgz";

11237 name = "tslib___tslib_2.2.0.tgz";

11446 path = fetchurl {

11238 path = fetchurl {

pkgs/tools/admin/syft/default.nix+3−3

@@ -2,13 +2,13 @@

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "syft";

4 pname = "syft";

5− version = "0.45.1";

5+ version = "0.44.1";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "anchore";

8 owner = "anchore";

9 repo = pname;

9 repo = pname;

10 rev = "v${version}";

10 rev = "v${version}";

11− sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew=";

11+ sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U=";

12 # populate values that require us to use git. By doing this in postFetch we

12 # populate values that require us to use git. By doing this in postFetch we

13 # can delete .git afterwards and maintain better reproducibility of the src.

13 # can delete .git afterwards and maintain better reproducibility of the src.

14 leaveDotGit = true;

14 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

20 find "$out" -name .git -print0 | xargs -0 rm -rf

20 find "$out" -name .git -print0 | xargs -0 rm -rf

21 '';

21 '';

22 };

22 };

23− vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg=";

23+ vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";

24

24

25 nativeBuildInputs = [ installShellFiles ];

25 nativeBuildInputs = [ installShellFiles ];

26

26

pkgs/tools/admin/winbox/default.nix+1−1

@@ -70,7 +70,7 @@ symlinkJoin {

70 homepage = "https://mikrotik.com";

70 homepage = "https://mikrotik.com";

71 downloadPage = "https://mikrotik.com/download";

71 downloadPage = "https://mikrotik.com/download";

72 changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";

72 changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";

73− license = licenses.unfree;

73+ license = licenses.gpl3Plus;

74 maintainers = with maintainers; [ yrd ];

74 maintainers = with maintainers; [ yrd ];

75 };

75 };

76}

76}

pkgs/tools/cd-dvd/ventoy-bin/default.nix+6−11

@@ -24,7 +24,7 @@ let

24 }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

24 }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

25in stdenv.mkDerivation rec {

25in stdenv.mkDerivation rec {

26 pname = "ventoy-bin";

26 pname = "ventoy-bin";

27− version = "1.0.74";

27+ version = "1.0.72";

28

28

29 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]

29 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]

30 ++ lib.optional withQt5 qt5.wrapQtAppsHook;

30 ++ lib.optional withQt5 qt5.wrapQtAppsHook;

@@ -40,13 +40,13 @@ in stdenv.mkDerivation rec {

40

40

41 src = fetchurl {

41 src = fetchurl {

42 url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";

42 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=";

44 };

44 };

45 patches = [

45 patches = [

46 (fetchpatch {

46 (fetchpatch {

47 name = "sanitize.patch";

47 name = "sanitize.patch";

48− url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=057f2d1eb496c7a3aaa8229e99a7f709428fa4c5";

48+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8";

49− sha256 = "sha256-iAtLtM+Q4OsXDK83eCnPNomeNSEqdRLFfK2x7ybPSpk=";

49+ sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o=";

50 })

50 })

51 ./fix-for-read-only-file-system.patch

51 ./fix-for-read-only-file-system.patch

52 ./add-mips64.patch

52 ./add-mips64.patch

@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {

82 aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;

82 aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;

83 mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;

83 mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;

84 esac

84 esac

85− rm README

85+ rm README tool/VentoyWorker.sh.orig

86 rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.

86 rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.

87

87

88 # Copy from "$src" to "$out".

88 # Copy from "$src" to "$out".

@@ -106,15 +106,10 @@ in stdenv.mkDerivation rec {

106 makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \

106 makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \

107 --prefix PATH : "${lib.makeBinPath buildInputs}" \

107 --prefix PATH : "${lib.makeBinPath buildInputs}" \

108 --chdir "$VENTOY_PATH"

108 --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/

112 '' + lib.optionalString (!withGtk3) ''

109 '' + lib.optionalString (!withGtk3) ''

113− rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}

110+ rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3"

114 '' + lib.optionalString (!withQt5) ''

111 '' + lib.optionalString (!withQt5) ''

115 rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"

112 rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"

116− '' + lib.optionalString (!withGtk3 && !withQt5) ''

117− rm "$VENTOY_PATH"/VentoyGUI.*

118 '';

113 '';

119

114

120 meta = with lib; {

115 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 @@

22

22

23stdenv.mkDerivation {

23stdenv.mkDerivation {

24 pname = "bcachefs-tools";

24 pname = "bcachefs-tools";

25− version = "unstable-2022-05-02";

25+ version = "unstable-2022-04-08";

26

26

27 src = fetchFromGitHub {

27 src = fetchFromGitHub {

28 owner = "koverstreet";

28 owner = "koverstreet";

29 repo = "bcachefs-tools";

29 repo = "bcachefs-tools";

30− rev = "6f5afc0c12bbf56ffdabe5b2c5297aef255c4baa";

30+ rev = "986533d8d5b21c8eb512bbb3f0496d3d2a087c5d";

31− sha256 = "0483zhm3gmk6fd1pn815i3fixwlwsnks3817gn7n3idbbw0kg5ng";

31+ sha256 = "1qvb5l937nnls5j82ipgrdh6q5fk923z752rzzqqcms6fz7rrjs4";

32 };

32 };

33

33

34 postPatch = ''

34 postPatch = ''

pkgs/tools/filesystems/ceph/default.nix+2−2

@@ -9,7 +9,7 @@

9, gtest

9, gtest

10, cunit, snappy

10, cunit, snappy

11, makeWrapper

11, makeWrapper

12−, leveldb, oath-toolkit

12+, leveldb, oathToolkit

13, libnl, libcap_ng

13, libnl, libcap_ng

14, rdkafka

14, rdkafka

15, nixosTests

15, nixosTests

@@ -161,7 +161,7 @@ in rec {

161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [

161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [

162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3

162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3

163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit

163 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

165 cryptsetup sqlite lua icu bzip2

165 cryptsetup sqlite lua icu bzip2

166 ] ++ lib.optionals stdenv.isLinux [

166 ] ++ lib.optionals stdenv.isLinux [

167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs

167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

@@ -4,11 +4,11 @@

4

4

5stdenv.mkDerivation rec {

5stdenv.mkDerivation rec {

6 pname = "xfsprogs";

6 pname = "xfsprogs";

7− version = "5.16.0";

7+ version = "5.15.0";

8

8

9 src = fetchurl {

9 src = fetchurl {

10 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

10 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

11− hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";

11+ sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";

12 };

12 };

13

13

14 outputs = [ "bin" "dev" "out" "doc" ];

14 outputs = [ "bin" "dev" "out" "doc" ];

pkgs/tools/graphics/vulkan-tools/default.nix+3−3

@@ -2,7 +2,7 @@

2, stdenv

2, stdenv

3, fetchFromGitHub

3, fetchFromGitHub

4, cmake

4, cmake

5−, pkg-config

5+, pkgconfig

6, glslang

6, glslang

7, libffi

7, libffi

8, libX11

8, libX11

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {

33

33

34 nativeBuildInputs = [

34 nativeBuildInputs = [

35 cmake

35 cmake

36− pkg-config

36+ pkgconfig

37 ];

37 ];

38

38

39 buildInputs = [

39 buildInputs = [

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {

59 "-DBUILD_ICD=OFF"

59 "-DBUILD_ICD=OFF"

60 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

60 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

61 "-DCMAKE_INSTALL_RPATH=${libraryPath}"

61 "-DCMAKE_INSTALL_RPATH=${libraryPath}"

62− "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

62+ "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

63 # Hide dev warnings that are useless for packaging

63 # Hide dev warnings that are useless for packaging

64 "-Wno-dev"

64 "-Wno-dev"

65 ];

65 ];

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 {

35 librime

35 librime

36 ];

36 ];

37

37

38− patches = [ ./fcitx5-rime-with-nix-env-variable.patch ];

39−

40 meta = with lib; {

38 meta = with lib; {

41 description = "RIME support for Fcitx5";

39 description = "RIME support for Fcitx5";

42 homepage = "https://github.com/fcitx/fcitx5-rime";

40 homepage = "https://github.com/fcitx/fcitx5-rime";

pkgs/tools/inputmethods/lisgd/default.nix+2−2

@@ -11,13 +11,13 @@

11

11

12stdenv.mkDerivation rec {

12stdenv.mkDerivation rec {

13 pname = "lisgd";

13 pname = "lisgd";

14− version = "0.3.4";

14+ version = "0.3.3";

15

15

16 src = fetchFromSourcehut {

16 src = fetchFromSourcehut {

17 owner = "~mil";

17 owner = "~mil";

18 repo = "lisgd";

18 repo = "lisgd";

19 rev = version;

19 rev = version;

20− hash = "sha256-ZzPdIwN4/G5Te51gJpbNcHVkG4Rplcaa8yHDJr58oyk=";

20+ sha256 = "sha256-zcDxR2fKsjuX+vxjhr5UcqEsiNM+zWd2SBaA6Xly3AI=";

21 };

21 };

22

22

23 inherit patches;

23 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

1+{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore

2−, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python

2+, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase

3−, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

3+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

4, ckbcomp, xkeyboard_config, mkDerivation

4, ckbcomp, xkeyboard_config, mkDerivation

5−, nixos-extensions ? false

6}:

5}:

7

6

8mkDerivation rec {

7mkDerivation rec {

9 pname = "calamares";

8 pname = "calamares";

10− version = "3.2.56";

9+ version = "3.2.55";

11

10

12 # release including submodule

11 # release including submodule

13 src = fetchurl {

12 src = fetchurl {

14− url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";

13+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";

15− sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03";

14+ sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI=";

16 };

15 };

17

16

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−

41 nativeBuildInputs = [ cmake extra-cmake-modules ];

17 nativeBuildInputs = [ cmake extra-cmake-modules ];

42 buildInputs = [

18 buildInputs = [

43− boost kparts.dev kpmcore.out kservice.dev kirigami2

19+ boost kparts.dev kpmcore.out kservice.dev

44− libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python

20+ libatasmart libxcb libyamlcpp parted polkit-qt python qtbase

45− qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

21+ qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

46 ];

22 ];

47

23

48 cmakeFlags = [

24 cmakeFlags = [

@@ -56,28 +32,15 @@ mkDerivation rec {

56 POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";

32 POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";

57

33

58 postPatch = ''

34 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−

72 sed -e "s,/usr/bin/calamares,$out/bin/calamares," \

35 sed -e "s,/usr/bin/calamares,$out/bin/calamares," \

36+ -i calamares.desktop \

73 -i com.github.calamares.calamares.policy

37 -i com.github.calamares.calamares.policy

74

38

75 sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \

39 sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \

76− -i src/modules/locale/SetTimezoneJob.cpp \

40+ -i src/modules/locale/SetTimezoneJob.cpp

77− -i src/libcalamares/locale/TimeZone.cpp

78

41

79 sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \

42 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

81

44

82 sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \

45 sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \

83 -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

46 -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

@@ -88,9 +51,8 @@ mkDerivation rec {

88

51

89 meta = with lib; {

52 meta = with lib; {

90 description = "Distribution-independent installer framework";

53 description = "Distribution-independent installer framework";

91− homepage = "https://calamares.io/";

92− license = with licenses; [ gpl3Plus bsd2 cc0 ];

54+ license = with licenses; [ gpl3Plus bsd2 ];

93− maintainers = with maintainers; [ manveru vlinkz ];

55+ maintainers = with maintainers; [ manveru ];

94 platforms = platforms.linux;

56 platforms = platforms.linux;

95 };

57 };

96}

58}

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 @@

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "chezmoi";

4 pname = "chezmoi";

5− version = "2.15.2";

5+ version = "2.15.1";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "twpayne";

8 owner = "twpayne";

9 repo = "chezmoi";

9 repo = "chezmoi";

10 rev = "v${version}";

10 rev = "v${version}";

11− sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";

11+ sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8=";

12 };

12 };

13

13

14− vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";

14+ vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";

15

15

16 doCheck = false;

16 doCheck = false;

17

17

pkgs/tools/misc/cht.sh/default.nix+3−3

@@ -10,15 +10,15 @@

10

10

11stdenv.mkDerivation {

11stdenv.mkDerivation {

12 pname = "cht.sh";

12 pname = "cht.sh";

13− version = "unstable-2022-04-18";

13+ version = "unstable-2022-04-17";

14

14

15 nativeBuildInputs = [ makeWrapper ];

15 nativeBuildInputs = [ makeWrapper ];

16

16

17 src = fetchFromGitHub {

17 src = fetchFromGitHub {

18 owner = "chubin";

18 owner = "chubin";

19 repo = "cheat.sh";

19 repo = "cheat.sh";

20− rev = "571377f2f79422398a701cb1864487124ec3dcc6";

20+ rev = "7f769d6f3697541e55fd3ea9b71f190296529e48";

21− sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0=";

21+ sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo=";

22 };

22 };

23

23

24 # Fix ".cht.sh-wrapped" in the help message

24 # Fix ".cht.sh-wrapped" in the help message

pkgs/tools/misc/fclones/default.nix+3−3

@@ -8,16 +8,16 @@

8

8

9rustPlatform.buildRustPackage rec {

9rustPlatform.buildRustPackage rec {

10 pname = "fclones";

10 pname = "fclones";

11− version = "0.23.0";

11+ version = "0.22.0";

12

12

13 src = fetchFromGitHub {

13 src = fetchFromGitHub {

14 owner = "pkolaczk";

14 owner = "pkolaczk";

15 repo = pname;

15 repo = pname;

16 rev = "v${version}";

16 rev = "v${version}";

17− sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI=";

17+ sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY=";

18 };

18 };

19

19

20− cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c=";

20+ cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo=";

21

21

22 buildInputs = lib.optionals stdenv.isDarwin [

22 buildInputs = lib.optionals stdenv.isDarwin [

23 AppKit

23 AppKit

pkgs/tools/misc/lookatme/default.nixnew file+67

@@ -0,0 +1,67 @@

1+{ lib, python3, fetchFromGitHub }:

2+

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 @@

1{ mkDerivation, fetchurl, lib, makeWrapper

1{ mkDerivation, fetchurl, lib, makeWrapper

2, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook

2, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook

3−, kconfig, kcrash, kinit, kpmcore, polkit-qt

3+, kconfig, kcrash, kinit, kpmcore

4, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux

4, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux

5, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs

5, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs

6, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs

6, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs

@@ -41,16 +41,16 @@ let

41in mkDerivation rec {

41in mkDerivation rec {

42 pname = "partitionmanager";

42 pname = "partitionmanager";

43 # NOTE: When changing this version, also change the version of `kpmcore`.

43 # NOTE: When changing this version, also change the version of `kpmcore`.

44− version = "22.04.0";

44+ version = "4.2.0";

45

45

46 src = fetchurl {

46 src = fetchurl {

47− url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

47+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

48− hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";

48+ hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";

49 };

49 };

50

50

51 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];

51 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];

52

52

53− propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];

53+ propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];

54

54

55 postFixup = ''

55 postFixup = ''

56 wrapProgram $out/bin/partitionmanager \

56 wrapProgram $out/bin/partitionmanager \

pkgs/tools/misc/pferd/default.nix+2−2

@@ -5,14 +5,14 @@

5

5

6python3Packages.buildPythonApplication rec {

6python3Packages.buildPythonApplication rec {

7 pname = "pferd";

7 pname = "pferd";

8− version = "3.4.0";

8+ version = "3.3.1";

9 format = "pyproject";

9 format = "pyproject";

10

10

11 src = fetchFromGitHub {

11 src = fetchFromGitHub {

12 owner = "Garmelon";

12 owner = "Garmelon";

13 repo = "PFERD";

13 repo = "PFERD";

14 rev = "v${version}";

14 rev = "v${version}";

15− sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g";

15+ sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh";

16 };

16 };

17

17

18 propagatedBuildInputs = with python3Packages; [

18 propagatedBuildInputs = with python3Packages; [

pkgs/tools/misc/rust-motd/default.nix+3−5

@@ -9,23 +9,21 @@

9

9

10rustPlatform.buildRustPackage rec {

10rustPlatform.buildRustPackage rec {

11 pname = "rust-motd";

11 pname = "rust-motd";

12− version = "0.2.1";

12+ version = "0.1.1";

13

13

14 src = fetchFromGitHub {

14 src = fetchFromGitHub {

15 owner = "rust-motd";

15 owner = "rust-motd";

16 repo = pname;

16 repo = pname;

17 rev = "v${version}";

17 rev = "v${version}";

18− sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4=";

18+ sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m";

19 };

19 };

20

20

21− cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA=";

21+ cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY=";

22

22

23 nativeBuildInputs = [ pkg-config ];

23 nativeBuildInputs = [ pkg-config ];

24

24

25 buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

25 buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

26

26

27− OPENSSL_NO_VENDOR = 1;

28−

29 meta = with lib; {

27 meta = with lib; {

30 description = "Beautiful, useful MOTD generation with zero runtime dependencies";

28 description = "Beautiful, useful MOTD generation with zero runtime dependencies";

31 homepage = "https://github.com/rust-motd/rust-motd";

29 homepage = "https://github.com/rust-motd/rust-motd";

pkgs/tools/misc/zellij/default.nix+3−3

@@ -15,16 +15,16 @@

15

15

16rustPlatform.buildRustPackage rec {

16rustPlatform.buildRustPackage rec {

17 pname = "zellij";

17 pname = "zellij";

18− version = "0.29.1";

18+ version = "0.27.0";

19

19

20 src = fetchFromGitHub {

20 src = fetchFromGitHub {

21 owner = "zellij-org";

21 owner = "zellij-org";

22 repo = "zellij";

22 repo = "zellij";

23 rev = "v${version}";

23 rev = "v${version}";

24− sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8=";

24+ sha256 = "sha256-iQ+Z1A/wiui2IHuK35e6T/44TYaf6+KbaDl5GfVF2vo=";

25 };

25 };

26

26

27− cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw=";

27+ cargoSha256 = "sha256-DMHIvqClBpBplvqqXM2dUOumO+Ean4yAHWDplJ9PaUM=";

28

28

29 nativeBuildInputs = [

29 nativeBuildInputs = [

30 mandown

30 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 }:

2

2

3−python3Packages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

4 pname = "pssh";

4 pname = "pssh";

5− version = "2.3.4";

5+ version = "2.3.1";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "lilydjwg";

8 owner = "lilydjwg";

9 repo = "pssh";

9 repo = "pssh";

10 rev = "v${version}";

10 rev = "v${version}";

11− hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";

11+ sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";

12 };

12 };

13

13

14 postPatch = ''

14 postPatch = ''

@@ -20,9 +20,6 @@ python3Packages.buildPythonApplication rec {

20 done

20 done

21 '';

21 '';

22

22

23− # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126

24− doCheck = false;

25−

26 meta = with lib; {

23 meta = with lib; {

27 description = "Parallel SSH Tools";

24 description = "Parallel SSH Tools";

28 longDescription = ''

25 longDescription = ''

pkgs/tools/networking/urlwatch/default.nix+2−2

@@ -5,13 +5,13 @@

5

5

6python3Packages.buildPythonApplication rec {

6python3Packages.buildPythonApplication rec {

7 pname = "urlwatch";

7 pname = "urlwatch";

8− version = "2.25";

8+ version = "2.24";

9

9

10 src = fetchFromGitHub {

10 src = fetchFromGitHub {

11 owner = "thp";

11 owner = "thp";

12 repo = "urlwatch";

12 repo = "urlwatch";

13 rev = version;

13 rev = version;

14− hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4=";

14+ sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU=";

15 };

15 };

16

16

17 propagatedBuildInputs = with python3Packages; [

17 propagatedBuildInputs = with python3Packages; [

pkgs/tools/package-management/nix/default.nix+3−3

@@ -89,12 +89,12 @@ in lib.makeExtensible (self: {

89

89

90 unstable = lib.lowPrio (common rec {

90 unstable = lib.lowPrio (common rec {

91 version = "2.8";

91 version = "2.8";

92− suffix = "pre20220503_${lib.substring 0 7 src.rev}";

92+ suffix = "pre20220428_${lib.substring 0 7 src.rev}";

93 src = fetchFromGitHub {

93 src = fetchFromGitHub {

94 owner = "NixOS";

94 owner = "NixOS";

95 repo = "nix";

95 repo = "nix";

96− rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e";

96+ rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab";

97− sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4=";

97+ sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw=";

98 };

98 };

99 });

99 });

100})

100})

pkgs/tools/security/cryptomator/default.nix+3−3

@@ -6,13 +6,13 @@

6

6

7let

7let

8 pname = "cryptomator";

8 pname = "cryptomator";

9− version = "1.6.10";

9+ version = "1.6.8";

10

10

11 src = fetchFromGitHub {

11 src = fetchFromGitHub {

12 owner = "cryptomator";

12 owner = "cryptomator";

13 repo = "cryptomator";

13 repo = "cryptomator";

14 rev = version;

14 rev = version;

15− sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s=";

15+ sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U=";

16 };

16 };

17

17

18 # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)

18 # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)

@@ -37,7 +37,7 @@ let

37

37

38 outputHashAlgo = "sha256";

38 outputHashAlgo = "sha256";

39 outputHashMode = "recursive";

39 outputHashMode = "recursive";

40− outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak=";

40+ outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc=";

41

41

42 doCheck = false;

42 doCheck = false;

43 };

43 };

pkgs/tools/security/fulcio/default.nix+3−3

@@ -2,13 +2,13 @@

2

2

3buildGoModule rec {

3buildGoModule rec {

4 pname = "fulcio";

4 pname = "fulcio";

5− version = "0.4.1";

5+ version = "0.4.0";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "sigstore";

8 owner = "sigstore";

9 repo = pname;

9 repo = pname;

10 rev = "v${version}";

10 rev = "v${version}";

11− sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";

11+ sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";

12 # populate values that require us to use git. By doing this in postFetch we

12 # populate values that require us to use git. By doing this in postFetch we

13 # can delete .git afterwards and maintain better reproducibility of the src.

13 # can delete .git afterwards and maintain better reproducibility of the src.

14 leaveDotGit = true;

14 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

20 find "$out" -name .git -print0 | xargs -0 rm -rf

20 find "$out" -name .git -print0 | xargs -0 rm -rf

21 '';

21 '';

22 };

22 };

23− vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";

23+ vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";

24

24

25 nativeBuildInputs = [ installShellFiles ];

25 nativeBuildInputs = [ installShellFiles ];

26

26

pkgs/tools/security/gopass/default.nix+3−3

@@ -13,7 +13,7 @@

13

13

14buildGoModule rec {

14buildGoModule rec {

15 pname = "gopass";

15 pname = "gopass";

16− version = "1.14.1";

16+ version = "1.14.0";

17

17

18 nativeBuildInputs = [ installShellFiles makeWrapper ];

18 nativeBuildInputs = [ installShellFiles makeWrapper ];

19

19

@@ -21,10 +21,10 @@ buildGoModule rec {

21 owner = "gopasspw";

21 owner = "gopasspw";

22 repo = pname;

22 repo = pname;

23 rev = "v${version}";

23 rev = "v${version}";

24− sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";

24+ sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";

25 };

25 };

26

26

27− vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";

27+ vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";

28

28

29 subPackages = [ "." ];

29 subPackages = [ "." ];

30

30

pkgs/tools/security/grype/default.nix+3−3

@@ -6,13 +6,13 @@

6

6

7buildGoModule rec {

7buildGoModule rec {

8 pname = "grype";

8 pname = "grype";

9− version = "0.36.1";

9+ version = "0.36.0";

10

10

11 src = fetchFromGitHub {

11 src = fetchFromGitHub {

12 owner = "anchore";

12 owner = "anchore";

13 repo = pname;

13 repo = pname;

14 rev = "v${version}";

14 rev = "v${version}";

15− sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18=";

15+ sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw=";

16 # populate values that require us to use git. By doing this in postFetch we

16 # populate values that require us to use git. By doing this in postFetch we

17 # can delete .git afterwards and maintain better reproducibility of the src.

17 # can delete .git afterwards and maintain better reproducibility of the src.

18 leaveDotGit = true;

18 leaveDotGit = true;

@@ -25,7 +25,7 @@ buildGoModule rec {

25 '';

25 '';

26 };

26 };

27

27

28− vendorSha256 = "sha256-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA=";

28+ vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI=";

29

29

30 nativeBuildInputs = [

30 nativeBuildInputs = [

31 installShellFiles

31 installShellFiles

pkgs/tools/security/jadx/default.nix+3−3

@@ -2,13 +2,13 @@

2

2

3let

3let

4 pname = "jadx";

4 pname = "jadx";

5− version = "1.3.5";

5+ version = "1.3.4";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "skylot";

8 owner = "skylot";

9 repo = pname;

9 repo = pname;

10 rev = "v${version}";

10 rev = "v${version}";

11− hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";

11+ hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";

12 };

12 };

13

13

14 deps = stdenv.mkDerivation {

14 deps = stdenv.mkDerivation {

@@ -40,7 +40,7 @@ let

40 '';

40 '';

41

41

42 outputHashMode = "recursive";

42 outputHashMode = "recursive";

43− outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";

43+ outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";

44 };

44 };

45in stdenv.mkDerivation {

45in stdenv.mkDerivation {

46 inherit pname version src;

46 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

1+{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2

2−, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch

2+, gcc, python3Packages, perl, perlPackages, makeWrapper

3}:

3}:

4

4

5with lib;

5with lib;

@@ -8,21 +8,11 @@ stdenv.mkDerivation rec {

8 pname = "john";

8 pname = "john";

9 version = "1.9.0-jumbo-1";

9 version = "1.9.0-jumbo-1";

10

10

11− src = fetchFromGitHub {

11+ src = fetchurl {

12− owner = "openwall";

12+ url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";

13− repo = pname;

13+ sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";

14− rev = "1.9.0-Jumbo-1";

15− sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs=";

16 };

14 };

17

15

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−

26 postPatch = ''

16 postPatch = ''

27 sed -ri -e '

17 sed -ri -e '

28 s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!

18 s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!

@@ -79,8 +69,8 @@ stdenv.mkDerivation rec {

79

69

80 meta = {

70 meta = {

81 description = "John the Ripper password cracker";

71 description = "John the Ripper password cracker";

82− license = licenses.gpl2Plus;

72+ license = licenses.gpl2;

83− homepage = "https://github.com/openwall/john/";

73+ homepage = "https://github.com/magnumripper/JohnTheRipper/";

84 maintainers = with maintainers; [ offline matthewbauer ];

74 maintainers = with maintainers; [ offline matthewbauer ];

85 platforms = platforms.unix;

75 platforms = platforms.unix;

86 };

76 };

pkgs/tools/security/jwt-cli/default.nix+3−3

@@ -2,16 +2,16 @@

2

2

3rustPlatform.buildRustPackage rec {

3rustPlatform.buildRustPackage rec {

4 pname = "jwt-cli";

4 pname = "jwt-cli";

5− version = "5.0.3";

5+ version = "5.0.2";

6

6

7 src = fetchFromGitHub {

7 src = fetchFromGitHub {

8 owner = "mike-engel";

8 owner = "mike-engel";

9 repo = pname;

9 repo = pname;

10 rev = version;

10 rev = version;

11− sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59";

11+ sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r";

12 };

12 };

13

13

14− cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf";

14+ cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs";

15

15

16 buildInputs = lib.optional stdenv.isDarwin Security;

16 buildInputs = lib.optional stdenv.isDarwin Security;

17

17

pkgs/tools/security/nmap/default.nix+18−6

@@ -1,7 +1,9 @@

1{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

1{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

2, pcre, libssh2

2, pcre, libssh2

3+, graphicalSupport ? false

3, libX11 ? null

4, libX11 ? null

4, gtk2 ? null

5, gtk2 ? null

6+, python2 ? null

5, makeWrapper ? null

7, makeWrapper ? null

6, withLua ? true

8, withLua ? true

7}:

9}:

@@ -9,7 +11,7 @@

9with lib;

11with lib;

10

12

11stdenv.mkDerivation rec {

13stdenv.mkDerivation rec {

12− pname = "nmap";

14+ pname = "nmap${optionalString graphicalSupport "-graphical"}";

13 version = "7.92";

15 version = "7.92";

14

16

15 src = fetchurl {

17 src = fetchurl {

@@ -39,9 +41,7 @@ stdenv.mkDerivation rec {

39 configureFlags = [

41 configureFlags = [

40 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

42 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

41 "--with-liblinear=included"

43 "--with-liblinear=included"

42− "--without-ndiff"

43− "--without-zenmap"

44+ ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

44− ];

45

45

46 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

46 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

47 "AR=${stdenv.cc.bintools.targetPrefix}ar"

47 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,8 +49,20 @@ stdenv.mkDerivation rec {

49 "CC=${stdenv.cc.targetPrefix}gcc"

49 "CC=${stdenv.cc.targetPrefix}gcc"

50 ];

50 ];

51

51

52+ pythonPath = with python2.pkgs; optionals graphicalSupport [

53+ pygtk pysqlite pygobject2 pycairo

54+ ];

55+

52− nativeBuildInputs = [ pkg-config ];

56+ nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];

53− buildInputs = [ pcre libssh2 libpcap openssl ];

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+ '';

54

66

55 enableParallelBuilding = true;

67 enableParallelBuilding = true;

56

68

pkgs/tools/security/oath-toolkit/update.sh+1−1

@@ -5,7 +5,7 @@ set -euo pipefail

5

5

6nixfile='default.nix'

6nixfile='default.nix'

7release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

7release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

8−attr='oath-toolkit'

8+attr='oathToolkit'

9command='oathtool --version'

9command='oathtool --version'

10

10

11color() {

11color() {

pkgs/tools/security/pass/extensions/otp.nix+3−3

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, oath-toolkit }:

1+{ lib, stdenv, fetchFromGitHub, oathToolkit }:

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 pname = "pass-otp";

4 pname = "pass-otp";

@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {

11 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

11 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

12 };

12 };

13

13

14− buildInputs = [ oath-toolkit ];

14+ buildInputs = [ oathToolkit ];

15

15

16 dontBuild = true;

16 dontBuild = true;

17

17

18 patchPhase = ''

18 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

20 '';

20 '';

21

21

22 installFlags = [ "PREFIX=$(out)"

22 installFlags = [ "PREFIX=$(out)"

pkgs/tools/security/plasma-pass/default.nix+2−2

@@ -1,7 +1,7 @@

1{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules

1{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules

2, ki18n

2, ki18n

3, kitemmodels

3, kitemmodels

4−, oath-toolkit

4+, oathToolkit

5, qgpgme

5, qgpgme

6, plasma-framework

6, plasma-framework

7, qt5 }:

7, qt5 }:

@@ -21,7 +21,7 @@ mkDerivation rec {

21 buildInputs = [

21 buildInputs = [

22 ki18n

22 ki18n

23 kitemmodels

23 kitemmodels

24− oath-toolkit

24+ oathToolkit

25 qgpgme

25 qgpgme

26 plasma-framework

26 plasma-framework

27 qt5.qtbase

27 qt5.qtbase

pkgs/tools/security/tor/default.nix+5−9

@@ -30,11 +30,11 @@ let

30in

30in

31stdenv.mkDerivation rec {

31stdenv.mkDerivation rec {

32 pname = "tor";

32 pname = "tor";

33− version = "0.4.7.7";

33+ version = "0.4.6.10";

34

34

35 src = fetchurl {

35 src = fetchurl {

36 url = "https://dist.torproject.org/${pname}-${version}.tar.gz";

36 url = "https://dist.torproject.org/${pname}-${version}.tar.gz";

37− sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q=";

37+ sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";

38 };

38 };

39

39

40 outputs = [ "out" "geoip" ];

40 outputs = [ "out" "geoip" ];

@@ -45,13 +45,9 @@ stdenv.mkDerivation rec {

45

45

46 patches = [ ./disable-monotonic-timer-tests.patch ];

46 patches = [ ./disable-monotonic-timer-tests.patch ];

47

47

48− configureFlags =

49− # cross compiles correctly but needs the following

48+ # cross compiles correctly but needs the following

50− lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]

49+ configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

51− ++

50+ "--disable-tool-name-check";

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− ;

55

51

56 NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";

52 NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";

57

53

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 }:

2

2

3stdenv.mkDerivation rec {

3stdenv.mkDerivation rec {

4 version = "1.6.9";

4 version = "1.6.9";

@@ -9,13 +9,8 @@ stdenv.mkDerivation rec {

9 sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";

9 sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";

10 };

10 };

11

11

12− depsBuildBuild = [ buildPackages.stdenv.cc ];

13−

14 buildInputs = [ libgcrypt readline libgpg-error ];

12 buildInputs = [ libgcrypt readline libgpg-error ];

15

13

16− configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)

17− [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ];

18−

19 doCheck = true;

14 doCheck = true;

20

15

21 meta = {

16 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}:

2+

3+assert libxml2.pythonSupport == true;

4+

5+stdenv.mkDerivation rec {

6+ pname = "xpf";

7+ version = "0.2";

8+

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 @@

3, rsync

3, rsync

4, python3

4, python3

5, fetchFromGitHub

5, fetchFromGitHub

6−, nixosTests

7}:

6}:

8

7

9python3.pkgs.buildPythonApplication rec {

8python3.pkgs.buildPythonApplication rec {

@@ -38,8 +37,6 @@ python3.pkgs.buildPythonApplication rec {

38

37

39 doCheck = false;

38 doCheck = false;

40

39

41− passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

42−

43 meta = with lib; {

40 meta = with lib; {

44 description = "Creates and manages a simplestreams lxd image server on top of nginx";

41 description = "Creates and manages a simplestreams lxd image server on top of nginx";

45 homepage = "https://github.com/Avature/lxd-image-server";

42 homepage = "https://github.com/Avature/lxd-image-server";

pkgs/top-level/aliases.nix+1−10

@@ -92,7 +92,6 @@ mapAliases ({

92 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

92 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

93 avldrums-lv2 = x42-avldrums; # Added 2020-03-29

93 avldrums-lv2 = x42-avldrums; # Added 2020-03-29

94 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18

94 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18

95− awesome-4-0 = awesome; # Added 2022-05-05

96 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

95 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

97 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

96 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

98

97

@@ -147,7 +146,6 @@ mapAliases ({

147

146

148 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

147 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

149 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

148 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

151 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

149 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

152 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

150 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

153 callPackage_i686 = pkgsi686Linux.callPackage;

151 callPackage_i686 = pkgsi686Linux.callPackage;

@@ -326,7 +324,6 @@ mapAliases ({

326 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

324 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

327 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

325 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

328 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14

326 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

330 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

327 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

331 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

328 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

332 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

329 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 ({

873 nix_2_6 = nixVersions.nix_2_6;

870 nix_2_6 = nixVersions.nix_2_6;

874 nixopsUnstable = nixops_unstable; # Added 2022-03-03

871 nixopsUnstable = nixops_unstable; # Added 2022-03-03

875 nmap-unfree = nmap; # Added 2021-04-06

872 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

873+ nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22

877− nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26

878 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

874 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

879 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

875 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

880 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

876 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

@@ -885,7 +881,6 @@ mapAliases ({

885

881

886 ### O ###

882 ### O ###

887

883

888− oathToolkit = oath-toolkit; # Added 2022-04-04

889 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

884 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

890 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

885 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

891 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

886 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

@@ -1006,7 +1001,6 @@ mapAliases ({

1006 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

1001 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

1007 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

1002 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

1008 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22

1003 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

1010 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

1004 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

1011 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

1005 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

1012 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02

1006 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 ({

1311 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

1305 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

1312 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

1306 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

1313 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

1307 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

1315 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

1308 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

1316

1309

1317 ### U ###

1310 ### U ###

1318

1311

1319 uberwriter = apostrophe; # Added 2020-04-23

1312 uberwriter = apostrophe; # Added 2020-04-23

1320 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21

1313 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21

1321− uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02

1322 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22

1314 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22

1323 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

1315 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

1324 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22

1316 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22

@@ -1398,7 +1390,6 @@ mapAliases ({

1398 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

1390 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

1399 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

1391 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

1400 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1392 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1401− xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

1402 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

1393 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

1403 xf86_input_mtrack = throw ''

1394 xf86_input_mtrack = throw ''

1404 xf86_input_mtrack has been removed from nixpkgs as it is broken and

1395 xf86_input_mtrack has been removed from nixpkgs as it is broken and

pkgs/top-level/all-packages.nix+33−34

This diff is too big to show here.

pkgs/top-level/config.nix−51

This diff is too big to show here.

pkgs/top-level/coq-packages.nix−1

This diff is too big to show here.

pkgs/top-level/linux-kernels.nix−2

This diff is too big to show here.

pkgs/top-level/php-packages.nix−2

This diff is too big to show here.

pkgs/top-level/python-aliases.nix−1

This diff is too big to show here.

pkgs/top-level/python-packages.nix+2−28

This diff is too big to show here.

pkgs/top-level/release-lib.nix+1−1

This diff is too big to show here.