diff --git a/third_party/nixpkgs/doc/Makefile b/third_party/nixpkgs/doc/Makefile
index 4f520779f5..7affbb0bb5 100644
--- a/third_party/nixpkgs/doc/Makefile
+++ b/third_party/nixpkgs/doc/Makefile
@@ -1,4 +1,4 @@
-MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$')))
+MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' -not -name README.md)))
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
diff --git a/third_party/nixpkgs/doc/README.md b/third_party/nixpkgs/doc/README.md
new file mode 100644
index 0000000000..5395d7ca8f
--- /dev/null
+++ b/third_party/nixpkgs/doc/README.md
@@ -0,0 +1,12 @@
+
+# Nixpkgs/doc
+
+This directory houses the sources files for the Nixpkgs manual.
+
+You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/).
+
+[Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available.
+
+If you want to contribute to the documentation, [here's how to do it](https://nixos.org/manual/nixpkgs/unstable/#chap-contributing).
+
+If you're only getting started with Nix, go to [nixos.org/learn](https://nixos.org/learn).
diff --git a/third_party/nixpkgs/doc/builders/images.xml b/third_party/nixpkgs/doc/builders/images.xml
index 5e042a8ada..b72fe094db 100644
--- a/third_party/nixpkgs/doc/builders/images.xml
+++ b/third_party/nixpkgs/doc/builders/images.xml
@@ -6,7 +6,7 @@
This chapter describes tools for creating various types of images.
-
+
diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md
new file mode 100644
index 0000000000..0d7774e891
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md
@@ -0,0 +1,298 @@
+# pkgs.dockerTools {#sec-pkgs-dockerTools}
+
+`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions.
+
+## buildImage {#ssec-pkgs-dockerTools-buildImage}
+
+This function is analogous to the `docker build` command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with `docker load`.
+
+The parameters of `buildImage` with relative example values are described below:
+
+[]{#ex-dockerTools-buildImage}
+[]{#ex-dockerTools-buildImage-runAsRoot}
+
+```nix
+buildImage {
+ name = "redis";
+ tag = "latest";
+
+ fromImage = someBaseImage;
+ fromImageName = null;
+ fromImageTag = "latest";
+
+ contents = pkgs.redis;
+ runAsRoot = ''
+ #!${pkgs.runtimeShell}
+ mkdir -p /data
+ '';
+
+ config = {
+ Cmd = [ "/bin/redis-server" ];
+ WorkingDir = "/data";
+ Volumes = { "/data" = { }; };
+ };
+}
+```
+
+The above example will build a Docker image `redis/latest` from the given base image. Loading and running this image in Docker results in `redis-server` being started automatically.
+
+- `name` specifies the name of the resulting image. This is the only required argument for `buildImage`.
+
+- `tag` specifies the tag of the resulting image. By default it\'s `null`, which indicates that the nix output hash will be used as tag.
+
+- `fromImage` is the repository tarball containing the base image. It must be a valid Docker image, such as exported by `docker save`. By default it\'s `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`.
+
+- `fromImageName` can be used to further specify the base image within the repository, in case it contains multiple images. By default it\'s `null`, in which case `buildImage` will peek the first image available in the repository.
+
+- `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it\'s `null`, in which case `buildImage` will peek the first tag available for the base image.
+
+- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it\'s `null`.
+
+- `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`.
+
+> **_NOTE:_** Using this parameter requires the `kvm` device to be available.
+
+- `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
+
+After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied.
+
+At the end of the process, only one new single layer will be produced and added to the resulting image.
+
+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`.
+
+It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute.
+
+> **_NOTE:_** If you see errors similar to `getProtocolByName: does not exist (no such protocol name: tcp)` you may need to add `pkgs.iana-etc` to `contents`.
+
+> **_NOTE:_** If you see errors similar to `Error_Protocol ("certificate has unknown CA",True,UnknownCa)` you may need to add `pkgs.cacert` to `contents`.
+
+By default `buildImage` will use a static date of one second past the UNIX Epoch. This allows `buildImage` to produce binary reproducible images. When listing images with `docker images`, the newly created images will be listed like this:
+
+```ShellSession
+$ docker images
+REPOSITORY TAG IMAGE ID CREATED SIZE
+hello latest 08c791c7846e 48 years ago 25.2MB
+```
+
+You can break binary reproducibility but have a sorted, meaningful `CREATED` column by setting `created` to `now`.
+
+```nix
+pkgs.dockerTools.buildImage {
+ name = "hello";
+ tag = "latest";
+ created = "now";
+ contents = pkgs.hello;
+
+ config.Cmd = [ "/bin/hello" ];
+}
+```
+
+and now the Docker CLI will display a reasonable date and sort the images as expected:
+
+```ShellSession
+$ docker images
+REPOSITORY TAG IMAGE ID CREATED SIZE
+hello latest de2bf4786de6 About a minute ago 25.2MB
+```
+
+however, the produced images will not be binary reproducible.
+
+## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage}
+
+Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use `streamLayeredImage` instead, which this function uses internally.
+
+`name`
+
+: The name of the resulting image.
+
+`tag` _optional_
+
+: Tag of the generated image.
+
+ *Default:* the output path\'s hash
+
+`contents` _optional_
+
+: Top level paths in the container. Either a single derivation, or a list of derivations.
+
+ *Default:* `[]`
+
+`config` _optional_
+
+: 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).
+
+ *Default:* `{}`
+
+`created` _optional_
+
+: Date and time the layers were created. Follows the same `now` exception supported by `buildImage`.
+
+ *Default:* `1970-01-01T00:00:01Z`
+
+`maxLayers` _optional_
+
+: Maximum number of layers to create.
+
+ *Default:* `100`
+
+ *Maximum:* `125`
+
+`extraCommands` _optional_
+
+: Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are \"on top\" of all the other layers, so can create additional directories and files.
+
+### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents}
+
+Each path directly listed in `contents` will have a symlink in the root of the image.
+
+For example:
+
+```nix
+pkgs.dockerTools.buildLayeredImage {
+ name = "hello";
+ contents = [ pkgs.hello ];
+}
+```
+
+will create symlinks for all the paths in the `hello` package:
+
+```ShellSession
+/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
+/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
+/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
+```
+
+### Automatic inclusion of `config` references {#dockerTools-buildLayeredImage-arg-config}
+
+The closure of `config` is automatically included in the closure of the final image.
+
+This allows you to make very simple Docker images with very little code. This container will start up and run `hello`:
+
+```nix
+pkgs.dockerTools.buildLayeredImage {
+ name = "hello";
+ config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+}
+```
+
+### Adjusting `maxLayers` {#dockerTools-buildLayeredImage-arg-maxLayers}
+
+Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.
+
+Modern Docker installations support up to 128 layers, however older versions support as few as 42.
+
+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.
+
+The 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.
+
+Docker\'s Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image.
+
+## streamLayeredImage {#ssec-pkgs-dockerTools-streamLayeredImage}
+
+Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for `buildLayeredImage`. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images.
+
+The image produced by running the output script can be piped directly into `docker load`, to load it into the local docker daemon:
+
+```ShellSession
+$(nix-build) | docker load
+```
+
+Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry:
+
+```ShellSession
+$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag
+```
+
+## pullImage {#ssec-pkgs-dockerTools-fetchFromRegistry}
+
+This function is analogous to the `docker pull` command, in that it can be used to pull a Docker image from a Docker registry. By default [Docker Hub](https://hub.docker.com/) is used to pull images.
+
+Its parameters are described in the example below:
+
+```nix
+pullImage {
+ imageName = "nixos/nix";
+ imageDigest =
+ "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
+ finalImageName = "nix";
+ finalImageTag = "1.11";
+ sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
+ os = "linux";
+ arch = "x86_64";
+}
+```
+
+- `imageName` specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. `nixos`). This argument is required.
+
+- `imageDigest` specifies the digest of the image to be downloaded. This argument is required.
+
+- `finalImageName`, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s equal to `imageName`.
+
+- `finalImageTag`, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s `latest`.
+
+- `sha256` is the checksum of the whole fetched image. This argument is required.
+
+- `os`, if specified, is the operating system of the fetched image. By default it\'s `linux`.
+
+- `arch`, if specified, is the cpu architecture of the fetched image. By default it\'s `x86_64`.
+
+`nix-prefetch-docker` command can be used to get required image parameters:
+
+```ShellSession
+$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
+```
+
+Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on.
+
+```ShellSession
+$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
+```
+
+Desired image name and tag can be set using `--final-image-name` and `--final-image-tag` arguments:
+
+```ShellSession
+$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
+```
+
+## exportImage {#ssec-pkgs-dockerTools-exportImage}
+
+This function is analogous to the `docker export` command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with `docker import`.
+
+> **_NOTE:_** Using this function requires the `kvm` device to be available.
+
+The parameters of `exportImage` are the following:
+
+```nix
+exportImage {
+ fromImage = someLayeredImage;
+ fromImageName = null;
+ fromImageTag = null;
+
+ name = someLayeredImage.name;
+}
+```
+
+The parameters relative to the base image have the same synopsis as described in [buildImage](#ssec-pkgs-dockerTools-buildImage), except that `fromImage` is the only required argument in this case.
+
+The `name` argument is the name of the derivation output, which defaults to `fromImage.name`.
+
+## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup}
+
+This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below:
+
+```nix
+buildImage {
+ name = "shadow-basic";
+
+ runAsRoot = ''
+ #!${pkgs.runtimeShell}
+ ${shadowSetup}
+ groupadd -r redis
+ useradd -r -g redis redis
+ mkdir /data
+ chown redis:redis /data
+ '';
+}
+```
+
+Creating base files like `/etc/passwd` or `/etc/login.defs` is necessary for shadow-utils to manipulate users and groups.
diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.xml b/third_party/nixpkgs/doc/builders/images/dockertools.xml
deleted file mode 100644
index d881e712a0..0000000000
--- a/third_party/nixpkgs/doc/builders/images/dockertools.xml
+++ /dev/null
@@ -1,499 +0,0 @@
-
- pkgs.dockerTools
-
-
- pkgs.dockerTools is a set of functions for creating and manipulating Docker images according to the Docker Image Specification v1.2.0 . Docker itself is not used to perform any of the operations done by these functions.
-
-
-
- buildImage
-
-
- This function is analogous to the docker build command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with docker load.
-
-
-
- The parameters of buildImage with relative example values are described below:
-
-
-
- Docker build
-
-buildImage {
- name = "redis";
- tag = "latest";
-
- fromImage = someBaseImage;
- fromImageName = null;
- fromImageTag = "latest";
-
- contents = pkgs.redis;
- runAsRoot = ''
- #!${pkgs.runtimeShell}
- mkdir -p /data
- '';
-
- config = {
- Cmd = [ "/bin/redis-server" ];
- WorkingDir = "/data";
- Volumes = {
- "/data" = {};
- };
- };
-}
-
-
-
-
- The above example will build a Docker image redis/latest from the given base image. Loading and running this image in Docker results in redis-server being started automatically.
-
-
-
-
-
- name specifies the name of the resulting image. This is the only required argument for buildImage.
-
-
-
-
- tag specifies the tag of the resulting image. By default it's null, which indicates that the nix output hash will be used as tag.
-
-
-
-
- fromImage is the repository tarball containing the base image. It must be a valid Docker image, such as exported by docker save. By default it's null, which can be seen as equivalent to FROM scratch of a Dockerfile.
-
-
-
-
- fromImageName can be used to further specify the base image within the repository, in case it contains multiple images. By default it's null, in which case buildImage will peek the first image available in the repository.
-
-
-
-
- fromImageTag can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's null, in which case buildImage will peek the first tag available for the base image.
-
-
-
-
- contents is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as ADD contents/ / in a Dockerfile. By default it's null.
-
-
-
-
- runAsRoot is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied contents derivation. This can be similarly seen as RUN ... in a Dockerfile.
-
-
- Using this parameter requires the kvm device to be available.
-
-
-
-
-
-
- config is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the Docker Image Specification v1.2.0 .
-
-
-
-
-
- After the new layer has been created, its closure (to which contents, config and runAsRoot contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied.
-
-
-
- At the end of the process, only one new single layer will be produced and added to the resulting image.
-
-
-
- The resulting repository will only list the single image image/tag. In the case of it would be redis/latest.
-
-
-
- It is possible to inspect the arguments with which an image was built using its buildArgs attribute.
-
-
-
-
- If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) you may need to add pkgs.iana-etc to contents.
-
-
-
-
-
- If you see errors similar to Error_Protocol ("certificate has unknown CA",True,UnknownCa) you may need to add pkgs.cacert to contents.
-
-
-
-
- Impurely Defining a Docker Layer's Creation Date
-
- By default buildImage will use a static date of one second past the UNIX Epoch. This allows buildImage to produce binary reproducible images. When listing images with docker images, the newly created images will be listed like this:
-
-
-$ docker images
-REPOSITORY TAG IMAGE ID CREATED SIZE
-hello latest 08c791c7846e 48 years ago 25.2MB
-
-
- You can break binary reproducibility but have a sorted, meaningful CREATED column by setting created to now.
-
-
-
- and now the Docker CLI will display a reasonable date and sort the images as expected:
-
-$ docker images
-REPOSITORY TAG IMAGE ID CREATED SIZE
-hello latest de2bf4786de6 About a minute ago 25.2MB
-
- however, the produced images will not be binary reproducible.
-
-
-
-
-
- buildLayeredImage
-
-
- Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use streamLayeredImage instead, which this function uses internally.
-
-
-
-
-
- name
-
-
-
- The name of the resulting image.
-
-
-
-
-
- tag optional
-
-
-
- Tag of the generated image.
-
-
- Default: the output path's hash
-
-
-
-
-
- contents optional
-
-
-
- Top level paths in the container. Either a single derivation, or a list of derivations.
-
-
- Default: []
-
-
-
-
-
- config optional
-
-
-
- Run-time configuration of the container. A full list of the options are available at in the Docker Image Specification v1.2.0 .
-
-
- Default: {}
-
-
-
-
-
- created optional
-
-
-
- Date and time the layers were created. Follows the same now exception supported by buildImage.
-
-
- Default: 1970-01-01T00:00:01Z
-
-
-
-
-
- maxLayers optional
-
-
-
- Maximum number of layers to create.
-
-
- Default: 100
-
-
- Maximum: 125
-
-
-
-
-
- extraCommands optional
-
-
-
- Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files.
-
-
-
-
-
-
- Behavior of <varname>contents</varname> in the final image
-
-
- Each path directly listed in contents will have a symlink in the root of the image.
-
-
-
- For example:
-
- will create symlinks for all the paths in the hello package:
- /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
-/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
-/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
-]]>
-
-
-
-
- Automatic inclusion of <varname>config</varname> references
-
-
- The closure of config is automatically included in the closure of the final image.
-
-
-
- This allows you to make very simple Docker images with very little code. This container will start up and run hello:
-
-
-
-
-
- Adjusting <varname>maxLayers</varname>
-
-
- Increasing the maxLayers increases the number of layers which have a chance to be shared between different images.
-
-
-
- Modern Docker installations support up to 128 layers, however older versions support as few as 42.
-
-
-
- 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.
-
-
-
- The 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.
-
-
-
- Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image.
-
-
-
-
-
- streamLayeredImage
-
-
- Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for buildLayeredImage. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images.
-
-
-
- The image produced by running the output script can be piped directly into docker load, to load it into the local docker daemon:
-
-
-
- Alternatively, the image be piped via gzip into skopeo, e.g. to copy it into a registry:
-
-
-
-
-
- pullImage
-
-
- This function is analogous to the docker pull command, in that it can be used to pull a Docker image from a Docker registry. By default Docker Hub is used to pull images.
-
-
-
- Its parameters are described in the example below:
-
-
-
- Docker pull
-
-pullImage {
- imageName = "nixos/nix";
- imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
- finalImageName = "nix";
- finalImageTag = "1.11";
- sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
- os = "linux";
- arch = "x86_64";
-}
-
-
-
-
-
-
- imageName specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. nixos). This argument is required.
-
-
-
-
- imageDigest specifies the digest of the image to be downloaded. This argument is required.
-
-
-
-
- finalImageName, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to imageName.
-
-
-
-
- finalImageTag, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's latest.
-
-
-
-
- sha256 is the checksum of the whole fetched image. This argument is required.
-
-
-
-
- os, if specified, is the operating system of the fetched image. By default it's linux.
-
-
-
-
- arch, if specified, is the cpu architecture of the fetched image. By default it's x86_64.
-
-
-
-
-
- nix-prefetch-docker command can be used to get required image parameters:
-
-$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
-
- Since a given imageName may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the and arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on.
-
-$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux
-
- Desired image name and tag can be set using and arguments:
-
-$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod
-
-
-
-
-
- exportImage
-
-
- This function is analogous to the docker export command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with docker import.
-
-
-
-
- Using this function requires the kvm device to be available.
-
-
-
-
- The parameters of exportImage are the following:
-
-
-
- Docker export
-
-exportImage {
- fromImage = someLayeredImage;
- fromImageName = null;
- fromImageTag = null;
-
- name = someLayeredImage.name;
-}
-
-
-
-
- The parameters relative to the base image have the same synopsis as described in , except that fromImage is the only required argument in this case.
-
-
-
- The name argument is the name of the derivation output, which defaults to fromImage.name.
-
-
-
-
- shadowSetup
-
-
- This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a runAsRoot script for cases like in the example below:
-
-
-
- Shadow base files
-
-buildImage {
- name = "shadow-basic";
-
- runAsRoot = ''
- #!${pkgs.runtimeShell}
- ${shadowSetup}
- groupadd -r redis
- useradd -r -g redis redis
- mkdir /data
- chown redis:redis /data
- '';
-}
-
-
-
-
- Creating base files like /etc/passwd or /etc/login.defs is necessary for shadow-utils to manipulate users and groups.
-
-
-
diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.xml b/third_party/nixpkgs/doc/builders/packages/citrix.xml
index 803eb2e4fc..7a16b79f23 100644
--- a/third_party/nixpkgs/doc/builders/packages/citrix.xml
+++ b/third_party/nixpkgs/doc/builders/packages/citrix.xml
@@ -17,9 +17,11 @@
Citrix Selfservice
+
The selfservice 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.
+
In order to set this up, you first have to download the .cr file from the Netscaler Gateway. After that you can configure the selfservice like this:
diff --git a/third_party/nixpkgs/doc/builders/packages/emacs.section.md b/third_party/nixpkgs/doc/builders/packages/emacs.section.md
index b4723a22bb..93a819bc79 100644
--- a/third_party/nixpkgs/doc/builders/packages/emacs.section.md
+++ b/third_party/nixpkgs/doc/builders/packages/emacs.section.md
@@ -36,7 +36,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
;; load some packages
(use-package company
- :bind ("<C-tab>" . company-complete)
+ :bind ("" . company-complete)
:diminish company-mode
:commands (company-mode global-company-mode)
:defer 1
diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.xml b/third_party/nixpkgs/doc/contributing/coding-conventions.xml
index 9005a9ebaf..9f00942918 100644
--- a/third_party/nixpkgs/doc/contributing/coding-conventions.xml
+++ b/third_party/nixpkgs/doc/contributing/coding-conventions.xml
@@ -180,17 +180,12 @@ args.stdenv.mkDerivation (args // {
- Arguments should be listed in the order they are used, with the
- exception of lib, which always goes first.
+ Arguments should be listed in the order they are used, with the exception of lib, which always goes first.
- Prefer using the top-level lib over its alias
- stdenv.lib. lib is unrelated to
- stdenv, and so stdenv.lib should only
- be used as a convenience alias when developing to avoid having to modify
- the function inputs just to test something out.
+ Prefer using the top-level lib over its alias stdenv.lib. lib is unrelated to stdenv, and so stdenv.lib should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out.
@@ -689,8 +684,7 @@ args.stdenv.mkDerivation (args // {
- If it’s a theme for a desktop environment,
- a window manager or a display manager:
+ If it’s a theme for a desktop environment, a window manager or a display manager:
diff --git a/third_party/nixpkgs/doc/functions/library/attrsets.xml b/third_party/nixpkgs/doc/functions/library/attrsets.xml
index 7ef0d16624..9a4e640935 100644
--- a/third_party/nixpkgs/doc/functions/library/attrsets.xml
+++ b/third_party/nixpkgs/doc/functions/library/attrsets.xml
@@ -1677,8 +1677,7 @@ recursiveUpdate
- Make various Nix tools consider the contents of the resulting
- attribute set when looking for what to build, find, etc.
+ Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc.
@@ -1720,7 +1719,7 @@ recursiveUpdate
- Return the cartesian product of attribute set value combinations.
+ Return the cartesian product of attribute set value combinations.
@@ -1749,5 +1748,4 @@ cartesianProductOfSets { a = [ 1 2 ]; b = [ 10 20 ]; }
]]>
-
diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
index 71193ed0cc..e569cdaa93 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
@@ -611,7 +611,7 @@ Using the example above, the analagous pytestCheckHook usage would be:
"update"
];
- disabledTestFiles = [
+ disabledTestPaths = [
"tests/test_failing.py"
];
```
@@ -1188,7 +1188,8 @@ community to help save time. No tool is preferred at the moment.
expressions for your Python project. Note that [sharing derivations from
pypi2nix with nixpkgs is possible but not
encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376).
-- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov.
+- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools)
+- [poetry2nix](https://github.com/nix-community/poetry2nix)
### Deterministic builds
@@ -1554,9 +1555,9 @@ Following rules are desired to be respected:
* Python libraries are called from `python-packages.nix` and packaged with
`buildPythonPackage`. The expression of a library should be in
- `pkgs/development/python-modules//default.nix`. Libraries in
- `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid
- merge conflicts.
+ `pkgs/development/python-modules//default.nix`.
+* Libraries in `pkgs/top-level/python-packages.nix` are sorted
+ alphanumerically to avoid merge conflicts and ease locating attributes.
* Python applications live outside of `python-packages.nix` and are packaged
with `buildPythonApplication`.
* Make sure libraries build for all Python interpreters.
@@ -1570,3 +1571,4 @@ Following rules are desired to be respected:
[PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
means that characters should be converted to lowercase and `.` and `_` should
be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
+* Attribute names in `python-packages.nix` should be sorted alphanumerically.
diff --git a/third_party/nixpkgs/doc/languages-frameworks/qt.section.md b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md
index b6525490c8..9747c1037a 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/qt.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md
@@ -121,7 +121,7 @@ Use the `meta.broken` attribute to disable the package for unsupported Qt versio
stdenv.mkDerivation {
# ...
- # Disable this library with Qt < 5.9.0
+ # Disable this library with Qt < 5.9.0
meta.broken = lib.versionOlder qtbase.version "5.9.0";
}
```
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
index 18d3cd9c92..94f94aaffe 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
@@ -223,7 +223,7 @@ sometimes it may be necessary to disable this so the tests run consecutively.
```nix
rustPlatform.buildRustPackage {
/* ... */
- cargoParallelTestThreads = false;
+ dontUseCargoParallelTests = true;
}
```
@@ -264,6 +264,198 @@ rustPlatform.buildRustPackage rec {
}
```
+## Compiling non-Rust packages that include Rust code
+
+Several non-Rust packages incorporate Rust code for performance- or
+security-sensitive parts. `rustPlatform` exposes several functions and
+hooks that can be used to integrate Cargo in non-Rust packages.
+
+### Vendoring of dependencies
+
+Since network access is not allowed in sandboxed builds, Rust crate
+dependencies need to be retrieved using a fetcher. `rustPlatform`
+provides the `fetchCargoTarball` fetcher, which vendors all
+dependencies of a crate. For example, given a source path `src`
+containing `Cargo.toml` and `Cargo.lock`, `fetchCargoTarball`
+can be used as follows:
+
+```nix
+cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
+};
+```
+
+The `src` attribute is required, as well as a hash specified through
+one of the `sha256` or `hash` attributes. The following optional
+attributes can also be used:
+
+* `name`: the name that is used for the dependencies tarball. If
+ `name` is not specified, then the name `cargo-deps` will be used.
+* `sourceRoot`: when the `Cargo.lock`/`Cargo.toml` are in a
+ subdirectory, `sourceRoot` specifies the relative path to these
+ files.
+* `patches`: patches to apply before vendoring. This is useful when
+ the `Cargo.lock`/`Cargo.toml` files need to be patched before
+ vendoring.
+
+### Hooks
+
+`rustPlatform` provides the following hooks to automate Cargo builds:
+
+* `cargoSetupHook`: configure Cargo to use depenencies vendored
+ through `fetchCargoTarball`. This hook uses the `cargoDeps`
+ environment variable to find the vendored dependencies. If a project
+ already vendors its dependencies, the variable `cargoVendorDir` can
+ be used instead. When the `Cargo.toml`/`Cargo.lock` files are not in
+ `sourceRoot`, then the optional `cargoRoot` is used to specify the
+ Cargo root directory relative to `sourceRoot`.
+* `cargoBuildHook`: use Cargo to build a crate. If the crate to be
+ built is a crate in e.g. a Cargo workspace, the relative path to the
+ crate to build can be set through the optional `buildAndTestSubdir`
+ environment variable. Additional Cargo build flags can be passed
+ through `cargoBuildFlags`.
+* `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin)
+ to build a Python wheel. Similar to `cargoBuildHook`, the optional
+ variable `buildAndTestSubdir` can be used to build a crate in a
+ Cargo workspace. Additional maturin flags can be passed through
+ `maturinBuildFlags`.
+* `cargoCheckHook`: run tests using Cargo. Additional flags can be
+ passed to Cargo using `checkFlags` and `checkFlagsArray`. By
+ default, tests are run in parallel. This can be disabled by setting
+ `dontUseCargoParallelTests`.
+* `cargoInstallHook`: install binaries and static/shared libraries
+ that were built using `cargoBuildHook`.
+
+### Examples
+
+#### Python package using `setuptools-rust`
+
+For Python packages using `setuptools-rust`, you can use
+`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo
+dependencies. The build itself is then performed by
+`buildPythonPackage`.
+
+The following example outlines how the `tokenizers` Python package is
+built. Since the Python package is in the `source/bindings/python`
+directory of the *tokenizers* project's source archive, we use
+`sourceRoot` to point the tooling to this directory:
+
+```nix
+{ fetchFromGitHub
+, buildPythonPackage
+, rustPlatform
+, setuptools-rust
+}:
+
+buildPythonPackage rec {
+ pname = "tokenizers";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "huggingface";
+ repo = pname;
+ rev = "python-v${version}";
+ hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src sourceRoot;
+ name = "${pname}-${version}";
+ hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
+ };
+
+ sourceRoot = "source/bindings/python";
+
+ nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ # ...
+}
+```
+
+In some projects, the Rust crate is not in the main Python source
+directory. In such cases, the `cargoRoot` attribute can be used to
+specify the crate's directory relative to `sourceRoot`. In the
+following example, the crate is in `src/rust`, as specified in the
+`cargoRoot` attribute. Note that we also need to specify the correct
+path for `fetchCargoTarball`.
+
+```nix
+
+{ buildPythonPackage
+, fetchPypi
+, rustPlatform
+, setuptools-rust
+, openssl
+}:
+
+buildPythonPackage rec {
+ pname = "cryptography";
+ version = "3.4.2"; # Also update the hash in vectors.nix
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1i1mx5y9hkyfi9jrrkcw804hmkcglxi6rmf7vin7jfnbr2bf4q64";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ sourceRoot = "${pname}-${version}/${cargoRoot}";
+ name = "${pname}-${version}";
+ hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo=";
+ };
+
+ cargoRoot = "src/rust";
+
+ # ...
+}
+```
+
+#### Python package using `maturin`
+
+Python packages that use [Maturin](https://github.com/PyO3/maturin)
+can be built with `fetchCargoTarball`, `cargoSetupHook`, and
+`maturinBuildHook`. For example, the following (partial) derivation
+builds the `retworkx` Python package. `fetchCargoTarball` and
+`cargoSetupHook` are used to fetch and set up the crate dependencies.
+`maturinBuildHook` is used to perform the build.
+
+```nix
+{ lib
+, buildPythonPackage
+, rustPlatform
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "retworkx";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "Qiskit";
+ repo = "retworkx";
+ rev = version;
+ sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
+ };
+
+ format = "pyproject";
+
+ nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
+
+ # ...
+}
+```
+
## Compiling Rust crates using Nix instead of Cargo
### Simple operation
diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.xml b/third_party/nixpkgs/doc/stdenv/multiple-output.xml
index 20658918db..5f2d2b8cfb 100644
--- a/third_party/nixpkgs/doc/stdenv/multiple-output.xml
+++ b/third_party/nixpkgs/doc/stdenv/multiple-output.xml
@@ -26,7 +26,6 @@
A number of attributes can be used to work with a derivation with multiple outputs. The attribute outputs is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute meta.outputsToInstall is used to determine the default set of outputs to install when using the derivation name unqualified.
-
Installing a split package
@@ -154,7 +153,7 @@
- is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default.
+ is for development-only files. These include C(++) headers (include/), pkg-config (lib/pkgconfig/), cmake (lib/cmake/) and aclocal files (share/aclocal/). They go to dev or out by default.
@@ -164,7 +163,7 @@
- is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default.
+ is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default.
@@ -194,7 +193,7 @@
- is for developer documentation. Currently we count gtk-doc and devhelp books in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+ is for developer documentation. Currently we count gtk-doc and devhelp books, typically residing in share/gtk-doc/ and share/devhelp/, in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
@@ -204,7 +203,7 @@
- is for man pages (except for section 3). They go to man or $outputBin by default.
+ is for man pages (except for section 3), typically residing in share/man/man[0-9]/. They go to man or $outputBin by default.
@@ -214,7 +213,7 @@
- is for section 3 man pages. They go to devman or $outputMan by default.
+ is for section 3 man pages, typically residing in share/man/man3/. They go to devman or $outputMan by default.
@@ -224,7 +223,7 @@
- is for info pages. They go to info or $outputBin by default.
+ is for info pages, typically residing in share/info/. They go to info or $outputBin by default.
diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml
index 21485425f2..b2004270e9 100644
--- a/third_party/nixpkgs/doc/stdenv/stdenv.xml
+++ b/third_party/nixpkgs/doc/stdenv/stdenv.xml
@@ -1136,9 +1136,9 @@ preBuild = ''
Variables controlling the install phase
-
+
- dontInstall
+ dontInstall
@@ -1839,10 +1839,7 @@ addEnvHooks "$hostOffset" myBashFunction
- This setup hook moves any systemd user units installed in the lib
- subdirectory into share. In addition, a link is provided from share to
- lib for compatibility. This is needed for systemd to find user services
- when installed into the user profile.
+ This setup hook moves any systemd user units installed in the lib subdirectory into share. In addition, a link is provided from share to lib for compatibility. This is needed for systemd to find user services when installed into the user profile.
@@ -2022,8 +2019,7 @@ addEnvHooks "$hostOffset" myBashFunction
This is a special setup hook which helps in packaging proprietary software in that it automatically tries to find missing shared library dependencies of ELF files based on the given buildInputs and nativeBuildInputs.
- You can also specify a runtimeDependencies variable which lists dependencies to be unconditionally added to rpath of all executables.
- This is useful for programs that use
+ You can also specify a runtimeDependencies variable which lists dependencies to be unconditionally added to rpath of all executables. This is useful for programs that use
dlopen
3 to load libraries at runtime.
diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml
index 8e63e0072c..3ef3973345 100644
--- a/third_party/nixpkgs/doc/using/configuration.xml
+++ b/third_party/nixpkgs/doc/using/configuration.xml
@@ -170,7 +170,7 @@
- Note that allowlistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic allowlist for all types of licenses. blocklistedLicenses applies to all licenses.
+ Note that allowlistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic allowlist for all types of licenses. blocklistedLicenses applies to all licenses.
diff --git a/third_party/nixpkgs/doc/using/overlays.xml b/third_party/nixpkgs/doc/using/overlays.xml
index 8bda235d43..1def8b0695 100644
--- a/third_party/nixpkgs/doc/using/overlays.xml
+++ b/third_party/nixpkgs/doc/using/overlays.xml
@@ -28,8 +28,7 @@
- NOTE: DO NOT USE THIS in nixpkgs.
- Further overlays can be added by calling the pkgs.extend or pkgs.appendOverlays, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do.
+ NOTE: DO NOT USE THIS in nixpkgs. Further overlays can be added by calling the pkgs.extend or pkgs.appendOverlays, although it is often preferable to avoid these functions, because they recompute the Nixpkgs fixpoint, which is somewhat expensive to do.
@@ -139,98 +138,72 @@ self: super:
- Using overlays to configure alternatives
+ Using overlays to configure alternatives
+
+
+ Certain software packages have different implementations of the same interface. Other distributions have functionality to switch between these. For example, Debian provides DebianAlternatives. Nixpkgs has what we call alternatives, which are configured through overlays.
+
+
+
+ BLAS/LAPACK
+
- Certain software packages have different implementations of the
- same interface. Other distributions have functionality to switch
- between these. For example, Debian provides DebianAlternatives.
- Nixpkgs has what we call alternatives, which
- are configured through overlays.
+ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear algebra interfaces. They are:
-
- BLAS/LAPACK
+
+
+
- In Nixpkgs, we have multiple implementations of the BLAS/LAPACK
- numerical linear algebra interfaces. They are:
+ OpenBLAS
-
-
-
- OpenBLAS
-
-
- The Nixpkgs attribute is openblas for
- ILP64 (integer width = 64 bits) and
- openblasCompat for LP64 (integer width =
- 32 bits). openblasCompat is the default.
-
-
-
-
- LAPACK
- reference (also provides BLAS)
-
-
- The Nixpkgs attribute is lapack-reference.
-
-
-
-
- Intel
- MKL (only works on the x86_64 architecture, unfree)
-
-
- The Nixpkgs attribute is mkl.
-
-
-
-
-
+ The Nixpkgs attribute is openblas for ILP64 (integer width = 64 bits) and openblasCompat for LP64 (integer width = 32 bits). openblasCompat is the default.
+
+
+
+
+ LAPACK reference (also provides BLAS)
+
+
+ The Nixpkgs attribute is lapack-reference.
+
+
+
+
+ Intel MKL (only works on the x86_64 architecture, unfree)
+
+
+ The Nixpkgs attribute is mkl.
+
+
+
+
+ BLIS
-
-
- BLIS, available through the attribute
- blis, is a framework for linear algebra kernels. In
- addition, it implements the BLAS interface.
-
-
-
-
- AMD
- BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs)
-
-
- The AMD fork of the BLIS library, with attribute
- amd-blis, extends BLIS with optimizations for
- modern AMD CPUs. The changes are usually submitted to
- the upstream BLIS project after some time. However, AMD BLIS
- typically provides some performance improvements on AMD Zen CPUs.
- The complementary AMD LIBFLAME library, with attribute
- amd-libflame, provides a LAPACK implementation.
-
-
-
-
- Introduced in PR
- #83888, we are able to override the blas
- and lapack packages to use different implementations,
- through the blasProvider and
- lapackProvider argument. This can be used
- to select a different provider. BLAS providers will have
- symlinks in $out/lib/libblas.so.3 and
- $out/lib/libcblas.so.3 to their respective
- BLAS libraries. Likewise, LAPACK providers will have symlinks
- in $out/lib/liblapack.so.3 and
- $out/lib/liblapacke.so.3 to their respective
- LAPACK libraries. For example, Intel MKL is both a BLAS and
- LAPACK provider. An overlay can be created to use Intel MKL
- that looks like:
-
+
+ BLIS, available through the attribute blis, is a framework for linear algebra kernels. In addition, it implements the BLAS interface.
+
+
+
+
+ AMD BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs)
+
+
+ The AMD fork of the BLIS library, with attribute amd-blis, extends BLIS with optimizations for modern AMD CPUs. The changes are usually submitted to the upstream BLIS project after some time. However, AMD BLIS typically provides some performance improvements on AMD Zen CPUs. The complementary AMD LIBFLAME library, with attribute amd-libflame, provides a LAPACK implementation.
+
+
+
+
+
+ Introduced in PR #83888, we are able to override the blas and lapack packages to use different implementations, through the blasProvider and lapackProvider argument. This can be used to select a different provider. BLAS providers will have symlinks in $out/lib/libblas.so.3 and $out/lib/libcblas.so.3 to their respective BLAS libraries. Likewise, LAPACK providers will have symlinks in $out/lib/liblapack.so.3 and $out/lib/liblapacke.so.3 to their respective LAPACK libraries. For example, Intel MKL is both a BLAS and LAPACK provider. An overlay can be created to use Intel MKL that looks like:
+
+
+
self: super:
{
@@ -243,46 +216,24 @@ self: super:
};
}
-
- This overlay uses Intel’s MKL library for both BLAS and LAPACK
- interfaces. Note that the same can be accomplished at runtime
- using LD_LIBRARY_PATH of
- libblas.so.3 and
- liblapack.so.3. For instance:
-
+
+
+ This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime using LD_LIBRARY_PATH of libblas.so.3 and liblapack.so.3. For instance:
+
+
$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave
-
- Intel MKL requires an openmp implementation
- when running with multiple processors. By default,
- mkl will use Intel’s iomp
- implementation if no other is specified, but this is a
- runtime-only dependency and binary compatible with the LLVM
- implementation. To use that one instead, Intel recommends users
- set it with LD_PRELOAD. Note that
- mkl is only available on
- x86_64-linux and
- x86_64-darwin. Moreover, Hydra is not
- building and distributing pre-compiled binaries using it.
-
-
- For BLAS/LAPACK switching to work correctly, all packages must
- depend on blas or lapack.
- This ensures that only one BLAS/LAPACK library is used at one
- time. There are two versions versions of BLAS/LAPACK currently
- in the wild, LP64 (integer size = 32 bits)
- and ILP64 (integer size = 64 bits). Some
- software needs special flags or patches to work with
- ILP64. You can check if
- ILP64 is used in Nixpkgs with
- blas.isILP64 and
- lapack.isILP64. Some software does NOT work
- with ILP64, and derivations need to specify
- an assertion to prevent this. You can prevent
- ILP64 from being used with the following:
-
-
+
+
+ Intel MKL requires an openmp implementation when running with multiple processors. By default, mkl will use Intel’s iomp implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with LD_PRELOAD. Note that mkl is only available on x86_64-linux and x86_64-darwin. Moreover, Hydra is not building and distributing pre-compiled binaries using it.
+
+
+
+ For BLAS/LAPACK switching to work correctly, all packages must depend on blas or lapack. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions versions of BLAS/LAPACK currently in the wild, LP64 (integer size = 32 bits) and ILP64 (integer size = 64 bits). Some software needs special flags or patches to work with ILP64. You can check if ILP64 is used in Nixpkgs with blas.isILP64 and lapack.isILP64. Some software does NOT work with ILP64, and derivations need to specify an assertion to prevent this. You can prevent ILP64 from being used with the following:
+
+
+
{ stdenv, blas, lapack, ... }:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -291,41 +242,38 @@ stdenv.mkDerivation {
...
}
-
-
- Switching the MPI implementation
-
- All programs that are built with
- MPI
- support use the generic attribute mpi
- as an input. At the moment Nixpkgs natively provides two different
- MPI implementations:
-
-
-
- Open MPI
- (default), attribute name openmpi
-
-
-
-
- MPICH,
- attribute name mpich
-
-
-
-
-
- To provide MPI enabled applications that use MPICH, instead
- of the default Open MPI, simply use the following overlay:
-
-
+
+
+
+ Switching the MPI implementation
+
+
+ All programs that are built with MPI support use the generic attribute mpi as an input. At the moment Nixpkgs natively provides two different MPI implementations:
+
+
+
+ Open MPI (default), attribute name openmpi
+
+
+
+
+ MPICH, attribute name mpich
+
+
+
+
+
+
+ To provide MPI enabled applications that use MPICH, instead of the default Open MPI, simply use the following overlay:
+
+
+
self: super:
{
mpi = self.mpich;
}
-
+
diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix
index ee136c7337..993783db3e 100644
--- a/third_party/nixpkgs/lib/licenses.nix
+++ b/third_party/nixpkgs/lib/licenses.nix
@@ -7,7 +7,7 @@ let
in
-lib.mapAttrs (n: v: v // { shortName = n; }) {
+lib.mapAttrs (n: v: v // { shortName = n; }) ({
/* License identifiers from spdx.org where possible.
* If you cannot find your license here, then look for a similar license or
* add it to this list. The URL mentioned above is a good source for inspiration.
@@ -877,4 +877,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "GNU Lesser General Public License v3.0";
deprecated = true;
};
-}
+})
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 9518b1c44b..63248693c3 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -194,6 +194,12 @@
githubId = 124545;
name = "Anthony Cowley";
};
+ adamlwgriffiths = {
+ email = "adam.lw.griffiths@gmail.com";
+ github = "adamlwgriffiths";
+ githubId = 1239156;
+ name = "Adam Griffiths";
+ };
adamt = {
email = "mail@adamtulinius.dk";
github = "adamtulinius";
@@ -273,7 +279,7 @@
name = "James Alexander Feldman-Crough";
};
aforemny = {
- email = "alexanderforemny@googlemail.com";
+ email = "aforemny@posteo.de";
github = "aforemny";
githubId = 610962;
name = "Alexander Foremny";
@@ -1096,6 +1102,12 @@
githubId = 1432730;
name = "Benjamin Staffin";
};
+ benneti = {
+ name = "Benedikt Tissot";
+ email = "benedikt.tissot@googlemail.com";
+ github = "benneti";
+ githubId = 11725645;
+ };
bennofs = {
email = "benno.fuenfstueck@gmail.com";
github = "bennofs";
@@ -1711,6 +1723,12 @@
githubId = 2245737;
name = "Christopher Mark Poole";
};
+ chuahou = {
+ email = "human+github@chuahou.dev";
+ github = "chuahou";
+ githubId = 12386805;
+ name = "Chua Hou";
+ };
chvp = {
email = "nixpkgs@cvpetegem.be";
github = "chvp";
@@ -2417,6 +2435,16 @@
githubId = 6806011;
name = "Robert Schütz";
};
+ dottedmag = {
+ email = "dottedmag@dottedmag.net";
+ github = "dottedmag";
+ githubId = 16120;
+ name = "Misha Gusarov";
+ keys = [{
+ longkeyid = "rsa4096/0x9D20F6503E338888";
+ fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888";
+ }];
+ };
doublec = {
email = "chris.double@double.co.nz";
github = "doublec";
@@ -3061,6 +3089,12 @@
githubId = 1276854;
name = "Florian Peter";
};
+ fbrs = {
+ email = "yuuki@protonmail.com";
+ github = "cideM";
+ githubId = 4246921;
+ name = "Florian Beeres";
+ };
fdns = {
email = "fdns02@gmail.com";
github = "fdns";
@@ -3073,6 +3107,12 @@
githubId = 9959940;
name = "Andreas Fehn";
};
+ felixscheinost = {
+ name = "Felix Scheinost";
+ email = "felix.scheinost@posteo.de";
+ github = "felixscheinost";
+ githubId = 31761492;
+ };
felixsinger = {
email = "felixsinger@posteo.net";
github = "felixsinger";
@@ -4051,6 +4091,16 @@
fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54";
}];
};
+ ivankovnatsky = {
+ email = "ikovnatsky@protonmail.ch";
+ github = "ivankovnatsky";
+ githubId = 75213;
+ name = "Ivan Kovnatsky";
+ keys = [{
+ longkeyid = "rsa4096/0x3A33FA4C82ED674F";
+ fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F";
+ }];
+ };
ivar = {
email = "ivar.scholten@protonmail.com";
github = "IvarWithoutBones";
@@ -6055,7 +6105,7 @@
name = "Celine Mercier";
};
metadark = {
- email = "kira.bruneau@gmail.com";
+ email = "kira.bruneau@pm.me";
name = "Kira Bruneau";
github = "metadark";
githubId = 382041;
@@ -7203,6 +7253,12 @@
githubId = 157610;
name = "Piotr Bogdan";
};
+ pborzenkov = {
+ email = "pavel@borzenkov.net";
+ github = "pborzenkov";
+ githubId = 434254;
+ name = "Pavel Borzenkov";
+ };
pblkt = {
email = "pebblekite@gmail.com";
github = "pblkt";
@@ -7227,6 +7283,12 @@
githubId = 13225611;
name = "Nicolas Martin";
};
+ p3psi = {
+ name = "Elliot Boo";
+ email = "p3psi.boo@gmail.com";
+ github = "p3psi-boo";
+ githubId = 43925055;
+ };
periklis = {
email = "theopompos@gmail.com";
github = "periklis";
@@ -7419,6 +7481,16 @@
githubId = 103822;
name = "Patrick Mahoney";
};
+ pmenke = {
+ email = "nixos@pmenke.de";
+ github = "pmenke-de";
+ githubId = 898922;
+ name = "Philipp Menke";
+ keys = [{
+ longkeyid = "rsa4096/0xEB7F2D4CCBE23B69";
+ fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69";
+ }];
+ };
pmeunier = {
email = "pierre-etienne.meunier@inria.fr";
github = "P-E-Meunier";
@@ -7449,6 +7521,16 @@
githubId = 11365056;
name = "Kevin Liu";
};
+ pnotequalnp = {
+ email = "kevin@pnotequalnp.com";
+ github = "pnotequalnp";
+ githubId = 46154511;
+ name = "Kevin Mullins";
+ keys = [{
+ longkeyid = "rsa4096/361820A45DB41E9A";
+ fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A";
+ }];
+ };
polyrod = {
email = "dc1mdp@gmail.com";
github = "polyrod";
@@ -8033,6 +8115,12 @@
githubId = 3708689;
name = "Roberto Di Remigio";
};
+ robertoszek = {
+ email = "robertoszek@robertoszek.xyz";
+ github = "robertoszek";
+ githubId = 1080963;
+ name = "Roberto";
+ };
robgssp = {
email = "robgssp@gmail.com";
github = "robgssp";
@@ -8075,6 +8163,16 @@
githubId = 1312525;
name = "Rongcui Dong";
};
+ ronthecookie = {
+ name = "Ron B";
+ email = "me@ronthecookie.me";
+ github = "ronthecookie";
+ githubId = 2526321;
+ keys = [{
+ longkeyid = "rsa2048/0x6F5B32DE5E5FA80C";
+ fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C";
+ }];
+ };
roosemberth = {
email = "roosembert.palacios+nixpkgs@gmail.com";
github = "roosemberth";
@@ -9564,7 +9662,7 @@
name = "Tom Smeets";
};
toonn = {
- email = "nnoot@toonn.io";
+ email = "nixpkgs@toonn.io";
github = "toonn";
githubId = 1486805;
name = "Toon Nolten";
@@ -10012,6 +10110,12 @@
githubId = 7677567;
name = "Victor SENE";
};
+ vtuan10 = {
+ email = "mail@tuan-vo.de";
+ github = "vtuan10";
+ githubId = 16415673;
+ name = "Van Tuan Vo";
+ };
vyorkin = {
email = "vasiliy.yorkin@gmail.com";
github = "vyorkin";
@@ -10458,6 +10562,12 @@
githubId = 1141948;
name = "Zack Grannan";
};
+ zhaofengli = {
+ email = "hello@zhaofeng.li";
+ github = "zhaofengli";
+ githubId = 2189609;
+ name = "Zhaofeng Li";
+ };
zimbatm = {
email = "zimbatm@zimbatm.com";
github = "zimbatm";
@@ -10750,16 +10860,20 @@
github = "pulsation";
githubId = 1838397;
};
+ zseri = {
+ name = "zseri";
+ email = "zseri.devel@ytrizja.de";
+ github = "zseri";
+ githubId = 1618343;
+ keys = [{
+ longkeyid = "rsa4096/0x229E63AE5644A96D";
+ fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D";
+ }];
+ };
zupo = {
name = "Nejc Zupan";
email = "nejczupan+nix@gmail.com";
github = "zupo";
githubId = 311580;
};
- felixscheinost = {
- name = "Felix Scheinost";
- email = "felix.scheinost@posteo.de";
- github = "felixscheinost";
- githubId = 31761492;
- };
}
diff --git a/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.nix b/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.nix
index b0267281b3..873905373a 100644
--- a/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.nix
+++ b/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "nixpkgs-lint-1";
- buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl perlPackages.XMLSimple ];
dontUnpack = true;
buildPhase = "true";
diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.xml
index 7ccb5b3664..19cfb57920 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.xml
@@ -16,9 +16,10 @@
The first line ({ config, pkgs, ... }:) denotes that this
is actually a function that takes at least the two arguments
config and pkgs. (These are explained
- later.) The function returns a set of option definitions
- ({ ... }). These definitions
- have the form name =
+ later, in chapter ) The function returns
+ a set of option definitions ({
+ ... }). These definitions have the form
+ name =
value, where
name is the name of an option and
value is its value. For example,
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.xml
index d244356dbe..fad4637f51 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-modules.xml
@@ -74,7 +74,10 @@ linkend="sec-configuration-syntax"/>, we saw the following structure
This line makes the current Nix expression a function. The variable
- pkgs contains Nixpkgs, while config
+ pkgs contains Nixpkgs (by default, it takes the
+ nixpkgs entry of NIX_PATH, see the Nix
+ manual for further details), while config
contains the full system configuration. This line can be omitted if there
is no reference to pkgs and config
inside the module.
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
index 302a6d3f37..2f87869fbe 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
@@ -523,6 +523,21 @@ self: super:
as an hardware RNG, as it will automatically run the krngd task to periodically collect random
data from the device and mix it into the kernel's RNG.
+
+ The default SMTP port for GitLab has been changed to
+ 25 from its previous default of
+ 465. If you depended on this default, you
+ should now set the
+ option.
+
+
+
+
+ The default version of ImageMagick has been updated from 6 to 7.
+ You can use imagemagick6,
+ imagemagick6_light, and
+ imagemagick6Big if you need the older version.
+
@@ -558,14 +573,16 @@ self: super:
- The default-version of nextcloud is nextcloud20.
+ The default-version of nextcloud is nextcloud21.
Please note that it's not possible to upgrade nextcloud
across multiple major versions! This means that it's e.g. not possible to upgrade
- from nextcloud18 to nextcloud20 in a single deploy.
+ from nextcloud18 to nextcloud20 in a single deploy and
+ most 20.09 users will have to upgrade to nextcloud20
+ first.
The package can be manually upgraded by setting
- to nextcloud20.
+ to nextcloud21.
@@ -730,6 +747,56 @@ self: super:
terminology has been deprecated and should be replaced with Far/Near in the configuration file.
+
+
+ The nix-gc service now accepts randomizedDelaySec (default: 0) and persistent (default: true) parameters.
+ By default nix-gc will now run immediately if it would have been triggered at least
+ once during the time when the timer was inactive.
+
+
+
+
+ The rustPlatform.buildRustPackage function is split into several hooks:
+ cargoSetupHook to set up vendoring for Cargo-based projects,
+ cargoBuildHook to build a project using Cargo,
+ cargoInstallHook to install a project using Cargo, and
+ cargoCheckHook to run tests in Cargo-based projects. With this change,
+ mixed-language projects can use the relevant hooks within builders other than
+ buildRustPackage. However, these changes also required several API changes to
+ buildRustPackage itself:
+
+
+
+
+ The target argument was removed. Instead, buildRustPackage
+ will always use the same target as the C/C++ compiler that is used.
+
+
+
+
+ The cargoParallelTestThreads argument was removed. Parallel tests are
+ now disabled through dontUseCargoParallelTests.
+
+
+
+
+
+
+
+ The rustPlatform.maturinBuildHook hook was added. This hook can be used
+ with buildPythonPackage to build Python packages that are written in Rust
+ and use Maturin as their build tool.
+
+
+
+
+ Kubernetes has deprecated docker as container runtime.
+ As a consequence, the Kubernetes module now has support for configuration of custom remote container runtimes and enables containerd by default.
+ Note that containerd is more strict regarding container image OCI-compliance.
+ As an example, images with CMD or ENTRYPOINT defined as strings (not lists) will fail on containerd, while working fine on docker.
+ Please test your setup and container images with containerd prior to upgrading.
+
+
diff --git a/third_party/nixpkgs/nixos/lib/make-squashfs.nix b/third_party/nixpkgs/nixos/lib/make-squashfs.nix
index ee76c9c5bf..8690c42e7a 100644
--- a/third_party/nixpkgs/nixos/lib/make-squashfs.nix
+++ b/third_party/nixpkgs/nixos/lib/make-squashfs.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
# Generate the squashfs image.
mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \
- -keep-as-directory -all-root -b 1048576 -comp ${comp}
+ -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp}
'';
}
diff --git a/third_party/nixpkgs/nixos/lib/qemu-flags.nix b/third_party/nixpkgs/nixos/lib/qemu-flags.nix
index 0f06624589..f786745ba3 100644
--- a/third_party/nixpkgs/nixos/lib/qemu-flags.nix
+++ b/third_party/nixpkgs/nixos/lib/qemu-flags.nix
@@ -18,13 +18,15 @@ rec {
];
qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
- else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0"
+ else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0"
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
qemuBinary = qemuPkg: {
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
+ powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
+ powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
}
diff --git a/third_party/nixpkgs/nixos/modules/hardware/ksm.nix b/third_party/nixpkgs/nixos/modules/hardware/ksm.nix
index 0938dbdc11..829c3532c4 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/ksm.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/ksm.nix
@@ -26,13 +26,13 @@ in {
systemd.services.enable-ksm = {
description = "Enable Kernel Same-Page Merging";
wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
- script = ''
- if [ -e /sys/kernel/mm/ksm ]; then
+ script =
+ ''
echo 1 > /sys/kernel/mm/ksm/run
- ${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''}
- fi
- '';
+ '' + optionalString (cfg.sleep != null)
+ ''
+ echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs
+ '';
};
};
}
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 44b30d0e6c..9bb81d085c 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -257,6 +257,7 @@
./services/backup/zfs-replication.nix
./services/backup/znapzend.nix
./services/blockchain/ethereum/geth.nix
+ ./services/backup/zrepl.nix
./services/cluster/hadoop/default.nix
./services/cluster/k3s/default.nix
./services/cluster/kubernetes/addons/dns.nix
@@ -381,6 +382,7 @@
./services/hardware/sane.nix
./services/hardware/sane_extra_backends/brscan4.nix
./services/hardware/sane_extra_backends/dsseries.nix
+ ./services/hardware/spacenavd.nix
./services/hardware/tcsd.nix
./services/hardware/tlp.nix
./services/hardware/thinkfan.nix
@@ -488,6 +490,7 @@
./services/misc/logkeys.nix
./services/misc/leaps.nix
./services/misc/lidarr.nix
+ ./services/misc/lifecycled.nix
./services/misc/mame.nix
./services/misc/matrix-appservice-discord.nix
./services/misc/matrix-synapse.nix
@@ -510,6 +513,7 @@
./services/misc/paperless.nix
./services/misc/parsoid.nix
./services/misc/plex.nix
+ ./services/misc/plikd.nix
./services/misc/tautulli.nix
./services/misc/pinnwand.nix
./services/misc/pykms.nix
@@ -1049,6 +1053,7 @@
./testing/service-runner.nix
./virtualisation/anbox.nix
./virtualisation/container-config.nix
+ ./virtualisation/containerd.nix
./virtualisation/containers.nix
./virtualisation/nixos-containers.nix
./virtualisation/oci-containers.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/fish_completion-generator.patch b/third_party/nixpkgs/nixos/modules/programs/fish_completion-generator.patch
index 997f38c506..fa207e484c 100644
--- a/third_party/nixpkgs/nixos/modules/programs/fish_completion-generator.patch
+++ b/third_party/nixpkgs/nixos/modules/programs/fish_completion-generator.patch
@@ -1,13 +1,14 @@
--- a/create_manpage_completions.py
+++ b/create_manpage_completions.py
-@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
+@@ -879,10 +879,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
+ )
+ return False
- built_command_output.insert(0, "# " + CMDNAME)
+- # Output the magic word Autogenerated so we can tell if we can overwrite this
+- built_command_output.insert(
+- 0, "# " + CMDNAME + "\n# Autogenerated from man page " + manpage_path
+- )
+ # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABLE PARSER! Was really using Type2 but reporting TypeDeroffManParser
-- # Output the magic word Autogenerated so we can tell if we can overwrite this
-- built_command_output.insert(
-- 1, "# Autogenerated from man page " + manpage_path
-- )
- # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
-
- for line in built_command_output:
+ for line in built_command_output:
+
diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix
index 6e9b7729ad..ff4deba2bf 100644
--- a/third_party/nixpkgs/nixos/modules/programs/steam.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix
@@ -12,11 +12,30 @@ let
else [ package32 ] ++ extraPackages32;
};
in {
- options.programs.steam.enable = mkEnableOption "steam";
+ options.programs.steam = {
+ enable = mkEnableOption "steam";
+
+ remotePlay.openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open ports in the firewall for Steam Remote Play.
+ '';
+ };
+
+ dedicatedServer.openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open ports in the firewall for Source Dedicated Server.
+ '';
+ };
+ };
config = mkIf cfg.enable {
hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
enable = true;
+ driSupport = true;
driSupport32Bit = true;
};
@@ -26,6 +45,18 @@ in {
hardware.steam-hardware.enable = true;
environment.systemPackages = [ steam steam.run ];
+
+ networking.firewall = lib.mkMerge [
+ (mkIf cfg.remotePlay.openFirewall {
+ allowedTCPPorts = [ 27036 ];
+ allowedUDPPortRanges = [ { from = 27031; to = 27036; } ];
+ })
+
+ (mkIf cfg.dedicatedServer.openFirewall {
+ allowedTCPPorts = [ 27015 ]; # SRCDS Rcon port
+ allowedUDPPorts = [ 27015 ]; # Gameplay traffic
+ })
+ ];
};
meta.maintainers = with maintainers; [ mkg20001 ];
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix b/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix
new file mode 100644
index 0000000000..4356479b66
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix
@@ -0,0 +1,54 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+ cfg = config.services.zrepl;
+ format = pkgs.formats.yaml { };
+ configFile = format.generate "zrepl.yml" cfg.settings;
+in
+{
+ meta.maintainers = with maintainers; [ cole-h ];
+
+ options = {
+ services.zrepl = {
+ enable = mkEnableOption "zrepl";
+
+ settings = mkOption {
+ default = { };
+ description = ''
+ Configuration for zrepl. See
+ for more information.
+ '';
+ type = types.submodule {
+ freeformType = format.type;
+ };
+ };
+ };
+ };
+
+ ### Implementation ###
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.zrepl ];
+
+ # zrepl looks for its config in this location by default. This
+ # allows the use of e.g. `zrepl signal wakeup ` without having
+ # to specify the storepath of the config.
+ environment.etc."zrepl/zrepl.yml".source = configFile;
+
+ systemd.packages = [ pkgs.zrepl ];
+ systemd.services.zrepl = {
+ requires = [ "local-fs.target" ];
+ wantedBy = [ "zfs.target" ];
+ after = [ "zfs.target" ];
+
+ path = [ config.boot.zfs.package ];
+ restartTriggers = [ configFile ];
+
+ serviceConfig = {
+ Restart = "on-failure";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index f12e866930..24d86628b2 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix
@@ -3,7 +3,7 @@
with lib;
let
- version = "1.6.4";
+ version = "1.7.1";
cfg = config.services.kubernetes.addons.dns;
ports = {
dns = 10053;
@@ -55,9 +55,9 @@ in {
type = types.attrs;
default = {
imageName = "coredns/coredns";
- imageDigest = "sha256:493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b";
+ imageDigest = "sha256:4a6e0769130686518325b21b0c1d0688b54e7c79244d48e1b15634e98e40c6ef";
finalImageTag = version;
- sha256 = "0fm9zdjavpf5hni8g7fkdd3csjbhd7n7py7llxjc66sbii087028";
+ sha256 = "02r440xcdsgi137k5lmmvp0z5w5fmk8g9mysq5pnysq1wl8sj6mw";
};
};
};
@@ -156,7 +156,6 @@ in {
health :${toString ports.health}
kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
pods insecure
- upstream
fallthrough in-addr.arpa ip6.arpa
}
prometheus :${toString ports.metrics}
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix
index 95bdb4c0d1..a5b1321547 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -238,14 +238,40 @@ in
type = int;
};
+ apiAudiences = mkOption {
+ description = ''
+ Kubernetes apiserver ServiceAccount issuer.
+ '';
+ default = "api,https://kubernetes.default.svc";
+ type = str;
+ };
+
+ serviceAccountIssuer = mkOption {
+ description = ''
+ Kubernetes apiserver ServiceAccount issuer.
+ '';
+ default = "https://kubernetes.default.svc";
+ type = str;
+ };
+
+ serviceAccountSigningKeyFile = mkOption {
+ description = ''
+ Path to the file that contains the current private key of the service
+ account token issuer. The issuer will sign issued ID tokens with this
+ private key.
+ '';
+ type = path;
+ };
+
serviceAccountKeyFile = mkOption {
description = ''
- Kubernetes apiserver PEM-encoded x509 RSA private or public key file,
- used to verify ServiceAccount tokens. By default tls private key file
- is used.
+ File containing PEM-encoded x509 RSA or ECDSA private or public keys,
+ used to verify ServiceAccount tokens. The specified file can contain
+ multiple keys, and the flag can be specified multiple times with
+ different files. If unspecified, --tls-private-key-file is used.
+ Must be specified when --service-account-signing-key is provided
'';
- default = null;
- type = nullOr path;
+ type = path;
};
serviceClusterIpRange = mkOption {
@@ -357,8 +383,10 @@ in
${optionalString (cfg.runtimeConfig != "")
"--runtime-config=${cfg.runtimeConfig}"} \
--secure-port=${toString cfg.securePort} \
- ${optionalString (cfg.serviceAccountKeyFile!=null)
- "--service-account-key-file=${cfg.serviceAccountKeyFile}"} \
+ --api-audiences=${toString cfg.apiAudiences} \
+ --service-account-issuer=${toString cfg.serviceAccountIssuer} \
+ --service-account-signing-key-file=${cfg.serviceAccountSigningKeyFile} \
+ --service-account-key-file=${cfg.serviceAccountKeyFile} \
--service-cluster-ip-range=${cfg.serviceClusterIpRange} \
--storage-backend=${cfg.storageBackend} \
${optionalString (cfg.tlsCertFile != null)
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix
index 3a11a6513a..19edc338bb 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix
@@ -5,6 +5,29 @@ with lib;
let
cfg = config.services.kubernetes;
+ defaultContainerdConfigFile = pkgs.writeText "containerd.toml" ''
+ version = 2
+ root = "/var/lib/containerd/daemon"
+ state = "/var/run/containerd/daemon"
+ oom_score = 0
+
+ [grpc]
+ address = "/var/run/containerd/containerd.sock"
+
+ [plugins."io.containerd.grpc.v1.cri"]
+ sandbox_image = "pause:latest"
+
+ [plugins."io.containerd.grpc.v1.cri".cni]
+ bin_dir = "/opt/cni/bin"
+ max_conf_num = 0
+
+ [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+ runtime_type = "io.containerd.runc.v2"
+
+ [plugins."io.containerd.grpc.v1.cri".containerd.runtimes."io.containerd.runc.v2".options]
+ SystemdCgroup = true
+ '';
+
mkKubeConfig = name: conf: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON {
apiVersion = "v1";
kind = "Config";
@@ -222,14 +245,9 @@ in {
})
(mkIf cfg.kubelet.enable {
- virtualisation.docker = {
+ virtualisation.containerd = {
enable = mkDefault true;
-
- # kubernetes needs access to logs
- logDriver = mkDefault "json-file";
-
- # iptables must be disabled for kubernetes
- extraOptions = "--iptables=false --ip-masq=false";
+ configFile = mkDefault defaultContainerdConfigFile;
};
})
@@ -269,7 +287,6 @@ in {
users.users.kubernetes = {
uid = config.ids.uids.kubernetes;
description = "Kubernetes user";
- extraGroups = [ "docker" ];
group = "kubernetes";
home = cfg.dataDir;
createHome = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix
index 548ffed1dd..3f55719027 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/flannel.nix
@@ -8,16 +8,6 @@ let
# we want flannel to use kubernetes itself as configuration backend, not direct etcd
storageBackend = "kubernetes";
-
- # needed for flannel to pass options to docker
- mkDockerOpts = pkgs.runCommand "mk-docker-opts" {
- buildInputs = [ pkgs.makeWrapper ];
- } ''
- mkdir -p $out
-
- # bashInteractive needed for `compgen`
- makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "${pkgs.kubernetes}/bin/mk-docker-opts.sh"
- '';
in
{
###### interface
@@ -43,43 +33,17 @@ in
cniVersion = "0.3.1";
delegate = {
isDefaultGateway = true;
- bridge = "docker0";
+ bridge = "mynet";
};
}];
};
- systemd.services.mk-docker-opts = {
- description = "Pre-Docker Actions";
- path = with pkgs; [ gawk gnugrep ];
- script = ''
- ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker
- systemctl restart docker
- '';
- serviceConfig.Type = "oneshot";
- };
-
- systemd.paths.flannel-subnet-env = {
- wantedBy = [ "flannel.service" ];
- pathConfig = {
- PathModified = "/run/flannel/subnet.env";
- Unit = "mk-docker-opts.service";
- };
- };
-
- systemd.services.docker = {
- environment.DOCKER_OPTS = "-b none";
- serviceConfig.EnvironmentFile = "-/run/flannel/docker";
- };
-
- # read environment variables generated by mk-docker-opts
- virtualisation.docker.extraOptions = "$DOCKER_OPTS";
-
networking = {
firewall.allowedUDPPorts = [
8285 # flannel udp
8472 # flannel vxlan
];
- dhcpcd.denyInterfaces = [ "docker*" "flannel*" ];
+ dhcpcd.denyInterfaces = [ "mynet*" "flannel*" ];
};
services.kubernetes.pki.certs = {
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 479027f1b2..ef6da26a02 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -23,7 +23,7 @@ let
name = "pause";
tag = "latest";
contents = top.package.pause;
- config.Cmd = "/bin/pause";
+ config.Cmd = ["/bin/pause"];
};
kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
@@ -125,6 +125,18 @@ in
};
};
+ containerRuntime = mkOption {
+ description = "Which container runtime type to use";
+ type = enum ["docker" "remote"];
+ default = "remote";
+ };
+
+ containerRuntimeEndpoint = mkOption {
+ description = "Endpoint at which to find the container runtime api interface/socket";
+ type = str;
+ default = "unix:///var/run/containerd/containerd.sock";
+ };
+
enable = mkEnableOption "Kubernetes kubelet.";
extraOpts = mkOption {
@@ -235,16 +247,24 @@ in
###### implementation
config = mkMerge [
(mkIf cfg.enable {
+
+ environment.etc."cni/net.d".source = cniConfig;
+
services.kubernetes.kubelet.seedDockerImages = [infraContainer];
+ boot.kernel.sysctl = {
+ "net.bridge.bridge-nf-call-iptables" = 1;
+ "net.ipv4.ip_forward" = 1;
+ "net.bridge.bridge-nf-call-ip6tables" = 1;
+ };
+
systemd.services.kubelet = {
description = "Kubernetes Kubelet Service";
wantedBy = [ "kubernetes.target" ];
- after = [ "network.target" "docker.service" "kube-apiserver.service" ];
+ after = [ "containerd.service" "network.target" "kube-apiserver.service" ];
path = with pkgs; [
gitMinimal
openssh
- docker
util-linux
iproute
ethtool
@@ -254,8 +274,12 @@ in
] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package ++ top.path;
preStart = ''
${concatMapStrings (img: ''
- echo "Seeding docker image: ${img}"
- docker load <${img}
+ echo "Seeding container image: ${img}"
+ ${if (lib.hasSuffix "gz" img) then
+ ''${pkgs.gzip}/bin/zcat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
+ else
+ ''${pkgs.coreutils}/bin/cat "${img}" | ${pkgs.containerd}/bin/ctr -n k8s.io image import -''
+ }
'') cfg.seedDockerImages}
rm /opt/cni/bin/* || true
@@ -306,6 +330,9 @@ in
${optionalString (cfg.tlsKeyFile != null)
"--tls-private-key-file=${cfg.tlsKeyFile}"} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
+ --container-runtime=${cfg.containerRuntime} \
+ --container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \
+ --cgroup-driver=systemd \
${cfg.extraOpts}
'';
WorkingDirectory = top.dataDir;
@@ -315,7 +342,7 @@ in
# Allways include cni plugins
services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins];
- boot.kernelModules = ["br_netfilter"];
+ boot.kernelModules = ["br_netfilter" "overlay"];
services.kubernetes.kubelet.hostname = with config.networking;
mkDefault (hostName + optionalString (domain != null) ".${domain}");
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix
index 933ae481e9..8de6a3ba0d 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -361,6 +361,7 @@ in
tlsCertFile = mkDefault cert;
tlsKeyFile = mkDefault key;
serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.cert;
+ serviceAccountSigningKeyFile = mkDefault cfg.certs.serviceAccount.key;
kubeletClientCaFile = mkDefault caCert;
kubeletClientCertFile = mkDefault cfg.certs.apiserverKubeletClient.cert;
kubeletClientKeyFile = mkDefault cfg.certs.apiserverKubeletClient.key;
diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix
index 887a0cbf9a..2206ac522e 100644
--- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -89,6 +89,11 @@ in
example = "dbi:Pg:dbname=hydra;host=postgres.example.org;user=foo;";
description = ''
The DBI string for Hydra database connection.
+
+ NOTE: Attempts to set `application_name` will be overridden by
+ `hydra-TYPE` (where TYPE is e.g. `evaluator`, `queue-runner`,
+ etc.) in all hydra services to more easily distinguish where
+ queries are coming from.
'';
};
@@ -284,7 +289,9 @@ in
{ wantedBy = [ "multi-user.target" ];
requires = optional haveLocalDB "postgresql.service";
after = optional haveLocalDB "postgresql.service";
- environment = env;
+ environment = env // {
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init";
+ };
preStart = ''
mkdir -p ${baseDir}
chown hydra.hydra ${baseDir}
@@ -339,7 +346,9 @@ in
{ wantedBy = [ "multi-user.target" ];
requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" ];
- environment = serverEnv;
+ environment = serverEnv // {
+ HYDRA_DBI = "${serverEnv.HYDRA_DBI};application_name=hydra-server";
+ };
restartTriggers = [ hydraConf ];
serviceConfig =
{ ExecStart =
@@ -361,6 +370,7 @@ in
environment = env // {
PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr
IN_SYSTEMD = "1"; # to get log severity levels
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-queue-runner";
};
serviceConfig =
{ ExecStart = "@${hydra-package}/bin/hydra-queue-runner hydra-queue-runner -v";
@@ -380,7 +390,9 @@ in
after = [ "hydra-init.service" "network.target" ];
path = with pkgs; [ hydra-package nettools jq ];
restartTriggers = [ hydraConf ];
- environment = env;
+ environment = env // {
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-evaluator";
+ };
serviceConfig =
{ ExecStart = "@${hydra-package}/bin/hydra-evaluator hydra-evaluator";
User = "hydra";
@@ -392,7 +404,9 @@ in
systemd.services.hydra-update-gc-roots =
{ requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" ];
- environment = env;
+ environment = env // {
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-update-gc-roots";
+ };
serviceConfig =
{ ExecStart = "@${hydra-package}/bin/hydra-update-gc-roots hydra-update-gc-roots";
User = "hydra";
@@ -403,7 +417,9 @@ in
systemd.services.hydra-send-stats =
{ wantedBy = [ "multi-user.target" ];
after = [ "hydra-init.service" ];
- environment = env;
+ environment = env // {
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-send-stats";
+ };
serviceConfig =
{ ExecStart = "@${hydra-package}/bin/hydra-send-stats hydra-send-stats";
User = "hydra";
@@ -417,6 +433,7 @@ in
restartTriggers = [ hydraConf ];
environment = env // {
PGPASSFILE = "${baseDir}/pgpass-queue-runner";
+ HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-notify";
};
serviceConfig =
{ ExecStart = "@${hydra-package}/bin/hydra-notify hydra-notify";
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
new file mode 100644
index 0000000000..53fc9cc963
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json
@@ -0,0 +1,34 @@
+{
+ "properties": {},
+ "rules": [
+ {
+ "matches": [
+ {
+ "device.name": "~alsa_card.*"
+ }
+ ],
+ "actions": {
+ "update-props": {
+ "api.alsa.use-acp": true,
+ "api.acp.auto-profile": false,
+ "api.acp.auto-port": false
+ }
+ }
+ },
+ {
+ "matches": [
+ {
+ "node.name": "~alsa_input.*"
+ },
+ {
+ "node.name": "~alsa_output.*"
+ }
+ ],
+ "actions": {
+ "update-props": {
+ "node.pause-on-idle": false
+ }
+ }
+ }
+ ]
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
new file mode 100644
index 0000000000..4d50cb9f1a
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
@@ -0,0 +1,30 @@
+{
+ "properties": {},
+ "rules": [
+ {
+ "matches": [
+ {
+ "device.name": "~bluez_card.*"
+ }
+ ],
+ "actions": {
+ "update-props": {}
+ }
+ },
+ {
+ "matches": [
+ {
+ "node.name": "~bluez_input.*"
+ },
+ {
+ "node.name": "~bluez_output.*"
+ }
+ ],
+ "actions": {
+ "update-props": {
+ "node.pause-on-idle": false
+ }
+ }
+ }
+ ]
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json
new file mode 100644
index 0000000000..d294927b4f
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json
@@ -0,0 +1,26 @@
+{
+ "context.properties": {
+ "log.level": 0
+ },
+ "context.spa-libs": {
+ "audio.convert.*": "audioconvert/libspa-audioconvert",
+ "support.*": "support/libspa-support"
+ },
+ "context.modules": {
+ "libpipewire-module-rtkit": {
+ "args": {},
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-client-device": null,
+ "libpipewire-module-adapter": null,
+ "libpipewire-module-metadata": null,
+ "libpipewire-module-session-manager": null
+ },
+ "filter.properties": {},
+ "stream.properties": {}
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json
new file mode 100644
index 0000000000..224938abbb
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json
@@ -0,0 +1,19 @@
+{
+ "context.properties": {
+ "log.level": 0
+ },
+ "context.spa-libs": {
+ "audio.convert.*": "audioconvert/libspa-audioconvert",
+ "support.*": "support/libspa-support"
+ },
+ "context.modules": {
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-client-device": null,
+ "libpipewire-module-adapter": null,
+ "libpipewire-module-metadata": null,
+ "libpipewire-module-session-manager": null
+ },
+ "filter.properties": {},
+ "stream.properties": {}
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json
new file mode 100644
index 0000000000..2de04036b3
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json
@@ -0,0 +1,21 @@
+{
+ "context.properties": {
+ "log.level": 0
+ },
+ "context.spa-libs": {
+ "support.*": "support/libspa-support"
+ },
+ "context.modules": {
+ "libpipewire-module-rtkit": {
+ "args": {},
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-metadata": null
+ },
+ "jack.properties": {}
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json
new file mode 100644
index 0000000000..4b2505ff81
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json
@@ -0,0 +1,53 @@
+{
+ "context.properties": {},
+ "context.spa-libs": {
+ "api.bluez5.*": "bluez5/libspa-bluez5",
+ "api.alsa.*": "alsa/libspa-alsa",
+ "api.v4l2.*": "v4l2/libspa-v4l2",
+ "api.libcamera.*": "libcamera/libspa-libcamera"
+ },
+ "context.modules": {
+ "libpipewire-module-rtkit": {
+ "args": {},
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-client-device": null,
+ "libpipewire-module-adapter": null,
+ "libpipewire-module-metadata": null,
+ "libpipewire-module-session-manager": null
+ },
+ "session.modules": {
+ "default": [
+ "flatpak",
+ "portal",
+ "v4l2",
+ "suspend-node",
+ "policy-node"
+ ],
+ "with-audio": [
+ "metadata",
+ "default-nodes",
+ "default-profile",
+ "default-routes",
+ "alsa-seq",
+ "alsa-monitor"
+ ],
+ "with-alsa": [
+ "with-audio"
+ ],
+ "with-jack": [
+ "with-audio"
+ ],
+ "with-pulseaudio": [
+ "with-audio",
+ "bluez5",
+ "restore-stream",
+ "streams-follow-default"
+ ]
+ }
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index 81f4762e1e..b41ea349fb 100644
--- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -9,18 +9,36 @@ let
&& pkgs.stdenv.isx86_64
&& pkgs.pkgsi686Linux.pipewire != null;
+ prioritizeNativeProtocol = {
+ "context.modules" = {
+ "libpipewire-module-protocol-native" = {
+ _priority = -100;
+ _content = null;
+ };
+ };
+ };
+
+ # Use upstream config files passed through spa-json-dump as the base
+ # Patched here as necessary for them to work with this module
+ defaults = {
+ alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
+ bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
+ media-session = recursiveUpdate (builtins.fromJSON (builtins.readFile ./media-session.conf.json)) prioritizeNativeProtocol;
+ v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
+ };
# Helpers for generating the pipewire JSON config file
mkSPAValueString = v:
if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
else if lib.types.attrs.check v then
"{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
+ else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
else lib.generators.mkValueStringDefault { } v;
mkSPAKeyValue = attrs: map (def: def.content) (
lib.sortProperties
(
lib.mapAttrsToList
- (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}")
+ (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ":" ] k} = ${mkSPAValueString (v._content or v)}")
attrs
)
);
@@ -51,272 +69,41 @@ in {
'';
};
- config = mkOption {
- type = types.attrs;
- description = ''
- Configuration for the media session core.
- '';
- default = {
- # media-session config file
- properties = {
- # Properties to configure the session and some
- # modules
- #mem.mlock-all = false;
- #context.profile.modules = "default,rtkit";
- };
-
- spa-libs = {
- # Mapping from factory name to library.
- "api.bluez5.*" = "bluez5/libspa-bluez5";
- "api.alsa.*" = "alsa/libspa-alsa";
- "api.v4l2.*" = "v4l2/libspa-v4l2";
- "api.libcamera.*" = "libcamera/libspa-libcamera";
- };
-
- modules = {
- # These are the modules that are enabled when a file with
- # the key name is found in the media-session.d config directory.
- # the default bundle is always enabled.
-
- default = [
- "flatpak" # manages flatpak access
- "portal" # manage portal permissions
- "v4l2" # video for linux udev detection
- #"libcamera" # libcamera udev detection
- "suspend-node" # suspend inactive nodes
- "policy-node" # configure and link nodes
- #"metadata" # export metadata API
- #"default-nodes" # restore default nodes
- #"default-profile" # restore default profiles
- #"default-routes" # restore default route
- #"streams-follow-default" # move streams when default changes
- #"alsa-seq" # alsa seq midi support
- #"alsa-monitor" # alsa udev detection
- #"bluez5" # bluetooth support
- #"restore-stream" # restore stream settings
- ];
- "with-audio" = [
- "metadata"
- "default-nodes"
- "default-profile"
- "default-routes"
- "alsa-seq"
- "alsa-monitor"
- ];
- "with-alsa" = [
- "with-audio"
- ];
- "with-jack" = [
- "with-audio"
- ];
- "with-pulseaudio" = [
- "with-audio"
- "bluez5"
- "restore-stream"
- "streams-follow-default"
- ];
- };
+ config = {
+ media-session = mkOption {
+ type = types.attrs;
+ description = ''
+ Configuration for the media session core. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
+ '';
+ default = {};
};
- };
- alsaMonitorConfig = mkOption {
- type = types.attrs;
- description = ''
- Configuration for the alsa monitor.
- '';
- default = {
- # alsa-monitor config file
- properties = {
- #alsa.jack-device = true
- };
-
- rules = [
- # an array of matches/actions to evaluate
- {
- # rules for matching a device or node. It is an array of
- # properties that all need to match the regexp. If any of the
- # matches work, the actions are executed for the object.
- matches = [
- {
- # this matches all cards
- device.name = "~alsa_card.*";
- }
- ];
- actions = {
- # actions can update properties on the matched object.
- update-props = {
- api.alsa.use-acp = true;
- #api.alsa.use-ucm = true;
- #api.alsa.soft-mixer = false;
- #api.alsa.ignore-dB = false;
- #device.profile-set = "profileset-name";
- #device.profile = "default profile name";
- api.acp.auto-profile = false;
- api.acp.auto-port = false;
- #device.nick = "My Device";
- };
- };
- }
- {
- matches = [
- {
- # matches all sinks
- node.name = "~alsa_input.*";
- }
- {
- # matches all sources
- node.name = "~alsa_output.*";
- }
- ];
- actions = {
- update-props = {
- #node.nick = "My Node";
- #node.nick = null;
- #priority.driver = 100;
- #priority.session = 100;
- #node.pause-on-idle = false;
- #resample.quality = 4;
- #channelmix.normalize = false;
- #channelmix.mix-lfe = false;
- #audio.channels = 2;
- #audio.format = "S16LE";
- #audio.rate = 44100;
- #audio.position = "FL,FR";
- #api.alsa.period-size = 1024;
- #api.alsa.headroom = 0;
- #api.alsa.disable-mmap = false;
- #api.alsa.disable-batch = false;
- };
- };
- }
- ];
+ alsa-monitor = mkOption {
+ type = types.attrs;
+ description = ''
+ Configuration for the alsa monitor. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
+ '';
+ default = {};
};
- };
- bluezMonitorConfig = mkOption {
- type = types.attrs;
- description = ''
- Configuration for the bluez5 monitor.
- '';
- default = {
- # bluez-monitor config file
- properties = {
- # msbc is not expected to work on all headset + adapter combinations.
- #bluez5.msbc-support = true;
- #bluez5.sbc-xq-support = true;
-
- # Enabled headset roles (default: [ hsp_hs hfp_ag ]), this
- # property only applies to native backend. Currently some headsets
- # (Sony WH-1000XM3) are not working with both hsp_ag and hfp_ag
- # enabled, disable either hsp_ag or hfp_ag to work around it.
- #
- # Supported headset roles: hsp_hs (HSP Headset),
- # hsp_ag (HSP Audio Gateway),
- # hfp_ag (HFP Audio Gateway)
- #bluez5.headset-roles = [ "hsp_hs" "hsp_ag" "hfp_ag" ];
-
- # Enabled A2DP codecs (default: all)
- #bluez5.codecs = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ];
- };
-
- rules = [
- # an array of matches/actions to evaluate
- {
- # rules for matching a device or node. It is an array of
- # properties that all need to match the regexp. If any of the
- # matches work, the actions are executed for the object.
- matches = [
- {
- # this matches all cards
- device.name = "~bluez_card.*";
- }
- ];
- actions = {
- # actions can update properties on the matched object.
- update-props = {
- #device.nick = "My Device";
- };
- };
- }
- {
- matches = [
- {
- # matches all sinks
- node.name = "~bluez_input.*";
- }
- {
- # matches all sources
- node.name = "~bluez_output.*";
- }
- ];
- actions = {
- update-props = {
- #node.nick = "My Node"
- #node.nick = null;
- #priority.driver = 100;
- #priority.session = 100;
- #node.pause-on-idle = false;
- #resample.quality = 4;
- #channelmix.normalize = false;
- #channelmix.mix-lfe = false;
- };
- };
- }
- ];
+ bluez-monitor = mkOption {
+ type = types.attrs;
+ description = ''
+ Configuration for the bluez5 monitor. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
+ '';
+ default = {};
};
- };
- v4l2MonitorConfig = mkOption {
- type = types.attrs;
- description = ''
- Configuration for the V4L2 monitor.
- '';
- default = {
- # v4l2-monitor config file
- properties = {
- };
-
- rules = [
- # an array of matches/actions to evaluate
- {
- # rules for matching a device or node. It is an array of
- # properties that all need to match the regexp. If any of the
- # matches work, the actions are executed for the object.
- matches = [
- {
- # this matches all devices
- device.name = "~v4l2_device.*";
- }
- ];
- actions = {
- # actions can update properties on the matched object.
- update-props = {
- #device.nick = "My Device";
- };
- };
- }
- {
- matches = [
- {
- # matches all sinks
- node.name = "~v4l2_input.*";
- }
- {
- # matches all sources
- node.name = "~v4l2_output.*";
- }
- ];
- actions = {
- update-props = {
- #node.nick = "My Node";
- #node.nick = null;
- #priority.driver = 100;
- #priority.session = 100;
- #node.pause-on-idle = true;
- };
- };
- }
- ];
+ v4l2-monitor = mkOption {
+ type = types.attrs;
+ description = ''
+ Configuration for the V4L2 monitor. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
+ '';
+ default = {};
};
};
};
@@ -325,16 +112,17 @@ in {
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
- services.pipewire.sessionManagerExecutable = "${cfg.package}/bin/pipewire-media-session";
+ systemd.packages = [ cfg.package ];
+ systemd.user.services.pipewire-media-session.wantedBy = [ "pipewire.service" ];
- environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON cfg.config; };
- environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON cfg.v4l2MonitorConfig; };
+ environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON (recursiveUpdate defaults.media-session cfg.config.media-session); };
+ environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON (recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor); };
environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; };
- environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON cfg.alsaMonitorConfig; };
+ environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON (recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor); };
environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf config.services.pipewire.pulse.enable { text = ""; };
- environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON cfg.bluezMonitorConfig; };
+ environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON (recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor); };
environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; };
};
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
new file mode 100644
index 0000000000..da08bcea2c
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json
@@ -0,0 +1,28 @@
+{
+ "context.properties": {},
+ "context.spa-libs": {
+ "audio.convert.*": "audioconvert/libspa-audioconvert",
+ "support.*": "support/libspa-support"
+ },
+ "context.modules": {
+ "libpipewire-module-rtkit": {
+ "args": {},
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-adapter": null,
+ "libpipewire-module-metadata": null,
+ "libpipewire-module-protocol-pulse": {
+ "args": {
+ "server.address": [
+ "unix:native"
+ ]
+ }
+ }
+ },
+ "stream.properties": {}
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json
new file mode 100644
index 0000000000..59e2afca09
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json
@@ -0,0 +1,55 @@
+{
+ "context.properties": {
+ "link.max-buffers": 16,
+ "core.daemon": true,
+ "core.name": "pipewire-0"
+ },
+ "context.spa-libs": {
+ "audio.convert.*": "audioconvert/libspa-audioconvert",
+ "api.alsa.*": "alsa/libspa-alsa",
+ "api.v4l2.*": "v4l2/libspa-v4l2",
+ "api.libcamera.*": "libcamera/libspa-libcamera",
+ "api.bluez5.*": "bluez5/libspa-bluez5",
+ "api.vulkan.*": "vulkan/libspa-vulkan",
+ "api.jack.*": "jack/libspa-jack",
+ "support.*": "support/libspa-support"
+ },
+ "context.modules": {
+ "libpipewire-module-rtkit": {
+ "args": {},
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-protocol-native": null,
+ "libpipewire-module-profiler": null,
+ "libpipewire-module-metadata": null,
+ "libpipewire-module-spa-device-factory": null,
+ "libpipewire-module-spa-node-factory": null,
+ "libpipewire-module-client-node": null,
+ "libpipewire-module-client-device": null,
+ "libpipewire-module-portal": {
+ "flags": [
+ "ifexists",
+ "nofail"
+ ]
+ },
+ "libpipewire-module-access": {
+ "args": {}
+ },
+ "libpipewire-module-adapter": null,
+ "libpipewire-module-link-factory": null,
+ "libpipewire-module-session-manager": null
+ },
+ "context.objects": {
+ "spa-node-factory": {
+ "args": {
+ "factory.name": "support.node.driver",
+ "node.name": "Dummy-Driver",
+ "priority.driver": 8000
+ }
+ }
+ },
+ "context.exec": {}
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix
index 044120de7c..2577e77c4a 100644
--- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -18,11 +18,53 @@ let
ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire"
'';
+ prioritizeNativeProtocol = {
+ "context.modules" = {
+ # Most other modules depend on this, so put it first
+ "libpipewire-module-protocol-native" = {
+ _priority = -100;
+ _content = null;
+ };
+ };
+ };
+
+ fixDaemonModulePriorities = {
+ "context.modules" = {
+ # Most other modules depend on thism so put it first
+ "libpipewire-module-protocol-native" = {
+ _priority = -100;
+ _content = null;
+ };
+ # Needs to be before libpipewire-module-access
+ "libpipewire-module-portal" = {
+ _priority = -50;
+ _content = {
+ flags = [
+ "ifexists"
+ "nofail"
+ ];
+ };
+ };
+ };
+ };
+
+ # Use upstream config files passed through spa-json-dump as the base
+ # Patched here as necessary for them to work with this module
+ defaults = {
+ client = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client.conf.json)) prioritizeNativeProtocol;
+ client-rt = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client-rt.conf.json)) prioritizeNativeProtocol;
+ jack = recursiveUpdate (builtins.fromJSON (builtins.readFile ./jack.conf.json)) prioritizeNativeProtocol;
+ # Remove session manager invocation from the upstream generated file, it points to the wrong path
+ pipewire = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) fixDaemonModulePriorities;
+ pipewire-pulse = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json)) prioritizeNativeProtocol;
+ };
+
# Helpers for generating the pipewire JSON config file
mkSPAValueString = v:
if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
else if lib.types.attrs.check v then
"{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
+ else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
else lib.generators.mkValueStringDefault { } v;
mkSPAKeyValue = attrs: map (def: def.content) (
@@ -64,129 +106,51 @@ in {
'';
};
- config = mkOption {
- type = types.attrs;
- description = ''
- Configuration for the pipewire daemon.
- '';
- default = {
- properties = {
- ## set-prop is used to configure properties in the system
- #
- # "library.name.system" = "support/libspa-support";
- # "context.data-loop.library.name.system" = "support/libspa-support";
- "link.max-buffers" = 16; # version < 3 clients can't handle more than 16
- #"mem.allow-mlock" = false;
- #"mem.mlock-all" = true;
- ## https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/pipewire.h#L93
- #"log.level" = 2; # 5 is trace, which is verbose as hell, default is 2 which is warnings, 4 is debug output, 3 is info
-
- ## Properties for the DSP configuration
- #
- #"default.clock.rate" = 48000;
- #"default.clock.quantum" = 1024;
- #"default.clock.min-quantum" = 32;
- #"default.clock.max-quantum" = 8192;
- #"default.video.width" = 640;
- #"default.video.height" = 480;
- #"default.video.rate.num" = 25;
- #"default.video.rate.denom" = 1;
- };
-
- spa-libs = {
- ## add-spa-lib
- #
- # used to find spa factory names. It maps an spa factory name
- # regular expression to a library name that should contain
- # that factory.
- #
- "audio.convert*" = "audioconvert/libspa-audioconvert";
- "api.alsa.*" = "alsa/libspa-alsa";
- "api.v4l2.*" = "v4l2/libspa-v4l2";
- "api.libcamera.*" = "libcamera/libspa-libcamera";
- "api.bluez5.*" = "bluez5/libspa-bluez5";
- "api.vulkan.*" = "vulkan/libspa-vulkan";
- "api.jack.*" = "jack/libspa-jack";
- "support.*" = "support/libspa-support";
- # "videotestsrc" = "videotestsrc/libspa-videotestsrc";
- # "audiotestsrc" = "audiotestsrc/libspa-audiotestsrc";
- };
-
- modules = {
- ## = { [args = "= ..."]
- # [flags = ifexists] }
- # [flags = [ifexists]|[nofail]}
- #
- # Loads a module with the given parameters.
- # If ifexists is given, the module is ignoed when it is not found.
- # If nofail is given, module initialization failures are ignored.
- #
- libpipewire-module-rtkit = {
- args = {
- #rt.prio = 20;
- #rt.time.soft = 200000;
- #rt.time.hard = 200000;
- #nice.level = -11;
- };
- flags = "ifexists|nofail";
- };
- libpipewire-module-protocol-native = { _priority = -100; _content = "null"; };
- libpipewire-module-profiler = "null";
- libpipewire-module-metadata = "null";
- libpipewire-module-spa-device-factory = "null";
- libpipewire-module-spa-node-factory = "null";
- libpipewire-module-client-node = "null";
- libpipewire-module-client-device = "null";
- libpipewire-module-portal = "null";
- libpipewire-module-access = {
- args.access = {
- allowed = ["${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}"];
- rejected = [];
- restricted = [];
- force = "flatpak";
- };
- };
- libpipewire-module-adapter = "null";
- libpipewire-module-link-factory = "null";
- libpipewire-module-session-manager = "null";
- };
-
- objects = {
- ## create-object [-nofail] [= ...]
- #
- # Creates an object from a PipeWire factory with the given parameters.
- # If -nofail is given, errors are ignored (and no object is created)
- #
- };
-
-
- exec = {
- ## exec
- #
- # Execute the given program. This is usually used to start the
- # session manager. run the session manager with -h for options
- #
- "${builtins.unsafeDiscardStringContext cfg.sessionManagerExecutable}" = { args = "\"${lib.concatStringsSep " " cfg.sessionManagerArguments}\""; };
- };
+ config = {
+ client = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ Configuration for pipewire clients. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client.conf.in
+ '';
};
- };
- sessionManagerExecutable = mkOption {
- type = types.str;
- default = "";
- example = literalExample ''${pkgs.pipewire.mediaSession}/bin/pipewire-media-session'';
- description = ''
- Path to the session manager executable.
- '';
- };
+ client-rt = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ Configuration for realtime pipewire clients. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client-rt.conf.in
+ '';
+ };
- sessionManagerArguments = mkOption {
- type = types.listOf types.str;
- default = [];
- example = literalExample ''["-p" "bluez5.msbc-support=true"]'';
- description = ''
- Arguments passed to the pipewire session manager.
- '';
+ jack = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ Configuration for the pipewire daemon's jack module. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/jack.conf.in
+ '';
+ };
+
+ pipewire = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ Configuration for the pipewire daemon. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire.conf.in
+ '';
+ };
+
+ pipewire-pulse = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ Configuration for the pipewire-pulse daemon. For details see
+ https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire-pulse.conf.in
+ '';
+ };
};
alsa = {
@@ -253,13 +217,16 @@ in {
source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
};
+ environment.etc."pipewire/client.conf" = { text = toSPAJSON (recursiveUpdate defaults.client cfg.config.client); };
+ environment.etc."pipewire/client-rt.conf" = { text = toSPAJSON (recursiveUpdate defaults.client-rt cfg.config.client-rt); };
+ environment.etc."pipewire/jack.conf" = { text = toSPAJSON (recursiveUpdate defaults.jack cfg.config.jack); };
+ environment.etc."pipewire/pipewire.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire cfg.config.pipewire); };
+ environment.etc."pipewire/pipewire-pulse.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse); };
+
environment.sessionVariables.LD_LIBRARY_PATH =
lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire";
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554
- systemd.user.services.pipewire.environment = {
- "PIPEWIRE_LINK_PASSIVE" = "1";
- "PIPEWIRE_CONFIG_FILE" = pkgs.writeText "pipewire.conf" (toSPAJSON cfg.config);
- };
+ systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1";
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
new file mode 100644
index 0000000000..b08cba1b60
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json
@@ -0,0 +1,30 @@
+{
+ "properties": {},
+ "rules": [
+ {
+ "matches": [
+ {
+ "device.name": "~v4l2_device.*"
+ }
+ ],
+ "actions": {
+ "update-props": {}
+ }
+ },
+ {
+ "matches": [
+ {
+ "node.name": "~v4l2_input.*"
+ },
+ {
+ "node.name": "~v4l2_output.*"
+ }
+ ],
+ "actions": {
+ "update-props": {
+ "node.pause-on-idle": false
+ }
+ }
+ }
+ ]
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
index f52079fc1e..2111c970d4 100644
--- a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
+++ b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.minetest-server;
- flag = val: name: if val != null then "--${name} ${val} " else "";
+ flag = val: name: if val != null then "--${name} ${toString val} " else "";
flags = [
(flag cfg.gameId "gameid")
(flag cfg.world "world")
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix
index 4c97485d97..3e619fe32e 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix
@@ -3,21 +3,22 @@
with lib;
let
+ cfg = config.services.acpid;
canonicalHandlers = {
powerEvent = {
event = "button/power.*";
- action = config.services.acpid.powerEventCommands;
+ action = cfg.powerEventCommands;
};
lidEvent = {
event = "button/lid.*";
- action = config.services.acpid.lidEventCommands;
+ action = cfg.lidEventCommands;
};
acEvent = {
event = "ac_adapter.*";
- action = config.services.acpid.acEventCommands;
+ action = cfg.acEventCommands;
};
};
@@ -33,7 +34,7 @@ let
echo "event=${handler.event}" > $fn
echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn
'';
- in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers))
+ in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // cfg.handlers))
}
'';
@@ -47,11 +48,7 @@ in
services.acpid = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable the ACPI daemon.";
- };
+ enable = mkEnableOption "the ACPI daemon";
logEvents = mkOption {
type = types.bool;
@@ -129,26 +126,28 @@ in
###### implementation
- config = mkIf config.services.acpid.enable {
+ config = mkIf cfg.enable {
systemd.services.acpid = {
description = "ACPI Daemon";
+ documentation = [ "man:acpid(8)" ];
wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
-
- path = [ pkgs.acpid ];
serviceConfig = {
- Type = "forking";
+ ExecStart = escapeShellArgs
+ ([ "${pkgs.acpid}/bin/acpid"
+ "--foreground"
+ "--netlink"
+ "--confdir" "${acpiConfDir}"
+ ] ++ optional cfg.logEvents "--logevents"
+ );
};
-
unitConfig = {
ConditionVirtualization = "!systemd-nspawn";
ConditionPathExists = [ "/proc/acpi" ];
};
- script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix
new file mode 100644
index 0000000000..7afae76cc4
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/spacenavd.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.hardware.spacenavd;
+
+in {
+
+ options = {
+ hardware.spacenavd = {
+ enable = mkEnableOption "spacenavd to support 3DConnexion devices";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.user.services.spacenavd = {
+ description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion";
+ after = [ "syslog.target" ];
+ wantedBy = [ "graphical.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog";
+ StandardError = "syslog";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix
index 8c609bbf82..a65d4250c2 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix
@@ -48,7 +48,7 @@ in {
systemd.services.trezord = {
description = "Trezor Bridge";
- after = [ "systemd-udev-settle.service" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [];
serviceConfig = {
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb b/third_party/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb
deleted file mode 100644
index 0b58c59c7a..0000000000
--- a/third_party/nixpkgs/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-worker_processes 3
-
-listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
-listen "/run/gitlab/gitlab.socket", :backlog => 1024
-
-working_directory ENV["GITLAB_PATH"]
-
-pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
-
-timeout 60
-
-# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
-# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
-preload_app true
-GC.respond_to?(:copy_on_write_friendly=) and
- GC.copy_on_write_friendly = true
-
-check_client_connection false
-
-before_fork do |server, worker|
- # the following is highly recommended for Rails + "preload_app true"
- # as there's no need for the master process to hold a connection
- defined?(ActiveRecord::Base) and
- ActiveRecord::Base.connection.disconnect!
-
- # The following is only recommended for memory/DB-constrained
- # installations. It is not needed if your system can house
- # twice as many worker_processes as you have configured.
- #
- # This allows a new master process to incrementally
- # phase out the old master process with SIGTTOU to avoid a
- # thundering herd (especially in the "preload_app false" case)
- # when doing a transparent upgrade. The last worker spawned
- # will then kill off the old master process with a SIGQUIT.
- old_pid = "#{server.config[:pid]}.oldbin"
- if old_pid != server.pid
- begin
- sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
- Process.kill(sig, File.read(old_pid).to_i)
- rescue Errno::ENOENT, Errno::ESRCH
- end
- end
-
- # Throttle the master from forking too quickly by sleeping. Due
- # to the implementation of standard Unix signal handlers, this
- # helps (but does not completely) prevent identical, repeated signals
- # from being lost when the receiving process is busy.
- # sleep 1
-end
-
-after_fork do |server, worker|
- # per-process listener ports for debugging/admin/migrations
- # addr = "127.0.0.1:#{9293 + worker.nr}"
- # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-
- # the following is *required* for Rails + "preload_app true",
- defined?(ActiveRecord::Base) and
- ActiveRecord::Base.establish_connection
-
- # reset prometheus client, this will cause any opened metrics files to be closed
- defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
- Prometheus::Client.reinitialize_on_pid_change
-
- # if preload_app is true, then you may also want to check and
- # restart any other shared sockets/descriptors such as Memcached,
- # and Redis. TokyoCabinet file handles are safe to reuse
- # between any number of forked children (assuming your kernel
- # correctly implements pread()/pwrite() system calls)
-end
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
index 61faeab7d3..1d45af3634 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
@@ -142,7 +142,7 @@ let
gitlabEnv = {
HOME = "${cfg.statePath}/home";
- UNICORN_PATH = "${cfg.statePath}/";
+ PUMA_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
SCHEMA = "${cfg.statePath}/db/structure.sql";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
@@ -424,7 +424,7 @@ in {
port = mkOption {
type = types.int;
- default = 465;
+ default = 25;
description = "Port of the SMTP server for Gitlab.";
};
@@ -641,6 +641,11 @@ in {
environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];
+ systemd.targets.gitlab = {
+ description = "Common target for all GitLab services.";
+ wantedBy = [ "multi-user.target" ];
+ };
+
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
@@ -655,36 +660,45 @@ in {
# here.
systemd.services.gitlab-postgresql = let pgsql = config.services.postgresql; in mkIf databaseActuallyCreateLocally {
after = [ "postgresql.service" ];
- wantedBy = [ "multi-user.target" ];
- path = [ pgsql.package ];
+ bindsTo = [ "postgresql.service" ];
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
+ path = [
+ pgsql.package
+ pkgs.util-linux
+ ];
script = ''
set -eu
- PSQL="${pkgs.util-linux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}"
+ PSQL() {
+ psql --port=${toString pgsql.port} "$@"
+ }
- $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
- current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
+ PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
+ current_owner=$(PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'")
if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then
- $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"'
+ PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"'
if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then
echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..."
exit 1
fi
touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
- $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\""
+ PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\""
rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}"
fi
- $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
- $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;"
+ PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;"
'';
serviceConfig = {
+ User = pgsql.superUser;
Type = "oneshot";
+ RemainAfterExit = true;
};
};
# Use postfix to send out mails.
- services.postfix.enable = mkDefault true;
+ services.postfix.enable = mkDefault (cfg.smtp.enable && cfg.smtp.address == "localhost");
users.users.${cfg.user} =
{ group = cfg.group;
@@ -703,7 +717,6 @@ in {
"d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -"
- "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -"
"d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -"
@@ -726,13 +739,156 @@ in {
"L+ /run/gitlab/uploads - - - - ${cfg.statePath}/uploads"
"L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}"
-
- "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}"
];
+
+ systemd.services.gitlab-config = {
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
+ path = with pkgs; [
+ jq
+ openssl
+ replace
+ git
+ ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = cfg.user;
+ Group = cfg.group;
+ TimeoutSec = "infinity";
+ Restart = "on-failure";
+ WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
+ RemainAfterExit = true;
+
+ ExecStartPre = let
+ preStartFullPrivileges = ''
+ shopt -s dotglob nullglob
+ set -eu
+
+ chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/*
+ if [[ -n "$(ls -A '${cfg.statePath}'/config/)" ]]; then
+ chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/*
+ fi
+ '';
+ in "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}";
+
+ ExecStart = pkgs.writeShellScript "gitlab-config" ''
+ set -eu
+
+ umask u=rwx,g=rx,o=
+
+ cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+ rm -rf ${cfg.statePath}/db/*
+ rm -f ${cfg.statePath}/lib
+ find '${cfg.statePath}/config/' -maxdepth 1 -mindepth 1 -type d -execdir rm -rf {} \;
+ cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+ cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
+ ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
+
+ ${cfg.packages.gitlab-shell}/bin/install
+
+ ${optionalString cfg.smtp.enable ''
+ install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+ ${optionalString (cfg.smtp.passwordFile != null) ''
+ smtp_password=$(<'${cfg.smtp.passwordFile}')
+ replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb'
+ ''}
+ ''}
+
+ (
+ umask u=rwx,g=,o=
+
+ openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
+
+ rm -f '${cfg.statePath}/config/database.yml'
+
+ ${if cfg.databasePasswordFile != null then ''
+ export db_password="$(<'${cfg.databasePasswordFile}')"
+
+ if [[ -z "$db_password" ]]; then
+ >&2 echo "Database password was an empty string!"
+ exit 1
+ fi
+
+ jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+ '.production.password = $ENV.db_password' \
+ >'${cfg.statePath}/config/database.yml'
+ ''
+ else ''
+ jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
+ >'${cfg.statePath}/config/database.yml'
+ ''
+ }
+
+ ${utils.genJqSecretsReplacementSnippet
+ gitlabConfig
+ "${cfg.statePath}/config/gitlab.yml"
+ }
+
+ rm -f '${cfg.statePath}/config/secrets.yml'
+
+ export secret="$(<'${cfg.secrets.secretFile}')"
+ export db="$(<'${cfg.secrets.dbFile}')"
+ export otp="$(<'${cfg.secrets.otpFile}')"
+ export jws="$(<'${cfg.secrets.jwsFile}')"
+ jq -n '{production: {secret_key_base: $ENV.secret,
+ otp_key_base: $ENV.otp,
+ db_key_base: $ENV.db,
+ openid_connect_signing_key: $ENV.jws}}' \
+ > '${cfg.statePath}/config/secrets.yml'
+ )
+
+ # We remove potentially broken links to old gitlab-shell versions
+ rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
+
+ git config --global core.autocrlf "input"
+ '';
+ };
+ };
+
+ systemd.services.gitlab-db-config = {
+ after = [ "gitlab-config.service" "gitlab-postgresql.service" "postgresql.service" ];
+ bindsTo = [
+ "gitlab-config.service"
+ ] ++ optional (cfg.databaseHost == "") "postgresql.service"
+ ++ optional databaseActuallyCreateLocally "gitlab-postgresql.service";
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = cfg.user;
+ Group = cfg.group;
+ TimeoutSec = "infinity";
+ Restart = "on-failure";
+ WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
+ RemainAfterExit = true;
+
+ ExecStart = pkgs.writeShellScript "gitlab-db-config" ''
+ set -eu
+ umask u=rwx,g=rx,o=
+
+ initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
+ ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
+ GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null
+ '';
+ };
+ };
+
systemd.services.gitlab-sidekiq = {
- after = [ "network.target" "redis.service" "gitlab.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [
+ "network.target"
+ "redis.service"
+ "postgresql.service"
+ "gitlab-config.service"
+ "gitlab-db-config.service"
+ ];
+ bindsTo = [
+ "redis.service"
+ "gitlab-config.service"
+ "gitlab-db-config.service"
+ ] ++ optional (cfg.databaseHost == "") "postgresql.service";
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
@@ -758,9 +914,10 @@ in {
};
systemd.services.gitaly = {
- after = [ "network.target" "gitlab.service" ];
- bindsTo = [ "gitlab.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "gitlab-config.service" ];
+ bindsTo = [ "gitlab-config.service" ];
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
@@ -783,8 +940,10 @@ in {
systemd.services.gitlab-pages = mkIf (gitlabConfig.production.pages.enabled or false) {
description = "GitLab static pages daemon";
- after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs
- wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "gitlab-config.service" ];
+ bindsTo = [ "gitlab-config.service" ];
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
path = [ pkgs.unzip ];
@@ -803,7 +962,8 @@ in {
systemd.services.gitlab-workhorse = {
after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
path = with pkgs; [
exiftool
git
@@ -832,8 +992,10 @@ in {
systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) {
description = "GitLab incoming mail daemon";
- after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs
- wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "redis.service" "gitlab-config.service" ];
+ bindsTo = [ "gitlab-config.service" ];
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
environment = gitlabEnv;
serviceConfig = {
Type = "simple";
@@ -842,15 +1004,26 @@ in {
User = cfg.user;
Group = cfg.group;
- ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.packages.gitlab}/share/gitlab/config.dist/mail_room.yml";
+ ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.statePath}/config/mail_room.yml";
WorkingDirectory = gitlabEnv.HOME;
};
};
systemd.services.gitlab = {
- after = [ "gitlab-workhorse.service" "network.target" "gitlab-postgresql.service" "redis.service" ];
- requires = [ "gitlab-sidekiq.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [
+ "gitlab-workhorse.service"
+ "network.target"
+ "redis.service"
+ "gitlab-config.service"
+ "gitlab-db-config.service"
+ ];
+ bindsTo = [
+ "redis.service"
+ "gitlab-config.service"
+ "gitlab-db-config.service"
+ ] ++ optional (cfg.databaseHost == "") "postgresql.service";
+ wantedBy = [ "gitlab.target" ];
+ partOf = [ "gitlab.target" ];
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
@@ -868,96 +1041,7 @@ in {
TimeoutSec = "infinity";
Restart = "on-failure";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
- ExecStartPre = let
- preStartFullPrivileges = ''
- shopt -s dotglob nullglob
- set -eu
-
- chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/*
- chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/*
- '';
- preStart = ''
- set -eu
-
- cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
- rm -rf ${cfg.statePath}/db/*
- rm -rf ${cfg.statePath}/config/initializers/*
- rm -f ${cfg.statePath}/lib
- cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
- cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
- ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
-
- ${cfg.packages.gitlab-shell}/bin/install
-
- ${optionalString cfg.smtp.enable ''
- install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
- ${optionalString (cfg.smtp.passwordFile != null) ''
- smtp_password=$(<'${cfg.smtp.passwordFile}')
- ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb'
- ''}
- ''}
-
- (
- umask u=rwx,g=,o=
-
- ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret
-
- if [[ -h '${cfg.statePath}/config/database.yml' ]]; then
- rm '${cfg.statePath}/config/database.yml'
- fi
-
- ${if cfg.databasePasswordFile != null then ''
- export db_password="$(<'${cfg.databasePasswordFile}')"
-
- if [[ -z "$db_password" ]]; then
- >&2 echo "Database password was an empty string!"
- exit 1
- fi
-
- ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
- '.production.password = $ENV.db_password' \
- >'${cfg.statePath}/config/database.yml'
- ''
- else ''
- ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
- >'${cfg.statePath}/config/database.yml'
- ''
- }
-
- ${utils.genJqSecretsReplacementSnippet
- gitlabConfig
- "${cfg.statePath}/config/gitlab.yml"
- }
-
- if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then
- rm '${cfg.statePath}/config/secrets.yml'
- fi
-
- export secret="$(<'${cfg.secrets.secretFile}')"
- export db="$(<'${cfg.secrets.dbFile}')"
- export otp="$(<'${cfg.secrets.otpFile}')"
- export jws="$(<'${cfg.secrets.jwsFile}')"
- ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret,
- otp_key_base: $ENV.otp,
- db_key_base: $ENV.db,
- openid_connect_signing_key: $ENV.jws}}' \
- > '${cfg.statePath}/config/secrets.yml'
- )
-
- initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
- ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
- GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null
-
- # We remove potentially broken links to old gitlab-shell versions
- rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks
-
- ${pkgs.git}/bin/git config --global core.autocrlf "input"
- '';
- in [
- "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"
- "${pkgs.writeShellScript "gitlab-pre-start" preStart}"
- ];
- ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production";
+ ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/puma -C ${cfg.statePath}/config/puma.rb -e production";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix
index 0c9c754830..4053afa69b 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix
@@ -115,4 +115,6 @@ in
};
};
};
+
+ meta.maintainers = with lib.maintainers; [ erictapen ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
index 1f2e13f373..f53c49a1ee 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
@@ -183,8 +183,14 @@ in {
};
package = mkOption {
- default = pkgs.home-assistant;
- defaultText = "pkgs.home-assistant";
+ default = pkgs.home-assistant.overrideAttrs (oldAttrs: {
+ doInstallCheck = false;
+ });
+ defaultText = literalExample ''
+ pkgs.home-assistant.overrideAttrs (oldAttrs: {
+ doInstallCheck = false;
+ })
+ '';
type = types.package;
example = literalExample ''
pkgs.home-assistant.override {
@@ -192,7 +198,7 @@ in {
}
'';
description = ''
- Home Assistant package to use.
+ Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete.
Override extraPackages or extraComponents in order to add additional dependencies.
If you specify and do not set
to false, overriding extraComponents will have no effect.
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix b/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix
new file mode 100644
index 0000000000..1c8942998d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix
@@ -0,0 +1,164 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+ cfg = config.services.lifecycled;
+
+ # TODO: Add the ability to extend this with an rfc 42-like interface.
+ # In the meantime, one can modify the environment (as
+ # long as it's not overriding anything from here) with
+ # systemd.services.lifecycled.serviceConfig.Environment
+ configFile = pkgs.writeText "lifecycled" ''
+ LIFECYCLED_HANDLER=${cfg.handler}
+ ${lib.optionalString (cfg.cloudwatchGroup != null) "LIFECYCLED_CLOUDWATCH_GROUP=${cfg.cloudwatchGroup}"}
+ ${lib.optionalString (cfg.cloudwatchStream != null) "LIFECYCLED_CLOUDWATCH_STREAM=${cfg.cloudwatchStream}"}
+ ${lib.optionalString cfg.debug "LIFECYCLED_DEBUG=${lib.boolToString cfg.debug}"}
+ ${lib.optionalString (cfg.instanceId != null) "LIFECYCLED_INSTANCE_ID=${cfg.instanceId}"}
+ ${lib.optionalString cfg.json "LIFECYCLED_JSON=${lib.boolToString cfg.json}"}
+ ${lib.optionalString cfg.noSpot "LIFECYCLED_NO_SPOT=${lib.boolToString cfg.noSpot}"}
+ ${lib.optionalString (cfg.snsTopic != null) "LIFECYCLED_SNS_TOPIC=${cfg.snsTopic}"}
+ ${lib.optionalString (cfg.awsRegion != null) "AWS_REGION=${cfg.awsRegion}"}
+ '';
+in
+{
+ meta.maintainers = with maintainers; [ cole-h grahamc ];
+
+ options = {
+ services.lifecycled = {
+ enable = mkEnableOption "lifecycled";
+
+ queueCleaner = {
+ enable = mkEnableOption "lifecycled-queue-cleaner";
+
+ frequency = mkOption {
+ type = types.str;
+ default = "hourly";
+ description = ''
+ How often to trigger the queue cleaner.
+
+ NOTE: This string should be a valid value for a systemd
+ timer's OnCalendar configuration. See
+ systemd.timer5
+ for more information.
+ '';
+ };
+
+ parallel = mkOption {
+ type = types.ints.unsigned;
+ default = 20;
+ description = ''
+ The number of parallel deletes to run.
+ '';
+ };
+ };
+
+ instanceId = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The instance ID to listen for events for.
+ '';
+ };
+
+ snsTopic = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The SNS topic that receives events.
+ '';
+ };
+
+ noSpot = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Disable the spot termination listener.
+ '';
+ };
+
+ handler = mkOption {
+ type = types.path;
+ description = ''
+ The script to invoke to handle events.
+ '';
+ };
+
+ json = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable JSON logging.
+ '';
+ };
+
+ cloudwatchGroup = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Write logs to a specific Cloudwatch Logs group.
+ '';
+ };
+
+ cloudwatchStream = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Write logs to a specific Cloudwatch Logs stream. Defaults to the instance ID.
+ '';
+ };
+
+ debug = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable debugging information.
+ '';
+ };
+
+ # XXX: Can be removed if / when
+ # https://github.com/buildkite/lifecycled/pull/91 is merged.
+ awsRegion = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ The region used for accessing AWS services.
+ '';
+ };
+ };
+ };
+
+ ### Implementation ###
+
+ config = mkMerge [
+ (mkIf cfg.enable {
+ environment.etc."lifecycled".source = configFile;
+
+ systemd.packages = [ pkgs.lifecycled ];
+ systemd.services.lifecycled = {
+ wantedBy = [ "network-online.target" ];
+ restartTriggers = [ configFile ];
+ };
+ })
+
+ (mkIf cfg.queueCleaner.enable {
+ systemd.services.lifecycled-queue-cleaner = {
+ description = "Lifecycle Daemon Queue Cleaner";
+ environment = optionalAttrs (cfg.awsRegion != null) { AWS_REGION = cfg.awsRegion; };
+ serviceConfig = {
+ Type = "oneshot";
+ ExecStart = "${pkgs.lifecycled}/bin/lifecycled-queue-cleaner -parallel ${toString cfg.queueCleaner.parallel}";
+ };
+ };
+
+ systemd.timers.lifecycled-queue-cleaner = {
+ description = "Lifecycle Daemon Queue Cleaner Timer";
+ wantedBy = [ "timers.target" ];
+ after = [ "network-online.target" ];
+ timerConfig = {
+ Unit = "lifecycled-queue-cleaner.service";
+ OnCalendar = "${cfg.queueCleaner.frequency}";
+ };
+ };
+ })
+ ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix
index 12bed05757..a7a6a3b596 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix
@@ -21,13 +21,45 @@ in
};
dates = mkOption {
- default = "03:15";
type = types.str;
+ default = "03:15";
+ example = "weekly";
description = ''
- Specification (in the format described by
+ How often or when garbage collection is performed. For most desktop and server systems
+ a sufficient garbage collection is once a week.
+
+ The format is described in
systemd.time
- 7) of the time at
- which the garbage collector will run.
+ 7.
+ '';
+ };
+
+ randomizedDelaySec = mkOption {
+ default = "0";
+ type = types.str;
+ example = "45min";
+ description = ''
+ Add a randomized delay before each automatic upgrade.
+ The delay will be chosen between zero and this value.
+ This value must be a time span in the format specified by
+ systemd.time
+ 7
+ '';
+ };
+
+ persistent = mkOption {
+ default = true;
+ type = types.bool;
+ example = false;
+ description = ''
+ Takes a boolean argument. If true, the time when the service
+ unit was last triggered is stored on disk. When the timer is
+ activated, the service unit is triggered immediately if it
+ would have been triggered at least once during the time when
+ the timer was inactive. Such triggering is nonetheless
+ subject to the delay imposed by RandomizedDelaySec=. This is
+ useful to catch up on missed runs of the service when the
+ system was powered down.
'';
};
@@ -50,11 +82,18 @@ in
config = {
- systemd.services.nix-gc =
- { description = "Nix Garbage Collector";
- script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
- startAt = optional cfg.automatic cfg.dates;
+ systemd.services.nix-gc = {
+ description = "Nix Garbage Collector";
+ script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
+ startAt = optional cfg.automatic cfg.dates;
+ };
+
+ systemd.timers.nix-gc = lib.mkIf cfg.automatic {
+ timerConfig = {
+ RandomizedDelaySec = cfg.randomizedDelaySec;
+ Persistent = cfg.persistent;
};
+ };
};
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix b/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix
new file mode 100644
index 0000000000..a62dbef1d2
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix
@@ -0,0 +1,82 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.plikd;
+
+ format = pkgs.formats.toml {};
+ plikdCfg = format.generate "plikd.cfg" cfg.settings;
+in
+{
+ options = {
+ services.plikd = {
+ enable = mkEnableOption "the plikd server";
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Open ports in the firewall for the plikd.";
+ };
+
+ settings = mkOption {
+ type = format.type;
+ default = {};
+ description = ''
+ Configuration for plikd, see
+ for supported values.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.plikd.settings = mapAttrs (name: mkDefault) {
+ ListenPort = 8080;
+ ListenAddress = "localhost";
+ DataBackend = "file";
+ DataBackendConfig = {
+ Directory = "/var/lib/plikd";
+ };
+ MetadataBackendConfig = {
+ Driver = "sqlite3";
+ ConnectionString = "/var/lib/plikd/plik.db";
+ };
+ };
+
+ systemd.services.plikd = {
+ description = "Plikd file sharing server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = "${pkgs.plikd}/bin/plikd --config ${plikdCfg}";
+ Restart = "on-failure";
+ StateDirectory = "plikd";
+ LogsDirectory = "plikd";
+ DynamicUser = true;
+
+ # Basic hardening
+ NoNewPrivileges = "yes";
+ PrivateTmp = "yes";
+ PrivateDevices = "yes";
+ DevicePolicy = "closed";
+ ProtectSystem = "strict";
+ ProtectHome = "read-only";
+ ProtectControlGroups = "yes";
+ ProtectKernelModules = "yes";
+ ProtectKernelTunables = "yes";
+ RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+ RestrictNamespaces = "yes";
+ RestrictRealtime = "yes";
+ RestrictSUIDSGID = "yes";
+ MemoryDenyWriteExecute = "yes";
+ LockPersonality = "yes";
+ };
+ };
+
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ cfg.settings.ListenPort ];
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix
index 34f2d41706..7c6eff713c 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix
@@ -95,13 +95,13 @@ in
ALERTA_SVR_CONF_FILE = alertaConf;
};
serviceConfig = {
- ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
+ ExecStart = "${pkgs.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
User = "alerta";
Group = "alerta";
};
};
- environment.systemPackages = [ pkgs.python36Packages.alerta ];
+ environment.systemPackages = [ pkgs.alerta ];
users.users.alerta = {
uid = config.ids.uids.alerta;
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix
index c8515c4b89..88727e70ee 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix
@@ -65,10 +65,18 @@ let
dashboardFile = pkgs.writeText "dashboard.yaml" (builtins.toJSON dashboardConfiguration);
+ notifierConfiguration = {
+ apiVersion = 1;
+ notifiers = cfg.provision.notifiers;
+ };
+
+ notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration);
+
provisionConfDir = pkgs.runCommand "grafana-provisioning" { } ''
- mkdir -p $out/{datasources,dashboards}
+ mkdir -p $out/{datasources,dashboards,notifiers}
ln -sf ${datasourceFile} $out/datasources/datasource.yaml
ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml
+ ln -sf ${notifierFile} $out/notifiers/notifier.yaml
'';
# Get a submodule without any embedded metadata:
@@ -79,80 +87,80 @@ let
options = {
name = mkOption {
type = types.str;
- description = "Name of the datasource. Required";
+ description = "Name of the datasource. Required.";
};
type = mkOption {
type = types.enum ["graphite" "prometheus" "cloudwatch" "elasticsearch" "influxdb" "opentsdb" "mysql" "mssql" "postgres" "loki"];
- description = "Datasource type. Required";
+ description = "Datasource type. Required.";
};
access = mkOption {
type = types.enum ["proxy" "direct"];
default = "proxy";
- description = "Access mode. proxy or direct (Server or Browser in the UI). Required";
+ description = "Access mode. proxy or direct (Server or Browser in the UI). Required.";
};
orgId = mkOption {
type = types.int;
default = 1;
- description = "Org id. will default to orgId 1 if not specified";
+ description = "Org id. will default to orgId 1 if not specified.";
};
url = mkOption {
type = types.str;
- description = "Url of the datasource";
+ description = "Url of the datasource.";
};
password = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database password, if used";
+ description = "Database password, if used.";
};
user = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database user, if used";
+ description = "Database user, if used.";
};
database = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Database name, if used";
+ description = "Database name, if used.";
};
basicAuth = mkOption {
type = types.nullOr types.bool;
default = null;
- description = "Enable/disable basic auth";
+ description = "Enable/disable basic auth.";
};
basicAuthUser = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Basic auth username";
+ description = "Basic auth username.";
};
basicAuthPassword = mkOption {
type = types.nullOr types.str;
default = null;
- description = "Basic auth password";
+ description = "Basic auth password.";
};
withCredentials = mkOption {
type = types.bool;
default = false;
- description = "Enable/disable with credentials headers";
+ description = "Enable/disable with credentials headers.";
};
isDefault = mkOption {
type = types.bool;
default = false;
- description = "Mark as default datasource. Max one per org";
+ description = "Mark as default datasource. Max one per org.";
};
jsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
- description = "Datasource specific configuration";
+ description = "Datasource specific configuration.";
};
secureJsonData = mkOption {
type = types.nullOr types.attrs;
default = null;
- description = "Datasource specific secure configuration";
+ description = "Datasource specific secure configuration.";
};
version = mkOption {
type = types.int;
default = 1;
- description = "Version";
+ description = "Version.";
};
editable = mkOption {
type = types.bool;
@@ -168,41 +176,99 @@ let
name = mkOption {
type = types.str;
default = "default";
- description = "Provider name";
+ description = "Provider name.";
};
orgId = mkOption {
type = types.int;
default = 1;
- description = "Organization ID";
+ description = "Organization ID.";
};
folder = mkOption {
type = types.str;
default = "";
- description = "Add dashboards to the specified folder";
+ description = "Add dashboards to the specified folder.";
};
type = mkOption {
type = types.str;
default = "file";
- description = "Dashboard provider type";
+ description = "Dashboard provider type.";
};
disableDeletion = mkOption {
type = types.bool;
default = false;
- description = "Disable deletion when JSON file is removed";
+ description = "Disable deletion when JSON file is removed.";
};
updateIntervalSeconds = mkOption {
type = types.int;
default = 10;
- description = "How often Grafana will scan for changed dashboards";
+ description = "How often Grafana will scan for changed dashboards.";
};
options = {
path = mkOption {
type = types.path;
- description = "Path grafana will watch for dashboards";
+ description = "Path grafana will watch for dashboards.";
};
};
};
};
+
+ grafanaTypes.notifierConfig = types.submodule {
+ options = {
+ name = mkOption {
+ type = types.str;
+ default = "default";
+ description = "Notifier name.";
+ };
+ type = mkOption {
+ type = types.enum ["dingding" "discord" "email" "googlechat" "hipchat" "kafka" "line" "teams" "opsgenie" "pagerduty" "prometheus-alertmanager" "pushover" "sensu" "sensugo" "slack" "telegram" "threema" "victorops" "webhook"];
+ description = "Notifier type.";
+ };
+ uid = mkOption {
+ type = types.str;
+ description = "Unique notifier identifier.";
+ };
+ org_id = mkOption {
+ type = types.int;
+ default = 1;
+ description = "Organization ID.";
+ };
+ org_name = mkOption {
+ type = types.str;
+ default = "Main Org.";
+ description = "Organization name.";
+ };
+ is_default = mkOption {
+ type = types.bool;
+ description = "Is the default notifier.";
+ default = false;
+ };
+ send_reminder = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Should the notifier be sent reminder notifications while alerts continue to fire.";
+ };
+ frequency = mkOption {
+ type = types.str;
+ default = "5m";
+ description = "How frequently should the notifier be sent reminders.";
+ };
+ disable_resolve_message = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Turn off the message that sends when an alert returns to OK.";
+ };
+ settings = mkOption {
+ type = types.nullOr types.attrs;
+ default = null;
+ description = "Settings for the notifier type.";
+ };
+ secure_settings = mkOption {
+ type = types.nullOr types.attrs;
+ default = null;
+ description = "Secure settings for the notifier type.";
+ };
+ };
+ };
in {
options.services.grafana = {
enable = mkEnableOption "grafana";
@@ -337,17 +403,23 @@ in {
provision = {
enable = mkEnableOption "provision";
datasources = mkOption {
- description = "Grafana datasources configuration";
+ description = "Grafana datasources configuration.";
default = [];
type = types.listOf grafanaTypes.datasourceConfig;
apply = x: map _filter x;
};
dashboards = mkOption {
- description = "Grafana dashboard configuration";
+ description = "Grafana dashboard configuration.";
default = [];
type = types.listOf grafanaTypes.dashboardConfig;
apply = x: map _filter x;
};
+ notifiers = mkOption {
+ description = "Grafana notifier configuration.";
+ default = [];
+ type = types.listOf grafanaTypes.notifierConfig;
+ apply = x: map _filter x;
+ };
};
security = {
@@ -391,12 +463,12 @@ in {
smtp = {
enable = mkEnableOption "smtp";
host = mkOption {
- description = "Host to connect to";
+ description = "Host to connect to.";
default = "localhost:25";
type = types.str;
};
user = mkOption {
- description = "User used for authentication";
+ description = "User used for authentication.";
default = "";
type = types.str;
};
@@ -417,7 +489,7 @@ in {
type = types.nullOr types.path;
};
fromAddress = mkOption {
- description = "Email address used for sending";
+ description = "Email address used for sending.";
default = "admin@grafana.localhost";
type = types.str;
};
@@ -425,7 +497,7 @@ in {
users = {
allowSignUp = mkOption {
- description = "Disable user signup / registration";
+ description = "Disable user signup / registration.";
default = false;
type = types.bool;
};
@@ -451,17 +523,17 @@ in {
auth.anonymous = {
enable = mkOption {
- description = "Whether to allow anonymous access";
+ description = "Whether to allow anonymous access.";
default = false;
type = types.bool;
};
org_name = mkOption {
- description = "Which organization to allow anonymous access to";
+ description = "Which organization to allow anonymous access to.";
default = "Main Org.";
type = types.str;
};
org_role = mkOption {
- description = "Which role anonymous users have in the organization";
+ description = "Which role anonymous users have in the organization.";
default = "Viewer";
type = types.str;
};
@@ -470,7 +542,7 @@ in {
analytics.reporting = {
enable = mkOption {
- description = "Whether to allow anonymous usage reporting to stats.grafana.net";
+ description = "Whether to allow anonymous usage reporting to stats.grafana.net.";
default = true;
type = types.bool;
};
@@ -496,6 +568,9 @@ in {
(optional (
any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) cfg.provision.datasources
) "Datasource passwords will be stored as plaintext in the Nix store!")
+ (optional (
+ any (x: x.secure_settings != null) cfg.provision.notifiers
+ ) "Notifier secure settings will be stored as plaintext in the Nix store!")
];
environment.systemPackages = [ cfg.package ];
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix
index 9103a6f932..bd74e1a9cd 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix
@@ -468,7 +468,7 @@ let
'';
};
- value = mkOption {
+ values = mkOption {
type = types.listOf types.str;
default = [];
description = ''
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix
index 632c3fb105..d833062c47 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix
@@ -316,7 +316,7 @@ in
client = {
enable = mkEnableOption "Ceph client configuration";
extraConfig = mkOption {
- type = with types; attrsOf str;
+ type = with types; attrsOf (attrsOf str);
default = {};
example = ''
{
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix
index 4c040112d2..32a7eb3ed6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix
@@ -162,10 +162,7 @@ in {
NODE_NAME = cfg.nodeName;
};
path = [ pkgs.iptables ];
- preStart = ''
- mkdir -p /run/flannel
- touch /run/flannel/docker
- '' + optionalString (cfg.storageBackend == "etcd") ''
+ preStart = optionalString (cfg.storageBackend == "etcd") ''
echo "setting network configuration"
until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
do
@@ -177,6 +174,7 @@ in {
ExecStart = "${cfg.package}/bin/flannel";
Restart = "always";
RestartSec = "10s";
+ RuntimeDirectory = "flannel";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
index 4131ff8be5..d7208354d4 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
@@ -8,9 +8,9 @@ let
# Convert systemd-style address specification to kresd config line(s).
# On Nix level we don't attempt to precisely validate the address specifications.
mkListen = kind: addr: let
- al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr;
- al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr;
- al_portOnly = builtins.match "()([0-9]\+)" addr;
+ al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr;
+ al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr;
+ al_portOnly = builtins.match "()([0-9]+)" addr;
al = findFirst (a: a != null)
(throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ];
diff --git a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix
index aaf6fb0479..340cbbf02f 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix
@@ -8,30 +8,19 @@ let
cfg = config.services.clamav;
pkg = pkgs.clamav;
- clamdConfigFile = pkgs.writeText "clamd.conf" ''
- DatabaseDirectory ${stateDir}
- LocalSocket ${runDir}/clamd.ctl
- PidFile ${runDir}/clamd.pid
- TemporaryDirectory /tmp
- User clamav
- Foreground yes
+ toKeyValue = generators.toKeyValue {
+ mkKeyValue = generators.mkKeyValueDefault {} " ";
+ listsAsDuplicateKeys = true;
+ };
- ${cfg.daemon.extraConfig}
- '';
-
- freshclamConfigFile = pkgs.writeText "freshclam.conf" ''
- DatabaseDirectory ${stateDir}
- Foreground yes
- Checks ${toString cfg.updater.frequency}
-
- ${cfg.updater.extraConfig}
-
- DatabaseMirror database.clamav.net
- '';
+ clamdConfigFile = pkgs.writeText "clamd.conf" (toKeyValue cfg.daemon.settings);
+ freshclamConfigFile = pkgs.writeText "freshclam.conf" (toKeyValue cfg.updater.settings);
in
{
imports = [
- (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
+ (mkRemovedOptionModule [ "services" "clamav" "updater" "config" ] "Use services.clamav.updater.settings instead.")
+ (mkRemovedOptionModule [ "services" "clamav" "updater" "extraConfig" ] "Use services.clamav.updater.settings instead.")
+ (mkRemovedOptionModule [ "services" "clamav" "daemon" "extraConfig" ] "Use services.clamav.daemon.settings instead.")
];
options = {
@@ -39,12 +28,12 @@ in
daemon = {
enable = mkEnableOption "ClamAV clamd daemon";
- extraConfig = mkOption {
- type = types.lines;
- default = "";
+ settings = mkOption {
+ type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
+ default = {};
description = ''
- Extra configuration for clamd. Contents will be added verbatim to the
- configuration file.
+ ClamAV configuration. Refer to ,
+ for details on supported values.
'';
};
};
@@ -68,12 +57,12 @@ in
'';
};
- extraConfig = mkOption {
- type = types.lines;
- default = "";
+ settings = mkOption {
+ type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
+ default = {};
description = ''
- Extra configuration for freshclam. Contents will be added verbatim to the
- configuration file.
+ freshclam configuration. Refer to ,
+ for details on supported values.
'';
};
};
@@ -93,6 +82,22 @@ in
users.groups.${clamavGroup} =
{ gid = config.ids.gids.clamav; };
+ services.clamav.daemon.settings = {
+ DatabaseDirectory = stateDir;
+ LocalSocket = "${runDir}/clamd.ctl";
+ PidFile = "${runDir}/clamd.pid";
+ TemporaryDirectory = "/tmp";
+ User = "clamav";
+ Foreground = true;
+ };
+
+ services.clamav.updater.settings = {
+ DatabaseDirectory = stateDir;
+ Foreground = true;
+ Checks = cfg.updater.frequency;
+ DatabaseMirror = [ "database.clamav.net" ];
+ };
+
environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
environment.etc."clamav/clamd.conf".source = clamdConfigFile;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
index 9567223ebc..1ce584c6a4 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
@@ -329,7 +329,7 @@ in
extraConfig = "internal;";
};
- locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = {
extraConfig = "expires 365d;";
};
@@ -349,7 +349,7 @@ in
'';
};
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
extraConfig = ''
try_files $uri $uri/ /doku.php;
include ${pkgs.nginx}/conf/fastcgi_params;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index de1c67235f..5636415f6a 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
@@ -28,7 +28,10 @@ let
upload_max_filesize = cfg.maxUploadSize;
post_max_size = cfg.maxUploadSize;
memory_limit = cfg.maxUploadSize;
- } // cfg.phpOptions;
+ } // cfg.phpOptions
+ // optionalAttrs cfg.caching.apcu {
+ "apc.enable_cli" = "1";
+ };
occ = pkgs.writeScriptBin "nextcloud-occ" ''
#! ${pkgs.runtimeShell}
@@ -86,7 +89,7 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
- relatedPackages = [ "nextcloud18" "nextcloud19" "nextcloud20" ];
+ relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ];
};
maxUploadSize = mkOption {
@@ -280,6 +283,24 @@ in {
may be served via HTTPS.
'';
};
+
+ defaultPhoneRegion = mkOption {
+ default = null;
+ type = types.nullOr types.str;
+ example = "DE";
+ description = ''
+
+ This option exists since Nextcloud 21! If older versions are used,
+ this will throw an eval-error!
+
+
+ ISO 3611-1
+ country codes for automatic phone-number detection without a country code.
+
+ With e.g. DE set, the +49 can be omitted for
+ phone-numbers.
+ '';
+ };
};
caching = {
@@ -345,10 +366,13 @@ in {
&& !(acfg.adminpass != null && acfg.adminpassFile != null));
message = "Please specify exactly one of adminpass or adminpassFile";
}
+ { assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null;
+ message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!";
+ }
];
warnings = let
- latest = 20;
+ latest = 21;
upgradeWarning = major: nixos:
''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@@ -366,9 +390,9 @@ in {
Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
Please migrate your configuration to config.services.nextcloud.poolSettings.
'')
- ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03"))
++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09"))
- ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"));
+ ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"))
+ ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"));
services.nextcloud.package = with pkgs;
mkDefault (
@@ -378,14 +402,13 @@ in {
nextcloud defined in an overlay, please set `services.nextcloud.package` to
`pkgs.nextcloud`.
''
- else if versionOlder stateVersion "20.03" then nextcloud17
else if versionOlder stateVersion "20.09" then nextcloud18
# 21.03 will not be an official release - it was instead 21.05.
# This versionOlder statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
else if versionOlder stateVersion "21.03" then nextcloud19
- else nextcloud20
+ else nextcloud21
);
}
@@ -443,6 +466,7 @@ in {
'dbtype' => '${c.dbtype}',
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
+ ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
];
'';
occInstallCmd = let
@@ -591,6 +615,14 @@ in {
access_log off;
'';
};
+ "= /" = {
+ priority = 100;
+ extraConfig = ''
+ if ( $http_user_agent ~ ^DavClnt ) {
+ return 302 /remote.php/webdav/$is_args$args;
+ }
+ '';
+ };
"/" = {
priority = 900;
extraConfig = "rewrite ^ /index.php;";
@@ -609,6 +641,9 @@ in {
location = /.well-known/caldav {
return 301 /remote.php/dav;
}
+ location ~ ^/\.well-known/(?!acme-challenge|pki-validation) {
+ return 301 /index.php$request_uri;
+ }
try_files $uri $uri/ =404;
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml
index 6cbfda118c..83a6f68edc 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml
@@ -11,7 +11,7 @@
desktop client is packaged at pkgs.nextcloud-client.
- The current default by NixOS is nextcloud20 which is also the latest
+ The current default by NixOS is nextcloud21 which is also the latest
major version available.
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7f50b8fd8d..b2bb5055cd 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -22,7 +22,9 @@ let
php = cfg.phpPackage.override { apacheHttpd = pkg; };
- phpMajorVersion = lib.versions.major (lib.getVersion php);
+ phpModuleName = let
+ majorVersion = lib.versions.major (lib.getVersion php);
+ in (if majorVersion == "8" then "php" else "php${majorVersion}");
mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = pkg; };
@@ -63,7 +65,7 @@ let
++ optional enableSSL "ssl"
++ optional enableUserDir "userdir"
++ optional cfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
- ++ optional cfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
+ ++ optional cfg.enablePHP { name = phpModuleName; path = "${php}/modules/lib${phpModuleName}.so"; }
++ optional cfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
++ cfg.extraModules;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index fa8614e8ec..f3175793eb 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -804,7 +804,7 @@ in
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
- MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) pkgs.nginx.modules);
+ MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
index d39b4d6490..fc7f7bea4e 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -58,7 +58,7 @@ in
noDesktop = mkOption {
type = types.bool;
default = false;
- description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
+ description = "Don't install XFCE desktop components (xfdesktop and panel).";
};
enableXfwm = mkOption {
@@ -98,6 +98,7 @@ in
parole
ristretto
xfce4-appfinder
+ xfce4-notifyd
xfce4-screenshooter
xfce4-session
xfce4-settings
@@ -119,7 +120,6 @@ in
xfwm4
xfwm4-themes
] ++ optionals (!cfg.noDesktop) [
- xfce4-notifyd
xfce4-panel
xfdesktop
];
@@ -166,7 +166,8 @@ in
# Systemd services
systemd.packages = with pkgs.xfce; [
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
- ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
+ xfce4-notifyd
+ ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
index 9fdbe753da..e04fcdaf41 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix
@@ -37,6 +37,11 @@ let
. /etc/profile
cd "$HOME"
+ # Allow the user to execute commands at the beginning of the X session.
+ if test -f ~/.xprofile; then
+ source ~/.xprofile
+ fi
+
${optionalString cfg.displayManager.job.logToJournal ''
if [ -z "$_DID_SYSTEMD_CAT" ]; then
export _DID_SYSTEMD_CAT=1
@@ -64,22 +69,23 @@ let
# Speed up application start by 50-150ms according to
# http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
- rm -rf "$HOME/.compose-cache"
- mkdir "$HOME/.compose-cache"
+ compose_cache="''${XCOMPOSECACHE:-$HOME/.compose-cache}"
+ mkdir -p "$compose_cache"
+ # To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory,
+ # defensively try to delete cache *files* only, following the file format specified in
+ # https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/modules/im/ximcp/imLcIm.c#L353-358
+ # sprintf (*res, "%s/%c%d_%03x_%08x_%08x", dir, _XimGetMyEndian(), XIM_CACHE_VERSION, (unsigned int)sizeof (DefTree), hash, hash2);
+ ${pkgs.findutils}/bin/find "$compose_cache" -maxdepth 1 -regextype posix-extended -regex '.*/[Bl][0-9]+_[0-9a-f]{3}_[0-9a-f]{8}_[0-9a-f]{8}' -delete
+ unset compose_cache
# Work around KDE errors when a user first logs in and
# .local/share doesn't exist yet.
- mkdir -p "$HOME/.local/share"
+ mkdir -p "''${XDG_DATA_HOME:-$HOME/.local/share}"
unset _DID_SYSTEMD_CAT
${cfg.displayManager.sessionCommands}
- # Allow the user to execute commands at the beginning of the X session.
- if test -f ~/.xprofile; then
- source ~/.xprofile
- fi
-
# Start systemd user services for graphical sessions
/run/current-system/systemd/bin/systemctl --user start graphical-session.target
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
index 783685c9df..5d9534024b 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix
@@ -2,24 +2,6 @@
with lib;
let
- findWinner = candidates: winner:
- any (x: x == winner) candidates;
-
- # winners is an ordered list where first item wins over 2nd etc
- mergeAnswer = winners: locs: defs:
- let
- values = map (x: x.value) defs;
- inter = intersectLists values winners;
- winner = head winners;
- in
- if defs == [] then abort "This case should never happen."
- else if winner == [] then abort "Give a valid list of winner"
- else if inter == [] then mergeOneOption locs defs
- else if findWinner values winner then
- winner
- else
- mergeAnswer (tail winners) locs defs;
-
mergeFalseByDefault = locs: defs:
if defs == [] then abort "This case should never happen."
else if any (x: x == false) (getValues defs) then false
@@ -28,9 +10,7 @@ let
kernelItem = types.submodule {
options = {
tristate = mkOption {
- type = types.enum [ "y" "m" "n" null ] // {
- merge = mergeAnswer [ "y" "m" "n" ];
- };
+ type = types.enum [ "y" "m" "n" null ];
default = null;
internal = true;
visible = true;
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
index 914d3e62eb..bbdd5a4070 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
@@ -436,7 +436,8 @@ let
"IPv4ProxyARP"
"IPv6ProxyNDP"
"IPv6ProxyNDPAddress"
- "IPv6PrefixDelegation"
+ "IPv6SendRA"
+ "DHCPv6PrefixDelegation"
"IPv6MTUBytes"
"Bridge"
"Bond"
@@ -477,7 +478,8 @@ let
(assertMinimum "IPv6HopLimit" 0)
(assertValueOneOf "IPv4ProxyARP" boolValues)
(assertValueOneOf "IPv6ProxyNDP" boolValues)
- (assertValueOneOf "IPv6PrefixDelegation" ["static" "dhcpv6" "yes" "false"])
+ (assertValueOneOf "IPv6SendRA" boolValues)
+ (assertValueOneOf "DHCPv6PrefixDelegation" boolValues)
(assertByteFormat "IPv6MTUBytes")
(assertValueOneOf "ActiveSlave" boolValues)
(assertValueOneOf "PrimarySlave" boolValues)
@@ -643,18 +645,63 @@ let
sectionDHCPv6 = checkUnitConfig "DHCPv6" [
(assertOnlyFields [
+ "UseAddress"
"UseDNS"
"UseNTP"
+ "RouteMetric"
"RapidCommit"
+ "MUDURL"
+ "RequestOptions"
+ "SendVendorOption"
"ForceDHCPv6PDOtherInformation"
"PrefixDelegationHint"
- "RouteMetric"
+ "WithoutRA"
+ "SendOption"
+ "UserClass"
+ "VendorClass"
])
+ (assertValueOneOf "UseAddress" boolValues)
(assertValueOneOf "UseDNS" boolValues)
(assertValueOneOf "UseNTP" boolValues)
+ (assertInt "RouteMetric")
(assertValueOneOf "RapidCommit" boolValues)
(assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues)
- (assertInt "RouteMetric")
+ (assertValueOneOf "WithoutRA" ["solicit" "information-request"])
+ (assertRange "SendOption" 1 65536)
+ ];
+
+ sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [
+ (assertOnlyFields [
+ "SubnetId"
+ "Announce"
+ "Assign"
+ "Token"
+ ])
+ (assertValueOneOf "Announce" boolValues)
+ (assertValueOneOf "Assign" boolValues)
+ ];
+
+ sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [
+ (assertOnlyFields [
+ "UseDNS"
+ "UseDomains"
+ "RouteTable"
+ "UseAutonomousPrefix"
+ "UseOnLinkPrefix"
+ "RouterDenyList"
+ "RouterAllowList"
+ "PrefixDenyList"
+ "PrefixAllowList"
+ "RouteDenyList"
+ "RouteAllowList"
+ "DHCPv6Client"
+ ])
+ (assertValueOneOf "UseDNS" boolValues)
+ (assertValueOneOf "UseDomains" (boolValues ++ ["route"]))
+ (assertRange "RouteTable" 0 4294967295)
+ (assertValueOneOf "UseAutonomousPrefix" boolValues)
+ (assertValueOneOf "UseOnLinkPrefix" boolValues)
+ (assertValueOneOf "DHCPv6Client" (boolValues ++ ["always"]))
];
sectionDHCPServer = checkUnitConfig "DHCPServer" [
@@ -685,7 +732,7 @@ let
(assertValueOneOf "EmitTimezone" boolValues)
];
- sectionIPv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [
+ sectionIPv6SendRA = checkUnitConfig "IPv6SendRA" [
(assertOnlyFields [
"Managed"
"OtherInformation"
@@ -1090,6 +1137,30 @@ let
'';
};
+ dhcpV6PrefixDelegationConfig = mkOption {
+ default = {};
+ example = { SubnetId = "auto"; Announce = true; };
+ type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv6PrefixDelegation;
+ description = ''
+ Each attribute in this set specifies an option in the
+ [DHCPv6PrefixDelegation] section of the unit. See
+ systemd.network
+ 5 for details.
+ '';
+ };
+
+ ipv6AcceptRAConfig = mkOption {
+ default = {};
+ example = { UseDNS = true; DHCPv6Client = "always"; };
+ type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6AcceptRA;
+ description = ''
+ Each attribute in this set specifies an option in the
+ [IPv6AcceptRA] section of the unit. See
+ systemd.network
+ 5 for details.
+ '';
+ };
+
dhcpServerConfig = mkOption {
default = {};
example = { PoolOffset = 50; EmitDNS = false; };
@@ -1102,13 +1173,20 @@ let
'';
};
+ # systemd.network.networks.*.ipv6PrefixDelegationConfig has been deprecated
+ # in 247 in favor of systemd.network.networks.*.ipv6SendRAConfig.
ipv6PrefixDelegationConfig = mkOption {
+ visible = false;
+ apply = _: throw "The option `systemd.network.networks.*.ipv6PrefixDelegationConfig` has been replaced by `systemd.network.networks.*.ipv6SendRAConfig`.";
+ };
+
+ ipv6SendRAConfig = mkOption {
default = {};
example = { EmitDNS = true; Managed = true; OtherInformation = true; };
- type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6PrefixDelegation;
+ type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6SendRA;
description = ''
Each attribute in this set specifies an option in the
- [IPv6PrefixDelegation] section of the unit. See
+ [IPv6SendRA] section of the unit. See
systemd.network
5 for details.
'';
@@ -1457,13 +1535,21 @@ let
[DHCPv6]
${attrsToSection def.dhcpV6Config}
''
+ + optionalString (def.dhcpV6PrefixDelegationConfig != { }) ''
+ [DHCPv6PrefixDelegation]
+ ${attrsToSection def.dhcpV6PrefixDelegationConfig}
+ ''
+ + optionalString (def.ipv6AcceptRAConfig != { }) ''
+ [IPv6AcceptRA]
+ ${attrsToSection def.ipv6AcceptRAConfig}
+ ''
+ optionalString (def.dhcpServerConfig != { }) ''
[DHCPServer]
${attrsToSection def.dhcpServerConfig}
''
- + optionalString (def.ipv6PrefixDelegationConfig != { }) ''
- [IPv6PrefixDelegation]
- ${attrsToSection def.ipv6PrefixDelegationConfig}
+ + optionalString (def.ipv6SendRAConfig != { }) ''
+ [IPv6SendRA]
+ ${attrsToSection def.ipv6SendRAConfig}
''
+ flip concatMapStrings def.ipv6Prefixes (x: ''
[IPv6Prefix]
@@ -1479,7 +1565,6 @@ let
in
{
-
options = {
systemd.network.enable = mkOption {
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
index ef91689994..2a545e5525 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
@@ -4,8 +4,7 @@ with lib;
let
- inherit (pkgs) plymouth;
- inherit (pkgs) nixos-icons;
+ inherit (pkgs) plymouth nixos-icons;
cfg = config.boot.plymouth;
@@ -16,14 +15,37 @@ let
osVersion = config.system.nixos.release;
};
+ plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } ''
+ mkdir -p $out
+
+ # For themes that are compiled with PLYMOUTH_LOGO_FILE
+ mkdir -p $out/etc/plymouth
+ ln -s $logo $out/etc/plymouth/logo.png
+
+ # Logo for bgrt theme
+ # Note this is technically an abuse of watermark for the bgrt theme
+ # See: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/95#note_813768
+ mkdir -p $out/share/plymouth/themes/spinner
+ ln -s $logo $out/share/plymouth/themes/spinner/watermark.png
+
+ # Logo for spinfinity theme
+ # See: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/106
+ mkdir -p $out/share/plymouth/themes/spinfinity
+ ln -s $logo $out/share/plymouth/themes/spinfinity/header-image.png
+ '';
+
themesEnv = pkgs.buildEnv {
name = "plymouth-themes";
- paths = [ plymouth ] ++ cfg.themePackages;
+ paths = [
+ plymouth
+ plymouthLogos
+ ] ++ cfg.themePackages;
};
configFile = pkgs.writeText "plymouthd.conf" ''
[Daemon]
ShowDelay=0
+ DeviceTimeout=8
Theme=${cfg.theme}
${cfg.extraConfig}
'';
@@ -47,7 +69,7 @@ in
};
themePackages = mkOption {
- default = [ nixosBreezePlymouth ];
+ default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
type = types.listOf types.package;
description = ''
Extra theme packages for plymouth.
@@ -55,7 +77,7 @@ in
};
theme = mkOption {
- default = "breeze";
+ default = "bgrt";
type = types.str;
description = ''
Splash screen theme.
@@ -64,7 +86,8 @@ in
logo = mkOption {
type = types.path;
- default = "${nixos-icons}/share/icons/hicolor/128x128/apps/nix-snowflake.png";
+ # Dimensions are 48x48 to match GDM logo
+ default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
defaultText = ''pkgs.fetchurl {
url = "https://nixos.org/logo/nixos-hires.png";
sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
@@ -110,12 +133,18 @@ in
systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];
systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];
systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ];
- systemd.services.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"];
- systemd.paths.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"];
+ systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ];
+ systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ];
boot.initrd.extraUtilsCommands = ''
- copy_bin_and_libs ${pkgs.plymouth}/bin/plymouthd
- copy_bin_and_libs ${pkgs.plymouth}/bin/plymouth
+ copy_bin_and_libs ${plymouth}/bin/plymouth
+ copy_bin_and_libs ${plymouth}/bin/plymouthd
+
+ # Check if the actual requested theme is here
+ if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
+ echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
+ exit 1
+ fi
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
@@ -127,21 +156,29 @@ in
mkdir -p $out/share/plymouth/themes
cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
- # copy themes into working directory for patching
+ # Copy themes into working directory for patching
mkdir themes
- # use -L to copy the directories proper, not the symlinks to them
- cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes
- # patch out any attempted references to the theme or plymouth's themes directory
+ # Use -L to copy the directories proper, not the symlinks to them.
+ # Copy all themes because they're not large assets, and bgrt depends on the ImageDir of
+ # the spinner theme.
+ cp -r -L ${themesEnv}/share/plymouth/themes/* themes
+
+ # Patch out any attempted references to the theme or plymouth's themes directory
chmod -R +w themes
find themes -type f | while read file
do
sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
done
+ # Install themes
cp -r themes/* $out/share/plymouth/themes
- cp ${cfg.logo} $out/share/plymouth/logo.png
+ # Install logo
+ mkdir -p $out/etc/plymouth
+ cp -r -L ${themesEnv}/etc/plymouth $out
+
+ # Setup font
mkdir -p $out/share/fonts
cp ${cfg.font} $out/share/fonts
mkdir -p $out/etc/fonts
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh
index 5b39f34200..ddaf985878 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh
@@ -614,11 +614,16 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe
# Start stage 2. `switch_root' deletes all files in the ramfs on the
-# current root. Note that $stage2Init might be an absolute symlink,
-# in which case "-e" won't work because we're not in the chroot yet.
-if [ ! -e "$targetRoot/$stage2Init" ] && [ ! -L "$targetRoot/$stage2Init" ] ; then
- echo "stage 2 init script ($targetRoot/$stage2Init) not found"
- fail
+# current root. The path has to be valid in the chroot not outside.
+if [ ! -e "$targetRoot/$stage2Init" ]; then
+ stage2Check=${stage2Init}
+ while [ "$stage2Check" != "${stage2Check%/*}" ] && [ ! -L "$targetRoot/$stage2Check" ]; do
+ stage2Check=${stage2Check%/*}
+ done
+ if [ ! -L "$targetRoot/$stage2Check" ]; then
+ echo "stage 2 init script ($targetRoot/$stage2Init) not found"
+ fail
+ fi
fi
mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run
diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
index 088bffd7c5..23e1e611a7 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -93,17 +93,7 @@ in
(if i.useDHCP != null then i.useDHCP else false));
address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
- # IPv6PrivacyExtensions=kernel seems to be broken with networkd.
- # Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of
- # `tempAddress`:
- networkConfig.IPv6PrivacyExtensions = {
- # generate temporary addresses and use them by default
- "default" = true;
- # generate temporary addresses but keep using the standard EUI-64 ones by default
- "enabled" = "prefer-public";
- # completely disable temporary addresses
- "disabled" = false;
- }.${i.tempAddress};
+ networkConfig.IPv6PrivacyExtensions = "kernel";
linkConfig = optionalAttrs (i.macAddress != null) {
MACAddress = i.macAddress;
} // optionalAttrs (i.mtu != null) {
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix
index c5470b7af0..be83607c0a 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix
@@ -1,6 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+with lib;
let
+ cfg = config.virtualisation.amazon-init;
+
script = ''
#!${pkgs.runtimeShell} -eu
@@ -41,20 +45,33 @@ let
nixos-rebuild switch
'';
in {
- systemd.services.amazon-init = {
- inherit script;
- description = "Reconfigure the system from EC2 userdata on startup";
- wantedBy = [ "multi-user.target" ];
- after = [ "multi-user.target" ];
- requires = [ "network-online.target" ];
+ options.virtualisation.amazon-init = {
+ enable = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ Enable or disable the amazon-init service.
+ '';
+ };
+ };
- restartIfChanged = false;
- unitConfig.X-StopOnRemoval = false;
+ config = mkIf cfg.enable {
+ systemd.services.amazon-init = {
+ inherit script;
+ description = "Reconfigure the system from EC2 userdata on startup";
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
+ wantedBy = [ "multi-user.target" ];
+ after = [ "multi-user.target" ];
+ requires = [ "network-online.target" ];
+
+ restartIfChanged = false;
+ unitConfig.X-StopOnRemoval = false;
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
};
};
}
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix
index da5df35807..7b096bd1a9 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix
@@ -98,7 +98,6 @@ in
environment.XDG_RUNTIME_DIR="${anboxloc}";
wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
preStart = let
initsh = pkgs.writeText "nixos-init" (''
#!/system/bin/sh
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix
new file mode 100644
index 0000000000..194276d169
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix
@@ -0,0 +1,60 @@
+{ pkgs, lib, config, ... }:
+let
+ cfg = config.virtualisation.containerd;
+ containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { nativeBuildInputs = [pkgs.containerd]; } ''
+ containerd -c ${cfg.configFile} config dump >/dev/null
+ ln -s ${cfg.configFile} $out
+ '';
+in
+{
+
+ options.virtualisation.containerd = with lib.types; {
+ enable = lib.mkEnableOption "containerd container runtime";
+
+ configFile = lib.mkOption {
+ default = null;
+ description = "path to containerd config file";
+ type = nullOr path;
+ };
+
+ args = lib.mkOption {
+ default = {};
+ description = "extra args to append to the containerd cmdline";
+ type = attrsOf str;
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ virtualisation.containerd.args.config = lib.mkIf (cfg.configFile != null) (toString containerdConfigChecked);
+
+ environment.systemPackages = [pkgs.containerd];
+
+ systemd.services.containerd = {
+ description = "containerd - container runtime";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+ path = with pkgs; [
+ containerd
+ runc
+ iptables
+ ];
+ serviceConfig = {
+ ExecStart = ''${pkgs.containerd}/bin/containerd ${lib.concatStringsSep " " (lib.cli.toGNUCommandLine {} cfg.args)}'';
+ Delegate = "yes";
+ KillMode = "process";
+ Type = "notify";
+ Restart = "always";
+ RestartSec = "5";
+ StartLimitBurst = "8";
+ StartLimitIntervalSec = "120s";
+
+ # "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service
+ LimitNPROC = "infinity";
+ LimitCORE = "infinity";
+ LimitNOFILE = "infinity";
+ TasksMax = "infinity";
+ OOMScoreAdjust = "-999";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix
index 2425fbbed6..07547ffc5e 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix
@@ -221,7 +221,7 @@ in {
systemd.services.libvirtd = {
requires = [ "libvirtd-config.service" ];
- after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
+ after = [ "libvirtd-config.service" ]
++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = escapeShellArgs (
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
index 4b2adf4cc6..96e8d68ae5 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix
@@ -66,7 +66,7 @@ in {
type = types.bool;
default = false;
description = ''
- enables various settings to avoid common pitfalls when
+ Enables various settings to avoid common pitfalls when
running containers requiring many file operations.
Fixes errors like "Too many open files" or
"neighbour: ndisc_cache: neighbor table overflow!".
@@ -74,6 +74,17 @@ in {
for details.
'';
};
+
+ startTimeout = mkOption {
+ type = types.int;
+ default = 600;
+ apply = toString;
+ description = ''
+ Time to wait (in seconds) for LXD to become ready to process requests.
+ If LXD does not reply within the configured time, lxd.service will be
+ considered failed and systemd will attempt to restart it.
+ '';
+ };
};
};
@@ -81,40 +92,58 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
- security.apparmor = {
- enable = true;
- profiles = [
- "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start"
- "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers"
- ];
- packages = [ cfg.lxcPackage ];
- };
+ # Note: the following options are also declared in virtualisation.lxc, but
+ # the latter can't be simply enabled to reuse the formers, because it
+ # does a bunch of unrelated things.
+ systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];
+
+ security.apparmor.packages = [ cfg.lxcPackage ];
+ security.apparmor.profiles = [
+ "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers"
+ "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start"
+ ];
# TODO: remove once LXD gets proper support for cgroupsv2
# (currently most of the e.g. CPU accounting stuff doesn't work)
systemd.enableUnifiedCgroupHierarchy = false;
+ systemd.sockets.lxd = {
+ description = "LXD UNIX socket";
+ wantedBy = [ "sockets.target" ];
+
+ socketConfig = {
+ ListenStream = "/var/lib/lxd/unix.socket";
+ SocketMode = "0660";
+ SocketGroup = "lxd";
+ Service = "lxd.service";
+ };
+ };
+
systemd.services.lxd = {
description = "LXD Container Management Daemon";
wantedBy = [ "multi-user.target" ];
- after = [ "systemd-udev-settle.service" ];
+ after = [ "network-online.target" "lxcfs.service" ];
+ requires = [ "network-online.target" "lxd.socket" "lxcfs.service" ];
+ documentation = [ "man:lxd(1)" ];
- path = lib.optional config.boot.zfs.enabled config.boot.zfs.package;
-
- preStart = ''
- mkdir -m 0755 -p /var/lib/lxc/rootfs
- '';
+ path = optional cfg.zfsSupport config.boot.zfs.package;
serviceConfig = {
ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";
- Type = "simple";
+ ExecStartPost = "${cfg.package}/bin/lxd waitready --timeout=${cfg.startTimeout}";
+ ExecStop = "${cfg.package}/bin/lxd shutdown";
+
KillMode = "process"; # when stopping, leave the containers alone
LimitMEMLOCK = "infinity";
LimitNOFILE = "1048576";
LimitNPROC = "infinity";
TasksMax = "infinity";
+ Restart = "on-failure";
+ TimeoutStartSec = "${cfg.startTimeout}s";
+ TimeoutStopSec = "30s";
+
# By default, `lxd` loads configuration files from hard-coded
# `/usr/share/lxc/config` - since this is a no-go for us, we have to
# explicitly tell it where the actual configuration files are
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
index f06977f88f..3754fe6dac 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
@@ -271,8 +271,8 @@ let
DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
};
-
system = config.nixpkgs.localSystem.system;
+ kernelVersion = config.boot.kernelPackages.kernel.version;
bindMountOpts = { name, ... }: {
@@ -321,7 +321,6 @@ let
};
};
-
mkBindFlag = d:
let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind=";
mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}";
@@ -482,11 +481,16 @@ in
networking.useDHCP = false;
assertions = [
{
- assertion = config.privateNetwork -> stringLength name < 12;
+ assertion =
+ (builtins.compareVersions kernelVersion "5.8" <= 0)
+ -> config.privateNetwork
+ -> stringLength name <= 11;
message = ''
Container name `${name}` is too long: When `privateNetwork` is enabled, container names can
not be longer than 11 characters, because the container's interface name is derived from it.
- This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509
+ You should either make the container name shorter or upgrade to a more recent kernel that
+ supports interface altnames (i.e. at least Linux 5.8 - please see https://github.com/NixOS/nixpkgs/issues/38509
+ for details).
'';
}
];
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
index 5360cff22f..d9935bcafb 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
@@ -277,6 +277,18 @@ in
'';
};
+ virtualisation.msize =
+ mkOption {
+ default = null;
+ type = types.nullOr types.ints.unsigned;
+ description =
+ ''
+ msize (maximum packet size) option passed to 9p file systems, in
+ bytes. Increasing this should increase performance significantly,
+ at the cost of higher RAM usage.
+ '';
+ };
+
virtualisation.diskSize =
mkOption {
default = 512;
@@ -666,7 +678,7 @@ in
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store";
fsType = "9p";
- options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
+ options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}";
neededForBoot = true;
};
"/tmp" = mkIf config.boot.tmpOnTmpfs
@@ -679,13 +691,13 @@ in
"/tmp/xchg" =
{ device = "xchg";
fsType = "9p";
- options = [ "trans=virtio" "version=9p2000.L" ];
+ options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}";
neededForBoot = true;
};
"/tmp/shared" =
{ device = "shared";
fsType = "9p";
- options = [ "trans=virtio" "version=9p2000.L" ];
+ options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}";
neededForBoot = true;
};
} // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs)
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index bcf2003fc5..fe60b0b83f 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -73,6 +73,7 @@ in
containers-imperative = handleTest ./containers-imperative.nix {};
containers-ip = handleTest ./containers-ip.nix {};
containers-macvlans = handleTest ./containers-macvlans.nix {};
+ containers-names = handleTest ./containers-names.nix {};
containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
containers-portforward = handleTest ./containers-portforward.nix {};
containers-reloadable = handleTest ./containers-reloadable.nix {};
@@ -196,6 +197,7 @@ in
keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {};
krb5 = discoverTests (import ./krb5 {});
+ ksm = handleTest ./ksm.nix {};
kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};
# kubernetes.e2e should eventually replace kubernetes.rbac when it works
#kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {};
@@ -238,6 +240,7 @@ in
mosquitto = handleTest ./mosquitto.nix {};
mpd = handleTest ./mpd.nix {};
mumble = handleTest ./mumble.nix {};
+ musescore = handleTest ./musescore.nix {};
munin = handleTest ./munin.nix {};
mutableUsers = handleTest ./mutable-users.nix {};
mxisd = handleTest ./mxisd.nix {};
@@ -304,9 +307,13 @@ in
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
php = handleTest ./php {};
+ php73 = handleTest ./php { php = pkgs.php73; };
+ php74 = handleTest ./php { php = pkgs.php74; };
+ php80 = handleTest ./php { php = pkgs.php80; };
pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {};
+ plikd = handleTest ./plikd.nix {};
plotinus = handleTest ./plotinus.nix {};
podman = handleTestOn ["x86_64-linux"] ./podman.nix {};
postfix = handleTest ./postfix.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/containers-bridge.nix b/third_party/nixpkgs/nixos/tests/containers-bridge.nix
index 1208aa8fce..12fa67c8b0 100644
--- a/third_party/nixpkgs/nixos/tests/containers-bridge.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-bridge.nix
@@ -1,5 +1,3 @@
-# Test for NixOS' container support.
-
let
hostIp = "192.168.0.1";
containerIp = "192.168.0.100/24";
@@ -7,10 +5,10 @@ let
containerIp6 = "fc00::2/7";
in
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-bridge";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix
index 1412c32bfb..c050e49bc2 100644
--- a/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-custom-pkgs.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, lib, ...} : let
+import ./make-test-python.nix ({ pkgs, lib, ... }: let
customPkgs = pkgs.appendOverlays [ (self: super: {
hello = super.hello.overrideAttrs (old: {
@@ -8,8 +8,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : let
in {
name = "containers-custom-pkgs";
- meta = with lib.maintainers; {
- maintainers = [ adisbladis earvstedt ];
+ meta = {
+ maintainers = with lib.maintainers; [ adisbladis earvstedt ];
};
machine = { config, ... }: {
diff --git a/third_party/nixpkgs/nixos/tests/containers-ephemeral.nix b/third_party/nixpkgs/nixos/tests/containers-ephemeral.nix
index 692554ac0b..fabf0593f2 100644
--- a/third_party/nixpkgs/nixos/tests/containers-ephemeral.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-ephemeral.nix
@@ -1,7 +1,8 @@
-# Test for NixOS' container support.
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-ephemeral";
+ meta = {
+ maintainers = with lib.maintainers; [ patryk27 ];
+ };
machine = { pkgs, ... }: {
virtualisation.memorySize = 768;
diff --git a/third_party/nixpkgs/nixos/tests/containers-extra_veth.nix b/third_party/nixpkgs/nixos/tests/containers-extra_veth.nix
index 212f3d0f46..cbbb252583 100644
--- a/third_party/nixpkgs/nixos/tests/containers-extra_veth.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-extra_veth.nix
@@ -1,9 +1,7 @@
-# Test for NixOS' container support.
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-extra_veth";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ kampfschlaefer ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-hosts.nix b/third_party/nixpkgs/nixos/tests/containers-hosts.nix
index 65a983c42a..1f24ed1f3c 100644
--- a/third_party/nixpkgs/nixos/tests/containers-hosts.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-hosts.nix
@@ -1,9 +1,7 @@
-# Test for NixOS' container support.
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-hosts";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ montag451 ];
+ meta = {
+ maintainers = with lib.maintainers; [ montag451 ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-imperative.nix b/third_party/nixpkgs/nixos/tests/containers-imperative.nix
index 393b4a5135..0ff0d3f954 100644
--- a/third_party/nixpkgs/nixos/tests/containers-imperative.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-imperative.nix
@@ -1,9 +1,7 @@
-# Test for NixOS' container support.
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-imperative";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-ip.nix b/third_party/nixpkgs/nixos/tests/containers-ip.nix
index 0265ed92d4..5abea2dbad 100644
--- a/third_party/nixpkgs/nixos/tests/containers-ip.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-ip.nix
@@ -1,5 +1,3 @@
-# Test for NixOS' container support.
-
let
webserverFor = hostAddress: localAddress: {
inherit hostAddress localAddress;
@@ -13,10 +11,10 @@ let
};
};
-in import ./make-test-python.nix ({ pkgs, ...} : {
+in import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-ipv4-ipv6";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-macvlans.nix b/third_party/nixpkgs/nixos/tests/containers-macvlans.nix
index 9425252cb8..d0f41be8c1 100644
--- a/third_party/nixpkgs/nixos/tests/containers-macvlans.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-macvlans.nix
@@ -1,15 +1,13 @@
-# Test for NixOS' container support.
-
let
# containers IP on VLAN 1
containerIp1 = "192.168.1.253";
containerIp2 = "192.168.1.254";
in
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-macvlans";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ montag451 ];
+ meta = {
+ maintainers = with lib.maintainers; [ montag451 ];
};
nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/containers-names.nix b/third_party/nixpkgs/nixos/tests/containers-names.nix
new file mode 100644
index 0000000000..9ad2bfb748
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/containers-names.nix
@@ -0,0 +1,37 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "containers-names";
+ meta = {
+ maintainers = with lib.maintainers; [ patryk27 ];
+ };
+
+ machine = { ... }: {
+ # We're using the newest kernel, so that we can test containers with long names.
+ # Please see https://github.com/NixOS/nixpkgs/issues/38509 for details.
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+
+ containers = let
+ container = subnet: {
+ autoStart = true;
+ privateNetwork = true;
+ hostAddress = "192.168.${subnet}.1";
+ localAddress = "192.168.${subnet}.2";
+ config = { };
+ };
+
+ in {
+ first = container "1";
+ second = container "2";
+ really-long-name = container "3";
+ really-long-long-name-2 = container "4";
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("default.target")
+
+ machine.succeed("ip link show | grep ve-first")
+ machine.succeed("ip link show | grep ve-second")
+ machine.succeed("ip link show | grep ve-really-lFYWO")
+ machine.succeed("ip link show | grep ve-really-l3QgY")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/containers-physical_interfaces.nix b/third_party/nixpkgs/nixos/tests/containers-physical_interfaces.nix
index 0b55c3418e..57bd0eedcc 100644
--- a/third_party/nixpkgs/nixos/tests/containers-physical_interfaces.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-physical_interfaces.nix
@@ -1,8 +1,7 @@
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-physical_interfaces";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ kampfschlaefer ];
};
nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/containers-portforward.nix b/third_party/nixpkgs/nixos/tests/containers-portforward.nix
index d0be3c7d43..221a6f50ef 100644
--- a/third_party/nixpkgs/nixos/tests/containers-portforward.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-portforward.nix
@@ -1,5 +1,3 @@
-# Test for NixOS' container support.
-
let
hostIp = "192.168.0.1";
hostPort = 10080;
@@ -7,10 +5,10 @@ let
containerPort = 80;
in
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-portforward";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];
+ meta = {
+ maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/containers-reloadable.nix b/third_party/nixpkgs/nixos/tests/containers-reloadable.nix
index 8772469176..876e62c1da 100644
--- a/third_party/nixpkgs/nixos/tests/containers-reloadable.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-reloadable.nix
@@ -1,7 +1,6 @@
-import ./make-test-python.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
client_base = {
-
containers.test1 = {
autoStart = true;
config = {
@@ -16,8 +15,8 @@ let
};
in {
name = "containers-reloadable";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ danbst ];
+ meta = {
+ maintainers = with lib.maintainers; [ danbst ];
};
nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/containers-restart_networking.nix b/third_party/nixpkgs/nixos/tests/containers-restart_networking.nix
index b35552b5b1..e1ad8157b2 100644
--- a/third_party/nixpkgs/nixos/tests/containers-restart_networking.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-restart_networking.nix
@@ -1,5 +1,3 @@
-# Test for NixOS' container support.
-
let
client_base = {
networking.firewall.enable = false;
@@ -16,11 +14,11 @@ let
};
};
};
-in import ./make-test-python.nix ({ pkgs, ...} :
+in import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "containers-restart_networking";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ kampfschlaefer ];
+ meta = {
+ maintainers = with lib.maintainers; [ kampfschlaefer ];
};
nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/containers-tmpfs.nix b/third_party/nixpkgs/nixos/tests/containers-tmpfs.nix
index 7ebf0d02a2..fd9f9a252c 100644
--- a/third_party/nixpkgs/nixos/tests/containers-tmpfs.nix
+++ b/third_party/nixpkgs/nixos/tests/containers-tmpfs.nix
@@ -1,9 +1,7 @@
-# Test for NixOS' container support.
-
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-tmpfs";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ ];
+ meta = {
+ maintainers = with lib.maintainers; [ patryk27 ];
};
machine =
diff --git a/third_party/nixpkgs/nixos/tests/gitlab.nix b/third_party/nixpkgs/nixos/tests/gitlab.nix
index ba08533894..baad675229 100644
--- a/third_party/nixpkgs/nixos/tests/gitlab.nix
+++ b/third_party/nixpkgs/nixos/tests/gitlab.nix
@@ -11,6 +11,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
nodes = {
gitlab = { ... }: {
+ imports = [ common/user-account.nix ];
+
virtualisation.memorySize = if pkgs.stdenv.is64bit then 4096 else 2047;
systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
@@ -27,11 +29,31 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
};
};
+ services.dovecot2 = {
+ enable = true;
+ enableImap = true;
+ };
+
services.gitlab = {
enable = true;
databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4";
initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword;
smtp.enable = true;
+ extraConfig = {
+ incoming_email = {
+ enabled = true;
+ mailbox = "inbox";
+ address = "alice@localhost";
+ user = "alice";
+ password = "foobar";
+ host = "localhost";
+ port = 143;
+ };
+ pages = {
+ enabled = true;
+ host = "localhost";
+ };
+ };
secrets = {
secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj";
otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG";
@@ -64,12 +86,16 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
in
''
gitlab.start()
+
gitlab.wait_for_unit("gitaly.service")
gitlab.wait_for_unit("gitlab-workhorse.service")
+ gitlab.wait_for_unit("gitlab-pages.service")
+ gitlab.wait_for_unit("gitlab-mailroom.service")
gitlab.wait_for_unit("gitlab.service")
gitlab.wait_for_unit("gitlab-sidekiq.service")
gitlab.wait_for_file("/var/gitlab/state/tmp/sockets/gitlab.socket")
gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in")
+
gitlab.succeed(
"curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in"
)
diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix
index 131f50747f..726c7eb6ac 100644
--- a/third_party/nixpkgs/nixos/tests/home-assistant.nix
+++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix
@@ -24,6 +24,8 @@ in {
services.home-assistant = {
inherit configDir;
enable = true;
+ # includes the package with all tests enabled
+ package = pkgs.home-assistant;
config = {
homeassistant = {
name = "Home";
diff --git a/third_party/nixpkgs/nixos/tests/ksm.nix b/third_party/nixpkgs/nixos/tests/ksm.nix
new file mode 100644
index 0000000000..8f84b32020
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/ksm.nix
@@ -0,0 +1,22 @@
+import ./make-test-python.nix ({ lib, ...} :
+
+{
+ name = "ksm";
+ meta = with lib.maintainers; {
+ maintainers = [ rnhmjoj ];
+ };
+
+ machine = { ... }: {
+ imports = [ ../modules/profiles/minimal.nix ];
+
+ hardware.ksm.enable = true;
+ hardware.ksm.sleep = 300;
+ };
+
+ testScript =
+ ''
+ machine.start()
+ machine.wait_until_succeeds("test $( /tmp/data.txt")
+ machine.succeed("plik --server http://localhost:8080 /tmp/data.txt | grep curl")
+
+ machine.succeed("diff data.txt /tmp/data.txt")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index bce78f09fd..5831c8692f 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -165,7 +165,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
# accept the delegated prefix.
PrefixDelegationHint = "::/48";
};
- ipv6PrefixDelegationConfig = {
+ ipv6SendRAConfig = {
# Let networkd know that we would very much like to use DHCPv6
# to obtain the "managed" information. Not sure why they can't
# just take that from the upstream RAs.
@@ -179,24 +179,20 @@ import ./make-test-python.nix ({pkgs, ...}: {
name = "eth2";
networkConfig = {
Description = "Client interface";
- # the client shouldn't be allowed to send us RAs, that would be weird.
+ # The client shouldn't be allowed to send us RAs, that would be weird.
IPv6AcceptRA = false;
- # Just delegate prefixes from the DHCPv6 PD pool.
- # If you also want to distribute a local ULA prefix you want to
- # set this to `yes` as that includes both static prefixes as well
- # as PD prefixes.
- IPv6PrefixDelegation = "dhcpv6";
+ # Delegate prefixes from the DHCPv6 PD pool.
+ DHCPv6PrefixDelegation = true;
+ IPv6SendRA = true;
};
- # finally "act as router" (according to systemd.network(5))
- ipv6PrefixDelegationConfig = {
- RouterLifetimeSec = 300; # required as otherwise no RA's are being emitted
- # In a production environment you should consider setting these as well:
+ # In a production environment you should consider setting these as well:
+ # ipv6SendRAConfig = {
#EmitDNS = true;
#EmitDomains = true;
#DNS= = "fe80::1"; # or whatever "well known" IP your router will have on the inside.
- };
+ # };
# This adds a "random" ULA prefix to the interface that is being
# advertised to the clients.
diff --git a/third_party/nixpkgs/nixos/tests/unbound.nix b/third_party/nixpkgs/nixos/tests/unbound.nix
index c882316362..d4b8bb15ce 100644
--- a/third_party/nixpkgs/nixos/tests/unbound.nix
+++ b/third_party/nixpkgs/nixos/tests/unbound.nix
@@ -27,6 +27,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
# disable the root anchor update as we do not have internet access during
# the test execution
services.unbound.enableRootTrustAnchor = false;
+
+ # we want to test the full-variant of the package to also get DoH support
+ services.unbound.package = pkgs.unbound-full;
};
};
@@ -81,13 +84,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
networking.firewall.allowedTCPPorts = [
53 # regular DNS
853 # DNS over TLS
+ 443 # DNS over HTTPS
];
networking.firewall.allowedUDPPorts = [ 53 ];
services.unbound = {
enable = true;
allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ];
- interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" ];
+ interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2"
+ "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853"
+ "192.168.0.2@443" "fd21::2@443" "::1@443" "127.0.0.1@443" ];
forwardAddresses = [
(lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address
(lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address
@@ -217,6 +223,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
expected,
["+tcp", "+tls"] + args,
)
+ query(
+ machine,
+ remote,
+ query_type,
+ zone,
+ expected,
+ ["+https"] + args,
+ )
client.start()
diff --git a/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix b/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
index ade595732c..25cb969650 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/MMA/default.nix
@@ -9,7 +9,8 @@
sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732";
};
- buildInputs = [ makeWrapper python3 alsaUtils timidity ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python3 alsaUtils timidity ];
patchPhase = ''
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec
diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
index c3daee55fc..36320a0106 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
@@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.audacityteam.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lheckemann ];
- platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix b/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix
index 29c5130f57..7d6d51011c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
else
throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# Prebuilt binary distribution.
# "patchelf --set-rpath" seems to break the application (cannot start), using
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
index db8f8ad793..aafad7f82e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bchoppr";
- version = "1.10.0";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "sha256-LYndZhg4ILN0E8aRqgUBFzzzLv88TMSXG2OeFxImDu0=";
+ sha256 = "sha256-FBzdWUgncDCPJGb8T1HvzuuTlDhKa9JJrSrUoPQOSAU=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix
index 6b0ca55f27..76d2e78a26 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bschaffl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bschaffl";
- version = "1.4.2";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY=";
+ sha256 = "sha256-tu5JL0vcqRsZYmoaYGYm/aj95i7wLtnKYGbEPD7AsoM=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
index d45b42ddb9..692667c000 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bsequencer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSEQuencer";
- version = "1.8.4";
+ version = "1.8.6";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
+ sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix
index 7e45d6a826..04dd93b8f4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bshapr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BShapr";
- version = "0.9";
+ version = "0.10";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "v${version}";
- sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri";
+ sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix b/third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix
index 0360922c81..15ebb85136 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/caudec/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
patchShebangs ./install.sh
'';
- buildInputs = [ bash makeWrapper ];
+ nativeBuildInputs = [ bash makeWrapper ];
installPhase = ''
./install.sh --prefix=$out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
index be0f2f7252..e665edabd0 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
@@ -24,7 +24,7 @@ let
./clementine-spotify-blob.patch
];
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost
@@ -68,7 +68,7 @@ let
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
- buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
+ buildInputs = buildInputs ++ gst_plugins;
preConfigure = ''
rm -rf ext/{,lib}clementine-spotifyblob
@@ -102,7 +102,7 @@ let
# Use the same patches and sources as Clementine
inherit src nativeBuildInputs patches postPatch;
- buildInputs = buildInputs ++ [ libspotify makeWrapper ];
+ buildInputs = buildInputs ++ [ libspotify ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob
diff --git a/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
index 0724632a63..a2e71b955e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b";
};
- buildInputs = [ makeWrapper pythonPackages.mpd2 ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ pythonPackages.mpd2 ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix
index cd45ef5926..66108deab1 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -5,7 +5,7 @@ symlinkJoin {
paths = [ deadbeef ] ++ plugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/deadbeef \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix
index 6d7d2e2c2b..81ce11b9ea 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix
@@ -30,7 +30,7 @@ let
inherit src;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit wrap wrapWithBuildEnv;
@@ -159,8 +159,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@@ -195,7 +194,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do
diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix
index 990d073528..051caf120f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix
@@ -168,8 +168,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@@ -209,7 +208,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do
diff --git a/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix
new file mode 100644
index 0000000000..f60320784a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/freac/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+
+, boca
+, smooth
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "freac";
+ version = "1.1.3";
+
+ src = fetchFromGitHub {
+ owner = "enzo1982";
+ repo = "freac";
+ rev = "v${version}";
+ sha256 = "1sdrsc5pn5901bbds7dj02n71zn5rs4wnv2xxs8ffql4b7jjva0m";
+ };
+
+ buildInputs = [
+ boca
+ smooth
+ systemd
+ ];
+
+ makeFlags = [
+ "prefix=$(out)"
+ ];
+
+ meta = with lib; {
+ description = "The fre:ac audio converter project";
+ license = licenses.gpl2Plus;
+ homepage = "https://www.freac.org/";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
index d9d2570d0a..2ebff030b4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
- version = "1.43";
+ version = "1.44_fix";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
- sha256 = "sha256-OIQk7ngg1wsB6DFcxhrviPGlhzdaAWBi9C2roSNg1eI=";
+ sha256 = "sha256-2HhG2cDzAvpSm655M1KQnjbfVvqqOZDz2ty7xnttskA=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
diff --git a/third_party/nixpkgs/pkgs/applications/audio/google-musicmanager/default.nix b/third_party/nixpkgs/pkgs/applications/audio/google-musicmanager/default.nix
deleted file mode 100644
index e10a961a9e..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/google-musicmanager/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib, stdenv, fetchurl
-, flac, expat, libidn, qtbase, qtwebkit, libvorbis }:
-assert stdenv.hostPlatform.system == "x86_64-linux";
-
-stdenv.mkDerivation rec {
- version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo
- product = "google-musicmanager";
- name = "${product}-${version}";
-
- # When looking for newer versions, since google doesn't let you list their repo dirs,
- # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release
- # fetch an appropriate packages file such as main/binary-amd64/Packages:
- # curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages
- # which will contain the links to all available *.debs for the arch.
-
- src = fetchurl {
- url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb";
- sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2";
- };
-
- unpackPhase = ''
- ar vx ${src}
- tar xvf data.tar.xz
- tar xvf control.tar.gz
- '';
-
- prePatch = ''
- sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/lib
- mkdir -p $out/share/applications
-
- cp -r opt $out
- find -name "*.so*" -exec cp "{}" $out/lib \;
- ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin
- ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications
-
- for i in 16 32 48 128
- do
- iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps
-
- mkdir -p $iconDirectory
- ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png
- done
- '';
-
- postFixup = ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
- $out/opt/google/musicmanager/minidump_upload
-
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [
- flac
- expat
- libidn
- qtbase
- qtwebkit
- libvorbis
- stdenv.cc.cc.lib
- ]}" \
- $out/opt/google/musicmanager/MusicManager
- '';
-
- meta = with lib; {
- description = "Uploads music from your computer to Google Play";
- homepage = "https://support.google.com/googleplay/answer/1229970";
- license = licenses.unfree;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
deleted file mode 100644
index 0be1cc4571..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
-, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
-, nss, pango, udev, xorg
-}:
-
-let
- version = "4.7.1";
-
- deps = [
- alsaLib
- atk
- at-spi2-atk
- cairo
- cups
- dbus
- expat
- fontconfig
- freetype
- GConf
- gdk-pixbuf
- glib
- gtk2
- gtk3
- libpulseaudio
- nspr
- nss
- pango
- stdenv.cc.cc
- udev
- xorg.libX11
- xorg.libxcb
- xorg.libXcomposite
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXi
- xorg.libXrandr
- xorg.libXrender
- xorg.libXScrnSaver
- xorg.libXtst
- ];
-
-in
-
-stdenv.mkDerivation {
- pname = "google-play-music-desktop-player";
- inherit version;
-
- src = fetchurl {
- url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
- sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
- };
-
- dontBuild = true;
- buildInputs = [ dpkg makeWrapper ];
-
- unpackPhase = ''
- dpkg -x $src .
- '';
-
- installPhase = ''
- mkdir -p $out
- cp -r ./usr/share $out
- cp -r ./usr/bin $out
-
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
-
- wrapProgram $out/bin/google-play-music-desktop-player \
- --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
- '';
-
- meta = {
- homepage = "https://www.googleplaymusicdesktopplayer.com/";
- description = "A beautiful cross platform Desktop Player for Google Play Music";
- license = lib.licenses.mit;
- platforms = [ "x86_64-linux" ];
- maintainers = [ lib.maintainers.SuprDewd ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
index f111c4e99d..325d115b58 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jamin/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]
++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = "-ldl";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lash/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lash/default.nix
index eb355a4340..74bbeb9b7b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lash/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/lash/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
- buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
- pkg-config readline ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = "-lm -lpthread -luuid";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/linuxband/default.nix b/third_party/nixpkgs/pkgs/applications/audio/linuxband/default.nix
index 118b54ad85..ec034ae238 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/linuxband/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/linuxband/default.nix
@@ -11,8 +11,8 @@ in stdenv.mkDerivation rec {
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index 6c218738f0..9ae05fb571 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -25,7 +25,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "1.4.16";
+ version = "1.4.17";
format = "other";
doCheck = false;
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "sha256-4txJ+lYx2BROjZznFwWMc+tTVpYQpPtPySfCl+Hfy+0=";
+ sha256 = "sha256-GrznUXIYUTYOKQ1znsCqmBdm5YImCABMK2NGRtx5fSk=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index d7f0a7fb20..400f268d43 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "CharacterCompressor";
version = "0.3.3";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 7a917d79c5..0b80aef170 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "CompBus";
version = "1.1.1";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index 5ac7117232..5653430973 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "constant-detune-chorus";
version = "0.1.3";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index 277b186fd4..4b1157de0b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "LazyLimiter";
version = "0.3.2";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index de7e573cbe..f951486e3f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "MBdistortion";
version = "1.1.1";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 80c5bb89ee..fff4292cd7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "RhythmDelay";
version = "2.1";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 9bd4076f13..6bc8cff226 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
+{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
stdenv.mkDerivation rec {
pname = "VoiceOfFaust";
version = "1.1.4";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index a90492f423..7ea5fa753c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
name = "faustCompressors-v${version}";
version = "1.2";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index 414e350caa..fd807dd424 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "pluginUtils";
version = "1.1";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index 7dcdf985c8..07d4402578 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "shelfMultiBand";
version = "0.6.1";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
index 30d654ab87..92f8506483 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mda-lv2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mda-lv2";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
+ sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s=";
};
nativeBuildInputs = [ pkg-config wafHook python3 ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix
index 2c19afb16a..44d48fb378 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix
@@ -12,8 +12,6 @@ let
mopidy = callPackage ./mopidy.nix { };
- mopidy-gmusic = callPackage ./gmusic.nix { };
-
mopidy-iris = callPackage ./iris.nix { };
mopidy-local = callPackage ./local.nix { };
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix
deleted file mode 100644
index 6e76d6af87..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/gmusic.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, python3Packages, mopidy }:
-
-python3Packages.buildPythonApplication rec {
- pname = "mopidy-gmusic";
- version = "4.0.0";
-
- src = python3Packages.fetchPypi {
- inherit version;
- pname = "Mopidy-GMusic";
- sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3";
- };
-
- propagatedBuildInputs = [
- mopidy
- python3Packages.requests
- python3Packages.gmusicapi
- python3Packages.cachetools
- ];
-
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://www.mopidy.com/";
- description = "Mopidy extension for playing music from Google Play Music";
- license = licenses.asl20;
- maintainers = [ maintainers.jgillich ];
- hydraPlatforms = [];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
index de748ea7b3..ebe9885e49 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix
@@ -1,16 +1,15 @@
{ lib
, mopidy
, python3Packages
-, fetchpatch
}:
python3Packages.buildPythonApplication rec {
pname = "Mopidy-Local";
- version = "3.2.0";
+ version = "3.2.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0";
+ sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9";
};
propagatedBuildInputs = [
@@ -22,14 +21,6 @@ python3Packages.buildPythonApplication rec {
python3Packages.pytestCheckHook
];
- patches = [
- # Fix tests for Mopidy≥3.1.0. Remove with the next release.
- (fetchpatch {
- url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch";
- sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp";
- })
- ];
-
meta = with lib; {
homepage = "https://github.com/mopidy/mopidy-local";
description = "Mopidy extension for playing music from your local music archive";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
index 63a28eb0f5..d53bfee9ef 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix
@@ -42,7 +42,7 @@ pythonPackages.buildPythonApplication rec {
homepage = "https://www.mopidy.com/";
description = ''
An extensible music server that plays music from local disk, Spotify,
- SoundCloud, Google Play Music, and more
+ SoundCloud, and more
'';
license = licenses.asl20;
maintainers = [ maintainers.fpletz ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
index 47f8e5a22e..6a5dbebeca 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix
@@ -3,17 +3,18 @@
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools
, qtwebengine, qtxmlpatterns
+, nixosTests
}:
mkDerivation rec {
pname = "musescore";
- version = "3.6";
+ version = "3.6.1";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
- sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE=";
+ sha256 = "sha256-21ZI5rsc05ZWEyM0LeFr+212YViLYveZZBvVpskh8iA=";
};
patches = [
@@ -40,6 +41,8 @@ mkDerivation rec {
qtscript qtsvg qttools qtwebengine qtxmlpatterns
];
+ passthru.tests = nixosTests.musescore;
+
meta = with lib; {
description = "Music notation and composition software";
homepage = "https://musescore.org/";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pragha/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pragha/default.nix
index bc6ef526ea..da5a64f708 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pragha/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pragha/default.nix
@@ -36,13 +36,13 @@ assert withLastfm -> withCD;
mkDerivation rec {
pname = "pragha";
- version = "1.3.4";
+ version = "1.3.99.1";
src = fetchFromGitHub {
owner = "pragha-music-player";
repo = "pragha";
rev = "v${version}";
- sha256 = "sha256:0n8gx8amg5l9g4w7s4agjf8mlmpgjydgzx3vryp9lzzs9xrd5vqh";
+ sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix
index d207d26972..71b05aabf5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "projectm";
- version = "3.1.8";
+ version = "3.1.11";
src = fetchFromGitHub {
owner = "projectM-visualizer";
repo = "projectM";
rev = "v${version}";
- sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z";
+ sha256 = "sha256-0aIaT+pzwPjI1nSo6C5SrHBXcrxIpSi6TFV2mgK5GvU=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 843c131ea6..9d1d6df1da 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -7,13 +7,13 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.68";
+ version = "1.69";
src = fetchFromGitHub {
owner = "graysky2";
repo = pname;
rev = "v${version}";
- sha256 = "0wrzfanwy18wyawpg8rfvfgjh3lwngqwmfpi4ww3530rfmi84cf0";
+ sha256 = "sha256-5WRhVIQlSwWuyvkzrnNW0rdVet9ZzM47gISJpznM8mU=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix b/third_party/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix
index 80968e2700..3444ef9acb 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/puredata/wrapper.nix
@@ -7,7 +7,7 @@ in symlinkJoin {
paths = [ puredata ] ++ plugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/pd \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix
index 3fb476b65c..8bc2553f52 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5";
};
- buildInputs = [ perlPackages.perl makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perlPackages.perl ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
index 8d495b9362..45f4e76bf5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ in
stdenv.mkDerivation rec {
pname = "renoise";
- version = "3.2.2";
+ version = "3.3.1";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
"https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
];
- sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl";
+ sha256 = "05baicks5dx278z2dx6h5n2vabsn64niwqssgys36xy469l9m1h0";
}
else
releasePath
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
index b7abfa40b8..e8a275db98 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs .";
configureFlags = [ "--enable-cli" ];
- buildInputs = [ ruby cdparanoia makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ruby cdparanoia ];
postInstall = ''
wrapProgram "$out/bin/rrip_cli" \
--prefix PATH : "${ruby}/bin" \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 43ecb67d64..655a047a3a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation {
sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
};
- buildInputs = [ squashfsTools makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ squashfsTools ];
dontStrip = true;
dontPatchELF = true;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
index 776c9576bb..3c4370d161 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
@@ -1,24 +1,24 @@
{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
-, withALSA ? true, alsaLib ? null
-, withPulseAudio ? false, libpulseaudio ? null
-, withPortAudio ? false, portaudio ? null
+, withALSA ? true, alsaLib
+, withPulseAudio ? false, libpulseaudio
+, withPortAudio ? false, portaudio
, withMpris ? false
, withKeyring ? false
-, dbus ? null
+, dbus
}:
rustPackages.rustPlatform.buildRustPackage rec {
pname = "spotifyd";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = "v${version}";
- sha256 = "055njhy9if4qpsbgbr6615xxhcx9plava1m4l323vi4dbw09wh5r";
+ sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l";
};
- cargoSha256 = "1ijrl208607abjwpr3cajcbj6sr35bk6ik778a58zf28kzdhrawc";
+ cargoSha256 = "1sm5yfgjx5xfnqqh1v8ycwzxw4kl6dq5gcvsdnc4h1cj3pdhbpcc";
cargoBuildFlags = [
"--no-default-features"
@@ -39,7 +39,8 @@ rustPackages.rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "An open source Spotify client running as a UNIX daemon";
homepage = "https://github.com/Spotifyd/spotifyd";
- license = with licenses; [ gpl3 ];
+ changelog = "https://github.com/Spotifyd/spotifyd/raw/v${version}/CHANGELOG.md";
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix
deleted file mode 100644
index 4a215528b7..0000000000
--- a/third_party/nixpkgs/pkgs/applications/audio/tuijam/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ buildPythonApplication
-, fetchFromGitHub
-, lib
-, python3Packages
-}:
-
-buildPythonApplication rec {
- pname = "tuijam";
- version = "unstable-2020-06-05";
-
- src = fetchFromGitHub {
- owner = "cfangmeier";
- repo = pname;
- rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b";
- sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5";
- };
-
- buildInputs = [ python3Packages.Babel ];
-
- # the package has no tests
- doCheck = false;
-
- propagatedBuildInputs = with python3Packages; [
- gmusicapi
- google_api_python_client
- mpv
- pydbus
- pygobject3
- pyyaml
- requests
- rsa
- urwid
- ];
-
- meta = with lib; {
- description = "A fancy TUI client for Google Play Music";
- longDescription = ''
- TUIJam seeks to make a simple, attractive, terminal-based interface to
- listening to music for Google Play Music All-Access subscribers.
- '';
- homepage = "https://github.com/cfangmeier/tuijam";
- license = licenses.mit;
- maintainers = with maintainers; [ kalbasit ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
index 3409d8a490..943bd0d803 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/vkeybd/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
};
- buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ alsaLib libX11 tcl tk ];
configurePhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
index 690a25d6b4..c37bf0f20f 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "vorta";
- version = "0.7.3";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
- sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U=";
+ sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
index 2599eb43b1..7c03d06da5 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "4.0.0";
+ version = "4.0.7";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-M0kgd/txqc04WNLNZiq+imHMM9YGFd12jMWJyY2ExrY=";
+ sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
index dd3904b27c..4dab912cf1 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
@@ -8,17 +8,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
- version = "1.9.25";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd";
+ sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI=";
};
runVend = true;
- vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya";
+ vendorSha256 = "sha256-DgyOvplk1JWn6D/z4zbXHLNLuAVQ5beEHi0NuSv236A=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index d130b3d045..8c928cafa5 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -1,13 +1,13 @@
-{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
+{ lib, fetchurl, appimageTools, imagemagick }:
let
pname = "ledger-live-desktop";
- version = "2.21.3";
+ version = "2.23.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "11r6gwzg5qym7h40d8mrpw8c6zbdi534c2y7ghy2k0a4k3ybk8x1";
+ sha256 = "0id9zbpfq3knv8qwkhplbl9pwrvdkn212pafwh4vpjbbp4yimhq5";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix
index b884f044ef..17e884c579 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix
@@ -1,5 +1,5 @@
{ lib, appimageTools, fetchurl, makeDesktopItem
-, gsettings-desktop-schemas, gtk2
+, gsettings-desktop-schemas, gtk3
}:
let
@@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec {
inherit name src;
profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no p32bit needed
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix b/third_party/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix
index feced9eecb..99bc49e8db 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/particl/particl-core.nix
@@ -17,11 +17,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "particl-core";
- version = "0.19.2.3";
+ version = "0.19.2.5";
src = fetchurl {
url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
- sha256 = "sha256-nAsQvYWUejSu/4MMIwZhlV5Gjza/Da4jcp6/01lppvg=";
+ sha256 = "sha256-uI4T8h6RvCikk8h/sZmGlj3Uj3Xhu0vDn/fPb6rLcSg=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
index 9a5a1faac5..4436264ba2 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
- version = "0.8.28-1";
+ version = "0.8.29";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
- sha256 = "sha256-a+w/909PZuHsgIQEtO2IWQijsERfAKJUZ8K30+PhD3k=";
+ sha256 = "sha256-O5GIbX7qp+Te5QQuqytC9rsQJ5FuXtUl5h2DZXsfMPk=";
};
- cargoSha256 = "sha256-Zz844XDx5qj2hQlf99uvHV6e5wmDAlYh3zBvcpdoiIo=";
+ cargoSha256 = "sha256-4VmRIrd79odnYrHuBLdFwere+7bvtUI3daVs3ZUKsdY=";
nativeBuildInputs = [ clang ];
@@ -35,8 +35,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Polkadot Node Implementation";
homepage = "https://polkadot.network";
- license = licenses.gpl3;
- maintainers = with maintainers; [ akru andresilva RaghavSood ];
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ akru andresilva asymmetric RaghavSood ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index d1cd2e7d3e..0005fdb633 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lightdm-mini-greeter";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "prikhi";
repo = "lightdm-mini-greeter";
rev = version;
- sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s";
+ sha256 = "sha256-cVOnd3k+9hFQjROiwPpxZcCxD2NiH1eclJHF88eV6BM=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
index 1c3c4aade5..6be6defd19 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
@@ -72,8 +72,8 @@ let
installPhase = ''
cp -r . $out
wrapProgram $out/bin/studio.sh \
+ --set-default JAVA_HOME "$out/jre" \
--set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
- --set JAVA_HOME "$out/jre" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set FONTCONFIG_FILE ${fontsConf} \
--prefix PATH : "${lib.makeBinPath [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index 1dc8b9ca7f..fa4f7a40d9 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -14,13 +14,13 @@ let
sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
};
betaVersion = {
- version = "4.2.0.20"; # "Android Studio 4.2 Beta 4"
- build = "202.7094744";
- sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz";
+ version = "4.2.0.21"; # "Android Studio 4.2 Beta 5"
+ build = "202.7141121";
+ sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2";
};
latestVersion = { # canary & dev
- version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5"
- sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq";
+ version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7"
+ sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
index 4265e0ef10..dd8757d0c1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix
@@ -2,37 +2,37 @@
, wrapGAppsHook, pkg-config, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
-, shared-mime-info, haskellPackages}:
+, shared-mime-info, haskellPackages, libhandy
+}:
let
- pythonEnv = pythonPackages.python.withPackages(p: with p;
- [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]);
- texliveDist = texlive.combined.scheme-medium;
+ pythonEnv = pythonPackages.python.withPackages(p: with p; [
+ regex setuptools python-Levenshtein pyenchant
+ pygobject3 pycairo pypandoc chardet
+ ]);
in stdenv.mkDerivation rec {
pname = "apostrophe";
- version = "2.2.0.3";
+ version = "2.3";
src = fetchFromGitLab {
owner = "somas";
repo = pname;
domain = "gitlab.gnome.org";
rev = "v${version}";
- sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879";
+ sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb";
};
nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
appstream-glib wrapGAppsHook ];
buildInputs = [ glib pythonEnv gobject-introspection gtk3
- gnome3.adwaita-icon-theme webkitgtk gspell texliveDist
- glib-networking ];
+ gnome3.adwaita-icon-theme webkitgtk gspell texlive
+ glib-networking libhandy ];
postPatch = ''
patchShebangs --build build-aux/meson_post_install.py
- substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}"
-
# get rid of unused distributed dependencies
rm -r ${pname}/pylocales
'';
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
- --prefix PATH : "${texliveDist}/bin"
+ --prefix PATH : "${texlive}/bin"
--prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
diff --git a/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix b/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix
index e7a9a26f06..875f8612fd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix
@@ -3,18 +3,19 @@
let
versions = {
atom = {
- version = "1.48.0";
- sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1";
+ version = "1.54.0";
+ sha256 = "sha256-21AURgomEjuiTzeJ4MIx0mkyVi0b0mVdmFsFGNLXRP4";
};
atom-beta = {
- version = "1.49.0";
+ version = "1.55.0";
beta = 0;
- sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33";
+ sha256 = "sha256-PICkTt54cPkDJVnXBTtSHUQVbmosOpZfVAiD5A3/n+Q=";
+ broken = true;
};
};
- common = pname: {version, sha256, beta ? null}:
+ common = pname: {version, sha256, beta ? null, broken ? false}:
let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}";
name = "${pname}-${fullVersion}";
in stdenv.mkDerivation {
@@ -88,6 +89,7 @@ let
license = licenses.mit;
maintainers = with maintainers; [ offline ysndr ];
platforms = platforms.x86_64;
+ inherit broken;
};
};
in lib.mapAttrs common versions
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
index cff482e887..2c06725030 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
@@ -162,7 +162,7 @@ in rec {
# Eclipse.
name = (lib.meta.appendToName "with-plugins" eclipse).name;
in
- runCommand name { buildInputs = [ makeWrapper ]; } ''
+ runCommand name { nativeBuildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin $out/etc
# Prepare an eclipse.ini with the plugin directory.
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index d986903cc5..1cc47d5ca8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -685,10 +685,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
- version = "1.14";
+ version = "1.15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar";
- sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp";
+ url = "https://elpa.gnu.org/packages/csv-mode-1.15.tar";
+ sha256 = "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -726,16 +726,16 @@
license = lib.licenses.free;
};
}) {};
- dash = callPackage ({ elpaBuild, fetchurl, lib }:
+ dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dash";
ename = "dash";
- version = "2.12.0";
+ version = "2.18.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/dash-2.12.0.tar";
- sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05";
+ url = "https://elpa.gnu.org/packages/dash-2.18.1.tar";
+ sha256 = "17mrvmrfh5c3kri4r3gf1c3gz4i5vl9ac60grpx4103b56y4cgra";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dash.html";
license = lib.licenses.free;
@@ -2373,10 +2373,10 @@
elpaBuild {
pname = "oauth2";
ename = "oauth2";
- version = "0.15";
+ version = "0.16";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/oauth2-0.15.el";
- sha256 = "0ij17g6i8d4cyzc8v6sy2qglwhzd767331gavll6d507krdh3ca3";
+ url = "https://elpa.gnu.org/packages/oauth2-0.16.tar";
+ sha256 = "1rzly2nwjywrfgcmp8zidbmjl2ahyd8l8507lb1mxm4xqryvf316";
};
packageRequires = [ cl-lib nadvice ];
meta = {
@@ -2714,6 +2714,21 @@
license = lib.licenses.free;
};
}) {};
+ pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }:
+ elpaBuild {
+ pname = "pyim";
+ ename = "pyim";
+ version = "3.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/pyim-3.2.tar";
+ sha256 = "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a";
+ };
+ packageRequires = [ async emacs xr ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/pyim.html";
+ license = lib.licenses.free;
+ };
+ }) {};
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "python";
@@ -3058,10 +3073,10 @@
elpaBuild {
pname = "rt-liberation";
ename = "rt-liberation";
- version = "2.1";
+ version = "2.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar";
- sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl";
+ url = "https://elpa.gnu.org/packages/rt-liberation-2.2.tar";
+ sha256 = "01nkkrgygq5p5s0pfxpcn794jr6ln65ad809v9mvzz7972xw625s";
};
packageRequires = [];
meta = {
@@ -3563,10 +3578,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
- version = "2.5.0.1";
+ version = "2.5.0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-2.5.0.1.tar";
- sha256 = "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy";
+ url = "https://elpa.gnu.org/packages/tramp-2.5.0.2.tar";
+ sha256 = "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93";
};
packageRequires = [ emacs ];
meta = {
@@ -3604,6 +3619,21 @@
license = lib.licenses.free;
};
}) {};
+ transient = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "transient";
+ ename = "transient";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/transient-0.3.0.tar";
+ sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/transient.html";
+ license = lib.licenses.free;
+ };
+ }) {};
trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
elpaBuild {
pname = "trie";
@@ -4062,10 +4092,10 @@
elpaBuild {
pname = "xr";
ename = "xr";
- version = "1.20";
+ version = "1.21";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xr-1.20.tar";
- sha256 = "0i3vfsp110z60gabn9x9rv21fvm7nnr234mvmpp7gx4l4hpadvzy";
+ url = "https://elpa.gnu.org/packages/xr-1.21.tar";
+ sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi";
};
packageRequires = [ emacs ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
index a2963f1922..ef67cdbf61 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -128,6 +128,55 @@
};
};
+ matrix-client = melpaBuild {
+ pname = "matrix-client";
+ version = "0.3.0";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "matrix-client.el";
+ rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
+ sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";
+ };
+
+ patches = [
+ (pkgs.fetchpatch {
+ url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
+ sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
+ })
+ ];
+
+ packageRequires = [
+ anaphora
+ cl-lib
+ self.map
+ dash-functional
+ esxml
+ f
+ ov
+ tracking
+ rainbow-identifiers
+ dash
+ s
+ request
+ frame-purpose
+ a
+ ht
+ ];
+
+ recipe = pkgs.writeText "recipe" ''
+ (matrix-client
+ :repo "alphapapa/matrix-client.el"
+ :fetcher github)
+ '';
+
+ meta = {
+ description = "A chat client and API wrapper for Matrix.org";
+ license = gpl3Plus;
+ };
+
+ };
+
org-mac-link =
callPackage ./org-mac-link { };
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 06480f8ce2..e5e2bac964 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -132,9 +132,28 @@ let
flycheck-rtags = fix-rtags super.flycheck-rtags;
pdf-tools = super.pdf-tools.overrideAttrs (old: {
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
- preBuild = "make server/epdfinfo";
+ nativeBuildInputs = [
+ pkgs.autoconf
+ pkgs.automake
+ pkgs.pkg-config
+ pkgs.removeReferencesTo
+ ];
+ buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ];
+ preBuild = ''
+ make server/epdfinfo
+ remove-references-to ${lib.concatStringsSep " " (
+ map (output: "-t " + output) (
+ [
+ pkgs.glib.dev
+ pkgs.libpng.dev
+ pkgs.poppler.dev
+ pkgs.zlib.dev
+ pkgs.cairo.dev
+ ]
+ ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev
+ )
+ )} server/epdfinfo
+ '';
recipe = pkgs.writeText "recipe" ''
(pdf-tools
:repo "politza/pdf-tools" :fetcher github
@@ -299,6 +318,24 @@ let
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
nativeBuildInputs = [ pkgs.pkg-config ];
+ patches = [
+ (pkgs.fetchpatch {
+ name = "telega-server-bin-store-prefer.patch";
+ url = "https://github.com/zevlg/telega.el/commit/72550f984ca869309d197203ef7de99182d71729.patch";
+ sha256 = "18xvz53bygksak6h5f8cz79y83p2va15i8qz7n4s3g9gsklmkj2p";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace telega-customize.el \
+ --replace 'defcustom telega-server-command "telega-server"' \
+ "defcustom telega-server-command \"$out/bin/telega-server\""
+
+ substituteInPlace telega-sticker.el --replace '"dwebp"' '"${pkgs.libwebp}/bin/dwebp"'
+
+ substituteInPlace telega-vvnote.el --replace '"ffmpeg' '"${pkgs.ffmpeg}/bin/ffmpeg'
+ '';
+
postBuild = ''
cd source/server
make
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
index 9260900853..0308f8d976 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20210208";
+ version = "20210301";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20210208.tar";
- sha256 = "1awqk2dk3sgglq6fqgaz8y8rqw3p5rcnkp7i6m15n7wlq9nx7njp";
+ url = "https://orgmode.org/elpa/org-20210301.tar";
+ sha256 = "0930km35lvbw89ifrqmcv96fjmp4fi12yv3spn51q27sfsmzqsrj";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20210208";
+ version = "20210301";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20210208.tar";
- sha256 = "13yrzx7sdndf38hamm1m82kfgnqgm8752mjxmmqw1iqr3r33ihi3";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20210301.tar";
+ sha256 = "11mwar5x848iwc1cdssr3vyx0amji840x6f0dmjpigngpcnj02m8";
};
packageRequires = [];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 9d936e4b3d..a5707370ce 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -190,6 +190,29 @@
"sha256": "1rh9n97z1vi7w60qzam5vc025wwm346fgzym2zs1cm7ykyfh3mgd"
}
},
+ {
+ "ename": "aas",
+ "commit": "30cedefefdab6d423bfc8851463a7892c266be70",
+ "sha256": "0nn740r5w62a783ky9nsm3bzagcvamj0psd120vkdx28ml3g9xyr",
+ "fetcher": "github",
+ "repo": "ymarco/auto-activating-snippets",
+ "unstable": {
+ "version": [
+ 20210217,
+ 1642
+ ],
+ "commit": "5064c60408c3ab45693c5f516003141d56a57629",
+ "sha256": "1m3rfagmwjc13fqcf0ysmzxy11j6b42h9bfc0yvnzchjdqgrm4db"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "commit": "ffafc54e02475b9e7f7bcbe1d8ed3f11bcb4b542",
+ "sha256": "054sfzvm1ihaxy4hnhl424y5py8k7wi73rb0lqvbi4v8iphihzhr"
+ }
+ },
{
"ename": "abc-mode",
"commit": "aaee9dc5de06747374f311d86a550d3cc15beed1",
@@ -1006,8 +1029,8 @@
"auto-complete",
"yasnippet"
],
- "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399",
- "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz"
+ "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640",
+ "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f"
},
"stable": {
"version": [
@@ -1032,8 +1055,8 @@
"repo": "xcwen/ac-php",
"unstable": {
"version": [
- 20210129,
- 951
+ 20210218,
+ 559
],
"deps": [
"dash",
@@ -1043,8 +1066,8 @@
"s",
"xcscope"
],
- "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399",
- "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz"
+ "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640",
+ "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f"
},
"stable": {
"version": [
@@ -1763,11 +1786,11 @@
"repo": "louabill/ado-mode",
"unstable": {
"version": [
- 20210202,
- 2006
+ 20210219,
+ 1548
],
- "commit": "c9af0cac90b912ce0dd02fbf470f513dea2d4f43",
- "sha256": "0z4vi4q6awss52afp4nnxxdhmhdchp8qn6hqyhdikr8lgvja4pq6"
+ "commit": "438e2b9ca1ce9fd1043998359dfe5a32a0ddb6d0",
+ "sha256": "1fpk7lc5z9v8an9x8j1v3l2pkbg93368qv23jzsqs84r3ndw5b7k"
},
"stable": {
"version": [
@@ -1888,15 +1911,15 @@
"repo": "agda/agda",
"unstable": {
"version": [
- 20200922,
- 1231
+ 20210220,
+ 2039
],
"deps": [
"annotation",
"eri"
],
- "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479",
- "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i"
+ "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
+ "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
},
"stable": {
"version": [
@@ -2355,11 +2378,11 @@
"repo": "domtronn/all-the-icons.el",
"unstable": {
"version": [
- 20210208,
- 0
+ 20210228,
+ 1440
],
- "commit": "2f5ea7259ed104a0ef8727f640ee2525108038d5",
- "sha256": "1lvnzjarnzjkrkmhbwgny64ym7s6m4if6lc2fpapcx9hh6bq9h6c"
+ "commit": "e685f7bc0808e23717637536ccffd79a40f0512d",
+ "sha256": "1gbpl6yxb08jlawy4a98bl6ap888f5lx451fvd80z19gjabiad7f"
},
"stable": {
"version": [
@@ -2376,20 +2399,20 @@
},
{
"ename": "all-the-icons-dired",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9",
+ "commit": "26f650e465b22a0afdb77318aebfcfbdb832c9ce",
+ "sha256": "0qa2x3c9j779yr1q0kfi4696zhbgc1drafskl7rymdpia3vqkwd0",
"fetcher": "github",
- "repo": "jtbm37/all-the-icons-dired",
+ "repo": "wyuenho/all-the-icons-dired",
"unstable": {
"version": [
- 20200403,
- 1018
+ 20210211,
+ 1226
],
"deps": [
"all-the-icons"
],
- "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5",
- "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp"
+ "commit": "dd685166818b92470bcccb3e398f2d443f513e63",
+ "sha256": "0yqcmy61ncybfjmbgyzcak9zn017lx6sd1s792y7g7l0klj1l2va"
}
},
{
@@ -2419,14 +2442,14 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20201218,
- 356
+ 20210218,
+ 1006
],
"deps": [
"all-the-icons"
],
- "commit": "0260cd194d150126bcb81823742ab53036942c73",
- "sha256": "1snxbi5wv5qa78vx487rdrarpydrabxz3s6a9ck54wkf91mkbcvv"
+ "commit": "d08e8d4043d8731b81f74421cf0455ba8845113a",
+ "sha256": "1sk83c9inm14s0v11ij43ldkskyhwf3lyfm5nq4pa0nbn1dpkvb0"
},
"stable": {
"version": [
@@ -2488,8 +2511,8 @@
"all-the-icons",
"ivy-rich"
],
- "commit": "3cfc62cea6f26279e062d6056fa0fec7b6f7ac1c",
- "sha256": "03xpsrdh2z1d7sax83a5dv1alb5kmnbfvxwvqib3f7bllggw4wpg"
+ "commit": "f2b48400b2da0bbf64e9c749fa4a5d332ab7c91f",
+ "sha256": "1pdxz8arkhjc3sgg13s07fxlxxgq5y6amapg6daxafl1yvh99jrb"
},
"stable": {
"version": [
@@ -2803,15 +2826,11 @@
"repo": "didibus/anakondo",
"unstable": {
"version": [
- 20200503,
- 123
+ 20210221,
+ 1727
],
- "deps": [
- "clojure-mode",
- "projectile"
- ],
- "commit": "ba6b56c18f2b0ae035b448813b27114d19fb821c",
- "sha256": "0dbhkinfn6ahvi9pi7kghlc0fccil15lx0pd1rpgv4d7n3bnsdna"
+ "commit": "c48518560815c49d8d78fb9069906d17e883385e",
+ "sha256": "1fzsqd150gpmrj8kz3zy9cd78x9vank7ra720mljhyf04z0h1mj6"
},
"stable": {
"version": [
@@ -3127,8 +3146,8 @@
20200914,
644
],
- "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479",
- "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i"
+ "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
+ "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
},
"stable": {
"version": [
@@ -3579,11 +3598,19 @@
"repo": "emacsorphanage/applescript-mode",
"unstable": {
"version": [
- 20090321,
- 632
+ 20210223,
+ 1539
],
- "commit": "8f888cd80af1e0902b5609143facd3051bc94892",
- "sha256": "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg"
+ "commit": "a45c426b7e4a450faea004ef5b842fd37e17a7c6",
+ "sha256": "1f7bvcv4qqqa5bsfrcs69yc1phgnyrh5mbnb2hhgq72z8ymmrn7q"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "42b3db3838821f240e05752de4337359d25d8c04",
+ "sha256": "1z0z0pxy5f5lsw4pskk77dfql5s89iqb6zzkm4pr5r5pcqbhla1s"
}
},
{
@@ -3763,14 +3790,14 @@
"repo": "stardiviner/arduino-mode",
"unstable": {
"version": [
- 20201231,
- 214
+ 20210216,
+ 926
],
"deps": [
"spinner"
],
- "commit": "10af99792c8e4b97ea542c55bfed246781fdd1ba",
- "sha256": "1gz4hmmijlilqqh7scyidh5kbbmyvq12dhnjgnn9h6y9q5qabibq"
+ "commit": "969b49ef6c954a067b3cbca43a4cdc1c04b1a62a",
+ "sha256": "0cjygkddlla2ygiyn506mwqjfn52lqpwfbv1fbwcqljvfspc65am"
}
},
{
@@ -4178,15 +4205,15 @@
"repo": "alpha22jp/atomic-chrome",
"unstable": {
"version": [
- 20210117,
- 408
+ 20210221,
+ 59
],
"deps": [
"let-alist",
"websocket"
],
- "commit": "ae2a6158a6a216dddbe281d0b0b00af7a2fdd558",
- "sha256": "1wb770157p85nmsmqb2pspkw0jfrrlp43bp7cmdjv561gh0mbrak"
+ "commit": "d0414210c8eea8b80d293e79f2c8991948ab38cb",
+ "sha256": "1h4zf81gizi5qf86zxdsm9v0l2rvbsmw6fbr92ggw2r55cnqqrib"
},
"stable": {
"version": [
@@ -4210,8 +4237,8 @@
"repo": "jyp/attrap",
"unstable": {
"version": [
- 20210205,
- 1027
+ 20210219,
+ 1001
],
"deps": [
"dash",
@@ -4219,8 +4246,8 @@
"flycheck",
"s"
],
- "commit": "c84d68846995dbfe15f1237bf4ce0bc83c37bc52",
- "sha256": "14446mn96kmmn1l915jf54x3cvrmkjnzrgsp8091xicxfvmhmpyq"
+ "commit": "778382eba8e1a449862b1573e90c1e79cf5caeb1",
+ "sha256": "0a2n1p2nasd2ikv86p3sm5sn4qb3avj2sni9gja3yn6kdqn8s8jp"
},
"stable": {
"version": [
@@ -4245,26 +4272,26 @@
"repo": "tsuu32/auctex-cluttex",
"unstable": {
"version": [
- 20201029,
- 1241
+ 20210226,
+ 302
],
"deps": [
"auctex"
],
- "commit": "e01f42ef4db28d284db010dbb590b197520f73d4",
- "sha256": "0iq14adyry26n5c6i67fd6aiwlcw4a9shndljlvvzc7g82kdw7vl"
+ "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73",
+ "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
"deps": [
"auctex"
],
- "commit": "e358f7148092d8ed64703641b5621e130cce458d",
- "sha256": "1whzcp9wvpwn1c33n7mqxx8v6g4apg3cq5h2ffl74423ysymry71"
+ "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73",
+ "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs"
}
},
{
@@ -5283,8 +5310,8 @@
20190331,
2230
],
- "commit": "19e2f1766b4a845ce5a4ccc87de62608f385bd11",
- "sha256": "1gpzi092732chg0mvrwmr01c2njip1d2m15lj9fa1ii6sddfpand"
+ "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c",
+ "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3"
}
},
{
@@ -5427,8 +5454,8 @@
"avy",
"embark"
],
- "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622",
- "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n"
+ "commit": "0c7323953e628c8797270a37c0f639fe23092175",
+ "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
},
"stable": {
"version": [
@@ -5641,8 +5668,8 @@
20210131,
2053
],
- "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a",
- "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9"
+ "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
+ "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
}
},
{
@@ -6165,21 +6192,20 @@
"repo": "AlonTzarafi/battle-haxe",
"unstable": {
"version": [
- 20200222,
- 56
+ 20210219,
+ 354
],
"deps": [
"async",
"cl-lib",
"company",
"dash",
- "dash-functional",
"f",
"helm",
"s"
],
- "commit": "64d20c9ea3fd503fdefafda122e7095c192e72a3",
- "sha256": "15ykwqg100vjl014awwwzmch84vwqyrlm46c22w9x3dgqk8yxyi2"
+ "commit": "2f32c81dcecfc68fd410cb9d2aca303d6e3028c7",
+ "sha256": "0br1iy9zcjqaxmm691axrcbfxmid76rsbkcp1vrpzrdqvrkskpww"
}
},
{
@@ -6193,8 +6219,8 @@
20200627,
1625
],
- "commit": "689f5df2c728129f288ed6eed82cde5df8c2ad1f",
- "sha256": "09mj52wqdlysdqrs8mabm6373pqrab7zjbc4y5ll54a5iz7fv7yb"
+ "commit": "43026c5e09dfca86fb84b9a857708ad419f2215f",
+ "sha256": "0bwabpx56ybk114456x0p4k8xqh0s060ig40jdsqibq89h6m1nab"
},
"stable": {
"version": [
@@ -6639,11 +6665,11 @@
"url": "https://git.sr.ht/~technomancy/better-defaults",
"unstable": {
"version": [
- 20200717,
- 2012
+ 20210222,
+ 1928
],
- "commit": "fd4346735d61be88e6eafabf1f62c4c16548f1b3",
- "sha256": "1cnqwrkiml8jz4hbdv16pb97v6g528mvpqx1lg01v45h4mky82bn"
+ "commit": "4c5409406ee35c5ba46880c6cfe98df4b14dc631",
+ "sha256": "0agj1zyspm3bqj7apfjwhllnmydyj00x2iv7nvy03szpnwvm11fq"
},
"stable": {
"version": [
@@ -6741,14 +6767,14 @@
"repo": "zk-phi/bfbuilder",
"unstable": {
"version": [
- 20200816,
- 519
+ 20210228,
+ 1740
],
"deps": [
"cl-lib"
],
- "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf",
- "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2"
+ "commit": "689f320a9a1326cdeff43b8538e0d739f8519c4b",
+ "sha256": "0wrzyv38dmsdfjwsbf89pa5l2gzbbx86jmy8nflfs86im0g9qcp1"
}
},
{
@@ -6925,8 +6951,8 @@
"repo": "tmalsburg/helm-bibtex",
"unstable": {
"version": [
- 20210108,
- 1155
+ 20210223,
+ 840
],
"deps": [
"biblio",
@@ -6936,8 +6962,8 @@
"parsebib",
"s"
],
- "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2",
- "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2"
+ "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6",
+ "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2"
},
"stable": {
"version": [
@@ -7518,6 +7544,30 @@
"sha256": "1phiraki6l6bp7mw90spw0r99wahl47ycpz0lxr3zljb5ip8jddp"
}
},
+ {
+ "ename": "blox",
+ "commit": "cacd156d195ffddeba880a8ebb4f38a07db0b15f",
+ "sha256": "0w0j9xskvyb91i473wr1rj4q61i151ckslm87hszh9sqc9wv38p3",
+ "fetcher": "github",
+ "repo": "kennethloeffler/blox",
+ "unstable": {
+ "version": [
+ 20210225,
+ 1900
+ ],
+ "commit": "2bf0e618451fb1da11263d8a35ffcd9210590c0a",
+ "sha256": "0lkhdm9jhy8wlmrmd9nqrbrczh5k75q38n6bq3gfhppycmysh9d5"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 0
+ ],
+ "commit": "f27e79d6da65d8877ebb4e84a40350b61c3f0362",
+ "sha256": "1id5jgaa4yjkgzn00s54lcbdwll85nw0dfsa228mvkvigdn5rya6"
+ }
+ },
{
"ename": "bm",
"commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -7757,16 +7807,17 @@
"repo": "jyp/boon",
"unstable": {
"version": [
- 20210212,
- 2136
+ 20210228,
+ 1839
],
"deps": [
"dash",
"expand-region",
- "multiple-cursors"
+ "multiple-cursors",
+ "pcre2el"
],
- "commit": "d34d5cfc902702537e82df11d743fd0ac8ffe1d2",
- "sha256": "0545alciqa51gi6rnw8mhb0xjab8f22dnb2vh238in3bxf2i349h"
+ "commit": "58107055dadb735941537c90457753dbc1ea7005",
+ "sha256": "15x29jpfkfizkl3b9ghmd1wclvigcm05y6l7i9c6clclwqzzm5zw"
},
"stable": {
"version": [
@@ -8140,11 +8191,11 @@
"repo": "topikettunen/brutal-emacs",
"unstable": {
"version": [
- 20210206,
- 1
+ 20210226,
+ 1538
],
- "commit": "3959cf1737691d8eb41ec9c652d959f24c7de150",
- "sha256": "1pq4iyl0z8wwzahjcdncmvwc4nz4zh9nmb54zjx7mrdcqvzh2x7v"
+ "commit": "8173b7d041cccfa3e5bb3f3f85ec8c6109fd264b",
+ "sha256": "1y6b9q3byvwsi6d5sjc642189c5cjbinylqis3d248qws2dp6kvq"
}
},
{
@@ -8997,20 +9048,20 @@
"repo": "wendelscardua/ca65-mode",
"unstable": {
"version": [
- 20210202,
- 39
+ 20210218,
+ 106
],
- "commit": "100e0f1ff7678733404a03b5a5eefb5daf2081c2",
- "sha256": "0r66sw7scw0y1vfby7mcrf8kxhyvsaqhn9v2n098ih1x06ah0640"
+ "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a",
+ "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46"
},
"stable": {
"version": [
0,
3,
- 1
+ 3
],
- "commit": "431e61b886611d1c5f08266b482c18fd03a61130",
- "sha256": "0043v8a861714xalk3hf0gbpmx223432qbsgimizar59ysczagma"
+ "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a",
+ "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46"
}
},
{
@@ -9173,15 +9224,14 @@
"repo": "walseb/calc-at-point",
"unstable": {
"version": [
- 20200406,
- 1618
+ 20210219,
+ 1252
],
"deps": [
- "dash",
- "dash-functional"
+ "dash"
],
- "commit": "11e40c8db9493ada71964b73069c6db529016492",
- "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf"
+ "commit": "0c1a9e94b519b0edb0abcbacdf6101eea2f2a524",
+ "sha256": "04yg0rf6i95s913hs6zn01rajpbc1gk2hcpzkxyjy3mj1lqhh45s"
}
},
{
@@ -9551,15 +9601,15 @@
"repo": "kwrooijen/cargo.el",
"unstable": {
"version": [
- 20210124,
- 1516
+ 20210217,
+ 904
],
"deps": [
"markdown-mode",
"rust-mode"
],
- "commit": "e66beb9b2f1f8dce48aa31f42cb5c384328554c6",
- "sha256": "0hf7ij307nndxs96a3xqzcgpn8fblpx4px817ib08kfqzi6ph99j"
+ "commit": "9442af81d64f73935d3590948c97594f0bc79d4a",
+ "sha256": "1xci8kx10vxaniyzxgzzs0zd7m7s0grd0bbrxaxhyjjdvic77mq1"
},
"stable": {
"version": [
@@ -9589,6 +9639,21 @@
"sha256": "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n"
}
},
+ {
+ "ename": "cascading-dir-locals",
+ "commit": "4140f4b373119deba3142cbc6037e6634d74a4de",
+ "sha256": "1g5disv23wn70h7sr0z9pbh9ws66rbzw7s8q07xzvhk1yfggr0ls",
+ "fetcher": "github",
+ "repo": "fritzgrabo/cascading-dir-locals",
+ "unstable": {
+ "version": [
+ 20210221,
+ 1516
+ ],
+ "commit": "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0",
+ "sha256": "1jwd99kk5l588n7wwi1x3b4bgimm66x1icna3n20pwaj49kf0zy8"
+ }
+ },
{
"ename": "caseformat",
"commit": "ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0",
@@ -9631,8 +9696,8 @@
"repo": "cask/cask",
"unstable": {
"version": [
- 20210211,
- 727
+ 20210214,
+ 1455
],
"deps": [
"ansi",
@@ -9644,8 +9709,8 @@
"s",
"shut-up"
],
- "commit": "5ac82efeea812a83c636d5273ddf5b99bb72f8a2",
- "sha256": "19dg2z9mmqzpvjs5xnyj0yh2j212cakvkaf660ha6j03c203nbw4"
+ "commit": "b81a3caa3fa3696fd385aa7072f8dc3a57408c4a",
+ "sha256": "18w7kdr140s2km0mphznrlvx5w06q93q6z370wf4spkaflks6cjy"
},
"stable": {
"version": [
@@ -10027,15 +10092,15 @@
"repo": "ema2159/centaur-tabs",
"unstable": {
"version": [
- 20210114,
- 2059
+ 20210226,
+ 2246
],
"deps": [
"cl-lib",
"powerline"
],
- "commit": "50fd573ce9ed9f914940c79c82e411511ca5c8a8",
- "sha256": "0dxis8w931chcbfwggc0jdirsxys42n2g21wqnqy892k70p7by1j"
+ "commit": "5bbcc80778f6fd618f9f9c13dbc2c4f4ae1eef90",
+ "sha256": "0clz8d6w9j1pbqd6vk4pkan5mhidxpr802wfkh3sfq77r44hhl8x"
},
"stable": {
"version": [
@@ -10162,8 +10227,8 @@
20171115,
2108
],
- "commit": "711f389a527d65b39c91f5c10fc24cededb62ccf",
- "sha256": "1q134lk70qkm3cw0m2cn024bvahfwlyvpap50f150rfpkz1v4v5v"
+ "commit": "79e9fb4d4b2b630f11d09c25fa560a0aacd68e53",
+ "sha256": "05ysyvb318ilwamx9v82rv6wrh1xnv74i4flpm4x6db7apkh4kma"
},
"stable": {
"version": [
@@ -10247,30 +10312,30 @@
"repo": "Alexander-Miller/cfrs",
"unstable": {
"version": [
- 20210121,
- 2007
+ 20210217,
+ 1848
],
"deps": [
"dash",
"posframe",
"s"
],
- "commit": "fdcb5031ca364770475fc432b36599b7d34be502",
- "sha256": "1ffdxyw3f791s11hw0qlybxqhg9q0994hc8w21n9vg856by9h7yq"
+ "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298",
+ "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm"
},
"stable": {
"version": [
1,
5,
- 1
+ 4
],
"deps": [
"dash",
"posframe",
"s"
],
- "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d",
- "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m"
+ "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298",
+ "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm"
}
},
{
@@ -10863,8 +10928,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20210209,
- 632
+ 20210227,
+ 546
],
"deps": [
"clojure-mode",
@@ -10875,8 +10940,8 @@
"sesman",
"spinner"
],
- "commit": "6b397733f7ebe5dbd4d9c717c0acb13a69f88d7d",
- "sha256": "1mqws9386fph96ypr516i9dlm15nxyiwfsvqpgnzi366sdpx9bid"
+ "commit": "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7",
+ "sha256": "0lv422m1ym6m894mbwcbv1145dnh6xk1fa242cngvlkg7j5xksh6"
},
"stable": {
"version": [
@@ -11127,14 +11192,14 @@
"repo": "sulami/circleci-api.el",
"unstable": {
"version": [
- 20201221,
- 1036
+ 20210227,
+ 1607
],
"deps": [
"request"
],
- "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b",
- "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c"
+ "commit": "2e39c5896819bb2063f9d7795c4299f419cf5542",
+ "sha256": "0j184sgqxh3f34ni6bfb69mfir94glcyl0wpqmpsn9siq54s82ag"
}
},
{
@@ -11574,8 +11639,8 @@
"repo": "clojure-emacs/clj-refactor.el",
"unstable": {
"version": [
- 20210101,
- 1036
+ 20210216,
+ 928
],
"deps": [
"cider",
@@ -11588,14 +11653,14 @@
"seq",
"yasnippet"
],
- "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef",
- "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs"
+ "commit": "b24ce76acefe792975f00147c94b4dd784e65b80",
+ "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7"
},
"stable": {
"version": [
2,
5,
- 0
+ 1
],
"deps": [
"cider",
@@ -11608,8 +11673,8 @@
"seq",
"yasnippet"
],
- "commit": "92d372393a031e5fa73ef926447afe72b574cb45",
- "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4"
+ "commit": "b24ce76acefe792975f00147c94b4dd784e65b80",
+ "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7"
}
},
{
@@ -11836,11 +11901,11 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20201126,
- 1558
+ 20210226,
+ 1336
],
- "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b",
- "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m"
+ "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63",
+ "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by"
},
"stable": {
"version": [
@@ -11866,8 +11931,8 @@
"deps": [
"clojure-mode"
],
- "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b",
- "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m"
+ "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63",
+ "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by"
},
"stable": {
"version": [
@@ -12169,17 +12234,19 @@
20210104,
1831
],
- "commit": "99e9167caa8fa65e72553fa38adb24071b51fd71",
- "sha256": "0c0cxskd7nrswv3ihmkm9hgldfhw4grrsl2ihkw1idz5hj05y3rg"
+ "commit": "569547f0c4931c1ce163146d95375ead258c09d9",
+ "sha256": "02iwd0yrz9b9aw2v5vvqf43cscch85wgia386bkp4xaq2dd9h31s"
},
"stable": {
"version": [
3,
- 19,
- 4
+ 20,
+ 0,
+ -1,
+ 2
],
- "commit": "0c86d15459eeef2ddd15644b7bb3d7854f226334",
- "sha256": "1m56r4glwzvy92hafb8kh16x4qa0dhp0v464p7n1hb18bb53xl8h"
+ "commit": "498b7da2e471fd8ef5a41433505358df4f117044",
+ "sha256": "1j7sray4d5zpfy6mkmhxg83scwjvkvr5q98nlaxsi01nir1ywxla"
}
},
{
@@ -13138,11 +13205,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20210122,
- 2314
+ 20210224,
+ 2244
],
- "commit": "5c25e114c3ac1bee3671abd47f46592a3151d549",
- "sha256": "0y6gqc9w4zw1048hlyx0l46gcngbyrmdvzk30flwfphg1ancmcrj"
+ "commit": "88001d794d963049339883216b6606de0a1209ea",
+ "sha256": "097s1zan4xg7vrkcapylcbs0a9ky1wbglxf9sz44aslwzrsgvy1p"
},
"stable": {
"version": [
@@ -13280,8 +13347,8 @@
"axiom-environment",
"company"
],
- "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a",
- "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9"
+ "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
+ "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
}
},
{
@@ -13771,6 +13838,24 @@
"sha256": "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m"
}
},
+ {
+ "ename": "company-ipa",
+ "commit": "4ba3b53bd37c252eed24a5e8c61b7d9c91f9e2ee",
+ "sha256": "0xxx0kzspcxk9lblhcw19bjzsv64jwdda8jvv6hf9liql3c3npp9",
+ "fetcher": "gitlab",
+ "repo": "mguzmann89/company-ipa",
+ "unstable": {
+ "version": [
+ 20210222,
+ 30
+ ],
+ "deps": [
+ "company"
+ ],
+ "commit": "e9d919e0d15d3f986471d9d6cb46b67519f5088f",
+ "sha256": "1bg8y35rfyqdbn9y85iriq10iskc3dq0jgv3zqqykp5mriy5y8gd"
+ }
+ },
{
"ename": "company-irony",
"commit": "d2b6a8d57b192325dcd30fddc9ff8dd1516ad680",
@@ -14207,8 +14292,8 @@
"cl-lib",
"company"
],
- "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399",
- "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz"
+ "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640",
+ "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f"
},
"stable": {
"version": [
@@ -14373,27 +14458,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200716,
- 1414
+ 20210227,
+ 600
],
"deps": [
"company",
"prescient"
],
- "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d",
- "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w"
+ "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
+ "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
},
"stable": {
"version": [
5,
- 0
+ 1
],
"deps": [
"company",
"prescient"
],
- "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
- "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
+ "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12",
+ "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks"
}
},
{
@@ -14777,8 +14862,8 @@
"repo": "TommyX12/company-tabnine",
"unstable": {
"version": [
- 20210208,
- 1808
+ 20210228,
+ 435
],
"deps": [
"cl-lib",
@@ -14787,8 +14872,8 @@
"s",
"unicode-escape"
],
- "commit": "235c99dc9fe629a42e6432d54d46310e2b5b426d",
- "sha256": "1w8y9sv0k6r9q2d7a06bh6ackxckijyb9qd4w9s3lnbryrx1n6rk"
+ "commit": "9226f887e6b5e86599283a3b0f0b1774eb34fd7e",
+ "sha256": "0ljswlm745459grkp9dvdb49z5j53ki8xp2nxz7szcqa7xgpfs64"
}
},
{
@@ -15353,11 +15438,11 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210212,
- 2204
+ 20210228,
+ 133
],
- "commit": "3bb31bd5f23a2c5fbc3b9d314e60f85b6f9e11c2",
- "sha256": "1g6zgnbff6yqzz5wh4nqkbwzkrm96dmynfg0ak50lsy7brfyi1yh"
+ "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b",
+ "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9"
},
"stable": {
"version": [
@@ -15376,15 +15461,15 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210210,
- 1821
+ 20210226,
+ 1214
],
"deps": [
"consult",
"flycheck"
],
- "commit": "3bb31bd5f23a2c5fbc3b9d314e60f85b6f9e11c2",
- "sha256": "1g6zgnbff6yqzz5wh4nqkbwzkrm96dmynfg0ak50lsy7brfyi1yh"
+ "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b",
+ "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9"
},
"stable": {
"version": [
@@ -15399,6 +15484,57 @@
"sha256": "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2"
}
},
+ {
+ "ename": "consult-notmuch",
+ "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406",
+ "sha256": "09kslrizpk5jh9czjn4xrcs1k9661dgly9z08dwsvb76pnjzd7wg",
+ "fetcher": "git",
+ "url": "https://codeberg.org/jao/consult-notmuch.git",
+ "unstable": {
+ "version": [
+ 20210220,
+ 411
+ ],
+ "deps": [
+ "consult",
+ "notmuch"
+ ],
+ "commit": "823c1fefc4a393039bced29d6b4c9a9d2aa720fe",
+ "sha256": "0rhn1ha65xnrv03sn94ii5hl7ycpiz97xz13sxzchla64bwjqy75"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "deps": [
+ "consult",
+ "notmuch"
+ ],
+ "commit": "0bcdad24c8cc4ac530fcafd90ab728ed5dfbf0ed",
+ "sha256": "1s9glbwdwk29pp5nj4ab6giakhjqx4rcy4zbf7ml7h83qi59sd68"
+ }
+ },
+ {
+ "ename": "consult-spotify",
+ "commit": "fb515b013942cf5ef4590e7cbc17f11f10c7692f",
+ "sha256": "0y393qwvjv7blc8d4qih9ksm2521az28v29hgczjlady0fjp9bn9",
+ "fetcher": "git",
+ "url": "https://codeberg.org/jao/espotify",
+ "unstable": {
+ "version": [
+ 20210220,
+ 2229
+ ],
+ "deps": [
+ "consult",
+ "espotify",
+ "marginalia"
+ ],
+ "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
+ "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ }
+ },
{
"ename": "contextual",
"commit": "de20db067590624bbd2ca5a7a537b7f11ada84f2",
@@ -15712,26 +15848,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210129,
- 1143
+ 20210226,
+ 1256
],
"deps": [
+ "ivy",
"swiper"
],
- "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49",
- "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g"
+ "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
+ "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
},
"stable": {
"version": [
0,
13,
- 0
+ 2
],
"deps": [
+ "ivy",
"swiper"
],
- "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb",
- "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p"
+ "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
+ "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
}
},
{
@@ -15912,14 +16050,14 @@
"repo": "redguardtoo/counsel-etags",
"unstable": {
"version": [
- 20210131,
- 824
+ 20210226,
+ 1218
],
"deps": [
"counsel"
],
- "commit": "305eaa4a1ad6487e22eaa7ad36c33fa0d4a9456d",
- "sha256": "1649yhmiimi2fm8av22b7h1nlb7lm1j1g9wgbsb6fk9wpvndazfx"
+ "commit": "e41a39cd07c594b5fa1c6757e9464be56a3dadea",
+ "sha256": "1dcph2ak1r5yrw0hfygrb6d80y3jkx1fsj1rrp7sg3p37rnfhq94"
},
"stable": {
"version": [
@@ -15979,15 +16117,15 @@
"repo": "FelipeLema/emacs-counsel-gtags",
"unstable": {
"version": [
- 20201211,
- 1755
+ 20210222,
+ 1803
],
"deps": [
"counsel",
"seq"
],
- "commit": "e4a662c38cd217bae9c0bd80f2c9b53cc2cffcb7",
- "sha256": "0gb8gbphckyk834mxl704fawvykigmk0cl8klmyfap0nb55h846b"
+ "commit": "1d52eaeffeb60266434d4f7416a108ca058fde91",
+ "sha256": "13jx6hscdcfqwzk1pcmzrv7frglcnd1ywl22ddxzzymi339r4lyj"
},
"stable": {
"version": [
@@ -16693,11 +16831,19 @@
"repo": "Boruch-Baum/emacs-crossword",
"unstable": {
"version": [
- 20210212,
- 1602
+ 20210216,
+ 1703
],
- "commit": "8da505a40d077f06afefb8c6de507a62f5b3ad9a",
- "sha256": "0j7qzdxssp35n642caa5vdy4bs9p1sbhara21ncbsln09aisg78d"
+ "commit": "fa80bfef81168509ddbd840d95c6671efe91c253",
+ "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "commit": "fa80bfef81168509ddbd840d95c6671efe91c253",
+ "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db"
}
},
{
@@ -16708,14 +16854,14 @@
"repo": "bbatsov/crux",
"unstable": {
"version": [
- 20201129,
- 1921
+ 20210224,
+ 910
],
"deps": [
"seq"
],
- "commit": "ba4a1f38eee0ae7597f67a1424bbf5c0c09473bf",
- "sha256": "0swykynbxsvxwxqjf41aqydkfrwy6f5ngl4pp8py5r5vh78a91ih"
+ "commit": "a471cbed343dc5ff3a7150214726fe4ea0d3cf9e",
+ "sha256": "152c7x1zj4rwq9bj9d8xw4znspfik2g7aigazq9smv12fkmzvzrr"
},
"stable": {
"version": [
@@ -16981,16 +17127,15 @@
"repo": "neeasade/ct.el",
"unstable": {
"version": [
- 20210205,
- 1249
+ 20210219,
+ 1344
],
"deps": [
"dash",
- "dash-functional",
"hsluv"
],
- "commit": "356f6c765773b90e538f7801cb7281345cdbe4aa",
- "sha256": "1m0mifqjsfr3487n1hypcxb5f0895y4xwkri7djwi3brv3nx52rv"
+ "commit": "c302ee94feee0c5efc511e8f9fd8cb2f6dfe3490",
+ "sha256": "0230h5qvg5jbpyry4xxmh41c0wpinmm04k5hc1qsc2mvqhv3n9n5"
}
},
{
@@ -17066,19 +17211,19 @@
"repo": "raxod502/ctrlf",
"unstable": {
"version": [
- 20210118,
- 132
+ 20210227,
+ 552
],
- "commit": "928f98da5fdb8ca50c0957015f964dea8cde8b5f",
- "sha256": "0sp09rk63dfvc1h40rmzwhac0dzp19w6zqzqigdsn6zrpk8g9vjg"
+ "commit": "4fd7d9dffbbf91dfcaccccb54c571f53c279e94f",
+ "sha256": "076xjd8aia8q96hakcw861a4hmkfdx0aafhnkwww4fk7vv50b7qx"
},
"stable": {
"version": [
1,
- 2
+ 3
],
- "commit": "d398a9bfbd959489fd6515b62dbf818a61d0e4d6",
- "sha256": "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi"
+ "commit": "d7fad32584c3e569046691bf7f27b21e294c0a2a",
+ "sha256": "06wq6scqy2ax0h6aahy2r7hn3bbmkzl4w99bkrc3cqd4ij78sc8g"
}
},
{
@@ -17459,17 +17604,17 @@
20190111,
2150
],
- "commit": "c2fea5bf4a6e011a039f8764862bb6338a2ae546",
- "sha256": "114c7ilcim908664wp8llnnnf496l39bm7y0fprydh2zwn7cqdng"
+ "commit": "9a761a637fce6a7b70735ae2248963d63e569e14",
+ "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5"
},
"stable": {
"version": [
0,
29,
- 21
+ 22
],
- "commit": "976f5483c6df8570f34076ef25af7e7512dd9347",
- "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka"
+ "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea",
+ "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi"
}
},
{
@@ -17626,8 +17771,8 @@
"repo": "jyp/dante",
"unstable": {
"version": [
- 20210101,
- 907
+ 20210221,
+ 1947
],
"deps": [
"company",
@@ -17638,8 +17783,8 @@
"lcr",
"s"
],
- "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c",
- "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby"
+ "commit": "7b1ab644214e03b86dcf7436fd22a65cce2fa858",
+ "sha256": "177d9gk2fayx1nmd1gs6cf3mi35jakxn2di785qlhk7h5alai9hc"
},
"stable": {
"version": [
@@ -17667,21 +17812,21 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20210207,
- 1923
+ 20210222,
+ 419
],
"deps": [
"bui",
"dash",
- "dash-functional",
"f",
+ "ht",
"lsp-mode",
"lsp-treemacs",
"posframe",
"s"
],
- "commit": "5450af5c1cc7c46b1ecd47e9ba1ec2de9f62f9d9",
- "sha256": "1mk5prfx0nsi1528ar3yw0sgkgyk60697w9i14ljq6lhbnz6cx8n"
+ "commit": "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976",
+ "sha256": "02gws113c95567qp2zvxzqdhzapkcx9qnf00k2l0j52f7i0kz49b"
},
"stable": {
"version": [
@@ -17934,20 +18079,20 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20210210,
- 1427
+ 20210228,
+ 2221
],
- "commit": "be4e939b8982fa9a6ac5286027ea8ae1ff9b9b19",
- "sha256": "1b0wpvwivzsym6hiaxybhfy8mvq8cbxi97dcm1ci2sc33fv6vq74"
+ "commit": "6a086fccc95e96db2a819346d1eaf504654d9713",
+ "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p"
},
"stable": {
"version": [
2,
- 17,
- 0
+ 18,
+ 1
],
- "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
- "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
+ "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5",
+ "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva"
}
},
{
@@ -18007,26 +18152,26 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20210206,
- 1519
+ 20210210,
+ 1449
],
"deps": [
"dash"
],
- "commit": "be4e939b8982fa9a6ac5286027ea8ae1ff9b9b19",
- "sha256": "1b0wpvwivzsym6hiaxybhfy8mvq8cbxi97dcm1ci2sc33fv6vq74"
+ "commit": "6a086fccc95e96db2a819346d1eaf504654d9713",
+ "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p"
},
"stable": {
"version": [
2,
- 17,
- 0
+ 18,
+ 1
],
"deps": [
"dash"
],
- "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
- "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
+ "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5",
+ "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva"
}
},
{
@@ -18037,14 +18182,14 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20210125,
- 909
+ 20210218,
+ 1550
],
"deps": [
"page-break-lines"
],
- "commit": "18b38b49b60c005909f91f047c0507f47cc75fd3",
- "sha256": "0ajw2wr02j0avjr5zdjllqhm7f1y27p6xjc6grgv90mmka926486"
+ "commit": "411ff9ff9368f03d09097ad1d395d632fd4d9f40",
+ "sha256": "0db8h1004ndn1b9cvh27fj5w5r6p83nmskcy983cw5qris02vrkx"
},
"stable": {
"version": [
@@ -18427,16 +18572,16 @@
"repo": "Wilfred/deadgrep",
"unstable": {
"version": [
- 20210113,
- 829
+ 20210219,
+ 748
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "3ea915f0c4f3b37a482cbf6faa070845d7ab1876",
- "sha256": "1w922p46i3bf7mq5jj0i27b3ndiip2x46b1qy924y9874sc5ifxk"
+ "commit": "ca16c37ffa5caa5f698bc049012489a2e3071bcc",
+ "sha256": "055yxchqbqp4pbw9w9phibnp0a2qw1jsb1a5xbfc558phi2vbxdd"
},
"stable": {
"version": [
@@ -18612,8 +18757,8 @@
20201227,
2319
],
- "commit": "dd143e7e6cf5384d203a76e50fe677a77f1cd615",
- "sha256": "1zpf35x1w4ldijqx3a2qlykhy9xgw3mqzxhfv0r3qn37k7lg0m58"
+ "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc",
+ "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq"
}
},
{
@@ -18975,6 +19120,21 @@
"sha256": "03rl1z860jmirjrrg0xsjx0bqk73k043c8bz6049zhndh7pidri7"
}
},
+ {
+ "ename": "desktop-mail-user-agent",
+ "commit": "d0ac6ab8716a772a38e368bfe91229aa9bcbee29",
+ "sha256": "1w8yr1viwkcp3g499zgk20j0q38891s9smgwvn8bly25bas9z1x7",
+ "fetcher": "github",
+ "repo": "lassik/emacs-desktop-mail-user-agent",
+ "unstable": {
+ "version": [
+ 20210228,
+ 1335
+ ],
+ "commit": "cf45bbbdd77b105df8d2a51e27b46d480ef992c8",
+ "sha256": "0a18sfy9diwcrzhcykd7pnw990kmlfb60zdxbi0nmkyqzx5gj1hi"
+ }
+ },
{
"ename": "desktop-registry",
"commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f",
@@ -19094,11 +19254,11 @@
"repo": "raxod502/diary-manager",
"unstable": {
"version": [
- 20200404,
- 1549
+ 20210226,
+ 416
],
- "commit": "4f9d3104f0d89fe3e39c878d2035e6b6d9510659",
- "sha256": "094x2n9nlqwxdppkw7wsyxwp34gf0b1dfyxp97nn712mfy98g1fc"
+ "commit": "12f194bd411e52b72bdf555e48e9a831e5ff8357",
+ "sha256": "0mn90abd2ak5f9b1s3q5h3l2lfhi91mwx4j50hs8q91s0r43hixz"
},
"stable": {
"version": [
@@ -19227,8 +19387,8 @@
20201006,
1436
],
- "commit": "940f967bca64a8012892040c2e2f262d8709c41a",
- "sha256": "1pm4a3jx2aq1cz9s9nfs1zm0s4crqarai3hr6dyihjqyf0szwrvq"
+ "commit": "3fcf861f1f8b91d97000bda32345bc92df8e2d37",
+ "sha256": "0x0awnasdjkmmrm11dqs4spkx2j3prkiqrmf5w3lxp2v28i4m2qk"
}
},
{
@@ -19239,14 +19399,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20210213,
- 41
+ 20210223,
+ 2303
],
"deps": [
"cl-lib"
],
- "commit": "4c46b3b9851c85d15bff1e3ec92e5fc6043322bc",
- "sha256": "1na2daa3d6hclj9hr8f9l029716c3pzky9ybwq08iv68msf3lvhn"
+ "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126",
+ "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd"
},
"stable": {
"version": [
@@ -19269,16 +19429,16 @@
"repo": "dieggsy/difflib.el",
"unstable": {
"version": [
- 20171227,
- 1518
+ 20210224,
+ 2242
],
"deps": [
"cl-generic",
"ht",
"s"
],
- "commit": "b08850251812d71e62fd6956081299590acdf37b",
- "sha256": "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"
+ "commit": "646fc4388274fe765bbf4661e17a24e4d081250c",
+ "sha256": "1qagl3ffg01zjqrgpq32h4ya869066n8ll9yq8lk40argjm523fa"
},
"stable": {
"version": [
@@ -19741,20 +19901,20 @@
"repo": "knu/dired-fdclone.el",
"unstable": {
"version": [
- 20180403,
- 608
+ 20210226,
+ 532
],
- "commit": "903d7a736d240ef7352989a4e5d0ff9129c2ee3c",
- "sha256": "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"
+ "commit": "3ba369f5fc48a8fdf06d1c6ee1167b5a6eb7c1b3",
+ "sha256": "1qh19f0ry7ri7vibcsb9y36ni7k8spjlnl01knlx7cs65qza8mpf"
},
"stable": {
"version": [
1,
5,
- 4
+ 6
],
- "commit": "903d7a736d240ef7352989a4e5d0ff9129c2ee3c",
- "sha256": "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"
+ "commit": "1473c20fe91ebbe8c44bf2c6551a5f76fbc3b65b",
+ "sha256": "0dca8arnh07mdvrwiaxfgfirrsjcwl4vdap7czd4rdkbmgvkv994"
}
},
{
@@ -19840,11 +20000,11 @@
"repo": "mattiasb/dired-hide-dotfiles",
"unstable": {
"version": [
- 20170314,
- 2039
+ 20210222,
+ 1919
],
- "commit": "b715f643ec805b3b8aca334595e6589320f04a49",
- "sha256": "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i"
+ "commit": "6a379f23f64045f5950d229254ce6f32dbbf5364",
+ "sha256": "0cwsjndvnv9a62ism7ckj27jdqx362947lyizka78qvmv369avv3"
},
"stable": {
"version": [
@@ -20191,14 +20351,14 @@
"repo": "jojojames/dired-sidebar",
"unstable": {
"version": [
- 20210109,
- 1854
+ 20210227,
+ 1046
],
"deps": [
"dired-subtree"
],
- "commit": "18986f015c993508af0b1b4e43e11dbd7af98057",
- "sha256": "1zla8q26sif8795n5vncwgz2j7c45bh3gnjkwqgpdg4carrw5s60"
+ "commit": "beea35753bc7b0df86f1a966989d626e0aa20481",
+ "sha256": "16yi9k1lmmfyys2vgfjxpq3mh82g208c54b1nvm6cm8kqxy1x10q"
},
"stable": {
"version": [
@@ -21300,22 +21460,19 @@
"repo": "spotify/dockerfile-mode",
"unstable": {
"version": [
- 20210106,
- 235
+ 20210301,
+ 52
],
- "commit": "58b7380189de21496235382900838aa0db2dcf92",
- "sha256": "1n3kis5g7m25sl68iw9jw7jkfz7jab82v37xk492d77rr9cbvjwx"
+ "commit": "07dde72b0e356d772fb65b969bd6decfa166e4d7",
+ "sha256": "17hpwhv0mg7ai90sczb6p4i6fwi9s1i3dsbnmk9rf6w6f5y0r1wk"
},
"stable": {
"version": [
1,
- 3
+ 4
],
- "deps": [
- "s"
- ],
- "commit": "d31f7685ebc5832d957e25070a930aa42984327d",
- "sha256": "1br73dsls42fn4rwagljkpa3l4wwj6f7jxfn3gmgl6c54z81av3v"
+ "commit": "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf",
+ "sha256": "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0"
}
},
{
@@ -21356,6 +21513,36 @@
"sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083"
}
},
+ {
+ "ename": "docstr",
+ "commit": "d2638156924dc2a327dca5f20ca63479878690c2",
+ "sha256": "1kga9h5vy4nzwhcvshxk1lpg1n7lfbygxbdpln7vfizpw065f3m7",
+ "fetcher": "github",
+ "repo": "jcs-elpa/docstr",
+ "unstable": {
+ "version": [
+ 20210222,
+ 1525
+ ],
+ "deps": [
+ "s"
+ ],
+ "commit": "6103a63385f5dfa828a3e759f3668f6be630cd54",
+ "sha256": "0w69m94i2aqhfcwnvvpkkfrz1vd871rf0fn68jm123mxg1hc76ac"
+ },
+ "stable": {
+ "version": [
+ 5,
+ 7,
+ 0
+ ],
+ "deps": [
+ "s"
+ ],
+ "commit": "63b0460a4785b4b4aee5cc072b52fb2d3a7eef6e",
+ "sha256": "0qw8ycb2jmv015agm0yc1p3aymxccv79wfczypf0ncrkv448sbvi"
+ }
+ },
{
"ename": "doct",
"commit": "f075d73b3269eec73dda992ce2bee67ccdfe4911",
@@ -21483,16 +21670,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20210124,
- 1610
+ 20210227,
+ 1747
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "116c733fd580f729e275d3b6b3954667d5dfdd5a",
- "sha256": "0jx6ha2dg32mk5gy4p86ij61xssmd3q2za0xla9nfb23nrfm7g93"
+ "commit": "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3",
+ "sha256": "1irvb4s6y80jpi6lwr7fviwisfnv4nvay29dssbj66k2jqlwyjqz"
},
"stable": {
"version": [
@@ -21536,14 +21723,14 @@
"repo": "hlissner/emacs-doom-themes",
"unstable": {
"version": [
- 20210212,
- 1921
+ 20210226,
+ 1558
],
"deps": [
"cl-lib"
],
- "commit": "80cc62813bcb4e1f28b256a09d1e3d00a4b50b55",
- "sha256": "1q2mv4w6bw8caaq25hzj5z45firll2h7cd0gxzsy53xm199sdi4g"
+ "commit": "35b86f228f76ef4f782562c9d3188769e433b17b",
+ "sha256": "1xyykbygb0dajbwmfl50pq7azzhzis53nqg8az9c7rw1fd9bds9f"
},
"stable": {
"version": [
@@ -21787,11 +21974,11 @@
"repo": "dracula/emacs",
"unstable": {
"version": [
- 20201120,
- 758
+ 20210220,
+ 1358
],
- "commit": "18e8aa5ed78d10b372414b7def917337224bf2f5",
- "sha256": "0fw3qar6dwcq5ahf9ca2glshka1ddb4im21hfy069sbdaxdajj4d"
+ "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46",
+ "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy"
},
"stable": {
"version": [
@@ -22014,8 +22201,8 @@
"repo": "dtk01/dtk",
"unstable": {
"version": [
- 20210209,
- 1841
+ 20210227,
+ 2121
],
"deps": [
"cl-lib",
@@ -22023,8 +22210,8 @@
"s",
"seq"
],
- "commit": "270320f5a31dbef543f95b15608526629d613366",
- "sha256": "1w6ylljrdrrp0087gkz83rf0fr1qnpqsm3lsg6k681wnvxz916gv"
+ "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae",
+ "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w"
}
},
{
@@ -22050,19 +22237,19 @@
"repo": "jscheid/dtrt-indent",
"unstable": {
"version": [
- 20210205,
- 1727
+ 20210214,
+ 811
],
- "commit": "4a30d8edac7fbc5936fc07050e3ebfb94f97c1e7",
- "sha256": "1k0kwg4yqa29pcn5zzkp16qm8i0zwlxsazng1hnb5nvvqirsxv7c"
+ "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0",
+ "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih"
},
"stable": {
"version": [
1,
- 3
+ 4
],
- "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d",
- "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm"
+ "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0",
+ "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih"
}
},
{
@@ -22132,16 +22319,16 @@
"repo": "jacktasia/dumb-jump",
"unstable": {
"version": [
- 20201205,
- 1625
+ 20210227,
+ 2100
],
"deps": [
"dash",
"popup",
"s"
],
- "commit": "ff9fc9360d39f5e07c1f480f8b0656b49606781b",
- "sha256": "13anm4wrm7v5x9wsv5h0bxsvr36h228afqp0zxyv008xghqmzwbv"
+ "commit": "782c2f9595d4288ac0f662d6620e23b8e33f0790",
+ "sha256": "0sczljv4isgc6r4x46g876kivgq8ywr8z4gb4w1cis9bivrlbdsf"
},
"stable": {
"version": [
@@ -22185,8 +22372,8 @@
20210213,
757
],
- "commit": "e1564823e86b797d41b2bb833c1f877f165df8d8",
- "sha256": "05yl7p8f7l3gfyvxyjks2jcl9p6ghpxsia29903009ry5jiprjcr"
+ "commit": "a8c6ed8bb27af690955e51eabbef0382b7e2d41e",
+ "sha256": "1c2r9njzm4l3rvhz0854qymf70dbmawfiahm0iaf5gva480kjv3a"
},
"stable": {
"version": [
@@ -22236,20 +22423,20 @@
"repo": "integral-dw/dw-passphrase-generator",
"unstable": {
"version": [
- 20201006,
- 1927
+ 20210226,
+ 2028
],
- "commit": "9c989595536775b380d46f28452c136070b8e4ab",
- "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax"
+ "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a",
+ "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p"
},
"stable": {
"version": [
1,
0,
- 0
+ 1
],
- "commit": "9c989595536775b380d46f28452c136070b8e4ab",
- "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax"
+ "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a",
+ "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p"
}
},
{
@@ -22278,11 +22465,11 @@
"repo": "dylan-lang/dylan-mode",
"unstable": {
"version": [
- 20201212,
- 2106
+ 20210227,
+ 1818
],
- "commit": "6277d31e6ec896ceaa9533ed156cece26359ba17",
- "sha256": "12wkm04smmd3hgx6k3waa0wma0p8r23nh1ksm484znd7gij2bcrl"
+ "commit": "fe965628177b0ee0bced7aa4fa42b6f5519c2d0e",
+ "sha256": "17q91qnxbmbmsdnq9pnhn7q8wmq4bafl2z701783ka7nwf4z3ihl"
}
},
{
@@ -22823,16 +23010,15 @@
"repo": "rexim/ebf",
"unstable": {
"version": [
- 20160211,
- 1758
+ 20210225,
+ 1211
],
"deps": [
"cl-lib",
- "dash",
- "dash-functional"
+ "dash"
],
- "commit": "4cd9c26354d8be6571354b2954d21fba882e78a2",
- "sha256": "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611"
+ "commit": "6cbeb4d62416f4cfd5be8906667342af8ecc44a6",
+ "sha256": "1d9vbn8gmiqcpxqmsv8ir3cc7clm7x1c6hz8drws3cakxk0wffn9"
},
"stable": {
"version": [
@@ -22857,14 +23043,14 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20210110,
- 1450
+ 20210219,
+ 1115
],
"deps": [
"parsebib"
],
- "commit": "8a6e7ec3773ad0d87716bc0766eb1b4ff548f856",
- "sha256": "012v001dy49cspak16cr90fwz0y6r2l01r3j25h0gdd5gm91dggv"
+ "commit": "32f97677bcfca2157583473af507c17e24f88f55",
+ "sha256": "1wd63jiik98ya5z4bkdpnznw03c1qri9wb8nn0w9smia9888a640"
},
"stable": {
"version": [
@@ -23345,14 +23531,15 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20210209,
- 947
+ 20210221,
+ 1617
],
"deps": [
- "cl-lib"
+ "cl-lib",
+ "nadvice"
],
- "commit": "f830b86316338fcc5b26a07eaeab6c34104b9ddc",
- "sha256": "092cc8dgf1z1cxgjmkysca76z93xw1a1bjb5k4y0jiw6jsr4d1h0"
+ "commit": "048c553999c90db0b6066b3ec647a79f4af9985d",
+ "sha256": "0i1h0p78dm256y7gg2fzhks4x8hq89s5i5m39pipfwy4srkp3d19"
},
"stable": {
"version": [
@@ -23682,8 +23869,8 @@
20200107,
2333
],
- "commit": "6a83f224a3cbe2d97c1641d49e443c503e54ddb6",
- "sha256": "0r0ncy89h0gg8ah842rpmmkpn10xfgihh5bj3vswxi4g6b5mqqsz"
+ "commit": "df4e47f7c8adfe90d9bf408459772a6cb4e71b70",
+ "sha256": "1n0dcrhwpl24whxzwhxf7qjlqlllzl5aahdq8h2zdgb6xz912k64"
},
"stable": {
"version": [
@@ -23703,8 +23890,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20210203,
- 1041
+ 20210227,
+ 1019
],
"deps": [
"eldoc",
@@ -23713,8 +23900,8 @@
"project",
"xref"
],
- "commit": "398b81eeec44b35b39480a38f1b1357bc8550a1c",
- "sha256": "1w0ndyzdnjldpwgyb8dgfiyhxk2ks6vmxkk2v6y4kn7ch3qwbg8z"
+ "commit": "92b0c5d385cc6f3593f60c2f93917fd8b2d44207",
+ "sha256": "1rlgindfq43622gj8jsdkx3b590lhkr2zn18djyfd7g29j26b4wm"
},
"stable": {
"version": [
@@ -23864,8 +24051,8 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20210211,
- 1542
+ 20210228,
+ 15
],
"deps": [
"anaphora",
@@ -23876,8 +24063,8 @@
"websocket",
"with-editor"
],
- "commit": "069e54cc1270ff4957699e5e9481b56b7b4bef8b",
- "sha256": "0scl5lxl5dzcxbpw2xmqxcqpajfvvzl9zgmhl96i1q52f08mplhf"
+ "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469",
+ "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl"
},
"stable": {
"version": [
@@ -24157,11 +24344,11 @@
"repo": "raxod502/el-patch",
"unstable": {
"version": [
- 20200716,
- 1428
+ 20210226,
+ 411
],
- "commit": "a47067b4d63f3674d284a772bfe773021540c043",
- "sha256": "17gpysk41qf40xa4vab79d3dmi7l3xay5gb27wn7fmj9nrzbm4sm"
+ "commit": "5e823dc9a29e3be22597d93912f06119c38030d6",
+ "sha256": "0i7gvjy97cbfll93h5b9zyr1p075lklx7rdahkdy46c4kw6vy5py"
},
"stable": {
"version": [
@@ -24423,19 +24610,20 @@
"repo": "doublep/eldev",
"unstable": {
"version": [
- 20210124,
- 1814
+ 20210228,
+ 2242
],
- "commit": "dc8e1ebf0af386eee46097ee20c20b193d1d6a2d",
- "sha256": "1rvnpysd0cwpg1n6fvg94a5s5psav6vn76v10pv8a2y1nqirjjc9"
+ "commit": "47228bf2e4f187dc332301c5e06768b5d36c4392",
+ "sha256": "0kly9lw34sl3pmcgck2j058fjnh2hkhz9hd009j6s4lj0a1fbiar"
},
"stable": {
"version": [
0,
- 8
+ 8,
+ 1
],
- "commit": "0cd211d21628ab35b21cd9ab0f16b0fc8438cac8",
- "sha256": "1dfqajcghh9mww5c0hp9qya2nss87xd5x096bb17vgg5dpx5px3s"
+ "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd",
+ "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188"
}
},
{
@@ -24705,20 +24893,20 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20210212,
- 1601
+ 20210226,
+ 258
],
- "commit": "0b44362cb93ce49c36a94289d5fa5da8279c5f52",
- "sha256": "1j96sq266511z9mfqqv3n50f8i1nqaxkwcy7jg7vg6sqhsf40sdd"
+ "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
+ "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
},
"stable": {
"version": [
3,
4,
- 0
+ 1
],
- "commit": "362bbe5b38353d033c5299f621fea39e2c75a5e0",
- "sha256": "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0"
+ "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
+ "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
}
},
{
@@ -24824,26 +25012,26 @@
"repo": "sp1ff/elfeed-score",
"unstable": {
"version": [
- 20210130,
- 159
+ 20210226,
+ 106
],
"deps": [
"elfeed"
],
- "commit": "43609d6fdf388caac91e848dc50d368f0bf83296",
- "sha256": "075955i995d7xzd9cfyrpzyz0mfdvw95s0i00q85nb9wmxyijcb2"
+ "commit": "6f99f4b9338c1a4e64885a799ac01c5b9e1d3a0a",
+ "sha256": "1l7xmnn0j5h01416ras5fjb8x68ssq9hzkcz7p4539fgq5m0p9y0"
},
"stable": {
"version": [
0,
7,
- 1
+ 4
],
"deps": [
"elfeed"
],
- "commit": "795954c8afda6da0196267c3324290841fcc4647",
- "sha256": "0mmfzn1ims4w7nqa65r2cm7vbx8v9269h3n4scmjgjhrzmxh41dj"
+ "commit": "8c895a786be96db4caab476d4db30202c51b6c70",
+ "sha256": "0zkkrf7xl91c8156vq0njkqlbdx2949s8pmpy62w2xfl12f2wb98"
}
},
{
@@ -24854,28 +25042,28 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20210131,
- 143
+ 20210226,
+ 258
],
"deps": [
"elfeed",
"simple-httpd"
],
- "commit": "0b44362cb93ce49c36a94289d5fa5da8279c5f52",
- "sha256": "1j96sq266511z9mfqqv3n50f8i1nqaxkwcy7jg7vg6sqhsf40sdd"
+ "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
+ "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
},
"stable": {
"version": [
3,
4,
- 0
+ 1
],
"deps": [
"elfeed",
"simple-httpd"
],
- "commit": "362bbe5b38353d033c5299f621fea39e2c75a5e0",
- "sha256": "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0"
+ "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6",
+ "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1"
}
},
{
@@ -25238,8 +25426,8 @@
"repo": "jcollard/elm-mode",
"unstable": {
"version": [
- 20210106,
- 228
+ 20210224,
+ 2314
],
"deps": [
"dash",
@@ -25247,8 +25435,8 @@
"reformatter",
"s"
],
- "commit": "706ffb8779c7ace330d6e020bb046e331266586a",
- "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc"
+ "commit": "188b9c743d8ec99ff7735d2581999d07f43b5bbe",
+ "sha256": "0cjjx4mf4lr1rcalzfl52ps91hyc9pvmsgpnfcb6x3akshbjab6x"
},
"stable": {
"version": [
@@ -25537,11 +25725,11 @@
"repo": "redguardtoo/elpa-mirror",
"unstable": {
"version": [
- 20210210,
- 339
+ 20210217,
+ 2309
],
- "commit": "164b2034111535c727a9e5d2b7e12884c565923d",
- "sha256": "0gidcdfm792513pz3mbydrm36zpjlcji88hlfhkvvxwvrzh7flxx"
+ "commit": "ceef14444a5d668ec2eac2954db9f3fa8971521c",
+ "sha256": "0nngpjgc98hb3aq8cq32n3n6qr59jnmm5c81i105x0ard3025jgk"
},
"stable": {
"version": [
@@ -25600,8 +25788,8 @@
"repo": "jorgenschaefer/elpy",
"unstable": {
"version": [
- 20201115,
- 1811
+ 20210227,
+ 56
],
"deps": [
"company",
@@ -25610,8 +25798,8 @@
"s",
"yasnippet"
],
- "commit": "4032c7251eb2d74ec8a301a3988b62b7a0f00932",
- "sha256": "0bmfazghviwkn14vbk2iabgrnb0xk3xw8cp2cyrg68rxmbpvl527"
+ "commit": "c31cd91325595573c489b92ad58e492a839d2dec",
+ "sha256": "0myypqnb4001zf9rpn6sakq900kn6mqhyjkp8vvc5y3j6123gj07"
},
"stable": {
"version": [
@@ -25913,11 +26101,11 @@
"repo": "emacscollective/elx",
"unstable": {
"version": [
- 20200728,
- 819
+ 20210228,
+ 2103
],
- "commit": "01ad699c562887dfe135f21dbf65d72cfe7d9cd9",
- "sha256": "05r6y0sqfmxw6d8ngy3l3rz7v015v8hil834py1ghysnqq8farn3"
+ "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363",
+ "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx"
},
"stable": {
"version": [
@@ -25929,6 +26117,24 @@
"sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha"
}
},
+ {
+ "ename": "emacs-everywhere",
+ "commit": "12713e28c8c1fd736f06d4a3271d466941954665",
+ "sha256": "1ah5isnn6d934rqp0s0bby3k4w6fymjkbsxg8f1m7wckramdi8hn",
+ "fetcher": "github",
+ "repo": "tecosaur/emacs-everywhere",
+ "unstable": {
+ "version": [
+ 20210226,
+ 1928
+ ],
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "18e88648cdac06e62b9470bba03c7512c7f6ad00",
+ "sha256": "0jwxiaf6ajiqd18albj1y7aqj2r6f5k813kbbwwhixqk1sjd4i0c"
+ }
+ },
{
"ename": "emacsc",
"commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
@@ -25937,20 +26143,20 @@
"repo": "knu/emacsc",
"unstable": {
"version": [
- 20190917,
- 1102
+ 20210226,
+ 555
],
- "commit": "57940b93881efabb375df18093b99800bfb5d5f7",
- "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff"
+ "commit": "75761078047f2a28d74eab527b881128faaa4b75",
+ "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7"
},
"stable": {
"version": [
1,
3,
- 20190917
+ 20210226
],
- "commit": "57940b93881efabb375df18093b99800bfb5d5f7",
- "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff"
+ "commit": "75761078047f2a28d74eab527b881128faaa4b75",
+ "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7"
}
},
{
@@ -26216,11 +26422,11 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210212,
- 1743
+ 20210228,
+ 10
],
- "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622",
- "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n"
+ "commit": "0c7323953e628c8797270a37c0f639fe23092175",
+ "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
},
"stable": {
"version": [
@@ -26239,15 +26445,15 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210212,
- 228
+ 20210223,
+ 1919
],
"deps": [
"consult",
"embark"
],
- "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622",
- "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n"
+ "commit": "0c7323953e628c8797270a37c0f639fe23092175",
+ "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l"
},
"stable": {
"version": [
@@ -26414,15 +26620,15 @@
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20210120,
- 1745
+ 20210228,
+ 1251
],
"deps": [
"cl-lib",
"seq"
],
- "commit": "ba16ff6dedf2de5dda219cf38b1d6d092b542de6",
- "sha256": "0hvdd4mqghllnir88sszq54y8hss8dhkgc1p8082627bnqx4sbjb"
+ "commit": "757043ba5c4d259df41f71fa6545a156de107ff8",
+ "sha256": "05y09nr3l8xh8zg301jbl37yvm213cdq99gwjgzjs1vmlg8hp0nb"
},
"stable": {
"version": [
@@ -26809,8 +27015,8 @@
"repo": "Wilfred/emacs-refactor",
"unstable": {
"version": [
- 20210110,
- 1928
+ 20210301,
+ 213
],
"deps": [
"cl-lib",
@@ -26823,8 +27029,8 @@
"projectile",
"s"
],
- "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c",
- "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb"
+ "commit": "648c2e87516fac37b84fd9bc34a6362d2a9001e2",
+ "sha256": "1crgj5skqckvw1l445ywkdq23bqkj6b6yf5y3pcyay1aasvjbhmb"
},
"stable": {
"version": [
@@ -26928,6 +27134,21 @@
"sha256": "1jpiyjb5291jk6pd649d6i8nxaazqjznb3zpksp7ykrqqgw4wgjm"
}
},
+ {
+ "ename": "enlightened-theme",
+ "commit": "93728d3fe62331b49627c1cfa1c4273a43407da8",
+ "sha256": "18ry83hdmf3fx544s42rhkl5jnlvcvbfbardhwyciyp375jzam92",
+ "fetcher": "hg",
+ "url": "https://hg.sr.ht/~slondr/enlightened",
+ "unstable": {
+ "version": [
+ 20210220,
+ 2327
+ ],
+ "commit": "1bfebd8f47e8a8357c9e557cf6e95d7027861e6d",
+ "sha256": "10f8ccavmf4xz6fpd0psbvjdcxsrypswnhcqi92nirb2z72kq4hj"
+ }
+ },
{
"ename": "enlive",
"commit": "388fa2580e687d9608b11cdc069841831b414b29",
@@ -27119,14 +27340,14 @@
"repo": "emacscollective/epkg",
"unstable": {
"version": [
- 20210105,
- 1456
+ 20210227,
+ 1459
],
"deps": [
"closql"
],
- "commit": "b9040a91412824d04134286f31fe287f19496184",
- "sha256": "1ml6gyd1ad5n9fq5szrzjysa4nnapvszz5dd5qx68jrn1djg00jy"
+ "commit": "245157564b9bd1575480044c8b24007b2090dacb",
+ "sha256": "1bdbwbrrz4brkmg50808vsj70d5yaxb1a71n014nx1a09wnw1hmj"
},
"stable": {
"version": [
@@ -27552,6 +27773,21 @@
"sha256": "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y"
}
},
+ {
+ "ename": "erc-yank",
+ "commit": "0b66abddb134e0b4cc76ad73784fa529e6ea7312",
+ "sha256": "0rpn1zfn2g6lylicil3a4scvygqymb5pdmkyyy2r2mw4xlixh375",
+ "fetcher": "github",
+ "repo": "jwiegley/erc-yank",
+ "unstable": {
+ "version": [
+ 20210220,
+ 1815
+ ],
+ "commit": "55d96f18c5df9d8fce51fa073d7a12c47a46ac80",
+ "sha256": "1chigywld4v2shc7ij6gyxfq0xzwyms5nal85b3yh7km2pim5i8h"
+ }
+ },
{
"ename": "erc-youtube",
"commit": "a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2",
@@ -27760,8 +27996,8 @@
20200914,
644
],
- "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479",
- "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i"
+ "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0",
+ "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8"
},
"stable": {
"version": [
@@ -27782,20 +28018,21 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20201215,
- 830
+ 20210226,
+ 1127
],
- "commit": "26150b438fa1587506a020642ab9335ef7cd3fe2",
- "sha256": "0m2csjqviqd219mg99wgb19whq12842hq9mpjc4nhg9bd5n9zrf9"
+ "commit": "cd074622c9ed4c93d4f12ded40f2a36f91a26bc0",
+ "sha256": "0pf06a9wgzqm49xqyivddc3r3mc2g6rf3s7zsnxnnsp5wjx4amw3"
},
"stable": {
"version": [
- 23,
- 2,
- 4
+ 24,
+ 0,
+ -1,
+ 1
],
- "commit": "74d045d62e283948247e03a93d22171802997804",
- "sha256": "0567gk8by1l4bfwk2j4l4s0z8xw2qz62km9anw0vkfbshlabhmp3"
+ "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3",
+ "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa"
}
},
{
@@ -28101,14 +28338,14 @@
"repo": "dieggsy/esh-autosuggest",
"unstable": {
"version": [
- 20190228,
- 401
+ 20210224,
+ 2242
],
"deps": [
"company"
],
- "commit": "972094808d231a86dc6e43862191167b1997d840",
- "sha256": "1nkf3n20bc8fhdw8vmmnrwhaddhmqpjsrxm304ci6r6b4zz71nq6"
+ "commit": "0f144815ebcc1f911a6a7e6df170f8cc10744c92",
+ "sha256": "1lss6q24pdkzbxdn3lj85xci1md9bs28j8ib3qsk1cmv6m691y28"
},
"stable": {
"version": [
@@ -28364,11 +28601,11 @@
"repo": "akreisher/eshell-syntax-highlighting",
"unstable": {
"version": [
- 20210117,
- 357
+ 20210223,
+ 936
],
- "commit": "172c9fb80ba2bee37fbb067a69583a6428dcc0a4",
- "sha256": "10f3sz0hlqfihq60zz3m3lxqz5xncjiyd8qdcslfxzl2rlwlgx77"
+ "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2",
+ "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq"
},
"stable": {
"version": [
@@ -28523,6 +28760,21 @@
"sha256": "03xl6a49pg3y1g3dl7fglrn956ynzj2vlviwlv08ngflvbn5shai"
}
},
+ {
+ "ename": "espotify",
+ "commit": "fb515b013942cf5ef4590e7cbc17f11f10c7692f",
+ "sha256": "05kl2l272gafzp4c79f9fg63xc0rc9r5cjz32v7dhd2m0dv257vc",
+ "fetcher": "git",
+ "url": "https://codeberg.org/jao/espotify",
+ "unstable": {
+ "version": [
+ 20210224,
+ 126
+ ],
+ "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
+ "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ }
+ },
{
"ename": "espresso-theme",
"commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
@@ -28632,11 +28884,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20210210,
- 1202
+ 20210227,
+ 2101
],
- "commit": "6dc683130466df1d2b437c6956ce26a910e47156",
- "sha256": "0zsrwkr7zma8cb2v98wr1i7lxi2yqzhz3mm8jgb63hmq4042z2w3"
+ "commit": "4e9a04284d00232e20d44269195e2a524252ebe0",
+ "sha256": "07k091b04gkmk8mdbqjvr9br19v8b0blrn5ywxvimyy3vwrxb87r"
},
"stable": {
"version": [
@@ -28955,15 +29207,15 @@
"repo": "dieggsy/eterm-256color",
"unstable": {
"version": [
- 20190123,
- 401
+ 20210224,
+ 2241
],
"deps": [
"f",
"xterm-color"
],
- "commit": "0f0dab497239ebedbc9c4a48b3ec8cce4a47e980",
- "sha256": "00ins8n92p5aspr6bjrvn5y5w0ximakk22yklsfmkav4h10al4as"
+ "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8",
+ "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm"
},
"stable": {
"version": [
@@ -29215,15 +29467,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20210109,
- 807
+ 20210228,
+ 1738
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9",
- "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x"
+ "commit": "a50a15f4057dd474f274464842381aa44e550b4d",
+ "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr"
},
"stable": {
"version": [
@@ -29641,8 +29893,8 @@
"cl-lib",
"evil"
],
- "commit": "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1",
- "sha256": "0zchmnzkq7bz2c4hl95xwnz5w243ya4ryi6hgbdss7mc9rnyyarh"
+ "commit": "ac50f21b29b6e3a111e10a9e88ae61c907ac5ee8",
+ "sha256": "0yl6lw2vz2qf97rvfmd83i3v41yl8bp7srhmxgxmhwksy589s5y9"
}
},
{
@@ -29671,14 +29923,14 @@
"repo": "Dewdrops/evil-extra-operator",
"unstable": {
"version": [
- 20161213,
- 403
+ 20210225,
+ 1239
],
"deps": [
"evil"
],
- "commit": "e16a9b36f9901254da9af8a73871061616410fc3",
- "sha256": "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4"
+ "commit": "fb249889acacc3e28869491195391fa6f617ae56",
+ "sha256": "049325xd7yk707mncz8mm8cshryh2ir1zf6ahwikr11iwsxgfajd"
}
},
{
@@ -30740,8 +30992,8 @@
"deps": [
"evil"
],
- "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9",
- "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x"
+ "commit": "a50a15f4057dd474f274464842381aa44e550b4d",
+ "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr"
},
"stable": {
"version": [
@@ -30771,8 +31023,8 @@
"auctex",
"evil"
],
- "commit": "ac313efb22d621c093d8d30233bd7dc8b4cc54b4",
- "sha256": "1wrx8ihimn1sx3vzzfppcwv0yfh3x95jrkxqvzj0ykckipm3zk0b"
+ "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d",
+ "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w"
},
"stable": {
"version": [
@@ -31448,8 +31700,8 @@
20200304,
1839
],
- "commit": "ea6b4cbb9985ddae532bd2faf9bb00570c9f2781",
- "sha256": "1pc3nnyb6cy4x6xnm25kdhmjmfm2rar7cnxsfck2wg5nm11p0klm"
+ "commit": "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0",
+ "sha256": "1x6sbychbz91q7mnfn882ir9blfw98mjcrzby38z1xlx3c9phwyi"
},
"stable": {
"version": [
@@ -31591,15 +31843,15 @@
"repo": "ananthakumaran/exunit.el",
"unstable": {
"version": [
- 20210207,
- 1214
+ 20210222,
+ 1453
],
"deps": [
"f",
"s"
],
- "commit": "b341d3972af167ff82ad3dd41899c9367e12a7f7",
- "sha256": "05nbjkj968gdgpphqn7pjqwv11vmvl30947yq2z024wkvm3vpfmj"
+ "commit": "5bb115f3270cfe29d36286da889f0ee5bba03cfd",
+ "sha256": "0xz7vnj2wjzih0rm1bsf1ynjy46wmm0aifa9g8362d8570anmkj5"
}
},
{
@@ -32828,20 +33080,20 @@
"repo": "redguardtoo/find-file-in-project",
"unstable": {
"version": [
- 20210212,
- 231
+ 20210227,
+ 546
],
- "commit": "5bc4db49e9bfe33292d225e98ff2d7c31ac6d39c",
- "sha256": "0grm9q224jmd2vbxfgv5h4nrfbj3arrym1pi6xxwgx13415z1ddz"
+ "commit": "28de73305f6e83e7eebd5a3e7f7ec2f3c0f4985a",
+ "sha256": "1afridpi5imdxcv257872nx3g4rgzzi1ld629774da3p36jpvdwl"
},
"stable": {
"version": [
6,
0,
- 0
+ 1
],
- "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d",
- "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6"
+ "commit": "06df008d5dc9eaced2dfc216f934a79c66b5cd5e",
+ "sha256": "1r9x8fzc2ccyqk24q3gijssa9jmfc6lsylayjh24xz42kdbw2kx8"
}
},
{
@@ -32852,11 +33104,11 @@
"repo": "h/find-file-in-repository",
"unstable": {
"version": [
- 20210128,
- 2102
+ 20210225,
+ 1929
],
- "commit": "2dba14e8175b1107dc9d2860d26de628b7548dbf",
- "sha256": "0gfrpqdhipa8xmp29f8yqik4vh83mkj5j9kccyq3g9rb0xwjhf0b"
+ "commit": "047eeeb8bf1958397a048d9ea8aaa43f80bac34e",
+ "sha256": "1czhnf4ayiygkv3nxw3gdaimy2l6pfy308msnp2sjy0q719ygc79"
},
"stable": {
"version": [
@@ -33130,20 +33382,20 @@
"repo": "wwwjfy/emacs-fish",
"unstable": {
"version": [
- 20200213,
- 2137
+ 20210215,
+ 1114
],
- "commit": "db257db81058b0b12f788c324c264cc59b9a5bf4",
- "sha256": "1f6viga13k90ws8v18az3vh3rdc5vd28xkpx9vfv3542bx1np1im"
+ "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04",
+ "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9"
},
"stable": {
"version": [
0,
1,
- 5
+ 6
],
- "commit": "688c82decad108029b0434e3bce6c3d129ede6f3",
- "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p"
+ "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04",
+ "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9"
}
},
{
@@ -33918,14 +34170,14 @@
"repo": "leotaku/flycheck-aspell",
"unstable": {
"version": [
- 20200830,
- 2357
+ 20210213,
+ 1822
],
"deps": [
"flycheck"
],
- "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441",
- "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx"
+ "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508",
+ "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh"
}
},
{
@@ -34523,27 +34775,27 @@
"repo": "flycheck/flycheck-eldev",
"unstable": {
"version": [
- 20200614,
- 1904
+ 20210228,
+ 2234
],
"deps": [
"dash",
"flycheck"
],
- "commit": "c2e2bea1e69fe5f50a9629dec1d9b468ee92de54",
- "sha256": "0rkzjzghfgypplnsx4w4ih9dh8xyysy9wb0jqmbg13zvc3jcb600"
+ "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e",
+ "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y"
},
"stable": {
"version": [
1,
- 0
+ 1
],
"deps": [
"dash",
"flycheck"
],
- "commit": "1bddbfaa1de22879ea2b900c9f8d6f16940ee9fb",
- "sha256": "0ma26gk9a3lw60i172wcwdsyfa19j7fj579b4yb7gf9ibca2hs5m"
+ "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e",
+ "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y"
}
},
{
@@ -34785,21 +35037,21 @@
},
{
"ename": "flycheck-grammarly",
- "commit": "5fdf51167be86e0871125d5548bddc0c926b79dd",
- "sha256": "0rdgb9ig3gda33xwl8p9c11gf274v02zibzd660ncp0cipapvqp7",
+ "commit": "81d4d4888a531dc4428b76bd1ebf0c008e7e5b0e",
+ "sha256": "11jhq2pw5pwlb7v78n963r8msy6lzj0naykn8iijqf68j9qazcsy",
"fetcher": "github",
- "repo": "jcs-elpa/flycheck-grammarly",
+ "repo": "emacs-grammarly/flycheck-grammarly",
"unstable": {
"version": [
- 20201028,
- 647
+ 20210217,
+ 909
],
"deps": [
"flycheck",
"grammarly"
],
- "commit": "64e8ffc0ddf05586398a49ae2ad5704cae6eb4c8",
- "sha256": "1yd95pc00q838af9mwmifwh0ncbndv7jzyqi5l26jxv3zbhmkdq1"
+ "commit": "67c1135193f98cfa4ee1ff83cc502dc11f648334",
+ "sha256": "1ns5rrpxxwf1n0g568g1dajvpr5i49hnv8v4i4g2sfxyszkijyj7"
},
"stable": {
"version": [
@@ -35019,8 +35271,8 @@
"deps": [
"flycheck"
],
- "commit": "e1c3adfc148caf721691a55cae686b5f31209204",
- "sha256": "0b8hs7cdywqblbf5dkgck00x18xirlxi7kqd21cqfd276wvn8wyp"
+ "commit": "7febbea9ed407eccc4bfd24ae0d3afd1c19394f7",
+ "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd"
},
"stable": {
"version": [
@@ -35177,8 +35429,8 @@
"flycheck",
"keg"
],
- "commit": "10c70dba667752c3612e69a190e097677fef268d",
- "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5"
+ "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9",
+ "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d"
}
},
{
@@ -35728,15 +35980,15 @@
"repo": "alexmurray/flycheck-posframe",
"unstable": {
"version": [
- 20201122,
- 2307
+ 20210217,
+ 327
],
"deps": [
"flycheck",
"posframe"
],
- "commit": "66b73ddb93b357fe9b849d2aa14d5cc9e89e9ffd",
- "sha256": "0hggigwbpcq4w5nrjhp8g7vahl9zdixwrhga8ag8zvrdfr0g1cym"
+ "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0",
+ "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv"
}
},
{
@@ -36385,11 +36637,11 @@
"repo": "leotaku/flycheck-aspell",
"unstable": {
"version": [
- 20201212,
- 1038
+ 20210213,
+ 1822
],
- "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441",
- "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx"
+ "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508",
+ "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh"
}
},
{
@@ -36661,20 +36913,20 @@
},
{
"ename": "flymake-grammarly",
- "commit": "1365aa5edc900493e930429eca4748bb8e6aaf69",
- "sha256": "0ipap3vz40v90qlh1a3iiqm5934bsx5xk897m5r5q5ab63k5yq75",
+ "commit": "8271fbd6a4b47d0d3aa6f50547ac502c4f2a7e4a",
+ "sha256": "06va2zmg8m8al7rxpa7znvln9yhsjlxhnxgs8q76flx9fhg0pm2j",
"fetcher": "github",
- "repo": "flymake/flymake-grammarly",
+ "repo": "emacs-grammarly/flymake-grammarly",
"unstable": {
"version": [
- 20210127,
- 834
+ 20210217,
+ 909
],
"deps": [
"grammarly"
],
- "commit": "c86109387e277251ba3d9aee4a71f0f452e9b401",
- "sha256": "1bz0vs2l59ga7x1gqrywl1dhfs1ihbcsflaznmrvg7p7v9vdrmrc"
+ "commit": "41d10f26a76208612fa184d1155ab40130f4cbf0",
+ "sha256": "1f5vflanpq0kdqnp2jz6aj5v0v4wvmr01rlgxjz3yz31bp444a0d"
},
"stable": {
"version": [
@@ -37066,10 +37318,10 @@
},
{
"ename": "flymake-phpcs",
- "commit": "6e4d444198f593cfb03c7ca84f3e90db13ef5a01",
- "sha256": "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9",
+ "commit": "a35c3043bfc1ce5a3e0fe1c472c6f494a413ba7c",
+ "sha256": "1gki8ljlq0x954a7fvsz4qj634w40dmlirjg5bm4585ssnsh04wc",
"fetcher": "github",
- "repo": "senda-akiha/flymake-phpcs",
+ "repo": "flymake/flymake-phpcs",
"unstable": {
"version": [
20140713,
@@ -38058,8 +38310,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20210128,
- 812
+ 20210228,
+ 1555
],
"deps": [
"closql",
@@ -38071,8 +38323,8 @@
"markdown-mode",
"transient"
],
- "commit": "8683b148d3ce1413aeb4b6dde1b6f55610b5aaf5",
- "sha256": "1wgznm6qynz0vgylksgimlqawdv6cd8hi5zxw6cgxii2dgajpr1b"
+ "commit": "b4df041a25811daa2536f9502461b99379dc0f11",
+ "sha256": "0v5i3wnlajz7yznksml1rwl8avkjlqf3rbjl0gpr3ylv05hcra9k"
},
"stable": {
"version": [
@@ -38127,28 +38379,28 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20210213,
- 804
+ 20210224,
+ 1954
],
"deps": [
"inheritenv",
"language-id"
],
- "commit": "d64b8afc6dd91f7a990fe12799319c0f72534009",
- "sha256": "0wsp0awq237xngmp8glakljdlrv8y107icwmz70avnn97vhikj9b"
+ "commit": "8f25a5e72f81b60bcf27fdfd653b76e7c4773895",
+ "sha256": "0yfk59sbv8ydhc1sqwf3254h9qag7zmbs4h9f47kc9kp79a93i26"
},
"stable": {
"version": [
0,
- 3,
+ 4,
0
],
"deps": [
- "cl-lib",
+ "inheritenv",
"language-id"
],
- "commit": "8c8c47a863a397d947999fff4358caf20bafca0a",
- "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss"
+ "commit": "caa0269ce89789a702823041ca7b309ddaffb5ce",
+ "sha256": "1y5a704xbnvb46rp1ra9cjjazzs795hvh3p0di2hr5jsql0a0zwa"
}
},
{
@@ -38272,14 +38524,14 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20210131,
- 1220
+ 20210225,
+ 1517
],
"deps": [
"seq"
],
- "commit": "b855c916bfe988246572d9982435c7c9837c983c",
- "sha256": "15m7dihnnys9r2185bpdqd0iazdbccyrnkrdl7a067hygc3iilal"
+ "commit": "98e2729b7dfc99607778b07ef03ff994a74c045d",
+ "sha256": "09c9rmrs8aazmmiq0v71p7yhcgk7ykr0il188xl8qc39m4rky9mz"
},
"stable": {
"version": [
@@ -38896,8 +39148,8 @@
"deps": [
"cl-lib"
],
- "commit": "3654ddbd8b3d54258edcc0f4e30ec482cfa8a255",
- "sha256": "0xk7n93m1qsp68jxva9sjaafr98rqhw2swa1d76yg01dbq5fk9pw"
+ "commit": "1488f29aa774326e5d6bf4f9c2823124606399b3",
+ "sha256": "1wyyxg3z7s7ga003pjik1116vrj5x9cssmk50s80b4xdxmw04viz"
},
"stable": {
"version": [
@@ -38954,32 +39206,32 @@
},
{
"ename": "fullframe",
- "commit": "13d1dc5c39543b65c6bb4150c3690211872c00dc",
- "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a",
- "fetcher": "github",
- "repo": "tomterl/fullframe",
+ "commit": "9eb2ecf435ad197ed6636ee5fb101375aa76d5b0",
+ "sha256": "01vwijpy10gxjwz9zkd2ri2dzhidrqsihpy90kwb5ip9kbgc4jhr",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tomterl/fullframe",
"unstable": {
"version": [
- 20201022,
- 939
+ 20210226,
+ 1057
],
"deps": [
"cl-lib"
],
- "commit": "8cc4aebf4a1054812b34f9704c38c1616571078c",
- "sha256": "13f1lhdsm2sx9h8k9iz3mv5xqfxkfwji2aa6855z0jwn8rqqzqsf"
+ "commit": "886b831c001b44ec95aec4ff36e8bc1b3003c786",
+ "sha256": "1q276p3bagx9fhzyzjmz449f95k1z287x4p34980d06klj11lrab"
},
"stable": {
"version": [
0,
5,
- 0
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd",
- "sha256": "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi"
+ "commit": "886b831c001b44ec95aec4ff36e8bc1b3003c786",
+ "sha256": "1q276p3bagx9fhzyzjmz449f95k1z287x4p34980d06klj11lrab"
}
},
{
@@ -39282,25 +39534,25 @@
},
{
"ename": "gams-mode",
- "commit": "c895a716636b00c2a158d33aab18f664a8601833",
- "sha256": "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci",
+ "commit": "0c7f6a46adc9bc4b256006e86653a77f8f891db6",
+ "sha256": "1qlzmrs8771cgp63agwr2j1826jck80420plqy704ckc24f85i00",
"fetcher": "github",
"repo": "ShiroTakeda/gams-mode",
"unstable": {
"version": [
- 20200131,
- 1335
+ 20210227,
+ 251
],
- "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49",
- "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3"
+ "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a",
+ "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk"
},
"stable": {
"version": [
6,
- 6
+ 7
],
- "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49",
- "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3"
+ "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a",
+ "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk"
}
},
{
@@ -39496,11 +39748,11 @@
"repo": "jaor/geiser",
"unstable": {
"version": [
- 20210103,
- 953
+ 20210221,
+ 2032
],
- "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950",
- "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3"
+ "commit": "26dd2f4ae0f44879b5273bf87cdd42b8ec4140a1",
+ "sha256": "05xv5amg5pffgnrlcl0yjlx37p9m5hxllq6xn96sf8dcpgsiprfs"
},
"stable": {
"version": [
@@ -39567,11 +39819,20 @@
"url": "https://git.carcosa.net/jmcbray/gemini.el.git",
"unstable": {
"version": [
- 20210124,
- 1755
+ 20210226,
+ 1419
],
- "commit": "b4f2be4eec55f0c779311cf97ffd69122b161ac3",
- "sha256": "1qvnr591vyd85gm8m0y0r88s3ik163lq55phs0kf0vr2k5xq10p7"
+ "commit": "0a227125a4112266c06ed7247de039090314b525",
+ "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "0a227125a4112266c06ed7247de039090314b525",
+ "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz"
}
},
{
@@ -39707,8 +39968,8 @@
"repo": "thisch/gerrit.el",
"unstable": {
"version": [
- 20210211,
- 1542
+ 20210219,
+ 806
],
"deps": [
"dash",
@@ -39716,8 +39977,8 @@
"magit",
"s"
],
- "commit": "b1029914d6078e1883674d2f1e1af511202641d9",
- "sha256": "0s69a83y629an7fj05gkf3qvzx7hwd6wyx62sw9h021d6xdlk5ap"
+ "commit": "19a8d6805541cede2523b70fa6601667b420f32f",
+ "sha256": "1aqcqyi4933p4cixrmjb2g1yghbdshir61q3l90igw6h6nfwbiiq"
}
},
{
@@ -39975,15 +40236,15 @@
"repo": "magit/ghub",
"unstable": {
"version": [
- 20201211,
- 1717
+ 20210227,
+ 1925
],
"deps": [
"let-alist",
"treepy"
],
- "commit": "c46de21b8db1f17df126d5f5a361ed90cdd26f99",
- "sha256": "0yiccv9813bxix60jx39jflx6vvrgxs8gfs7l8amlmy0h0kssp8g"
+ "commit": "f26c1f7e575209da047e77c18d415f9dc11015e2",
+ "sha256": "1cvsslki8nkfh7j7fy0j3f21mf0qc5cz7hv0dm3hw7k25wkrbvb9"
},
"stable": {
"version": [
@@ -40349,8 +40610,8 @@
"transient",
"with-editor"
],
- "commit": "47c57839b80c05f792de288da050fabac90639d6",
- "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2"
+ "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
+ "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
},
"stable": {
"version": [
@@ -41521,15 +41782,29 @@
"url": "https://git.launchpad.net/global-tags.el",
"unstable": {
"version": [
- 20210122,
- 1606
+ 20210225,
+ 1553
],
"deps": [
"async",
+ "ht",
"project"
],
- "commit": "03bf9d9f92886bcc7b1b8dc45e3213d6e1be9df5",
- "sha256": "13qczr2z83ggc2rw2rkzmsj1xgn4rqmg9mvfkp7wf7232d3hwpg8"
+ "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26",
+ "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 7
+ ],
+ "deps": [
+ "async",
+ "ht",
+ "project"
+ ],
+ "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26",
+ "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm"
}
},
{
@@ -43083,21 +43358,21 @@
"repo": "nlamirault/gotest.el",
"unstable": {
"version": [
- 20191128,
- 1111
+ 20210221,
+ 1905
],
"deps": [
"f",
"go-mode",
"s"
],
- "commit": "70f63eafda1f6a2f0a01a9320cc4d2edee9a17b2",
- "sha256": "090xf2w5zgffndpjvg4qfdm77cpsc8vpr00h6j0skjpr3bni79cx"
+ "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60",
+ "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12"
},
"stable": {
"version": [
0,
- 14,
+ 15,
0
],
"deps": [
@@ -43105,8 +43380,8 @@
"go-mode",
"s"
],
- "commit": "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9",
- "sha256": "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7"
+ "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60",
+ "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12"
}
},
{
@@ -43261,8 +43536,8 @@
"magit-popup",
"s"
],
- "commit": "3f73f7597473434ef0b68fa7aa1d1b3ad775eb5a",
- "sha256": "1zkpjf7kja4qpfzxz9l6kyzdmzn0w6xnbq2ks2d1szl7czmfvm12"
+ "commit": "ee5d4c3f398dbd307c06cb092361268ee4afc60c",
+ "sha256": "0nx4zgafgwhzddsyvb4im0rm0k6bvd0lialr9k21mvs2amxpwmq7"
},
"stable": {
"version": [
@@ -43482,22 +43757,22 @@
},
{
"ename": "grammarly",
- "commit": "1bbf7e3434cea3d0f6f72747ea653188ce25f68f",
- "sha256": "0h0gikvbyraflm921jmf2jkj1nfgxsdq1ybih449zbhxkvb494d4",
+ "commit": "6bfa47f73110bdf2ca1b223dbed16f73c08a12f2",
+ "sha256": "14cmvd50g3v7c6d96mqck4d0pbjvs92s4axkhwc9zw1h2sl4wni2",
"fetcher": "github",
- "repo": "jcs-elpa/grammarly",
+ "repo": "emacs-grammarly/grammarly",
"unstable": {
"version": [
- 20201028,
- 612
+ 20210219,
+ 1713
],
"deps": [
"request",
"s",
"websocket"
],
- "commit": "cda079ea8e14455230108994c1bba53ba63a3bdc",
- "sha256": "1c6c1bp23r6kpp5xk65njcc9prxgglkdzb9k4px961mbmc4s8hsl"
+ "commit": "e11a5a67307f05e08812be190b23460a1bf97687",
+ "sha256": "10ral5vipq3jvg3l8l2vgia97dpsjzkjvidp63n5z6mpjdwblka1"
},
"stable": {
"version": [
@@ -43877,8 +44152,8 @@
20200725,
725
],
- "commit": "7a37b76342ebcc30b08b1a6a7d8a043d7fede5b2",
- "sha256": "0mcyj8g1d124zpif9m4x911d877fdf3hahdpp76grsvn2qpzq2az"
+ "commit": "1aebf9c36ecfd6523e84fe092faa6ff06ce2177d",
+ "sha256": "1m86b1x4rkxy1m3q3yj564jihhxcw8ysbfxc38vl75ldnsgvbmy8"
},
"stable": {
"version": [
@@ -44239,14 +44514,14 @@
"repo": "tmalsburg/guess-language.el",
"unstable": {
"version": [
- 20210131,
- 1100
+ 20210217,
+ 1507
],
"deps": [
"cl-lib"
],
- "commit": "e423be90a4c517f8fb032ba4ea6d776a72db03f9",
- "sha256": "12calq514nxd2vkskj497r38v887sz4bg2m4gp2lllw929wj4wpn"
+ "commit": "e7decda098ee6819b37bacd958260c7c789962cb",
+ "sha256": "0d0348knda33qb9l729bz5ccig49hhw15dbjayl9y6l23nlwx7yg"
}
},
{
@@ -44321,8 +44596,8 @@
"repo": "alezost/guix.el",
"unstable": {
"version": [
- 20201222,
- 907
+ 20210224,
+ 1601
],
"deps": [
"bui",
@@ -44331,8 +44606,8 @@
"geiser",
"magit-popup"
],
- "commit": "bb2a0539f8d68b2292b3d0f3174c139b4c304028",
- "sha256": "1qf584slf4lqg4qgxj7vblmx0f0jgas03m5cc93a3wfkgkfm19w6"
+ "commit": "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31",
+ "sha256": "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k"
},
"stable": {
"version": [
@@ -44504,8 +44779,8 @@
"deps": [
"s"
],
- "commit": "9079bc333e715a13e57ab366522b15d0307e32cd",
- "sha256": "0qigmp1fwphp909vq0h4kj5m97knnwjvjw3w9d1i074gwdq54j9g"
+ "commit": "847fd910e9d0ac76e2cfeb87512e6923a39d7d5f",
+ "sha256": "1h2j1gbs47l5njny174146b2naf1wv3bgwv932abhjamj7vl06mq"
},
"stable": {
"version": [
@@ -44551,11 +44826,11 @@
"repo": "clarete/hackernews.el",
"unstable": {
"version": [
- 20210117,
- 1834
+ 20210226,
+ 1226
],
- "commit": "c9c2bb0f13f5bd64c74dbdf945d9613192c0e454",
- "sha256": "17lkjcka6ydd6khhz5jbjlybfpx05153z0d8s1rxaxcwl7z2y6cf"
+ "commit": "cea521750eddb3a70ccd38789d12b09bbdc7e906",
+ "sha256": "0mc9v8az97kap11f8np55xkbrl4mbiy6jfg76jaagkdsfizqpx5a"
},
"stable": {
"version": [
@@ -44969,15 +45244,15 @@
"repo": "haskell/haskell-snippets",
"unstable": {
"version": [
- 20160919,
- 22
+ 20210228,
+ 344
],
"deps": [
"cl-lib",
"yasnippet"
],
- "commit": "07b0f460b946fd1be26c29652cb0468b47782f3a",
- "sha256": "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci"
+ "commit": "1c29c4a68ce89848b8d371c6510d1de3b586c8b3",
+ "sha256": "1lwnggarmavyf164cfzbzzkq9ffahhd3bz7gw644czs49sndcawf"
},
"stable": {
"version": [
@@ -45280,16 +45555,16 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210212,
- 659
+ 20210223,
+ 2045
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "df4f34bc1d6d6478ad8ee543c358314da040fbe1",
- "sha256": "17i50b87ycqvb8x69qxbk9zq44k2q7d308dm06ny774mafcprrj9"
+ "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
+ "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
},
"stable": {
"version": [
@@ -45582,8 +45857,8 @@
"cl-lib",
"helm"
],
- "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2",
- "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2"
+ "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6",
+ "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2"
},
"stable": {
"version": [
@@ -46194,8 +46469,8 @@
"deps": [
"async"
],
- "commit": "df4f34bc1d6d6478ad8ee543c358314da040fbe1",
- "sha256": "17i50b87ycqvb8x69qxbk9zq44k2q7d308dm06ny774mafcprrj9"
+ "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
+ "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
},
"stable": {
"version": [
@@ -46695,15 +46970,15 @@
"repo": "emacs-helm/helm-exwm",
"unstable": {
"version": [
- 20200325,
- 1022
+ 20210215,
+ 858
],
"deps": [
"exwm",
"helm"
],
- "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d",
- "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v"
+ "commit": "5b35a42ff10fbcbf673268987df700ea6b6288e8",
+ "sha256": "1j7a3jn1599cy7n2q42vqc9kwz252k018vy3sbj8a8v0cz2xvy5z"
},
"stable": {
"version": [
@@ -47487,16 +47762,16 @@
"repo": "yyoncho/helm-icons",
"unstable": {
"version": [
- 20210125,
- 1913
+ 20210219,
+ 1752
],
"deps": [
"dash",
"f",
"treemacs"
],
- "commit": "14df05527e1c629d8eb8e5937de97fa13aeedbe8",
- "sha256": "1ia72l8n9n59ikq4gcjqpc9asnyyykkg4nzs5bzw2wf6i41pn4dl"
+ "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05",
+ "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl"
}
},
{
@@ -47878,16 +48153,16 @@
"repo": "emacs-lsp/helm-lsp",
"unstable": {
"version": [
- 20200910,
- 518
+ 20210226,
+ 2027
],
"deps": [
"dash",
"helm",
"lsp-mode"
],
- "commit": "fc09aa0903ee6abe4955e9a6062dcea667ebff5a",
- "sha256": "1gcs6aky8h6g9wkrqjl8j50zm4lnvnjv4xcfxxg2z0j7vln81pbx"
+ "commit": "74a02f89088484c42ffc184ece338b73abd4d6f6",
+ "sha256": "1p130xj03wh3pqwf1bb3xl86pqnv1kpmn90mwfg0g52jwl0grv6b"
},
"stable": {
"version": [
@@ -48231,8 +48506,8 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20210210,
- 1119
+ 20210228,
+ 1853
],
"deps": [
"dash",
@@ -48242,8 +48517,8 @@
"org-multi-wiki",
"org-ql"
],
- "commit": "3b97aa047233d521e937b6040cf9085e77507f28",
- "sha256": "0rq37k0ydksc2wsavy4g6wydr2hxcclbipab14qdldvrif35sr24"
+ "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2",
+ "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5"
},
"stable": {
"version": [
@@ -48434,29 +48709,29 @@
"repo": "emacs-helm/helm-pass",
"unstable": {
"version": [
- 20190315,
- 1335
+ 20210221,
+ 1655
],
"deps": [
"auth-source-pass",
"helm",
"password-store"
],
- "commit": "ed5798f2d83937575e8f23fde33323bca9e85131",
- "sha256": "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv"
+ "commit": "4ce46f1801f2e76e53482c65aa0619d427a3fbf9",
+ "sha256": "19w24isddzamkikq17vbv3y7ha22i7wc09d2nqw1j0qwhrrfkng9"
},
"stable": {
"version": [
0,
- 3
+ 4
],
"deps": [
"auth-source-pass",
"helm",
"password-store"
],
- "commit": "ed5798f2d83937575e8f23fde33323bca9e85131",
- "sha256": "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv"
+ "commit": "4ce46f1801f2e76e53482c65aa0619d427a3fbf9",
+ "sha256": "19w24isddzamkikq17vbv3y7ha22i7wc09d2nqw1j0qwhrrfkng9"
}
},
{
@@ -49155,8 +49430,8 @@
"repo": "emacs-helm/helm-searcher",
"unstable": {
"version": [
- 20210124,
- 1648
+ 20210221,
+ 923
],
"deps": [
"f",
@@ -49164,8 +49439,8 @@
"s",
"searcher"
],
- "commit": "3c0e4997126b5e7ba2db2dba8f1dbc5cb92d2459",
- "sha256": "1fcinlxrvzmlrn17gfpv3n2wf9si084p6yi3jg0jzagnprris8lx"
+ "commit": "181f60cb8505aec05393a9dbf414733d19f76d2a",
+ "sha256": "06bnnbay56ngiddkvvwmy3fv4v2gjss8gm7gjcp2064m9njgw5mx"
},
"stable": {
"version": [
@@ -49250,6 +49525,24 @@
"sha256": "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx"
}
},
+ {
+ "ename": "helm-shell-history",
+ "commit": "93d2ca7bf89a96a8a2eac59d2a34d8f152fa9752",
+ "sha256": "1krb7i00rf9dwq9pq8zppiyhhahpk661qbg8hazg7bpsb58kxy8r",
+ "fetcher": "github",
+ "repo": "anoopemacs/helm-shell-history",
+ "unstable": {
+ "version": [
+ 20210214,
+ 948
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "0c861f3db721e54053fc65f5651cf548cc1cb600",
+ "sha256": "00dkwym5xkvxa3w4dgpbk22rhrwl7v73cv6ay3pqcv7rjcc2m3s8"
+ }
+ },
{
"ename": "helm-slime",
"commit": "c35d43a7a8219de4a7f675147f598966aaecb9db",
@@ -49941,18 +50234,17 @@
"repo": "Wilfred/helpful",
"unstable": {
"version": [
- 20201012,
- 614
+ 20210219,
+ 728
],
"deps": [
"dash",
- "dash-functional",
"elisp-refs",
"f",
"s"
],
- "commit": "584ecc887bb92133119f93a6716cdf7af0b51dca",
- "sha256": "04kk8rrkgkggjxqppivc4dbn13dkc786dv0masby0wy58vlxpsfv"
+ "commit": "0b6720145e1d1e037ec8658b83fddfad2c0ce923",
+ "sha256": "0rsxd62l81hkpvznclgwvd1r6ca66mx6xm7jlvv8id28jhrqv03w"
},
"stable": {
"version": [
@@ -50434,11 +50726,11 @@
"repo": "antonj/Highlight-Indentation-for-Emacs",
"unstable": {
"version": [
- 20201110,
- 1327
+ 20210221,
+ 1418
],
- "commit": "4fc4e346c17e4e975a8c8ece3d4e7240357e2869",
- "sha256": "1laj0h8vm058miwv0pl8hsh5pyfg98h4y9szzq03ilry4ifx9jz5"
+ "commit": "d88db4248882da2d4316e76ed673b4ac1fa99ce3",
+ "sha256": "02a3r3f6nd37yx1gsr6nv168wmx5r5c7b47a5r5fw16d2zlkfmix"
},
"stable": {
"version": [
@@ -50776,10 +51068,10 @@
},
{
"ename": "history",
- "commit": "f51d4cc6521546c99197adeb35459fcd53bd67d4",
- "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g",
+ "commit": "d1172402073d66c671de75ddf5c9b6ac3f6d64cd",
+ "sha256": "14n0h6lca450w68lk20q98bdbkfadmsqmv1sb73m0pnvzyh5c04z",
"fetcher": "github",
- "repo": "boyw165/history",
+ "repo": "tcw165/history",
"unstable": {
"version": [
20160821,
@@ -50890,8 +51182,8 @@
20201126,
818
],
- "commit": "82f42045c11ad8c6f13db3a32dcda970a378d164",
- "sha256": "1ydks5mrzsxj7q3kvv8ji6vy4jxfra7lhd3vfyqldp3inhz3rpkz"
+ "commit": "05a8c5119c717f53e2e9c279d316f04dd744b9b3",
+ "sha256": "11pa6nlpisaba9db0a8iqs86m4ly93cnd8rszd051dg3av8snx67"
}
},
{
@@ -51140,16 +51432,16 @@
"repo": "alhassy/holy-books",
"unstable": {
"version": [
- 20210114,
- 1607
+ 20210227,
+ 2225
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "3a31424fcf889e594067de314acb4fec238d510b",
- "sha256": "1n69j4yx2dyyhvs649n17lqb1b5nwdrsfrj0a3vhyvd3q56j3fkl"
+ "commit": "53ee29d1b1a1a9cbd664c318b01aa1c13011efff",
+ "sha256": "0n7qnr23h22lsp2n19z3j30zq6l2rvqj1mldkaki0gvw5whi4r3w"
}
},
{
@@ -51378,16 +51670,16 @@
"repo": "thanhvg/emacs-howdoyou",
"unstable": {
"version": [
- 20210205,
- 1720
+ 20210217,
+ 1723
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "63addedefcad86fe3cd64b29d87a500849124d4b",
- "sha256": "162sqbvxxh19fyg6is1hnqzck01mglw2cahs07lsxmfh58gw2lx6"
+ "commit": "27e9e015b930175896c07536c25e379a4e1997af",
+ "sha256": "14f3fqz8sjmjh7si5gk31fh7bnvc9p1rfd9p2l39zvasvk1sxki0"
}
},
{
@@ -51398,14 +51690,14 @@
"url": "https://scm.osdn.net/gitroot/howm/howm.git",
"unstable": {
"version": [
- 20201231,
- 1042
+ 20210217,
+ 1128
],
"deps": [
"cl-lib"
],
- "commit": "c11a6b7ad3d683d2910572fa7f2a87ffdf503317",
- "sha256": "0fjwgxaf7lzby6hz96xz9b97mv4vhczs14cq6j6vxygrkykafwam"
+ "commit": "bac98b873d07baf039fe252b9d67f71c235dca06",
+ "sha256": "0rhyhkm84fsff5lyvb0z9rnbhmqn4ix0d8wixzll2n2yclj9d9my"
}
},
{
@@ -52025,14 +52317,14 @@
"repo": "zzkt/i-ching",
"unstable": {
"version": [
- 20210208,
- 1251
+ 20210222,
+ 1519
],
"deps": [
"request"
],
- "commit": "706052ba196797fd32e6d6d05e059b1f5dd4f2c9",
- "sha256": "16kkdzd49b91dvby4mfghpq4phwilzyqaciar8jvk5sfiilyw7yi"
+ "commit": "51a3180ed07ae9f8b7ff3f2b822d998495864a07",
+ "sha256": "1rrykszzcyvrmks2clrpdq5kdldcqp38wc908bhq2b4qw7w3d7sw"
}
},
{
@@ -52212,11 +52504,11 @@
"repo": "jojojames/ibuffer-sidebar",
"unstable": {
"version": [
- 20180219,
- 131
+ 20210215,
+ 1849
],
- "commit": "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc",
- "sha256": "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz"
+ "commit": "59e20690fc4f5ccd751e7a13a60664b97f053a1c",
+ "sha256": "1z6japr7n950222x33jinb34z7j6n5spj9cn8nq8f8yf8rgp6n2j"
}
},
{
@@ -52310,11 +52602,11 @@
"repo": "oantolin/icomplete-vertical",
"unstable": {
"version": [
- 20210212,
- 1737
+ 20210227,
+ 2146
],
- "commit": "708d2b673f5e993c8894817b083dd08eef66cebe",
- "sha256": "0hxsmk97cis6k34a0iq2pz97nkhpljkbf8x306ra2y5sf6a82rcf"
+ "commit": "e490b01f7420bc15bc8e7b4594964208c3d31107",
+ "sha256": "1b069vnjlwnwk62332ndwizjp44dhjxvajv2nndpxqrkpqg9s8jb"
},
"stable": {
"version": [
@@ -52333,27 +52625,27 @@
"repo": "plandes/icsql",
"unstable": {
"version": [
- 20210115,
- 137
+ 20210216,
+ 2116
],
"deps": [
"buffer-manage",
"choice-program"
],
- "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902",
- "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d"
+ "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16",
+ "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp"
},
"stable": {
"version": [
0,
- 3
+ 4
],
"deps": [
"buffer-manage",
"choice-program"
],
- "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902",
- "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d"
+ "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16",
+ "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp"
}
},
{
@@ -52871,15 +53163,15 @@
"repo": "idris-hackers/idris-mode",
"unstable": {
"version": [
- 20200522,
- 808
+ 20210223,
+ 850
],
"deps": [
"cl-lib",
"prop-menu"
],
- "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59",
- "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1"
+ "commit": "80aabd2566082aa67d17eccdd80e9f1fb10c9ec8",
+ "sha256": "1cmmasfmgnzhixhczigz1c2jzhr9yj4v6mwvgxs99vbg2k3p9rcq"
},
"stable": {
"version": [
@@ -53172,11 +53464,11 @@
"repo": "QiangF/imbot",
"unstable": {
"version": [
- 20210210,
- 909
+ 20210223,
+ 1226
],
- "commit": "4083ad2e5a840467668a7c2fb809177726a7c519",
- "sha256": "1hcfhlvnqbfkym96bl9qpvcarijbqva2q80ld8vi3hmr2ghrq30y"
+ "commit": "b5d191c9168918a47373c70e97ae83ba46b946f6",
+ "sha256": "10qj11q35q9ck5dlkv26ra5zy5p3jckb24jl7y050af0fip1m0vd"
}
},
{
@@ -53688,8 +53980,8 @@
"repo": "NicolasPetton/Indium",
"unstable": {
"version": [
- 20201103,
- 2040
+ 20210222,
+ 1110
],
"deps": [
"company",
@@ -53698,8 +53990,8 @@
"json-process-client",
"seq"
],
- "commit": "b870d1ed6b350d3753e7a148c61c373ca76ba78a",
- "sha256": "1fscqkpk3z6pxgy1kf548jbck5p57k02badm7j8ggixbvng63d3g"
+ "commit": "32487a432d6c0728e1fd69db61c4a07b94bb5798",
+ "sha256": "11s3mn096bsbsrj14h9wpi0721yhlnnd434yswgj6m12k1wpdmzq"
},
"stable": {
"version": [
@@ -53741,14 +54033,14 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20200801,
- 1128
+ 20210213,
+ 2044
],
"deps": [
"clojure-mode"
],
- "commit": "e291da3cd0c11271ad7372594139974057612172",
- "sha256": "1cnr72s3d224l7wk742hlj5mlgr65pchfc2w6dz9gx3ww6by9b8l"
+ "commit": "e144b335fae20418e783c4067463de38de56b65a",
+ "sha256": "0jjfgi77pkqissbqvghqwfqlxkzgg69k28q1phgpm06c56z2shnq"
},
"stable": {
"version": [
@@ -53793,6 +54085,30 @@
"sha256": "0vija33n2j4j5inzm29qk1bjzaxjm97zn263j15258pqxwkbddv3"
}
},
+ {
+ "ename": "inf-elixir",
+ "commit": "9d4add1ea6aeca5f19e2827628751ea321912219",
+ "sha256": "0vaxp92d2v094gqwdw2xvfrh13iqshr94hab81135a9pgggy4rc9",
+ "fetcher": "github",
+ "repo": "J3RN/inf-elixir",
+ "unstable": {
+ "version": [
+ 20210226,
+ 1653
+ ],
+ "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d",
+ "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 1,
+ 0
+ ],
+ "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d",
+ "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3"
+ }
+ },
{
"ename": "inf-mongo",
"commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -54168,8 +54484,8 @@
20210109,
1112
],
- "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b",
- "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr"
+ "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7",
+ "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy"
}
},
{
@@ -54439,8 +54755,8 @@
20191129,
958
],
- "commit": "383eb955bf0084a6e6ec03c9bd34511e20e0407d",
- "sha256": "11bm00pw0bg8z6b5gyfmb2iss5libp6m4x0mc8agazabxzhmzyx9"
+ "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa",
+ "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr"
},
"stable": {
"version": [
@@ -55018,20 +55334,20 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210202,
- 1423
+ 20210225,
+ 1251
],
- "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49",
- "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g"
+ "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
+ "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
},
"stable": {
"version": [
0,
13,
- 0
+ 2
],
- "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb",
- "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p"
+ "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
+ "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
}
},
{
@@ -55042,15 +55358,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200615,
- 938
+ 20210225,
+ 1251
],
"deps": [
"avy",
"ivy"
],
- "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49",
- "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g"
+ "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
+ "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 13,
+ 2
+ ],
+ "deps": [
+ "avy",
+ "ivy"
+ ],
+ "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
+ "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
}
},
{
@@ -55069,8 +55398,8 @@
"cl-lib",
"swiper"
],
- "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2",
- "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2"
+ "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6",
+ "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2"
},
"stable": {
"version": [
@@ -55397,28 +55726,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200608,
- 1010
+ 20210225,
+ 1251
],
"deps": [
"hydra",
"ivy"
],
- "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49",
- "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g"
+ "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
+ "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
},
"stable": {
"version": [
0,
13,
- 0
+ 2
],
"deps": [
"hydra",
"ivy"
],
- "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb",
- "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p"
+ "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
+ "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
}
},
{
@@ -55603,27 +55932,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200716,
- 1414
+ 20210227,
+ 600
],
"deps": [
"ivy",
"prescient"
],
- "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d",
- "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w"
+ "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
+ "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
},
"stable": {
"version": [
5,
- 0
+ 1
],
"deps": [
"ivy",
"prescient"
],
- "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
- "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
+ "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12",
+ "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks"
}
},
{
@@ -55726,8 +56055,8 @@
"repo": "jcs-elpa/ivy-searcher",
"unstable": {
"version": [
- 20210124,
- 1641
+ 20210221,
+ 923
],
"deps": [
"f",
@@ -55735,8 +56064,8 @@
"s",
"searcher"
],
- "commit": "46a461eb873083bc53d7fd3a15b266c52b3cbfb4",
- "sha256": "1qsbbpmk3211lm29mks7r3dfphyikbkkj94028748y6ngwqk1vb4"
+ "commit": "3a2f5073a0d5842a6b3c386e70cc484e3c4ea77b",
+ "sha256": "1bk8kaxqq1m76x1i4hy3jqcy05pr6dlzjd4dbyi8lrx9sxnfrnkk"
},
"stable": {
"version": [
@@ -56525,20 +56854,19 @@
"repo": "Emiller88/emacs-jest",
"unstable": {
"version": [
- 20201130,
- 1920
+ 20210219,
+ 1508
],
"deps": [
"cl-lib",
"dash",
- "dash-functional",
"js2-mode",
"magit-popup",
"projectile",
"s"
],
- "commit": "b70698d25ffeaa99520d4571659abb3005657398",
- "sha256": "1n3qn9zgc09bpblv7rmm7lxdaz2ii7wjws0vd30ppdc8dy301gfp"
+ "commit": "0fe875082e54bdbfe924808aa155b938ed90d401",
+ "sha256": "0dxzml0i4x072jwxsbv0nnj3ws1i3z1x2ybg3fqfnfvzy2vynx3w"
}
},
{
@@ -56549,11 +56877,11 @@
"repo": "rymndhng/jest-test-mode",
"unstable": {
"version": [
- 20200329,
- 506
+ 20210228,
+ 132
],
- "commit": "f04d08db36715d7509fd68448f74f917c6c1a382",
- "sha256": "1pmzls19wpg60ql0b5l6rhml8hh8mzpbc0dgylzhps1jghi055s1"
+ "commit": "fb2bacab9475410c79e6e4ca344f093f7698466d",
+ "sha256": "0m3p75659krzcyc54ri0x8bwr1zxhkrfmyz8z7z5mjpydb8qb1v8"
}
},
{
@@ -57408,8 +57736,8 @@
20190714,
1521
],
- "commit": "1623346b308dc8f593346dc947fdc4092d674834",
- "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv"
+ "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e",
+ "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p"
},
"stable": {
"version": [
@@ -57883,14 +58211,14 @@
"repo": "TxGVNN/emacs-k8s-mode",
"unstable": {
"version": [
- 20201215,
- 1656
+ 20210219,
+ 1317
],
"deps": [
"yaml-mode"
],
- "commit": "9d37e64b9bdc1778481687ca04e2ee5a96bc0474",
- "sha256": "054pasvk5xspdndsc962z3d3z5jgpd28ysag5pxa8dfh3yz65vxq"
+ "commit": "0df142ac98bcd072dd7017053c9c9c476345aeef",
+ "sha256": "1nxcp1hq9d1j7whfak60j4dmzsfmq2mgmdxxvlj3az7p7vannd2v"
},
"stable": {
"version": [
@@ -58174,15 +58502,15 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20210206,
- 1553
+ 20210225,
+ 725
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "097ffb434feb149bce548dfe4daf99d604abb1bd",
- "sha256": "00svj1w9iyf7qh1s49d955j1q7ja8fcs5kwd6prjmg61whlqnyik"
+ "commit": "7f27dd887da0e2d2522f711f8954c997de366ac4",
+ "sha256": "134ijij23vhc5jw1bvfvkikl64lwvnsmbprqsv64791x1fvcbd6y"
},
"stable": {
"version": [
@@ -58324,14 +58652,14 @@
"repo": "conao3/keg.el",
"unstable": {
"version": [
- 20210201,
- 821
+ 20210226,
+ 2246
],
"deps": [
"cl-lib"
],
- "commit": "10c70dba667752c3612e69a190e097677fef268d",
- "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5"
+ "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9",
+ "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d"
}
},
{
@@ -58345,8 +58673,8 @@
20200601,
333
],
- "commit": "10c70dba667752c3612e69a190e097677fef268d",
- "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5"
+ "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9",
+ "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d"
}
},
{
@@ -58959,8 +59287,8 @@
20180702,
2029
],
- "commit": "7f8a887e153e9924d260069c0184958c0b53e57b",
- "sha256": "0hzmsr911y2r701l92hjx0nh1w58407jfkn8ky8mymvszb0qggy3"
+ "commit": "de520e601fee568b03800e8069118730ccbbdb95",
+ "sha256": "1yk5ygmhkzhfwk770k6lhqx5hjcwsjrgnf99qzl59af74qxn3wya"
},
"stable": {
"version": [
@@ -58980,14 +59308,14 @@
"repo": "stardiviner/kiwix.el",
"unstable": {
"version": [
- 20210113,
- 1834
+ 20210219,
+ 51
],
"deps": [
"request"
],
- "commit": "e5821f5ccb34262aedcb4ea3a19e583c6a97e2f8",
- "sha256": "1g9cn34r948a0g9wyda1kzlq33ddgmarl9j6wbb76g0fgkh7qjh9"
+ "commit": "0c5e1619f079df822686cf42af5859111b6afd44",
+ "sha256": "179wsr1ffsl4hm4vnb0zzbw338jni5pz8ndgkfq21jppgzk8mlna"
},
"stable": {
"version": [
@@ -59244,8 +59572,8 @@
"repo": "abrochard/kubel",
"unstable": {
"version": [
- 20210212,
- 2154
+ 20210222,
+ 2212
],
"deps": [
"dash",
@@ -59253,8 +59581,8 @@
"transient",
"yaml-mode"
],
- "commit": "5d5639cac5d98bca74cad44b5a1e128df77050bd",
- "sha256": "059yqvr36gycqdbnls2nbsd34q16wxyi2paxqlh7wc053h2y7zp3"
+ "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e",
+ "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni"
},
"stable": {
"version": [
@@ -59286,8 +59614,8 @@
"evil",
"kubel"
],
- "commit": "5d5639cac5d98bca74cad44b5a1e128df77050bd",
- "sha256": "059yqvr36gycqdbnls2nbsd34q16wxyi2paxqlh7wc053h2y7zp3"
+ "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e",
+ "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni"
},
"stable": {
"version": [
@@ -59310,16 +59638,16 @@
"repo": "chrisbarrett/kubernetes-el",
"unstable": {
"version": [
- 20200911,
- 756
+ 20210219,
+ 625
],
"deps": [
"dash",
"magit",
"magit-popup"
],
- "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509",
- "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg"
+ "commit": "de4ff6ccdf58a939908d384efe9cf06b2bcabe12",
+ "sha256": "0nz34h601him6x1a6fkvzvr4r3f5d55cz520ddsmin9zwpq7rlhq"
},
"stable": {
"version": [
@@ -59351,8 +59679,8 @@
"evil",
"kubernetes"
],
- "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509",
- "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg"
+ "commit": "de4ff6ccdf58a939908d384efe9cf06b2bcabe12",
+ "sha256": "0nz34h601him6x1a6fkvzvr4r3f5d55cz520ddsmin9zwpq7rlhq"
},
"stable": {
"version": [
@@ -59464,6 +59792,36 @@
"sha256": "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy"
}
},
+ {
+ "ename": "l",
+ "commit": "36d7dce3ad5cfc4047800c84945b714df2af0632",
+ "sha256": "0wkgl3sw7wr3fqlgb3hzw64fawha4lnxbh12w9d7196bfwnm3ny2",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tarsius/l",
+ "unstable": {
+ "version": [
+ 20210214,
+ 1130
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "518203abc6cee13c73c2d91282354ed59f00f15e",
+ "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "518203abc6cee13c73c2d91282354ed59f00f15e",
+ "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan"
+ }
+ },
{
"ename": "lab-themes",
"commit": "c5817cb4cb3a573f93bacfb8ef340bef0e1c5df4",
@@ -59541,16 +59899,16 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20210208,
- 908
+ 20210220,
+ 728
],
"deps": [
"eglot",
"highlight",
"math-symbol-lists"
],
- "commit": "c05332eb20f98fd1dba05279a5a02a7c819aa342",
- "sha256": "0fyrzpphs7lahzqgcljbfd4lgcj566f3wyc4ym8x5jl6vd6kdr0g"
+ "commit": "e9aeee78c3aede7e39fec993b846e731d7790acf",
+ "sha256": "1dkbrwd1dchc9h650r7rfw9xcjr342xkyjjrq0lyxwa8v5s4558v"
}
},
{
@@ -60038,11 +60396,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20201211,
- 412
+ 20210224,
+ 144
],
- "commit": "e0c4b7484ab6ee3bbf8413f620ccb99af4328d2f",
- "sha256": "18vvl8a5s6n1kky31n0khnv89998gy9vfk5q58hkczfadc6nss76"
+ "commit": "fbe9bfba5ef4c99ee190b259a5e3341dd7a71935",
+ "sha256": "16rki5xzffws02l2nr2ra0kxapizqdix5373ny9f4hlkvp7bqgzi"
},
"stable": {
"version": [
@@ -60082,14 +60440,14 @@
"repo": "conao3/leaf-keywords.el",
"unstable": {
"version": [
- 20201225,
- 1406
+ 20210222,
+ 1243
],
"deps": [
"leaf"
],
- "commit": "64c5ec702b7fab83770c539d613d8c6610ce510d",
- "sha256": "0qzmnbn91g02g6vhilx081xz6n1360a3ri64rpzd8avcgmrkb1vr"
+ "commit": "4146621f4ae80ef0c30160337119441c1f6334b6",
+ "sha256": "16iv1cvlky2gij1ndx2d6q8l35axm72bx52n6v5y3h21aibj197n"
},
"stable": {
"version": [
@@ -60280,11 +60638,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20210118,
- 2040
+ 20210221,
+ 1315
],
- "commit": "643f29cd618db5366fa8ff442548d124528355c6",
- "sha256": "1vip1yc4vf4213kjxal1bff7bw776b8mhk8f3h56rnp7siah2m1n"
+ "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336",
+ "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac"
},
"stable": {
"version": [
@@ -60329,8 +60687,8 @@
"log4e",
"spinner"
],
- "commit": "5b17bc254e225b880e94ff5dad5caa60b270eecc",
- "sha256": "18qnzgysdzadwy97s6fcfmcjs8gnrqkgqxfgq1130r1b36gjixqg"
+ "commit": "9c44791407c3f4f76d903ee43367547803ae9c32",
+ "sha256": "14nlmgbkb8vyb0r25sdg03lg2h38gj83vspp9v9vsqyiiirhnvnh"
},
"stable": {
"version": [
@@ -60593,8 +60951,8 @@
20201007,
2214
],
- "commit": "89683794014cab79d2cb7362f901d03c6d3b8c00",
- "sha256": "09cflqn4g9s6hz91882w9vnkwzpbba796jhcyvxr23qbv14q7257"
+ "commit": "5bb4b76b1d1d2453de69920b3a1a6b2a302aea07",
+ "sha256": "1dqpksmpnnpi591p76hhv95p5gmkmsw794vzny7rd4xkdgcc39jv"
},
"stable": {
"version": [
@@ -60837,26 +61195,26 @@
"repo": "jcs-elpa/line-reminder",
"unstable": {
"version": [
- 20200914,
- 611
+ 20210216,
+ 1451
],
"deps": [
"indicators"
],
- "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5",
- "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds"
+ "commit": "bc488bbdba2172629183891758cfa9466a64182f",
+ "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55"
},
"stable": {
"version": [
0,
4,
- 4
+ 5
],
"deps": [
"indicators"
],
- "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5",
- "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds"
+ "commit": "bc488bbdba2172629183891758cfa9466a64182f",
+ "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55"
}
},
{
@@ -60870,8 +61228,8 @@
20180219,
1024
],
- "commit": "3f42011e08dd4c15f20b620cdd5008cc1d9ef65f",
- "sha256": "0fdl4prvhn905y8js8hd6dysxisrrvz51g5dqd22cs8w06zk6zis"
+ "commit": "a49afb9c168eaf8aaaf94f0c631b7b74db9a1d82",
+ "sha256": "0213ppx15rdb5cxg7w8978880fzv3dh2m9p6idkmlfj7bndfd411"
},
"stable": {
"version": [
@@ -61099,20 +61457,20 @@
"repo": "marcowahl/lisp-butt-mode",
"unstable": {
"version": [
- 20200727,
- 1441
+ 20210215,
+ 2206
],
- "commit": "1b178fec96cb200574a17cb26ac0742d9df571a9",
- "sha256": "01hj2kzy1mrzqc806jvgvkiyf7mkjacg944l3dblblyl7zgx8plx"
+ "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23",
+ "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l"
},
"stable": {
"version": [
2,
0,
- 2
+ 4
],
- "commit": "008d2093608ee8fac184a6682e4ccf7b461dcaa1",
- "sha256": "1kxvwd9y9q5ax9509b3xy3qqjpamfxzljyvbm1fc89qy50pdjxyr"
+ "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23",
+ "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l"
}
},
{
@@ -61459,14 +61817,14 @@
"repo": "sulami/literate-calc-mode.el",
"unstable": {
"version": [
- 20201214,
- 1221
+ 20210227,
+ 1744
],
"deps": [
"s"
],
- "commit": "1cf4fa18731248c6519667c16a6832b616b2b86f",
- "sha256": "19icc2c3s4jmn0i55dfllpvbwm6f3wmscfp8nrgini2wk89260jl"
+ "commit": "55494982d21de36c182b41896e1ed571bda69541",
+ "sha256": "06r7d5zgavam9jdnffnb3gznx9k5347dlwc4yj1knhfnphzzvl7a"
}
},
{
@@ -61723,8 +62081,8 @@
"deps": [
"seq"
],
- "commit": "fa28bed90b77487e275e3908c3bd0f00f94ab88b",
- "sha256": "1f58d1y44m3ac2db8yddhrxjpv2503di08p0v46103pnlm7a245q"
+ "commit": "f2f1476e88153b167bf4ce755f7455fcb3f98458",
+ "sha256": "0qnzbamf763h8fwjsn7i47a1amb8nixl25zw58jh4hhl470czi2f"
},
"stable": {
"version": [
@@ -61857,11 +62215,11 @@
"repo": "fourier/loccur",
"unstable": {
"version": [
- 20191022,
- 1955
+ 20210224,
+ 2041
],
- "commit": "284d7bb285bd382be6c1936077de7e2246fa2374",
- "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l"
+ "commit": "01b7afa62589432a98171074abb8c5a1e089034a",
+ "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2"
}
},
{
@@ -62235,8 +62593,8 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20210110,
- 15
+ 20210215,
+ 1558
],
"deps": [
"dap-mode",
@@ -62247,14 +62605,14 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "69e36b6c824c165527a25b9e6e754eea659a878e",
- "sha256": "1k4dxi1yv0w0k99qlpaz2wsvnb31p33ypqvbh9x3fqj6kp720biq"
+ "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f",
+ "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr"
},
"stable": {
"version": [
1,
17,
- 12
+ 13
],
"deps": [
"dap-mode",
@@ -62265,8 +62623,8 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23",
- "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw"
+ "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f",
+ "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr"
}
},
{
@@ -62277,15 +62635,15 @@
"repo": "emacs-lsp/lsp-docker",
"unstable": {
"version": [
- 20201102,
- 1802
+ 20210217,
+ 1102
],
"deps": [
"dash",
"lsp-mode"
],
- "commit": "38f75193f7a8a0e095975104f3ff1c58b3c7c59c",
- "sha256": "0ghbcih8hshiyw0mwr2qjhzjbs1sikxl1ih4m41fk4pzd86vjbm4"
+ "commit": "a5b9ae58fc46b683bccd97d6722f9bd1663fd79a",
+ "sha256": "0gddfn5rxf7n4l9llziad95cmnn2zlyam7fwh1jbirrhwidg024q"
}
},
{
@@ -62320,6 +62678,36 @@
"sha256": "1xzyz59bgsjpvb32x60wk2n6x6pj5pk65sfd677h898rvlxnn1lz"
}
},
+ {
+ "ename": "lsp-grammarly",
+ "commit": "ececaeddf8d7d17ddd9bb20401ff96edb707c06f",
+ "sha256": "1lwk5pwiglp6xzh8d7fwb0nzr3zaqxcbfx6h9wl7vlnz6sz29z4m",
+ "fetcher": "github",
+ "repo": "emacs-grammarly/lsp-grammarly",
+ "unstable": {
+ "version": [
+ 20210222,
+ 409
+ ],
+ "deps": [
+ "lsp-mode"
+ ],
+ "commit": "699a0fda7b83953a19a30d235c6a4006f72f41fb",
+ "sha256": "0ip55ji04z9mmlmhrwywq7sw4j98jq79lfac2j3nz0q1qx8576w2"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "lsp-mode"
+ ],
+ "commit": "16825b8dde5dfb3042f4c6fb94be70d6f10b745d",
+ "sha256": "1byv93xasdpiyfhszi8vh6z7jmhdhxh6lj91xhlgif0s209nfbs9"
+ }
+ },
{
"ename": "lsp-haskell",
"commit": "1a7b69312e688211089a23b75910c05efb507e35",
@@ -62398,13 +62786,12 @@
"repo": "emacs-lsp/lsp-java",
"unstable": {
"version": [
- 20210122,
- 2024
+ 20210228,
+ 1108
],
"deps": [
"dap-mode",
"dash",
- "dash-functional",
"f",
"ht",
"lsp-mode",
@@ -62412,8 +62799,8 @@
"request",
"treemacs"
],
- "commit": "e56fb65bf17af46fa13d4527530c491dd798edcd",
- "sha256": "0gp31yj65rs30a1a9wjidm6r6qkhpf5azpisdl2dvh4f2jypc2ll"
+ "commit": "93db10d0b521435824732e1e46ac1fcf05c9893f",
+ "sha256": "0fskr9s7rp9dcarv3jz4pdkhhik0j6y19s10zp1fknwniql7kvj5"
},
"stable": {
"version": [
@@ -62597,20 +62984,19 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20210213,
- 910
+ 20210228,
+ 1524
],
"deps": [
"dash",
- "dash-functional",
"f",
"ht",
"lv",
"markdown-mode",
"spinner"
],
- "commit": "83334f62b58feed06c0438671bfc550efcbebe63",
- "sha256": "1vkc2ffl08d36cgr69g3fl1lmkpr33qzzsxmm7zzaa0b6hzba58d"
+ "commit": "555bd9f0ee598f2c5601c7e33ef640f4fbe8e246",
+ "sha256": "0wjkcyq67447b79rif8hys2sy4gvzzb494jw6h8ab244zbkrrag9"
},
"stable": {
"version": [
@@ -62758,16 +63144,16 @@
"repo": "emacs-lsp/lsp-pyright",
"unstable": {
"version": [
- 20201014,
- 1620
+ 20210220,
+ 1714
],
"deps": [
"dash",
"ht",
"lsp-mode"
],
- "commit": "71ff088ac4c93b0edd012f305a3dfd1602c5d21e",
- "sha256": "03fgw10fq1s98xrmfzg8y9xv14yig3lgjc44x7mvlc5awsmv5lxa"
+ "commit": "65fb14128127fb1ddf68dd4cb3140d6c7911a093",
+ "sha256": "0qhs4cv01b7aqq5r6bk91xgwsp8yg1bpn68xk90iirsxlgfb1ffq"
}
},
{
@@ -62778,14 +63164,14 @@
"repo": "emacs-lsp/lsp-python-ms",
"unstable": {
"version": [
- 20210123,
- 1748
+ 20210217,
+ 1823
],
"deps": [
"lsp-mode"
],
- "commit": "5470ada6cde6e68fe6ce13ff1146c89c3bae0cc8",
- "sha256": "1m9nwnwyabbl7gxkyf43mvi76i6qnkqbpy7f5hvx84674pcjnh06"
+ "commit": "689f6cf815c8ee2ca2332f31dfda8ddefb0b7e26",
+ "sha256": "13vc2pwxl2cl2qa3gjkpa6si3760y7xyrlg1ygk3g1633w756h80"
},
"stable": {
"version": [
@@ -62878,19 +63264,18 @@
"repo": "emacs-lsp/lsp-treemacs",
"unstable": {
"version": [
- 20210131,
- 911
+ 20210216,
+ 1250
],
"deps": [
"dash",
- "dash-functional",
"f",
"ht",
"lsp-mode",
"treemacs"
],
- "commit": "10c34fc213f9aff29b5fe86b26bfc216b14c631e",
- "sha256": "0l5473fa880993k02rz1bxwcp701q874bv1bx5caa4vygvm0rhiw"
+ "commit": "3bae4a91e05d55d5ca92da272ffcd497f370e9df",
+ "sha256": "03dvf5vf74p3vjzv98csidw6hzpx2w7f20xmyy12cpiip76wanf0"
},
"stable": {
"version": [
@@ -62917,17 +63302,16 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20210202,
- 551
+ 20210220,
+ 703
],
"deps": [
"dash",
- "dash-functional",
"lsp-mode",
"markdown-mode"
],
- "commit": "732992aa41bb78b7341e28c980817de488b7a317",
- "sha256": "1cmsyql92ldb0c4phdk8pws2whb6slhy3r52nf10v45bqh9n167m"
+ "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec",
+ "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp"
},
"stable": {
"version": [
@@ -63258,6 +63642,25 @@
"sha256": "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6"
}
},
+ {
+ "ename": "macrostep-geiser",
+ "commit": "2e154604ed9abf51f3779fdbff00850d13a91a9e",
+ "sha256": "09md4gmbk1lhrnj288vcq5apxjwys56np4msm2yfalfh2bhxzcg6",
+ "fetcher": "github",
+ "repo": "nbfalcon/macrostep-geiser",
+ "unstable": {
+ "version": [
+ 20210222,
+ 1552
+ ],
+ "deps": [
+ "geiser",
+ "macrostep"
+ ],
+ "commit": "4409d0f6834e0429c42e0675365bc58284312ad1",
+ "sha256": "02ydl3lfm269bi7dczkqsk6rbcdir759gd0nk7f477aw6x03hgwf"
+ }
+ },
{
"ename": "madhat2r-theme",
"commit": "44a382a388821908306c0b8350fba91218515e1b",
@@ -63371,8 +63774,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210212,
- 1313
+ 20210228,
+ 1841
],
"deps": [
"dash",
@@ -63380,8 +63783,8 @@
"transient",
"with-editor"
],
- "commit": "47c57839b80c05f792de288da050fabac90639d6",
- "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2"
+ "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
+ "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
},
"stable": {
"version": [
@@ -63416,8 +63819,8 @@
"cl-lib",
"magit"
],
- "commit": "71b1522a2d681ab5653f48c7a13ad73330e7914f",
- "sha256": "152sk0bm33i37ijvnr0427dvfwdzr0jl8s6bjhs9f3ii393k7mwn"
+ "commit": "870174f23faa00b003b3eb63452228511c2da597",
+ "sha256": "156d0gd0a2cx9rn0zb9i96s3l62rys1dpxcdix2j6aix6iv669ql"
},
"stable": {
"version": [
@@ -63664,8 +64067,8 @@
"deps": [
"magit"
],
- "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6",
- "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1"
+ "commit": "a6130871e5f4421618e66d9254d0b5df9f3a1ef2",
+ "sha256": "1zrgqcxp2jshp52m0sa73kk071hvisqlrk79k9is6smkjss97s8c"
},
"stable": {
"version": [
@@ -63727,8 +64130,8 @@
"libgit",
"magit"
],
- "commit": "47c57839b80c05f792de288da050fabac90639d6",
- "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2"
+ "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
+ "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
}
},
{
@@ -63763,10 +64166,10 @@
},
{
"ename": "magit-p4",
- "commit": "440d47ca465845eaa601ca8a6e4b15fc197e522b",
- "sha256": "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069",
+ "commit": "e6c16a59ca48a0b17cae90354e8929d31a5eef1f",
+ "sha256": "1c5qv1f2d8c114a5z21j0nkw285k3gx787l0c3cd9ls7awxfp1is",
"fetcher": "github",
- "repo": "qoocku/magit-p4",
+ "repo": "emacsorphanage/magit-p4",
"unstable": {
"version": [
20170414,
@@ -63876,14 +64279,14 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210124,
- 1824
+ 20210224,
+ 1417
],
"deps": [
"dash"
],
- "commit": "47c57839b80c05f792de288da050fabac90639d6",
- "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2"
+ "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7",
+ "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356"
},
"stable": {
"version": [
@@ -63963,8 +64366,8 @@
"deps": [
"magit"
],
- "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce",
- "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c"
+ "commit": "8eea04c10d116057d3d4f249e6a184d5ed090263",
+ "sha256": "1m2p317xkbhfadba30m8lq01k543368ajbxid1v9627slgkcjf89"
},
"stable": {
"version": [
@@ -64205,15 +64608,15 @@
"repo": "jerrypnz/major-mode-hydra.el",
"unstable": {
"version": [
- 20191030,
- 2354
+ 20210221,
+ 834
],
"deps": [
"dash",
"pretty-hydra"
],
- "commit": "20362323f66883c1336ffe70be24f91509addf54",
- "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz"
+ "commit": "84c1929a5153be169ca5c36737439d51dffde505",
+ "sha256": "1yw9xdyqbf285ljsspg8ajjx1bp1g27xpg85p84fsh88nr015rh5"
},
"stable": {
"version": [
@@ -64672,11 +65075,11 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20210210,
- 112
+ 20210224,
+ 1404
],
- "commit": "51f750994aaa0b6798d97366acfb0d397639af66",
- "sha256": "0d6vif3ymwlddk3f8pg02h3s62kx9zzsbgyvc7cb76g6fk3b46kd"
+ "commit": "2387cba868a21f6c18244b8c84125221a866dfb5",
+ "sha256": "00pr1zw9si8if76pjvxvalxzwk42320y2k6fnkbpdfm8yv6pxkd1"
},
"stable": {
"version": [
@@ -64792,11 +65195,11 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20210210,
- 636
+ 20210220,
+ 1301
],
- "commit": "d8267c17eb14d3db2ebd079094df524b547607b1",
- "sha256": "0h8jpgg0dn8l56kq13gs3dlzr1b6d614gravwjqaywvswiiwnjzn"
+ "commit": "051734091aba17a54af96b81beebdbfc84c26459",
+ "sha256": "11qybgasg4im76j4kryynqvqbqpxm1xfs5dxgjhr3whn3wiqba51"
},
"stable": {
"version": [
@@ -65164,16 +65567,15 @@
"repo": "matsievskiysv/math-preview",
"unstable": {
"version": [
- 20210108,
- 1121
+ 20210219,
+ 1431
],
"deps": [
"dash",
- "dash-functional",
"s"
],
- "commit": "6c83ab7c6e3df95e60e942a9017d0c218228d429",
- "sha256": "1v32nip530j4lvvm9gsjr9f6i0p0i59lx3f3j32m25q0yvv4s8z6"
+ "commit": "08aa7c47ffc85c9cba1c9812e1c14250cc4192e4",
+ "sha256": "1z371v68aw92iaj5mbsk47mfr44scgkwazbf9i6gzygq84fdm6dh"
}
},
{
@@ -65222,11 +65624,11 @@
"url": "https://git.code.sf.net/p/matlab-emacs/src",
"unstable": {
"version": [
- 20201204,
- 736
+ 20210225,
+ 1441
],
- "commit": "935c67274b84503640a9f90cce87b533461385ca",
- "sha256": "08xjcva2fryw81zw1hd0glvq9pzkpnkcrkwp2i19032zzk3hqcxm"
+ "commit": "00e25f897c56c91a18bb821cd502270cad91fa0c",
+ "sha256": "1zbwzfsqkw97ywl60h6ryvrlcq82z8407g29w93cigakfwg6ir6j"
}
},
{
@@ -65743,16 +66145,16 @@
"repo": "DogLooksGood/meow",
"unstable": {
"version": [
- 20210213,
- 654
+ 20210301,
+ 59
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "cfcb0d457dd92afb511b9376c9f928f20ab96b89",
- "sha256": "03sa5bh8ackmbc2gg4nwnc34ij0g4mcmizn7sf1z54lg0d585fdz"
+ "commit": "5f01f8be74853f27cff021ad6e750f4b31e9375d",
+ "sha256": "009kfsis6qib0ax9nlipcvwclqk4kyqwafvsymssvls0r7ar50f9"
}
},
{
@@ -65766,16 +66168,16 @@
20210129,
1443
],
- "commit": "ecde6900bb9d6dee3683c214993375f65bb39c7c",
- "sha256": "1fambd8n4hzbmizc04p5m8an84qklc4gpnhz957dpwd3x4prcx2s"
+ "commit": "2a0dd5c16178efcc4b8132e3c3b3c2a6cc7b13ea",
+ "sha256": "0aa0izxahpyzv9vz3g8q6m332ndqb8kxgwx22bxnf01n9v90v2j7"
},
"stable": {
"version": [
4,
- 0
+ 1
],
- "commit": "4b7c642c92ea6e6906709bb4656f6cf02ff35289",
- "sha256": "0ylfp0750k79ylzwjd4f36hfh2jwxsvvi39v4bhc8xy9skl9b88q"
+ "commit": "ab02f60994c81166820791b5f465f467d752b8dc",
+ "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99"
}
},
{
@@ -65910,16 +66312,16 @@
"repo": "seblemaguer/metal-archives.el",
"unstable": {
"version": [
- 20201214,
- 1027
+ 20210223,
+ 1638
],
"deps": [
"alert",
"ht",
"request"
],
- "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45",
- "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4"
+ "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae",
+ "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk"
}
},
{
@@ -65939,8 +66341,8 @@
"metal-archives",
"org-ml"
],
- "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45",
- "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4"
+ "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae",
+ "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk"
}
},
{
@@ -66717,11 +67119,11 @@
"repo": "Mulling/mlso-theme",
"unstable": {
"version": [
- 20200828,
- 1221
+ 20210215,
+ 1755
],
- "commit": "b47243006470798caa4d3f8fe1af9bd5ef06bbee",
- "sha256": "0gwa2izmi2ljh4avfpfq778ym1p91gsssbqz2q95m9py1vvb3xr7"
+ "commit": "40caa67262c78e7668147f86a2b7ca1dad4b2190",
+ "sha256": "0wcqj0wf1bhqsbvs52a7nwix71nmiy0xixvmmx2pkg7c7mxpm6v4"
}
},
{
@@ -67046,6 +67448,21 @@
"sha256": "0y5bkbl6achfdpk4pjyan2hy8y45mvhrzwkf1mz5j4lwr476g18l"
}
},
+ {
+ "ename": "mode-line-idle",
+ "commit": "6c854955505f809f7a70e8918ea3a0187e62257c",
+ "sha256": "0wvy7p27d4qa5f6cg1zqrm8wzfvd0wfwcc5aimcs1hkxlzl1kr6b",
+ "fetcher": "gitlab",
+ "repo": "ideasman42/emacs-mode-line-idle",
+ "unstable": {
+ "version": [
+ 20210215,
+ 2345
+ ],
+ "commit": "02b1da6278e43cc9cc0356110cc6bfbb37eb8241",
+ "sha256": "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8"
+ }
+ },
{
"ename": "modern-cpp-font-lock",
"commit": "4bfc2386049adfe7a8e20da9b69fb73d6cb71387",
@@ -67150,11 +67567,11 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20210213,
- 550
+ 20210228,
+ 2012
],
- "commit": "2f80b40710d13017a0756830c9e314cf8e3dd82c",
- "sha256": "0xd4w2aqil4dhv37d2a0h1jb2jsh8rz4zidsq2wznvvz4cylb8ay"
+ "commit": "9d3538f8a5007e33640b8ac1a0b725afc6287174",
+ "sha256": "0h3y94gglkdlygdkhakxlp5gmpvhrl76z2cm22pads722j1jj5nw"
},
"stable": {
"version": [
@@ -67174,11 +67591,11 @@
"repo": "kuanyui/moe-theme.el",
"unstable": {
"version": [
- 20200930,
- 853
+ 20210226,
+ 1623
],
- "commit": "76116f6eeb93c7902042f275a496629393730e08",
- "sha256": "091wrp80y4k80w8wnv8pxipyf33dxb4qs0yn3m83bb1drn2x3g2p"
+ "commit": "697864d14f4b620f1be579a975bf97b769d2199e",
+ "sha256": "19jqf6q2fl89hpf6jl53kl6a64aryf5q2hm1dg14fyiag883m9q9"
},
"stable": {
"version": [
@@ -67458,20 +67875,20 @@
"repo": "jessieh/mood-one-theme",
"unstable": {
"version": [
- 20200904,
- 1639
+ 20210221,
+ 18
],
- "commit": "47f043c1a883e3b0fd550eafffe71b915eb892c1",
- "sha256": "0zh0l2zpnms4s1c33ksj6rr8cc6bd9pxnc73cwvmaysak1650jfq"
+ "commit": "42e402a89473458f55a71c5bbe785575e9a927ba",
+ "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8"
},
"stable": {
"version": [
1,
- 1,
- 0
+ 2,
+ 1
],
- "commit": "82b471852a23bc4de972cac32da322c2b168ad9c",
- "sha256": "09ykh1c21kphfzli1qzrlx13bn6p22873y6rwkx9fnj2232gv9vi"
+ "commit": "42e402a89473458f55a71c5bbe785575e9a927ba",
+ "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8"
}
},
{
@@ -67506,11 +67923,11 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20210213,
- 721
+ 20210228,
+ 718
],
- "commit": "2d7ca0b0ad76da4d11f8925e72904f03fd1c869e",
- "sha256": "0cp8hm9vfb453h47vjxk549km51p06zzw6wjjag42ldj9hnba1v3"
+ "commit": "a756418dde112a67c4c68355bee46ef17fc45d07",
+ "sha256": "0csv7afdyzvpnc1znh4fz3d7ddgi51dfkfbr3c1mv6wvwg844j2a"
},
"stable": {
"version": [
@@ -67841,8 +68258,8 @@
20210109,
642
],
- "commit": "6ac62d2e888cabb138c8427e6173c04e07bb60e0",
- "sha256": "1zrhpiwfsxva5v7vdwilf50d8q8gl6kw1nydaika4f1a5321a35i"
+ "commit": "36c81efa69ecf6843e8b671a3caffb905a54f72f",
+ "sha256": "0smfhrcikxzaw4qbvq84ac51rdjw1mm5lm58zb8zyps7pzv3d9s8"
},
"stable": {
"version": [
@@ -68393,15 +68810,15 @@
"repo": "lordpretzel/mu4e-views",
"unstable": {
"version": [
- 20201229,
- 216
+ 20210228,
+ 1556
],
"deps": [
"ht",
"xwidgets-reuse"
],
- "commit": "55e5467a25d424b2c10b5392e68b370164efa230",
- "sha256": "1gagaxpb4psshs8x61icilx4576al2qjs612d65ss857gfmzachi"
+ "commit": "1a0ceeb874e2a56b3ebe06c8375221031bb90a5c",
+ "sha256": "0v7d899pvpwvvp9x0yaskhjf1c6bjmqajk2mclfkykadrh89z61j"
},
"stable": {
"version": [
@@ -68765,16 +69182,16 @@
"repo": "Wilfred/mustache.el",
"unstable": {
"version": [
- 20210210,
- 643
+ 20210224,
+ 710
],
"deps": [
"dash",
"ht",
"s"
],
- "commit": "ebecf704d1431e03f1be6df9e45e07944b359a56",
- "sha256": "0bwdm1sx3r8fmc3hp278wqx3x9hxa5gjwywgsym4vfkg2jp3g7zn"
+ "commit": "6fcb31f5075edc5fc70c63426b2aef91352ca80f",
+ "sha256": "1rq2p376016y68w6447sd7h6zgzrxbb3skh7fjw7xfq1p6f19kr4"
},
"stable": {
"version": [
@@ -68899,15 +69316,15 @@
"repo": "agzam/mw-thesaurus.el",
"unstable": {
"version": [
- 20210106,
- 1857
+ 20210224,
+ 449
],
"deps": [
"dash",
"request"
],
- "commit": "cb0637bd3799820d6738f5d66b8bc2de2333e0e4",
- "sha256": "1j5x1rfnxvghdmai7cv9sjqw1azq59pk8h5vm0krgnan2rpx5k4k"
+ "commit": "96f02694bc28f31c2a280a05d47e6ff589f525f3",
+ "sha256": "0gy3lyncyvwimkhfmd0qh1kkc0qgf7sgvbyr1aljdn9qh7n5l34k"
}
},
{
@@ -69862,8 +70279,8 @@
"repo": "felko/neuron-mode",
"unstable": {
"version": [
- 20210208,
- 1455
+ 20210227,
+ 1737
],
"deps": [
"company",
@@ -69871,8 +70288,8 @@
"markdown-mode",
"s"
],
- "commit": "02fbfca98b5dfb09f09159914682efea6d6afb5a",
- "sha256": "18xj8a5h9rrz134hac9qz8cpqswz79h3h24wb3bf89xvq2kyvq10"
+ "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c",
+ "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa"
}
},
{
@@ -70041,6 +70458,30 @@
"sha256": "157zdnpy18ca9biv5bxv3qvg62sh3qmpp2lv9q8sgasg0wvb9vpk"
}
},
+ {
+ "ename": "nikki",
+ "commit": "f1e2937a2b4947c922d42f0dea4e764d713a7c29",
+ "sha256": "0jfg1bziqhbgfrl77ddl2krkrd11xcpy6v2fqcpxmrd0i7jb17qc",
+ "fetcher": "github",
+ "repo": "th994/nikki",
+ "unstable": {
+ "version": [
+ 20210227,
+ 1707
+ ],
+ "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d",
+ "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 6
+ ],
+ "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d",
+ "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c"
+ }
+ },
{
"ename": "nikola",
"commit": "2e8e1a5169f0841db4980aebe97235845bbe7183",
@@ -70121,8 +70562,8 @@
20181024,
1439
],
- "commit": "9c66e698466ed29a493df8746b767558684205b2",
- "sha256": "0lpzicxaj2nf4926j50x29sijgarkrj2wvsmnp1xfj1s38v9pyqd"
+ "commit": "1a8015038d9a8c6bf0c04a42588fb2a26861be63",
+ "sha256": "08071i5zv0jg9yb83bq9r2sj6hyw31ziwzg79gsbyr7l8whz7cx8"
},
"stable": {
"version": [
@@ -70404,18 +70845,17 @@
"repo": "dickmao/nndiscourse",
"unstable": {
"version": [
- 20200829,
- 1751
+ 20210219,
+ 1949
],
"deps": [
"anaphora",
"dash",
- "dash-functional",
"json-rpc",
"rbenv"
],
- "commit": "152f3176fff026572d2cfa22adaeb32f42410083",
- "sha256": "1sljvp31jccffd6h21lf01lkr4qa093ia0bh7kakx9azvqdz55qf"
+ "commit": "c6074af3b60ef7af7d9c45b8ad1daa21296a5e04",
+ "sha256": "0hx8sg6wa688f2bzddbzl81b553vjv8aaafizns9r8icsws7acc0"
}
},
{
@@ -70426,17 +70866,16 @@
"repo": "dickmao/nnhackernews",
"unstable": {
"version": [
- 20210203,
- 240
+ 20210219,
+ 1948
],
"deps": [
"anaphora",
"dash",
- "dash-functional",
"request"
],
- "commit": "008d4a475dcf9432318d0baed53a0a196453ee75",
- "sha256": "0s9wgq1k1f3dlx6rna67p2bpnpd6cn3x9wvi8dlg3wfckg652fjy"
+ "commit": "b5a221b63c8b311d50807fdfab4ae6b965844f06",
+ "sha256": "1lq3rh52x0f059lxk0cczins2vggiwjs5m1drj7dkb8lmlxc41y4"
}
},
{
@@ -70828,17 +71267,17 @@
20210205,
1412
],
- "commit": "8fb42948a209c54e3dcf832119d7f54e9cc0665a",
- "sha256": "017fqgwvvrbb8i6bfaappimz8fv41b01ia06xq9fn0a2vzn1pf4r"
+ "commit": "4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6",
+ "sha256": "1kfg503j44ivcx9zsqzgjl7ab936vwnw31gb6kpcjhd1kyha0mjm"
},
"stable": {
"version": [
0,
31,
- 3
+ 4
],
- "commit": "d812256aeb91646b5b1c644fa67f07c483cca651",
- "sha256": "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v"
+ "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612",
+ "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik"
}
},
{
@@ -70938,15 +71377,15 @@
"url": "https://depp.brause.cc/nov.el.git",
"unstable": {
"version": [
- 20201207,
- 3
+ 20210228,
+ 2125
],
"deps": [
"dash",
"esxml"
],
- "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4",
- "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk"
+ "commit": "b6138895ace3042ed78140b6f4859e544fbca27e",
+ "sha256": "03knl5zch59r1zrk2kvricvirp6rhcdiywny3n9cmbv653gjzyvi"
},
"stable": {
"version": [
@@ -71290,6 +71729,25 @@
"sha256": "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx"
}
},
+ {
+ "ename": "numpydoc",
+ "commit": "e7e20f00482f143ac67589a48f7bc591e075b5da",
+ "sha256": "1p2ls9qmbl58p4cyrk4f769blc72lfgbwd3sy4hhkv75m4qj4lws",
+ "fetcher": "github",
+ "repo": "douglasdavis/numpydoc.el",
+ "unstable": {
+ "version": [
+ 20210301,
+ 25
+ ],
+ "deps": [
+ "dash",
+ "s"
+ ],
+ "commit": "8a7430de69650dbd2e91fd746c2f8fe1665e5a45",
+ "sha256": "1n26c8kj6w36v3cz15497r51rkb03ngsgkld5qcy75j8ha7mddwz"
+ }
+ },
{
"ename": "nv-delete-back",
"commit": "7542fa39060b507a6f455225367e45e89d3e2f92",
@@ -71313,17 +71771,16 @@
"repo": "rejeep/nvm.el",
"unstable": {
"version": [
- 20201005,
- 2328
+ 20210217,
+ 744
],
"deps": [
"dash",
- "dash-functional",
"f",
"s"
],
- "commit": "f15334f78de7786617a15c9de54f4c79a92865fb",
- "sha256": "10v4593yz3afrqj6zilq3dw2fngf0f20dy2mrgbcickvdbvkifby"
+ "commit": "6f47fac1bc42526a7474488f560d064c08f8dd6e",
+ "sha256": "01rfgxkahpx17q8k72hxibysysv8pgx6bfy5gbc6finm3f7ak6ia"
},
"stable": {
"version": [
@@ -71410,6 +71867,25 @@
"sha256": "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj"
}
},
+ {
+ "ename": "oauth2-request",
+ "commit": "d8fd29717d69408c845d44077b5223902051dbd9",
+ "sha256": "1yb9wgc1p6rbsarb7yhwwrpsjz2adnf9k590c9sif9vx3llras2g",
+ "fetcher": "github",
+ "repo": "conao3/oauth2-request.el",
+ "unstable": {
+ "version": [
+ 20210215,
+ 657
+ ],
+ "deps": [
+ "oauth2",
+ "request"
+ ],
+ "commit": "86ff048635e002b00e23d6bed2ec6f36c17bca8e",
+ "sha256": "0z9vkssdxkikwjcb3vrby5dfcixy4lw9r2jp7g9nls6w88l184jf"
+ }
+ },
{
"ename": "ob-ammonite",
"commit": "508358506a6994baf120be2acba86762f5727c6c",
@@ -71493,8 +71969,8 @@
"deps": [
"axiom-environment"
],
- "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a",
- "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9"
+ "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
+ "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
}
},
{
@@ -72147,6 +72623,24 @@
"sha256": "0sc6rljlzm7g4v4l4ziqrr0ydbsyypbq0h19f9xafvnb2pn40j84"
}
},
+ {
+ "ename": "ob-reticulate",
+ "commit": "cccdf7cfda6b23877d0649145808f0a4e9321b1a",
+ "sha256": "0jjrdykpcswbwjvy4zzs7sfjyxnzvvc17wa67arharpxgg4d8083",
+ "fetcher": "github",
+ "repo": "jackkamm/ob-reticulate",
+ "unstable": {
+ "version": [
+ 20210214,
+ 2229
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "8109fb02fb6339b1cf9290df29fc0c1109a33c04",
+ "sha256": "1wr0acf0nhdz48n8p1q80sv0bd929n7v8ahcrx5zc7wcimbqshl1"
+ }
+ },
{
"ename": "ob-rust",
"commit": "843affc2fd481647c5377bf9a96b636b39718034",
@@ -72500,17 +72994,17 @@
20201204,
945
],
- "commit": "60678b05f75d660fcde4c1b991758af9620dcea8",
- "sha256": "07xszr8405lcakzdl6c99x73a6zdfc43dr30rw9qpq4mrs6q5npz"
+ "commit": "7db8d1377a127b39e2bf985c91b6a9a8d6cbeff2",
+ "sha256": "1vwmw3dcqxg7sy0ki86gq4kpva5ncwzygzbl5ml9947xklvnw9in"
},
"stable": {
"version": [
0,
- 16,
+ 17,
0
],
- "commit": "101d2306f5b0b23bbc25e1155c1ffd51a0bbf61e",
- "sha256": "0yf1kf3yhiw39qpybz2aszwl7kjshiv45d81gq7q7xgn9nqnf0z4"
+ "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245",
+ "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn"
}
},
{
@@ -72694,26 +73188,26 @@
"repo": "oer/oer-reveal",
"unstable": {
"version": [
- 20210107,
- 1519
+ 20210223,
+ 1351
],
"deps": [
"org-re-reveal"
],
- "commit": "7edfa815105543a183b1503fa49531f77a713840",
- "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3"
+ "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a",
+ "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp"
},
"stable": {
"version": [
3,
- 15,
+ 17,
0
],
"deps": [
"org-re-reveal"
],
- "commit": "7edfa815105543a183b1503fa49531f77a713840",
- "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3"
+ "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a",
+ "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp"
}
},
{
@@ -73386,11 +73880,11 @@
"repo": "oantolin/orderless",
"unstable": {
"version": [
- 20210212,
- 1645
+ 20210227,
+ 1543
],
- "commit": "edce950fe1353c2284516f7b01bd37bc2d7fa136",
- "sha256": "0dgw51f5cp2yxvpq11xkbavbykkr9c275pizcj8d81zw8jrnbs79"
+ "commit": "9d5b95f40275dc47a57e9d4ee9b9994ee3a4b426",
+ "sha256": "0ksjvi257m6ij7dd40rjc106grxi727717w8k58h3i5l6f03w70f"
},
"stable": {
"version": [
@@ -73574,11 +74068,11 @@
"repo": "dfeich/org-screenshot",
"unstable": {
"version": [
- 20201130,
- 1607
+ 20210221,
+ 1336
],
- "commit": "a467a1f04a416252f067b95c0f00a9f10d03c433",
- "sha256": "1mi9h69zdm4yhvpsgiqvg214f5k818y3w1hz626cw0vr2jxmgdf2"
+ "commit": "6a5d5f8fd7cda1200cf088f415b9983e89a03075",
+ "sha256": "0gqqcgadlzzbqd4sqbwbwx41app6ryz2l3lrng8bz9hq9cx547jj"
}
},
{
@@ -73589,26 +74083,26 @@
"repo": "yilkalargaw/org-auto-tangle",
"unstable": {
"version": [
- 20210208,
- 847
+ 20210214,
+ 917
],
"deps": [
"async"
],
- "commit": "5da721fff97a44a38a650b23bdf73b74f17d4a36",
- "sha256": "0iydrx38ih8vrj7p3sn861ckn52sh8pvwjvl7s3287j3x81affnh"
+ "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a",
+ "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja"
},
"stable": {
"version": [
0,
2,
- 10
+ 13
],
"deps": [
"async"
],
- "commit": "7bd6e9c934bc659b026b0d1497b2013da44597d8",
- "sha256": "04wc7yc47csz1amzm7990f46pr89avcxrpf2kyiw02i1lc50cfpq"
+ "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a",
+ "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja"
}
},
{
@@ -74038,11 +74532,11 @@
"repo": "thisirs/org-context",
"unstable": {
"version": [
- 20200615,
- 1554
+ 20210216,
+ 1526
],
- "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93",
- "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck"
+ "commit": "a08f1f607f819791b9b95ad4f91c5eaa9fdbb091",
+ "sha256": "18ld5kqr0l7nklybdwbwrnkrh06w71myfynbwp9rh8q4lhzh73jc"
}
},
{
@@ -74507,8 +75001,8 @@
"repo": "kidd/org-gcal.el",
"unstable": {
"version": [
- 20201113,
- 2330
+ 20210228,
+ 2038
],
"deps": [
"alert",
@@ -74516,8 +75010,8 @@
"request",
"request-deferred"
],
- "commit": "0a6f9a7385410b70853eb65c14344ad76cc6815f",
- "sha256": "0m6h2psshkr2kvckp2bmaj2y1cp3kbyw2nwwvwg2k3yymkqr8l7l"
+ "commit": "133cca813abd2823a6e2a9ada295b7b8b115be4f",
+ "sha256": "1mwspxx1im87qa886w9ib8a104xzi02qky6z5pl8va0mrcnpl86i"
},
"stable": {
"version": [
@@ -74661,28 +75155,28 @@
"repo": "marcIhm/org-id-cleanup",
"unstable": {
"version": [
- 20210212,
- 1158
+ 20210226,
+ 1636
],
"deps": [
"dash",
"org"
],
- "commit": "87752d5b4811f94d0e5b2cc220aa30147a89a7ea",
- "sha256": "03c29app8n1a8grv2a7qlqgq7f90ql1raxfnm9slfwk1al3s8j8k"
+ "commit": "5f9ac60cedb0be935c2b7ccefd484c0a378bc9d9",
+ "sha256": "0xbxfrrbcklhji6j99hvz7j6k6hv60cjvrwnf5kq3af1wy0kiayg"
},
"stable": {
"version": [
1,
5,
- 5
+ 6
],
"deps": [
"dash",
"org"
],
- "commit": "87752d5b4811f94d0e5b2cc220aa30147a89a7ea",
- "sha256": "03c29app8n1a8grv2a7qlqgq7f90ql1raxfnm9slfwk1al3s8j8k"
+ "commit": "f7e6dfb349e5c93a134f1d6badacd504b5b345ef",
+ "sha256": "1h65qa0m3p999pbhw9z98pn7bnz1qczsfybp3zr0g66mi7qqbalq"
}
},
{
@@ -74717,30 +75211,30 @@
"repo": "marcIhm/org-index",
"unstable": {
"version": [
- 20210208,
- 1405
+ 20210226,
+ 1635
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "b0a4892ca4f2f9791ebc78b472680465f5785fc6",
- "sha256": "14xhbsar219kbgzg59ynynxx21723f7f0qr39p2ardi16b00pzvs"
+ "commit": "1f029b28b817dcdc7d1deb734a087ba08e66c6b5",
+ "sha256": "04qcdf3knpxjjp972skdqgdh56bhh8frvljw1zb5wnln6byvqxr3"
},
"stable": {
"version": [
7,
1,
- 2
+ 5
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "b0a4892ca4f2f9791ebc78b472680465f5785fc6",
- "sha256": "14xhbsar219kbgzg59ynynxx21723f7f0qr39p2ardi16b00pzvs"
+ "commit": "c8998d4b81879c757cc2825200543921e0f6b637",
+ "sha256": "0cjpvcwfiaanaii91937907nsfadwnnlaq16yx79xk8gcvbrx1fg"
}
},
{
@@ -74953,14 +75447,14 @@
"repo": "stardiviner/org-link-beautify",
"unstable": {
"version": [
- 20210210,
- 1421
+ 20210222,
+ 227
],
"deps": [
"all-the-icons"
],
- "commit": "bbf6257951cfcee7cb7850eca6af17d797555c86",
- "sha256": "1sps2j096rhk0sfvl98lvvcqv8i9886xav7r9r7fw0qa1sc5337z"
+ "commit": "4662b3a7b9244aa35aae2f469f87be4a44a6b1bb",
+ "sha256": "1wb00rm6zdlb8hrhph783wi8zjra8m09gi6m2nnfr37al3986g0s"
}
},
{
@@ -75132,30 +75626,30 @@
"repo": "ndwarshuis/org-ml",
"unstable": {
"version": [
- 20210203,
- 1452
+ 20210224,
+ 2308
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "5faf2bd099c51b51af241132578c1a4e06f73d57",
- "sha256": "0f1ldhsjnfh1jn3zlgnmw22fml0y1dhvn7gsbf4x2szkcw1i9hfs"
+ "commit": "1b02583a5cdb8f6b7cd82b31ec80b53753cb7729",
+ "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz"
},
"stable": {
"version": [
5,
- 5,
- 4
+ 6,
+ 1
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "1c7ace3d536f6f1b63410a63e52975dc37871b77",
- "sha256": "0f1ldhsjnfh1jn3zlgnmw22fml0y1dhvn7gsbf4x2szkcw1i9hfs"
+ "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d",
+ "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz"
}
},
{
@@ -75184,11 +75678,11 @@
"repo": "unhammer/org-mru-clock",
"unstable": {
"version": [
- 20210127,
- 1400
+ 20210216,
+ 1141
],
- "commit": "75d4f32c2526f752bd121aa807ee9256e0e64441",
- "sha256": "026p6sk02lk6cc4mrhpjqrfksfxfa1mmn0k68ipa3wgg1rizdhhi"
+ "commit": "99ac0c85060f9e4710de73db4a19120a0a23c39e",
+ "sha256": "1xqb9pcj6hw1z6anvy5hm78a90m442cg868d62yyynwkzjyns64q"
},
"stable": {
"version": [
@@ -75226,8 +75720,8 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20210122,
- 552
+ 20210228,
+ 542
],
"deps": [
"dash",
@@ -75235,8 +75729,8 @@
"org-ql",
"s"
],
- "commit": "3b97aa047233d521e937b6040cf9085e77507f28",
- "sha256": "0rq37k0ydksc2wsavy4g6wydr2hxcclbipab14qdldvrif35sr24"
+ "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2",
+ "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5"
},
"stable": {
"version": [
@@ -76016,8 +76510,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20210210,
- 1810
+ 20210225,
+ 1454
],
"deps": [
"bibtex-completion",
@@ -76032,8 +76526,8 @@
"pdf-tools",
"s"
],
- "commit": "32803203cc4b01e1d4436f0f65138bf569dad8ad",
- "sha256": "09g9zblhkfcaks5m4h418v85cwbz308r7sh1qj2v8yxay1360v03"
+ "commit": "7dbe3ace9bf8ba9bd7c28c73ff960b4732d09071",
+ "sha256": "0nyqhbdbawg0rfqzgfqhk38hk1mb0naksrmrgha669zzmha6vd29"
},
"stable": {
"version": [
@@ -76199,15 +76693,15 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20210129,
- 954
+ 20210226,
+ 1227
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "c2b097e982108f53bb995c74dde3b1a9dd28cb5b",
- "sha256": "0gv5a4bk333vg1xy9pys9j52ikp9n1y17x5mgm4w2gnf2q0s1sc8"
+ "commit": "356cb0f882ed925913dd41e1901dec0c2f86fb98",
+ "sha256": "0p616v191h10hz98la52qy19bg1ry4vy6y88hgw0i3ndh6k872s2"
},
"stable": {
"version": [
@@ -76447,17 +76941,16 @@
"repo": "alhassy/org-special-block-extras",
"unstable": {
"version": [
- 20210208,
- 103
+ 20210228,
+ 212
],
"deps": [
"dash",
- "dash-functional",
"org",
"s"
],
- "commit": "7b94dcb8daa2495348da0c4177af77e911e0fb3c",
- "sha256": "0yvna55zl74q92hzrlmychmi0h1gzsz9kaciy517vgzc3ma8w348"
+ "commit": "143146d5bab10e32d4a24f4c3e5e30905b0f3176",
+ "sha256": "1wbb5isfm1ixv2zbys75cn276zcr2927j3h2crb081acygm78qqv"
},
"stable": {
"version": [
@@ -76481,8 +76974,8 @@
"repo": "ndwarshuis/org-sql",
"unstable": {
"version": [
- 20210121,
- 1746
+ 20210220,
+ 2146
],
"deps": [
"dash",
@@ -76490,14 +76983,14 @@
"org-ml",
"s"
],
- "commit": "9a2a753b41685b241fb3ba6cf5c01073b4648e0f",
- "sha256": "1iy25j0qqqic6jzzppg0vq4990r97n9glikrmwzq6hwj9y901bj4"
+ "commit": "87c712740cc0e934bbb9fd322386adf45f05c543",
+ "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z"
},
"stable": {
"version": [
+ 2,
1,
- 1,
- 1
+ 0
],
"deps": [
"dash",
@@ -76505,8 +76998,8 @@
"org-ml",
"s"
],
- "commit": "9a2a753b41685b241fb3ba6cf5c01073b4648e0f",
- "sha256": "1iy25j0qqqic6jzzppg0vq4990r97n9glikrmwzq6hwj9y901bj4"
+ "commit": "19eaba4dcadb3f1101a2363aac2a6d2430559c70",
+ "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z"
}
},
{
@@ -76517,15 +77010,14 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20201202,
- 234
+ 20210219,
+ 1622
],
"deps": [
- "dash",
- "dash-functional"
+ "dash"
],
- "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098",
- "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63"
+ "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
+ "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
},
"stable": {
"version": [
@@ -76556,8 +77048,8 @@
"org-starter",
"swiper"
],
- "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098",
- "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63"
+ "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
+ "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
},
"stable": {
"version": [
@@ -76581,11 +77073,11 @@
"repo": "bastibe/org-static-blog",
"unstable": {
"version": [
- 20210211,
- 933
+ 20210222,
+ 1035
],
- "commit": "a66d1e43882978a9da82c033a809765061c71052",
- "sha256": "1xpwpfwbxblybj8h9dqd6d9s0xy95hpkfviviwzprcsrm9i7b971"
+ "commit": "9b9f7a994be54a10f5ac2a58221d52555574f78d",
+ "sha256": "1s3p7ig0swp1msvrzbkpyf6nv121rgschcacs3c5ps758yldg5lh"
},
"stable": {
"version": [
@@ -76671,26 +77163,26 @@
"repo": "integral-dw/org-superstar-mode",
"unstable": {
"version": [
- 20210212,
- 1458
+ 20210216,
+ 1925
],
"deps": [
"org"
],
- "commit": "84362aeccb7e1022f534e7face6aa5456ec9a787",
- "sha256": "1700n0zxk58d9akkdhgjhdi9xya1b4x0cchdw42gxbwycrzsjnf3"
+ "commit": "9d64c42e5029910153ec74cb9b5747b074281140",
+ "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a"
},
"stable": {
"version": [
1,
- 4,
+ 5,
0
],
"deps": [
"org"
],
- "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d",
- "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb"
+ "commit": "9d64c42e5029910153ec74cb9b5747b074281140",
+ "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a"
}
},
{
@@ -77054,11 +77546,11 @@
"repo": "takaxp/org-tree-slide",
"unstable": {
"version": [
- 20201215,
- 1117
+ 20210224,
+ 1213
],
- "commit": "d6e8e91433dfe4968f1343b483f2680f45a77d52",
- "sha256": "1zz12xk8vl2qic5hpvl0jcwysbmrfb6rfigvf8hr3nhdm9fp36aw"
+ "commit": "9d2ba1df456d8d7c6372c8c294dbe3ee81540b33",
+ "sha256": "145avv616k190wzirlrh7rljysfffhh3j37wr7p6sk13wayqc27h"
},
"stable": {
"version": [
@@ -77313,16 +77805,16 @@
"repo": "marcIhm/org-working-set",
"unstable": {
"version": [
- 20210212,
- 1204
+ 20210226,
+ 1635
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "8e22ffe59d241a0f43395f2cd88589ffb0c7db23",
- "sha256": "0vcawnrj5ap3h0cy5h1nsiki41scgdhxf83adnvv3lj6gwif1l9a"
+ "commit": "866010a4391d12c9c1968a74e396d9b0ffa58d78",
+ "sha256": "0s4xkzz39xd4cdfb325h1d3nwpp4nzfzn9w1wjfpgz9n5mrpmhvp"
},
"stable": {
"version": [
@@ -77459,15 +77951,15 @@
"repo": "ardumont/org2jekyll",
"unstable": {
"version": [
- 20200622,
- 1519
+ 20210220,
+ 1845
],
"deps": [
- "dash-functional",
+ "dash",
"s"
],
- "commit": "571249c977e0340edb3ef3af45b7841b62ec8065",
- "sha256": "1hjqawygbmvdlvzi908b2l4k7ca3g0dg32mpk7vld8xwi49hb1kp"
+ "commit": "e469373e0c656cec475c145037be1902d2622f09",
+ "sha256": "1pqrvrs54ggm2hr7b7m9n4wglbmakw0q9651mwxylz6bwm66kcc1"
},
"stable": {
"version": [
@@ -77760,8 +78252,8 @@
20201129,
604
],
- "commit": "69b2b5c3c6e581c3da56ec3ca4e2cd6c2e141c51",
- "sha256": "0a87izghc9kjjbxylaqiy5ln6hzf4kjsn8fk7s4dpx0mqv5ps7y6"
+ "commit": "50ce687d0be602c86256211fc8f783f5ef7df8a5",
+ "sha256": "1hr476lr2lwh4hz8z9yi2n3gdyzaabchn364jzwkppjksq9q0q6h"
},
"stable": {
"version": [
@@ -77781,11 +78273,11 @@
"repo": "tbanel/orgaggregate",
"unstable": {
"version": [
- 20200829,
- 708
+ 20210225,
+ 915
],
- "commit": "bab95388b182c07bc9f0679426514fe7e8c997d9",
- "sha256": "18qasx17hgfrmzkljjpni4m2lgic3imyksjg6wa7xrjf0y3kwmgw"
+ "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88",
+ "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8"
}
},
{
@@ -77811,14 +78303,14 @@
"repo": "tbanel/orgtbljoin",
"unstable": {
"version": [
- 20200825,
- 640
+ 20210225,
+ 923
],
"deps": [
"cl-lib"
],
- "commit": "e93e8eaeab2137bc391cf6d0643619ce6b066d19",
- "sha256": "0rbcdgsb7vzsjiwk5zskv15sf8npxdsbvpzd9r6s7aib83mb5kqa"
+ "commit": "f411d38de5e36f65336a37e43cfe9a5125b6543a",
+ "sha256": "05m6xq1c3cc2vpwfgknjx6rad8lr2hd6prbziq04qxp8x8qcs3sj"
}
},
{
@@ -78208,11 +78700,11 @@
"repo": "tarsius/outline-minor-faces",
"unstable": {
"version": [
- 20201031,
- 1318
+ 20210214,
+ 1715
],
- "commit": "a34602b59063dd22ca6877466b85b2728f03c242",
- "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb"
+ "commit": "bb6db842e4fc2ed4d635001938ebafe93925f48c",
+ "sha256": "0h54wdsh6g0wmqf356s6br08hq29p6cdrsd14q9w6qaxhmfzbs7m"
},
"stable": {
"version": [
@@ -78239,21 +78731,6 @@
"sha256": "1ad6bxa5x95n6i1197p13qy5fgzn1pslwbzqsf4rfy9bvr49g6q3"
}
},
- {
- "ename": "outlined-elisp-mode",
- "commit": "ae918c301e1c0ae39574ae76d70059718724293b",
- "sha256": "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v",
- "fetcher": "github",
- "repo": "zk-phi/outlined-elisp-mode",
- "unstable": {
- "version": [
- 20131108,
- 1127
- ],
- "commit": "c16cb02b540448919ad148f2be6a41523ee5489c",
- "sha256": "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv"
- }
- },
{
"ename": "outlook",
"commit": "c5ce3e6800213b117578a1022f25407f2ec1604f",
@@ -78513,6 +78990,36 @@
"sha256": "045kci7xvlp0kg8gmplnybc7ydv66hkl88dxgd113ac7ipf9zir7"
}
},
+ {
+ "ename": "ox-bb",
+ "commit": "da730e416206f4cb7a2e1552a3079cec9af89ae5",
+ "sha256": "1gpx9kls1pmnbr5izv3qxlkd3bg7wbk4il3q3xw006lxcmwl48v8",
+ "fetcher": "github",
+ "repo": "mmitch/ox-bb",
+ "unstable": {
+ "version": [
+ 20210222,
+ 2002
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "a79dc519cd28c000ebca4254a4744ce2b9b82168",
+ "sha256": "1ffpslv58kzw9nhrfv2cp42vq0pdx5gm1bk20g6k697ijiz1r1jj"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "37e22316afac9dd73dec072ac6420e5c1c4471b6",
+ "sha256": "0a2vp4br1s4zjvjz7z7j3kzzlnb4rzmash1425rz55zg2v3zsi0a"
+ }
+ },
{
"ename": "ox-bibtex-chinese",
"commit": "6c09c708c4372451502923cd3cb756f4f98ba97b",
@@ -78675,8 +79182,8 @@
"deps": [
"org"
],
- "commit": "be1d5ddd8622d369cb5196b7f9e7d4b21a71a8f1",
- "sha256": "0zs7izss7kpqwv5a7crbwbis9w71vkz9qwgbbzhs2my6wmcdyjxi"
+ "commit": "6805ccc23365620004034c18fbed22a8a07bd4dc",
+ "sha256": "12z1w6xsdx7p3q20h3bfap7ghxlj7awd6vpf4g3r7acd86fmxkjq"
},
"stable": {
"version": [
@@ -79003,11 +79510,14 @@
"repo": "DarkBuffalo/ox-report",
"unstable": {
"version": [
- 20201208,
- 1749
+ 20210219,
+ 2023
],
- "commit": "b7b1d682a724ef4ea729327395aa6577cba27133",
- "sha256": "1cznkrcxi0pfs7i1fvz6zg8b3z2axcmqmjw62s15p0fhn4d2czxf"
+ "deps": [
+ "org-msg"
+ ],
+ "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85",
+ "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9"
},
"stable": {
"version": [
@@ -79026,14 +79536,14 @@
"repo": "yjwen/org-reveal",
"unstable": {
"version": [
- 20201211,
- 1518
+ 20210215,
+ 1605
],
"deps": [
"org"
],
- "commit": "e8673f4825b1c6e97f8ba895ccaf8c460cba5a09",
- "sha256": "08gsb4c7a3hvkp3vdzad2wbs3n6ldxddhqp7bxsgsw7z3gfb4snv"
+ "commit": "499c5777174dbc7318e3f32fd50357c2823b228a",
+ "sha256": "1sf7ksda0898lgig1qhdzqm9v2jgrr033ainpb9406ij1v63gsh7"
}
},
{
@@ -79504,15 +80014,15 @@
"repo": "purcell/package-lint",
"unstable": {
"version": [
- 20210127,
- 158
+ 20210227,
+ 314
],
"deps": [
"cl-lib",
"let-alist"
],
- "commit": "1dd52c65cf1431aec5b3dbbb16408f25559c5112",
- "sha256": "0pq4ksipnli2798c7rvv2wlnk1nkd8j92vz7kpld8y0bgfr62mbr"
+ "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04",
+ "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz"
},
"stable": {
"version": [
@@ -79541,8 +80051,8 @@
"deps": [
"package-lint"
],
- "commit": "1dd52c65cf1431aec5b3dbbb16408f25559c5112",
- "sha256": "0pq4ksipnli2798c7rvv2wlnk1nkd8j92vz7kpld8y0bgfr62mbr"
+ "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04",
+ "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz"
},
"stable": {
"version": [
@@ -79594,14 +80104,14 @@
"repo": "Silex/package-utils",
"unstable": {
"version": [
- 20180514,
- 1415
+ 20210221,
+ 822
],
"deps": [
"restart-emacs"
],
- "commit": "5621b95c56b55499f0463fd8b29501da25d861bd",
- "sha256": "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd"
+ "commit": "6a26accfdf9c0f1cbceb09d970bf9c25a72f562a",
+ "sha256": "1gmr3ncr98fb7j3iwig9bbawkpj1f0vmq3nmapwqbaqv6gyy93h1"
},
"stable": {
"version": [
@@ -79648,17 +80158,16 @@
"repo": "codingteam/pacmacs.el",
"unstable": {
"version": [
- 20160131,
- 832
+ 20210225,
+ 1255
],
"deps": [
"cl-lib",
"dash",
- "dash-functional",
"f"
],
- "commit": "d813e9c62c2540fe619234824fc60e128c786442",
- "sha256": "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i"
+ "commit": "5e0bcba1eeb10a4218087ff9cd6217d662fb775b",
+ "sha256": "15w7wr3bdqmwg459nl6vyf4ymrhqxk9pvli5q55qyvy905n3281j"
}
},
{
@@ -79764,14 +80273,14 @@
"repo": "zainab-ali/pair-tree.el",
"unstable": {
"version": [
- 20210205,
- 1018
+ 20210214,
+ 1651
],
"deps": [
"dash"
],
- "commit": "f45418560dfc7773ea896e34fb216f68b90c764d",
- "sha256": "10bhwq7g16cvib8s4lg9skskbwp1bjyqrw8h0mip3sgvvjlhckfh"
+ "commit": "972ba441c40edf9b2c212f64fc6670104749662b",
+ "sha256": "1v4d17hdh3dvb2a4n10gxlr20zal8c7v456wiknkfrpv06d8awap"
}
},
{
@@ -80194,38 +80703,6 @@
"sha256": "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni"
}
},
- {
- "ename": "parinfer",
- "commit": "470ab2b5cceef23692523b4668b15a0775a0a5ba",
- "sha256": "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i",
- "fetcher": "github",
- "repo": "DogLooksGood/parinfer-mode",
- "unstable": {
- "version": [
- 20201021,
- 254
- ],
- "deps": [
- "cl-lib",
- "dash"
- ],
- "commit": "8659c99a9475ee34af683fdf8f272728c6bebb3a",
- "sha256": "06pz7ady4l05y56w3nr7bknv277jr949p9p9yy0dh8slii2acl77"
- },
- "stable": {
- "version": [
- 0,
- 4,
- 10
- ],
- "deps": [
- "cl-lib",
- "dash"
- ],
- "commit": "5b3b247d68eeaf7404598cbcbf2158e07f16e65d",
- "sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk"
- }
- },
{
"ename": "parinfer-rust-mode",
"commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070",
@@ -80234,20 +80711,20 @@
"repo": "justinbarclay/parinfer-rust-mode",
"unstable": {
"version": [
- 20201124,
- 616
+ 20210218,
+ 1650
],
- "commit": "67eed38129c28f087c0b5dffe8a790978d41a8c1",
- "sha256": "074mx8dx4ja0bylsrf05d8n03a7ivix65iz3377h4p3ikmvppc3f"
+ "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774",
+ "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x"
},
"stable": {
"version": [
0,
8,
- 2
+ 3
],
- "commit": "0953765ec361c1c0d6f36eb3c5dd706752af2482",
- "sha256": "1d9885l1aifrdrg6c4m2kakhs3bbmfmsm02q96j0k0mzzwr7rs41"
+ "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774",
+ "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x"
}
},
{
@@ -80291,20 +80768,20 @@
},
{
"ename": "parse-it",
- "commit": "3f163ca64c2533603410f320c7e9b9b1c2635458",
- "sha256": "076b981jdhgv7kqdj6xnckp3x25wfymy0il9fffrpyfs7hrcdzgf",
+ "commit": "9e89bebbccf9ccf85841b00bf113925f8fb20775",
+ "sha256": "0l3h3sjr3xipj8lm7ph03jl326mcxscsbh0gx7gfrwfaynjb61kl",
"fetcher": "github",
"repo": "jcs-elpa/parse-it",
"unstable": {
"version": [
- 20210128,
- 1345
+ 20210222,
+ 1623
],
"deps": [
"s"
],
- "commit": "27a7b6ac6e92644160358958602aeae596ba8bad",
- "sha256": "13hh3rfpfcmg6avakgb7rg4nrrifsj8s3yp359933axv2f622gbx"
+ "commit": "b1b80d1bd1cb852d344a8daf6ba7142be2c9ee7b",
+ "sha256": "1dckhlzxzr8zj6hbccgs60igigcij9qrvsb3v80z5dqgj24mqab2"
},
"stable": {
"version": [
@@ -80521,11 +80998,11 @@
"repo": "vandrlexay/emacs-password-genarator",
"unstable": {
"version": [
- 20201123,
- 1610
+ 20210224,
+ 1705
],
- "commit": "d754391d11d1d384833eb82fd34e02d2baec36cb",
- "sha256": "1658mzzdk012rwn049dxzrqp1k4vfbvrsksnh06zdn8m6n7xqi28"
+ "commit": "778f98d507d337f916bb3251fae6e351ebe50aa2",
+ "sha256": "07k2jsjfl3cyk0piikvn03280hbmggvkwkfin8s1wz54495504g5"
}
},
{
@@ -80536,11 +81013,11 @@
"repo": "juergenhoetzel/password-mode",
"unstable": {
"version": [
- 20170412,
- 629
+ 20210214,
+ 1905
],
- "commit": "ed764a4ec1011526457c71b7c37fa9a659a866ab",
- "sha256": "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr"
+ "commit": "ed4a4bedbdd920aad486009932495cb6ab70c3e6",
+ "sha256": "1xqsrvnqcfmlncqbys21p8pzwxl064lzgs5qfb2m6w0p9ipblkjw"
}
},
{
@@ -80559,8 +81036,8 @@
"s",
"with-editor"
],
- "commit": "f152064da9832d6d3d2b4e75f43f63bf2d50716f",
- "sha256": "0qxzqiljiqxzi1jlgm0c5f1pjz1jnnhq74lm0x9q68cim1vch48n"
+ "commit": "918992c19231b33b3d4a3288a7288a620e608cb4",
+ "sha256": "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi"
},
"stable": {
"version": [
@@ -81489,8 +81966,8 @@
"deps": [
"cl-lib"
],
- "commit": "d46082ca2adb8df3f6a7a422cff4af095878c2b6",
- "sha256": "1vxnp6bzs1vlvh3cn56g64pb5zsy0ww1f50hlz7sklabc1mpp6sy"
+ "commit": "697d95f24e055eb9725781d179d7db63d6afd2b5",
+ "sha256": "18sjkqc94kawgfv3q9ai8m0bq3h63mlyg47bxyv0zyn34n1mpc9l"
},
"stable": {
"version": [
@@ -82890,11 +83367,11 @@
"repo": "thomasluquet/playerctl.el",
"unstable": {
"version": [
- 20180301,
- 1354
+ 20210221,
+ 1956
],
- "commit": "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1",
- "sha256": "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f"
+ "commit": "f480cd30bad76e4bc337e4be0cac6300e8154fce",
+ "sha256": "0f2f9dpi1yxckicybmdp7ns8x1hqhdygcvw8b7z0mhbwwxc7ml6m"
}
},
{
@@ -83804,11 +84281,11 @@
"repo": "baudtack/pomodoro.el",
"unstable": {
"version": [
- 20210111,
- 1934
+ 20210225,
+ 2018
],
- "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03",
- "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j"
+ "commit": "ed888b24d0b89a5dec6f5278b1064c530c827321",
+ "sha256": "0yv1339q5s31wxw8y34pb09b0rlvz9m3gzqb4dc1q8ncq8xb8wl5"
}
},
{
@@ -84100,11 +84577,11 @@
"repo": "emacsorphanage/popwin",
"unstable": {
"version": [
- 20200908,
- 816
+ 20210215,
+ 1849
],
- "commit": "215d6cb509b11c63394a20666565cd9e9b2c2eab",
- "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1"
+ "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50",
+ "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra"
},
"stable": {
"version": [
@@ -84484,19 +84961,19 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20210101,
- 2227
+ 20210227,
+ 600
],
- "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d",
- "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w"
+ "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
+ "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
},
"stable": {
"version": [
5,
- 0
+ 1
],
- "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
- "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
+ "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12",
+ "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks"
}
},
{
@@ -84552,15 +85029,15 @@
"repo": "jscheid/prettier.el",
"unstable": {
"version": [
- 20210129,
- 826
+ 20210224,
+ 913
],
"deps": [
"iter2",
"nvm"
],
- "commit": "61f135a82156712b9226d9bf23156c0cce9d5c98",
- "sha256": "0z0nrhajx4xs6miaixhb0syzp7ilbbm71qcbvqqdk1fr9819nhgl"
+ "commit": "d7ab018a9312979a415d27973890129586b13dc5",
+ "sha256": "1phkvmhrcszhc74l92syrsmjqg1pd233fl2hpfivyclwyapqky76"
},
"stable": {
"version": [
@@ -84614,17 +85091,16 @@
"repo": "jerrypnz/major-mode-hydra.el",
"unstable": {
"version": [
- 20190930,
- 2106
+ 20210221,
+ 834
],
"deps": [
"dash",
- "dash-functional",
"hydra",
"s"
],
- "commit": "20362323f66883c1336ffe70be24f91509addf54",
- "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz"
+ "commit": "84c1929a5153be169ca5c36737439d51dffde505",
+ "sha256": "1yw9xdyqbf285ljsspg8ajjx1bp1g27xpg85p84fsh88nr015rh5"
},
"stable": {
"version": [
@@ -85118,14 +85594,14 @@
"repo": "bbatsov/projectile",
"unstable": {
"version": [
- 20210125,
- 726
+ 20210225,
+ 1816
],
"deps": [
"pkg-info"
],
- "commit": "fd5994762a90c2311e8aa40c37373f24e1743a55",
- "sha256": "1vlry2pa45v0l3g0lrhi6sp24cf8i0s76nz1pm92iwgk6hpdz560"
+ "commit": "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58",
+ "sha256": "014v34kxjz04jgd70kskh0iwms17ydapk43ywwp23f3m89ps1917"
},
"stable": {
"version": [
@@ -85198,8 +85674,8 @@
"repo": "asok/projectile-rails",
"unstable": {
"version": [
- 20201004,
- 1011
+ 20210218,
+ 831
],
"deps": [
"f",
@@ -85208,13 +85684,13 @@
"projectile",
"rake"
],
- "commit": "7a256b1b1444fe0001f97095d99252e946dd9777",
- "sha256": "1d8wcjrhw0k4ws0bdl1q37pm0cz1smqink1d8hi8fs505brbpfdp"
+ "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d",
+ "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb"
},
"stable": {
"version": [
0,
- 20,
+ 21,
0
],
"deps": [
@@ -85224,8 +85700,8 @@
"projectile",
"rake"
],
- "commit": "228f6316f2da229bc82fbbcf52323da951a17871",
- "sha256": "1l9l0hza6p1l750i7lvys6gnrdy2j0dmlg6nbb6zr2cq6jbf1lkd"
+ "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d",
+ "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb"
}
},
{
@@ -85529,11 +86005,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20210131,
- 2042
+ 20210227,
+ 1942
],
- "commit": "89300b579aea2471448b8871b94c0e5982c7c059",
- "sha256": "0097gkhb9lw8rl1pqk0fchpgkvfynvgvkz7rgwp4dqifn63krq1j"
+ "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b",
+ "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr"
},
"stable": {
"version": [
@@ -85636,8 +86112,8 @@
20200619,
1742
],
- "commit": "aee143afe8c17a3d2c7e88b70ffa6e08a73e2683",
- "sha256": "184fg4x1v2yyzh5z47mj0shmq45v1cb8d8pdqbrx7ffxr4lmyn74"
+ "commit": "8080bebf1f2ff87ef96a24135afe7f82d2eb3d2a",
+ "sha256": "1i82kgi3pwz61a07kmqw2gv79ym32rffwqqx8rlljk139k9j57mc"
},
"stable": {
"version": [
@@ -85733,20 +86209,19 @@
"repo": "purescript-emacs/psc-ide-emacs",
"unstable": {
"version": [
- 20200702,
- 1540
+ 20210219,
+ 2247
],
"deps": [
"company",
"dash",
- "dash-functional",
"flycheck",
"let-alist",
"s",
"seq"
],
- "commit": "663f4e2cf9cbafdd4b9a60c34346596e2a40c87c",
- "sha256": "06zgi5inlg244qhabsp4a24kda83i6rdpxf78qb7ygpxwdj4hf44"
+ "commit": "ce97d719458ea099b40c02f05b6609601c727e66",
+ "sha256": "0xfw93pdf744h2yswc53qwyawfzkc31rv8dmha3irq7k1nklhq6y"
}
},
{
@@ -85898,14 +86373,14 @@
"repo": "nbfalcon/ptemplate-templates",
"unstable": {
"version": [
- 20210204,
- 1308
+ 20210222,
+ 1555
],
"deps": [
"ptemplate"
],
- "commit": "66bcd5d16289809ac771a7f25bd62b6eaa1ab022",
- "sha256": "0bz1ipf7spch9fh1dwgnypka0199yfl07avrsg19y2lpbwi7mg0k"
+ "commit": "f65acbb4991470cb5ae513c9f2a8197ead297704",
+ "sha256": "094qxh06jibc6kxs2fa5cw1xmj8mf7ykgdw02qpk0rjmczwns9vs"
}
},
{
@@ -86065,14 +86540,14 @@
"repo": "voxpupuli/puppet-mode",
"unstable": {
"version": [
- 20200505,
- 344
+ 20210215,
+ 2347
],
"deps": [
"pkg-info"
],
- "commit": "0e2e32a3b1644edd8010bd3d44e83def683348b3",
- "sha256": "082r71wn5klihv8npc8qsvsyw4jyib5mqpnqr029kv7cvlcyfghk"
+ "commit": "9f4fef6489ddd9251213f68c8389328ca75db9a6",
+ "sha256": "1syaxzsfwd6q9xkbr9mf9hy4k3bray6m3iybcxszqm1qmwdbl6qs"
},
"stable": {
"version": [
@@ -86493,31 +86968,27 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20210109,
- 1118
+ 20210228,
+ 653
],
"deps": [
"async",
- "popup",
- "pyim-basedict",
"xr"
],
- "commit": "09a3b590cd83bf94b92ea772765db581e3aeb2f1",
- "sha256": "0v5b7p8icn9gvdqmbh7xy79xnqi80qhskg00ag8zabmg624mpn2x"
+ "commit": "e55fd0d23f75d4f30ce268973d8909510fa01731",
+ "sha256": "1n25546nlc2vw3wb4znjvv490yi0j614hravzsj99ybwkl9bf094"
},
"stable": {
"version": [
- 2,
- 0
+ 3,
+ 2
],
"deps": [
"async",
- "popup",
- "pyim-basedict",
"xr"
],
- "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7",
- "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0"
+ "commit": "0c8cd00d2da981e3833bface7d0c476cbb3e93d2",
+ "sha256": "102ns8vjmpb56afc3vyd62zfvvrnjdclm1fsn4jzj45b2in5wmxx"
}
},
{
@@ -86649,8 +87120,8 @@
20200503,
1624
],
- "commit": "d825c21e18de5618cfcacea0fd818efa80a6b0fe",
- "sha256": "0riipssdnhys8qijayz1syk1haw1z915c0pplv50qi9nf7lli95j"
+ "commit": "15396a14bc8f977a00b5288356e79467653a2c3c",
+ "sha256": "0j5dgaplar71lyx05ali8rhd6nmfc2dkphcq3wn0gdmd5qmwbwxk"
}
},
{
@@ -86891,11 +87362,11 @@
"repo": "python-mode-devs/python-mode",
"unstable": {
"version": [
- 20201230,
- 2132
+ 20210216,
+ 1205
],
- "commit": "41b123b4d4906cce7591900a952bb75a38c5296c",
- "sha256": "1dl6vpwqxrdy26gh8kw5xkyj1ka88plm60c6ka2g6ji2s851b6ki"
+ "commit": "689ff2ddb1102a7fae9491333e418740ea0c0cbc",
+ "sha256": "05a5qv98y2gbi9vycmcfnbzwnnzmdz2iv7fwd5c5qxfi9bsv24sv"
},
"stable": {
"version": [
@@ -86915,18 +87386,17 @@
"repo": "wbolster/emacs-python-pytest",
"unstable": {
"version": [
- 20210111,
- 1046
+ 20210219,
+ 1947
],
"deps": [
"dash",
- "dash-functional",
"projectile",
"s",
"transient"
],
- "commit": "3fadf1f8bc363d57c54eedd1bf98e6d9db9f0a62",
- "sha256": "0ij72rjf3qnsbg3zripxyx3lwzliplm24pfrg867dr6lxczkxwv2"
+ "commit": "31ae5e0e6813de8d889103f7b8dde252b04b1ae4",
+ "sha256": "1kf62adlm5nf7r3qar8h1cx11xxrz95bfqii62i9xqdi3i8z7b2l"
},
"stable": {
"version": [
@@ -87536,15 +88006,15 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20210213,
- 24
+ 20210226,
+ 1343
],
"deps": [
"faceup",
"pos-tip"
],
- "commit": "c73c3fcbe135f6cda7abc246e01bc5dc6b310462",
- "sha256": "0crzdaqr1yjziv3dswxa9nn1dirq4pa8rhd0mda09bipvxfjirhp"
+ "commit": "48084a44e50a3ecd91e40ac5b58eed297e314f3f",
+ "sha256": "18r0pi6g9nfhzj8l306r28al4pfwkn836arvnpbysqxjknxnvqll"
}
},
{
@@ -88677,8 +89147,8 @@
20201202,
126
],
- "commit": "d0e61f19a29108d676849e0925f00d002a26d32d",
- "sha256": "1r3fmc5c2aqfqpfzdxkj6qi86j8vwmrj1gk3xz263pl3q96pzcya"
+ "commit": "f831f61797e03a0a1df8d99637a8738ba84d7cdd",
+ "sha256": "0lfpqzbrxs261cpb1hpmszcck13zkmqs67qf736cg2zx9ypfhx1g"
}
},
{
@@ -88787,6 +89257,27 @@
"sha256": "1dxghz1fb2l7y7qphqk0kk732vazlk1n1fl6dlqhqhccj450h2qa"
}
},
+ {
+ "ename": "reddigg",
+ "commit": "ec2ec4f094e1faee764ad73a5f9addfbd47117df",
+ "sha256": "04gzhbflh8q5bnyfsw769dlv9s4y2kkqnix3p9pzqz6inmbabg3w",
+ "fetcher": "github",
+ "repo": "thanhvg/emacs-reddigg",
+ "unstable": {
+ "version": [
+ 20210225,
+ 1948
+ ],
+ "deps": [
+ "ht",
+ "org",
+ "promise",
+ "request"
+ ],
+ "commit": "fab7b6881c1c93d96258596602531c2e2dafc1c4",
+ "sha256": "1wxig3bhifczi9an98rw57wzkxshq5z16n44dy72r37pkc6azax5"
+ }
+ },
{
"ename": "redis",
"commit": "10fbb970956ee19d812c17900f3c01c5fee0c3f2",
@@ -89265,32 +89756,32 @@
},
{
"ename": "repl-toggle",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b",
- "fetcher": "github",
- "repo": "tomterl/repl-toggle",
+ "commit": "ce2df1e493e3bcd63dfb07c3c5475d2dbf410fb8",
+ "sha256": "099sz9c0fl7b65qahc3gf2hlzmrm19spzm8bsl30wyc9vycik9yk",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tomterl/repl-toggle",
"unstable": {
"version": [
- 20210114,
- 932
+ 20210226,
+ 1055
],
"deps": [
"fullframe"
],
- "commit": "091aea753f59f2af5c581e73d15b4dd7ee394d94",
- "sha256": "0r2zr6dxzml418rmar5v6yw6x1wfbrk89lqqvgsbjfps3yk9b27a"
+ "commit": "7028ae65f136215f8e07a43afc33a6b99fe82857",
+ "sha256": "0nycm8a4wwkkaif958z4m89slayp17k20lp2h7lvddjx8prn6yfp"
},
"stable": {
"version": [
0,
- 6,
+ 7,
1
],
"deps": [
"fullframe"
],
- "commit": "a36caac7649fbffbe30f7b06541c9efd723563fc",
- "sha256": "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd"
+ "commit": "7028ae65f136215f8e07a43afc33a6b99fe82857",
+ "sha256": "0nycm8a4wwkkaif958z4m89slayp17k20lp2h7lvddjx8prn6yfp"
}
},
{
@@ -89447,11 +89938,11 @@
"repo": "tkf/emacs-request",
"unstable": {
"version": [
- 20210212,
- 505
+ 20210214,
+ 37
],
- "commit": "c5a10680f38cd9b60057a7d213eb9bc7dcec918b",
- "sha256": "16vs9ifnsa76kikz64jawwkpfck15xm8cdd3ndi4hl4g6ff8a92s"
+ "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82",
+ "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc"
},
"stable": {
"version": [
@@ -89471,15 +89962,15 @@
"repo": "tkf/emacs-request",
"unstable": {
"version": [
- 20181129,
- 317
+ 20210214,
+ 37
],
"deps": [
"deferred",
"request"
],
- "commit": "c5a10680f38cd9b60057a7d213eb9bc7dcec918b",
- "sha256": "16vs9ifnsa76kikz64jawwkpfck15xm8cdd3ndi4hl4g6ff8a92s"
+ "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82",
+ "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc"
},
"stable": {
"version": [
@@ -89859,28 +90350,28 @@
"repo": "dajva/rg.el",
"unstable": {
"version": [
- 20210209,
- 1953
+ 20210227,
+ 1113
],
"deps": [
"transient",
"wgrep"
],
- "commit": "a1bc7036dc662b8c38aaac0b4e2ea3bb5934a688",
- "sha256": "1q8z71b9vwq1v1n36byr1qqb3h7sjrvkds2yzbs3vvm1mzzl3qa3"
+ "commit": "8a537d9f033ba1b47f2ebe4d76f68b3dd74aefcb",
+ "sha256": "1gqh28fwyjxy4haclf23kzr755p8iyh2mvly3vmzpf55y2n1z8ib"
},
"stable": {
"version": [
2,
0,
- 2
+ 3
],
"deps": [
"transient",
"wgrep"
],
- "commit": "2ec8d1d36cfb9750c9a65c4a2687ea76399fccb3",
- "sha256": "15qcnsnbni0aincm9pxpfhff3c5ivd5zs2s2qchjzhcn4kdm6kxr"
+ "commit": "bb89400d4d5e4eb22917f7048256745ea566a844",
+ "sha256": "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr"
}
},
{
@@ -90324,10 +90815,10 @@
},
{
"ename": "ron-mode",
- "commit": "67c658fe2ee340f3902c7ff5c0138995e69fe5dc",
- "sha256": "1w0zicbva3xvqi1qz87fbr4ciq28hg70f0n2q70drh4nqb4ahwm2",
+ "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406",
+ "sha256": "19hb9snfkm8fdbn8i9whvq0g85xlr4l6hbjyf1vb8355yrwsdcvs",
"fetcher": "git",
- "url": "https://codeberg.org/Hutzdog/ron-mode",
+ "url": "https://codeberg.org/Hutzdog/ron-mode.git",
"unstable": {
"version": [
20200830,
@@ -90578,20 +91069,20 @@
"repo": "rubocop-hq/rubocop-emacs",
"unstable": {
"version": [
- 20190326,
- 1424
+ 20210213,
+ 1215
],
- "commit": "03bf15558a6eb65e4f74000cab29412efd46660e",
- "sha256": "0bl1l2qbpdknn93wr95a49gdnpl3pwpjj3rka3s44hvihny9p8q0"
+ "commit": "1372ee3fc1daf7dc8d96741b03e4aff5f7ae3906",
+ "sha256": "1svzp1ylc3j5mfp5bgivmxgy60wyfrzgahvcfzr1217dwjbf68jm"
},
"stable": {
"version": [
0,
- 5,
+ 6,
0
],
- "commit": "980bedb455e3551d35a212fae515c054888907c1",
- "sha256": "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"
+ "commit": "608a3c1dccab9a3af467ce75d94dedfbfd37b21d",
+ "sha256": "0bxz80j7bnrlrd6gd548rvd5jf6m36wyxfc4vzxbcim1xcfjyp09"
}
},
{
@@ -90888,11 +91379,11 @@
"repo": "bard/emacs-run-command",
"unstable": {
"version": [
- 20210207,
- 1145
+ 20210224,
+ 1444
],
- "commit": "a504d6d5f978e9e133daa901eda6c1420e19f307",
- "sha256": "02md9ayraclj97jyjs5pz9xnw32j5wr86zjbaly1dwm87avs27g6"
+ "commit": "cb76adf8e41d393090a4a3c6f390bd75288642c3",
+ "sha256": "0gkd7yabjdw6si814wzbkr7hi835pah8z6l0kfyhllvqnkp66qsc"
}
},
{
@@ -90906,8 +91397,8 @@
20201109,
351
],
- "commit": "54787de62839c48428f2e1edc4e2aa64851e9849",
- "sha256": "0zbf2nvnwx6yyjjk4xfdpn15bna6r32n02q32qzk6bnqipw54ca3"
+ "commit": "80661d33cf705c1128975ab371b3ed4139e4e0f8",
+ "sha256": "1l66phlrrwzrykapd8hmkb0ppb2jqkvr7yc8bpbxk1dxjb9w9na2"
}
},
{
@@ -90994,11 +91485,11 @@
"repo": "rust-lang/rust-mode",
"unstable": {
"version": [
- 20201204,
- 1527
+ 20210226,
+ 1106
],
- "commit": "c5c7ed31a2e1106ab4835b135618a34570796dc7",
- "sha256": "1r2qm3n4788pyyglp23ghzbfq8xzni1vb2jgzc6v65x1047j5rl3"
+ "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b",
+ "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v"
},
"stable": {
"version": [
@@ -91431,14 +91922,11 @@
"repo": "nicolaisingh/saveplace-pdf-view",
"unstable": {
"version": [
- 20201216,
- 934
+ 20210217,
+ 1312
],
- "deps": [
- "pdf-tools"
- ],
- "commit": "b0370912049222f3a4c943856de3d69d48d53a35",
- "sha256": "1ky1d3aycc1r96z3fy484p99xlmry9y9z61s7l7mw0m231k7kpbd"
+ "commit": "54ed966b842501c3c092dbf57b372e37b033c578",
+ "sha256": "0i03qb6qc2agp9s5s7l08f1wl8anqndh6xshg1c3w357vd1whv7i"
}
},
{
@@ -91529,8 +92017,8 @@
20200830,
301
],
- "commit": "1a814450162a2a8d0dde107f5a72d6152efbb63a",
- "sha256": "0zpmsga0y1sgdm22w9k790mm44y4xc1hjcnlf6byhm1raf7yairg"
+ "commit": "cacada6203a860236aff831f6a863c92dbe2b878",
+ "sha256": "17k4n0kwfqrn172mi3d2f67jalgc13p6xr10zhs56mbd5bzwg958"
}
},
{
@@ -91724,14 +92212,14 @@
"url": "https://git.sr.ht/~technomancy/scpaste",
"unstable": {
"version": [
- 20200731,
- 1520
+ 20210223,
+ 1902
],
"deps": [
"htmlize"
],
- "commit": "779b94d1159bba8dbcf2b1081df7c54a15577066",
- "sha256": "02zsknby258l62vga5p7gzbx12aj6cs4ypmrf7acv5pvliwd9wl6"
+ "commit": "4ec352fb9fe261ffb8b78449dea986dc34d337b3",
+ "sha256": "0219jzj3rwcx4k6f4grzrarq0v05jgmmracis3jb25rv0cln3i9r"
},
"stable": {
"version": [
@@ -91916,8 +92404,8 @@
20201013,
123
],
- "commit": "3cd1e1801aaddd011992d284280b5b43ccbee17b",
- "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f"
+ "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51",
+ "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf"
}
},
{
@@ -92114,10 +92602,10 @@
},
{
"ename": "searchq",
- "commit": "9738c1be0511540bfd8f324334518c72c9c38c94",
- "sha256": "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr",
+ "commit": "cd08b1a89eba9dcc0ed7f6d6ccb783b6ba0c00ca",
+ "sha256": "0n3azkzfflxi8fif4m3q886l5gp33z2ylfl2j3h0w36xlgc9h58l",
"fetcher": "github",
- "repo": "boyw165/searchq",
+ "repo": "tcw165/searchq",
"unstable": {
"version": [
20150829,
@@ -92318,19 +92806,19 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20210212,
- 1714
+ 20210228,
+ 1401
],
- "commit": "a2ba6333e59ddc853318ece229f34016400ca033",
- "sha256": "1agpcazga6gxl6k28bdski1sx046699cici8a9hz0nj7s8rkx1zm"
+ "commit": "bcf371433f3593bfe911369a4c87fbf7287df866",
+ "sha256": "052323wgs7z68hzfp6y9x262qsd0l6la667hsjvrdc64x6mv0dii"
},
"stable": {
"version": [
3,
- 0
+ 1
],
- "commit": "bec406a47bd95f5b7363be239783a01631858520",
- "sha256": "0j10yxlikyg7qxcmp4fnddyd5nc3hlz080d1zcbijq020a08k86g"
+ "commit": "a9ecaa018f249c15fae8e1af5d4df337e846e92f",
+ "sha256": "02jrki6vzyfyi1bbslki5pk2348flh9dz18jkc4y7p60bvbr52cb"
}
},
{
@@ -92341,27 +92829,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20201214,
- 227
+ 20210227,
+ 600
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d",
- "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w"
+ "commit": "b6da466e552a710a9362c73a3c1c265984de9790",
+ "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall"
},
"stable": {
"version": [
5,
- 0
+ 1
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
- "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
+ "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12",
+ "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks"
}
},
{
@@ -92406,15 +92894,15 @@
"repo": "wanderlust/semi",
"unstable": {
"version": [
- 20201115,
- 116
+ 20210214,
+ 853
],
"deps": [
"apel",
"flim"
],
- "commit": "f279ebe1c1f9c14bdd5d3da01af24277a6167b69",
- "sha256": "1a387s4h167lsray5k5gzm8jpnrg5az7y982iamk67rz5i1ccgz5"
+ "commit": "20d75302509b5fba9849e74b61c1ce93e5819864",
+ "sha256": "14qy9k64fi8asd4ka9hv5v0aa7mkdnx6252n02gldg760janr7xl"
}
},
{
@@ -92877,6 +93365,21 @@
"sha256": "13scj6w3vsdcgmq7zak3pflqpq295wgzsng72rcafgkkr7r12rar"
}
},
+ {
+ "ename": "shades-of-purple-theme",
+ "commit": "fec35f46d061fdd454de7406253a1e24b2b501ed",
+ "sha256": "1gff2c53wvcfdvh1vx35rm3njp2y5742jkmfm0lbi6q68fz19d3j",
+ "fetcher": "github",
+ "repo": "arturovm/shades-of-purple-emacs",
+ "unstable": {
+ "version": [
+ 20210213,
+ 1939
+ ],
+ "commit": "96c58f2421165d67f300cc5014715fc0517e8f8c",
+ "sha256": "17cnwc235wm6la3wh1wcrs621jqzka7xnrrbcsk4kv8fnidi81n4"
+ }
+ },
{
"ename": "shadowenv",
"commit": "b2651055ab67448f90a93cf594342b8212202b82",
@@ -92885,11 +93388,11 @@
"repo": "Shopify/shadowenv.el",
"unstable": {
"version": [
- 20190903,
- 1907
+ 20210216,
+ 2031
],
- "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be",
- "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6"
+ "commit": "e4563469fe20b9e6e63d7b19c86ac8b8b615df1d",
+ "sha256": "1p7a4lps2w6dnc5i1fiwx22ij4in70a0h0bl5bp7ab5ba6l22kaw"
}
},
{
@@ -93290,11 +93793,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20201021,
- 552
+ 20210218,
+ 2329
],
- "commit": "54c3ccd9b3fa9becc4b108046b117ccd6384449d",
- "sha256": "024drmvh1qv2sbl5nxvyrqbwlk4wk8bfsa08rn21rhlbnwknb5ip"
+ "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37",
+ "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph"
}
},
{
@@ -93480,15 +93983,15 @@
"repo": "chenyanming/shrface",
"unstable": {
"version": [
- 20210213,
- 531
+ 20210218,
+ 115
],
"deps": [
"language-detection",
"org"
],
- "commit": "46573b3823be1f5ea57603a0e4855279848ad037",
- "sha256": "12v1snjw4adrnbz6d0f4xkbr8k2kxa4xfkx32zwqp4bvsgi80arv"
+ "commit": "3f6807543ffc1da16ede10df8a05d5e4414ba7df",
+ "sha256": "053r87s6jxl3hi8f7215hvn4xm6913l9wrjxwafv76gsdyl9cgz7"
},
"stable": {
"version": [
@@ -93569,18 +94072,17 @@
"url": "https://git.savannah.nongnu.org/git/emacs-shroud.git",
"unstable": {
"version": [
- 20200124,
- 1833
+ 20210220,
+ 1952
],
"deps": [
"bui",
"dash",
- "dash-functional",
"epg",
"s"
],
- "commit": "bf8a854ecd440c525b870f9439f6785700af80d3",
- "sha256": "1rfmykbv2jipkb8by9jsx51gdh62spilffj3c49h3rfcllqnbv2g"
+ "commit": "2e6ff2bab4a1e798c090c9d7fbd90b7f3463d5c5",
+ "sha256": "08nnpzdrh4sq3vddfcdagaxvn4liprmc3dd17lbrvw5qlcadrbvg"
},
"stable": {
"version": [
@@ -93756,11 +94258,11 @@
"repo": "mswift42/silkworm-theme",
"unstable": {
"version": [
- 20191005,
- 1903
+ 20210215,
+ 1120
],
- "commit": "6cb44e3bfb095588aa3bdf8d0d45b583521f9e2c",
- "sha256": "0w5h1gl8npmwmpvhhwchrknd977w4l3vvd2lib7qphinj117fhzv"
+ "commit": "ff80e9294da0fb093e15097ac62153ef4a64a889",
+ "sha256": "09zrhfk6w74kc4sml20k6vhnd8b07yppn69rffan5mhr3qr69176"
},
"stable": {
"version": [
@@ -94111,6 +94613,29 @@
"sha256": "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q"
}
},
+ {
+ "ename": "sketch-themes",
+ "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1",
+ "sha256": "18n6blkrn72zyjj4ik3f6w2axmn0rwk8lpbcaynl3y7v7ij35m0r",
+ "fetcher": "github",
+ "repo": "dawranliou/sketch-themes",
+ "unstable": {
+ "version": [
+ 20210222,
+ 1337
+ ],
+ "commit": "33b63867db76225e46eda0a8a613813151dc5b62",
+ "sha256": "19dlwp27g1sd1hd0wq8s16fqk8v4ll6xwn2hl1a9axkdk97mps27"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "commit": "df8182628052bf55e7779fb6967383629059b5c0",
+ "sha256": "0184vmhl3m84qavx1vnrp16fwfpd1fpynfb5vwaa4nvg55ly247i"
+ }
+ },
{
"ename": "skewer-less",
"commit": "fb63f7417f39bd718972f54e57360708eb48b977",
@@ -94315,15 +94840,15 @@
"repo": "slime/slime",
"unstable": {
"version": [
- 20210202,
- 1426
+ 20210214,
+ 2243
],
"deps": [
"cl-lib",
"macrostep"
],
- "commit": "f135f69c5c97bb1f2456d05ee1e84ad6b4495ca3",
- "sha256": "0xx4zm0anp9vvhl5j1xvq039jyhs96fbbq21pap0c4h1rfv5mgin"
+ "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875",
+ "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0"
},
"stable": {
"version": [
@@ -94540,11 +95065,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20210207,
- 940
+ 20210224,
+ 1024
],
- "commit": "3278819ddf71d16444e6cea293dd41ca83ea9bae",
- "sha256": "1acq2jsk3hbk3lq5klwf825kykyvqrrzicawy5wvssmbvxcgpy8s"
+ "commit": "fb84318c08f59bc786e047006fc81e2ace568309",
+ "sha256": "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj"
},
"stable": {
"version": [
@@ -95048,15 +95573,15 @@
"repo": "Fuco1/smartparens",
"unstable": {
"version": [
- 20201229,
- 1937
+ 20210213,
+ 1851
],
"deps": [
"cl-lib",
"dash"
],
- "commit": "63695c64233d215a92bf08e762f643cdb595bdd9",
- "sha256": "0yx9xamrpjpn6qshcdzc43pj3avb0nq4q40nmid28vb4giab4927"
+ "commit": "fb1ce4b4013fe6f86dde9dd5bd5d4c032ab0d45b",
+ "sha256": "0wl3fg761ddigqfcbgprgn8d03qapbsh803qp36pq09mgi29s161"
},
"stable": {
"version": [
@@ -95490,21 +96015,6 @@
"sha256": "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v"
}
},
- {
- "ename": "snippet",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68",
- "fetcher": "github",
- "repo": "pkazmier/snippet.el",
- "unstable": {
- "version": [
- 20130210,
- 2315
- ],
- "commit": "11d00dd803874b93836f2010b08bd2c97b0f3c63",
- "sha256": "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y"
- }
- },
{
"ename": "snitch",
"commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c",
@@ -96421,11 +96931,11 @@
"repo": "condy0919/spdx.el",
"unstable": {
"version": [
- 20210206,
- 728
+ 20210301,
+ 224
],
- "commit": "7cb1809498442b1e52f586bcde36b387777ec316",
- "sha256": "0zqczxnrjwl9y0q54gsxz906cds8q9bk7mhlplsgnlm7w9aipr2l"
+ "commit": "63704d435255c1fe3d7579f0344e244c2fbdb706",
+ "sha256": "1fbpbj7jzm4djlbzvzjld2gs46wiy6gm9hd1pjg2rr987fl882rg"
}
},
{
@@ -96567,16 +97077,16 @@
"repo": "naiquevin/sphinx-doc.el",
"unstable": {
"version": [
- 20160116,
- 1117
+ 20210213,
+ 1250
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "f39da2e6cae55d5d7c7ce887e69755b7529bcd67",
- "sha256": "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch"
+ "commit": "1eda612a44ef027e5229895daa77db99a21b8801",
+ "sha256": "0q72i95yx3xa57jlgr7dik6prf20hi8bp8xf3f5c6ificv7i5378"
},
"stable": {
"version": [
@@ -96979,14 +97489,14 @@
"repo": "purcell/sqlformat",
"unstable": {
"version": [
- 20200327,
- 2329
+ 20210218,
+ 312
],
"deps": [
"reformatter"
],
- "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437",
- "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk"
+ "commit": "a7b38b20320b2b4f9ec109845fed3661da9b4a49",
+ "sha256": "164x6vskcby6h7jaz119wqn5x73pnsf53qq314v0q4ncw2917bym"
},
"stable": {
"version": [
@@ -97137,11 +97647,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20210212,
- 2231
+ 20210228,
+ 1834
],
- "commit": "537b4c350e562660aa406b99660f80275254714e",
- "sha256": "1ihyrdpsqf06d4s91hnd9lgwsas5r2pajdinj1jydqdy6z7g0bba"
+ "commit": "12eec5df609b16f16b520eceb0681b74d9ae8aa6",
+ "sha256": "043mra5ysz00jxziqglzpkg5nmhc15lvv4n7q26c5yv2dn4nbdsq"
},
"stable": {
"version": [
@@ -97254,11 +97764,11 @@
"repo": "jhgorrell/ssh-config-mode-el",
"unstable": {
"version": [
- 20210127,
+ 20210217,
1051
],
- "commit": "7539916b1eb4f44b2a682111424f3aca1233c482",
- "sha256": "04hmf8haqpvd0vjrmr65rnh6xd3pginpg7330r1gsbhkbhpy3p53"
+ "commit": "820f60af17e71898303f4f3c2576f0619528a492",
+ "sha256": "1haypfhpbxsv2rm1wpskjdm0ddv34qvaiiyw8qhy1nn64q4b5xx0"
}
},
{
@@ -97565,8 +98075,8 @@
20200606,
1308
],
- "commit": "11aa5944459e464a96f41d934e23da5320c13333",
- "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1"
+ "commit": "755c709c02e4e091ceb934fd5672db416fc94dbd",
+ "sha256": "08fb1qlld0dyi7i1pd5xb1g6z2681nyrqfl1ihq0gr8dal6mc772"
},
"stable": {
"version": [
@@ -97908,11 +98418,11 @@
"repo": "PythonNut/su.el",
"unstable": {
"version": [
- 20200820,
- 57
+ 20210226,
+ 42
],
- "commit": "eadfacdbcb8d54d83f6f6cfe7990b492f7217453",
- "sha256": "0xwkkzs4pl3wgjq7n43klkh814h3kzh0mwnka07dbb0gv1xmaigl"
+ "commit": "787f78989253f4568942a4cece5f135f005e135f",
+ "sha256": "1sr6lwjd2py0pncbx4qxa8wfxa3fnmfhxr944aid672hba2pdx7s"
}
},
{
@@ -98326,11 +98836,11 @@
"repo": "leafOfTree/svelte-mode",
"unstable": {
"version": [
- 20210111,
- 1314
+ 20210222,
+ 1037
],
- "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9",
- "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3"
+ "commit": "25d0018036f44ff9bd685a1c9a76d8ba57c1024d",
+ "sha256": "070i3k5djw2m1763ihqngpxfmdxq7gs058fvjaaf62dpkqy9vv3a"
}
},
{
@@ -98371,11 +98881,11 @@
"repo": "rougier/svg-tag-mode",
"unstable": {
"version": [
- 20201129,
- 608
+ 20210227,
+ 1105
],
- "commit": "87489d28450559078aa15b4a435143a297508e48",
- "sha256": "0gyhmv60dx0zxx4bmhzsd7q5vfnkpfwlj6539bn272fwcr7zncp8"
+ "commit": "a34a2e1128fa99f999c34c3bc6642fb62b887f34",
+ "sha256": "01apd8agfdhr662lkiy5rh2xvr913754f9zz7f5hn4vkmfgambrh"
}
},
{
@@ -98633,26 +99143,26 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210202,
- 2312
+ 20210225,
+ 1251
],
"deps": [
"ivy"
],
- "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49",
- "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g"
+ "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259",
+ "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2"
},
"stable": {
"version": [
0,
13,
- 0
+ 2
],
"deps": [
"ivy"
],
- "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb",
- "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p"
+ "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e",
+ "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb"
}
},
{
@@ -98955,11 +99465,11 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20210113,
- 1943
+ 20210219,
+ 2348
],
"deps": [
- "dash-functional",
+ "dash",
"evil",
"evil-cleverparens",
"evil-surround",
@@ -98970,8 +99480,8 @@
"smartparens",
"undo-tree"
],
- "commit": "c535794b539627b26b7e73481e41f3c870d4b33e",
- "sha256": "0pyyjbwcacql4l45fi6jxxvrm4alz9rm8pp6abikh5di98yidjm6"
+ "commit": "a8e573324a56e131b92967802a8df88bedd1ef6f",
+ "sha256": "015ijjzzrx6gjh1qgb7ja6fwffialck814y1japg6d6smkd8b82i"
},
"stable": {
"version": [
@@ -99343,6 +99853,54 @@
"sha256": "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk"
}
},
+ {
+ "ename": "tab-bar-echo-area",
+ "commit": "82df49c34664a5078d92e6015abc6f965d34791e",
+ "sha256": "0y91iyllpy4hf2y9saw4p3rj1q34fziw40f64glcsbnv37jkifp3",
+ "fetcher": "github",
+ "repo": "fritzgrabo/tab-bar-echo-area",
+ "unstable": {
+ "version": [
+ 20210221,
+ 2336
+ ],
+ "commit": "7fe200bf2c7397abe5623d1b05983eaccc467320",
+ "sha256": "16rf0b33adj780ix3x7xhp74dbx6f2044dzihpl77ar1yd48dhc7"
+ }
+ },
+ {
+ "ename": "tab-bar-groups",
+ "commit": "7c3efd2b2a7030a45244adf07ec9014c6e4540e9",
+ "sha256": "0c1a26ynjbf6dp2g7lx6iwnrqhri93k57fhfb2dvkb7ya58df7v3",
+ "fetcher": "github",
+ "repo": "fritzgrabo/tab-bar-groups",
+ "unstable": {
+ "version": [
+ 20210213,
+ 2138
+ ],
+ "deps": [
+ "s"
+ ],
+ "commit": "930a86edcfe7c0e33e16bfe2501dbe285a443df9",
+ "sha256": "14vpwh2yh1626jlc1ifyl7lfyv2lsczcgsbjs4flbpv83c9biq8s"
+ }
+ },
+ {
+ "ename": "tab-bar-lost-commands",
+ "commit": "6f2d6b740ab3a35d111381f3358b9f6b52c3df7c",
+ "sha256": "149rf304ylksdv5l23gz4zkx42cv5ym286j2k0qbj51gfg73kks4",
+ "fetcher": "github",
+ "repo": "fritzgrabo/tab-bar-lost-commands",
+ "unstable": {
+ "version": [
+ 20210215,
+ 1412
+ ],
+ "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e",
+ "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y"
+ }
+ },
{
"ename": "tab-group",
"commit": "ad758d865bde8c97d27c0d57cabe1606f8b36974",
@@ -99596,11 +100154,11 @@
"repo": "saf-dmitry/taskpaper-mode",
"unstable": {
"version": [
- 20210120,
- 2015
+ 20210228,
+ 2046
],
- "commit": "6ef30c69be9da77f0750880da27bab5d81006c6a",
- "sha256": "0wfrmp3rix3jxiiq1aijl0k73l8qxi9fp41faxyabr2cqx2pzzsv"
+ "commit": "62b112a335a62fbc6898401761275cff5d173821",
+ "sha256": "0xnjwsw6ri46i5gygmn5p9ashwp1lcxglqgnllrq8b918qrayww1"
},
"stable": {
"version": [
@@ -99787,15 +100345,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20210212,
- 1021
+ 20210228,
+ 1348
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "f1bb443ce1d24f00203c67b7ebca536832286704",
- "sha256": "14ghyvpiwqlrxn76zq6jbwwh3lmp542kaixncwm26ljvmgq22b6p"
+ "commit": "d3e5d654e1a86019f85dd8c41923fce29fab45d6",
+ "sha256": "116ff8d8ir7dnmmm6qiy82i9ikziyx0xmy35v2p3dz4qib32n0yh"
},
"stable": {
"version": [
@@ -99875,11 +100433,11 @@
"repo": "lassik/emacs-teletext",
"unstable": {
"version": [
- 20201019,
- 700
+ 20210222,
+ 901
],
- "commit": "e674ff636e9d15cade171ef432aaeead8109dc48",
- "sha256": "0ws2b1kmhrbnhmy2ld7kjkximqpbb8cdcpvz33638ylcvb46vd1x"
+ "commit": "7092a52b18b4b13b36f4558fade98f89e182e00d",
+ "sha256": "15rhrkb454kby6n4i669d2l24n7m3xa7nm9p68nbqs04c4sinynq"
}
},
{
@@ -99926,11 +100484,11 @@
"repo": "clarete/templatel",
"unstable": {
"version": [
- 20210210,
- 1359
+ 20210218,
+ 1340
],
- "commit": "a3458234b8e0e83c46c6aca11a757c1134752c09",
- "sha256": "0l5j2a44sslq1qm0sjaqcnca0y89faxw6ic19zzv5z836m83hl9d"
+ "commit": "c1bb14cbaf47a24b0765b68ac6f252d0b5e2809f",
+ "sha256": "1sk8g4gs9103f2sk76x6zx8i74zr79fr30mg87x4shlrnj6a54fq"
},
"stable": {
"version": [
@@ -100863,18 +101421,18 @@
20200212,
1903
],
- "commit": "a983a4a27a9e49f9ea7f990e260214a3d2473b61",
- "sha256": "0cnasic4xk9x5s81i36dprmg93csmil5p8fadfpmdsfpi83cb9i9"
+ "commit": "2a5e467de2a63fd59b15c347581f3c5dca349e2b",
+ "sha256": "0px46fq29xdsgys525l5ba0zbqq9d86c739zqlqnn3safvg5vrih"
},
"stable": {
"version": [
2021,
2,
- 8,
+ 22,
0
],
- "commit": "38468becbbda1488b2b204b209a4dac3352d1791",
- "sha256": "1z2s12rqgzi4cx77mmim25rh9xgna9i10vv7wljkkfwncnf1xlin"
+ "commit": "a0eb44d20005e25284d0204f42387ff872bf52b9",
+ "sha256": "1294wsx9g3k2y5prgxr7w8ms6h0af8c0xijvh4fjil6bsx729c6b"
}
},
{
@@ -100930,20 +101488,20 @@
"deps": [
"haskell-mode"
],
- "commit": "8cf18c6a8b1b4c825bdacbdd913d1c355c15bf11",
- "sha256": "05ffyh4a9cmv14a64xxscp303wddhi1264xgsiyvllfasz14vjj1"
+ "commit": "839c9ae0db91509015d7638905d2d7a4811f877d",
+ "sha256": "1gm8i3bvqkdk2fmkl1lbra1hqlag18bi0fq1mi6grw5lkmmlhay2"
},
"stable": {
"version": [
1,
7,
- 1
+ 2
],
"deps": [
"haskell-mode"
],
- "commit": "8cf18c6a8b1b4c825bdacbdd913d1c355c15bf11",
- "sha256": "05ffyh4a9cmv14a64xxscp303wddhi1264xgsiyvllfasz14vjj1"
+ "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198",
+ "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq"
}
},
{
@@ -101440,8 +101998,8 @@
"deps": [
"cl-lib"
],
- "commit": "19e2f1766b4a845ce5a4ccc87de62608f385bd11",
- "sha256": "1gpzi092732chg0mvrwmr01c2njip1d2m15lj9fa1ii6sddfpand"
+ "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c",
+ "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3"
}
},
{
@@ -101740,8 +102298,8 @@
"deps": [
"w32-ime"
],
- "commit": "077dfb87054a20a1bbec8d6d0f282f64c6722999",
- "sha256": "066vl2qvz14ds66vvyj6cabmf4fbc8x4p12ph340kj4yjncpqcqs"
+ "commit": "8fd8ae64f71d1d69d7e1bcc47a6f65aa7f8e6993",
+ "sha256": "020qvjszwkx5klgh865vs5z17ym651i4zzq7c4sz6qwv361ygfm8"
},
"stable": {
"version": [
@@ -101913,20 +102471,20 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20210117,
- 2008
+ 20210228,
+ 1207
],
- "commit": "94582a3fd96450072ab1b7a4e65802dbdb00aebc",
- "sha256": "0p96vsva9y6w8fa69vhzzakb9c2sfzihlk9789z3gs5nw88qwkly"
+ "commit": "1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba",
+ "sha256": "0ci7khr2cp185kv4lm4a87fd7sgrjzz12k7w1s4iicaqvfryw9l5"
},
"stable": {
"version": [
0,
- 2,
+ 3,
0
],
- "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca",
- "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr"
+ "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d",
+ "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c"
}
},
{
@@ -101974,14 +102532,14 @@
"repo": "holomorph/transmission",
"unstable": {
"version": [
- 20210203,
- 2107
+ 20210218,
+ 2015
],
"deps": [
"let-alist"
],
- "commit": "e3c1fb176c6d91a8378426e3ea5e6c036f321746",
- "sha256": "1dlm3hi22cyw6d0c7i36wkr186v7ll840s1dm4zpd12k11m9sbks"
+ "commit": "b5c1d391b4be469a07536e901e54a8680387025f",
+ "sha256": "1z3gzax6i9cwipmi64hg3h98haimlb0xsz4zm1ggqwwq1zd5csvp"
},
"stable": {
"version": [
@@ -102127,14 +102685,14 @@
"url": "https://git.sr.ht/~tarsius/tray",
"unstable": {
"version": [
- 20210209,
- 1655
+ 20210214,
+ 1119
],
"deps": [
"transient"
],
- "commit": "ba04344c90094910cfa4f2f5e56b0b33934cebf7",
- "sha256": "1bgshgqwidkk14vq0jmi42wfa81y0bd9rq1r6gzqw024g8syhv47"
+ "commit": "e2b169daae9d1d6f7e9fc32365247027fb4e87ba",
+ "sha256": "1wrip00q6lbpllhaz0c7llnm774dq2mizr39ynfssvsdci38z1lm"
}
},
{
@@ -102166,8 +102724,8 @@
"deps": [
"tsc"
],
- "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1",
- "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2"
+ "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7",
+ "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg"
},
"stable": {
"version": [
@@ -102190,45 +102748,57 @@
"url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git",
"unstable": {
"version": [
- 20210116,
- 1930
+ 20210215,
+ 1506
],
"deps": [
"seq",
"tree-sitter"
],
- "commit": "7ce723730993ca7879c8660f5ae78c69193a1451",
- "sha256": "069851611i4ra8kjknn9nyzrj2xy9qax4f69jxnf99cimw2xd8gr"
- }
- },
- {
- "ename": "tree-sitter-langs",
- "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3",
- "sha256": "147p5hmpys4qhg5ymsmgbc3wx3x2jjw625waprfph7sr6h2cfrps",
- "fetcher": "github",
- "repo": "ubolonton/emacs-tree-sitter",
- "unstable": {
- "version": [
- 20210212,
- 1035
- ],
- "deps": [
- "tree-sitter"
- ],
- "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1",
- "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2"
+ "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4",
+ "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53"
},
"stable": {
"version": [
0,
- 13,
- 1
+ 3
+ ],
+ "deps": [
+ "seq",
+ "tree-sitter"
+ ],
+ "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4",
+ "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53"
+ }
+ },
+ {
+ "ename": "tree-sitter-langs",
+ "commit": "4029e21f74841db0c82f4a343a3b51b09cae2f25",
+ "sha256": "0jygxdlh94blfn5gxn949ic2v2x49cvl0rfzmvig3igyfwmm33sp",
+ "fetcher": "github",
+ "repo": "ubolonton/tree-sitter-langs",
+ "unstable": {
+ "version": [
+ 20210228,
+ 1450
],
"deps": [
"tree-sitter"
],
- "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2",
- "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v"
+ "commit": "fcd267f5d141b0de47f0da16306991ece93100a1",
+ "sha256": "0vyln2gh7x6fkn1wm5z81ibbn7ly440zb68yg7xmyvmxy8xyqfmm"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 9,
+ 2
+ ],
+ "deps": [
+ "tree-sitter"
+ ],
+ "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747",
+ "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h"
}
},
{
@@ -102275,22 +102845,21 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20210201,
- 1800
+ 20210228,
+ 1117
],
"deps": [
"ace-window",
"cfrs",
"cl-lib",
"dash",
- "f",
"ht",
"hydra",
"pfuture",
"s"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102326,8 +102895,8 @@
"all-the-icons",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
}
},
{
@@ -102345,8 +102914,8 @@
"evil",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102375,8 +102944,8 @@
"deps": [
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102407,8 +102976,8 @@
"pfuture",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102440,8 +103009,8 @@
"persp-mode",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102473,8 +103042,8 @@
"perspective",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
}
},
{
@@ -102492,8 +103061,8 @@
"projectile",
"treemacs"
],
- "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a",
- "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd"
+ "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1",
+ "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss"
},
"stable": {
"version": [
@@ -102750,8 +103319,8 @@
20210116,
621
],
- "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1",
- "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2"
+ "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7",
+ "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg"
},
"stable": {
"version": [
@@ -103494,8 +104063,8 @@
20200701,
1435
],
- "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca",
- "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j"
+ "commit": "f4db4c9b9875134df6f5279281099361ae11c2e9",
+ "sha256": "0s88mz3x9iwz4hj1n4l4nmya473hcv8wsps8dyx4mmgzgpdb1lvf"
}
},
{
@@ -103509,8 +104078,8 @@
20201218,
400
],
- "commit": "702210384a0c68f04aabc23e08ebd4d6f43ea2c7",
- "sha256": "0brd92jln528j7hh8gyv5wz451cfpayvkz9fic7b0wisnwgvq26b"
+ "commit": "a0389147365c10c974ad68b797b185affb935fe3",
+ "sha256": "0qdls5h0ryh93ziwd5gibhknz8n9v66fyp55iwjk8zblgahnm6ym"
}
},
{
@@ -104378,8 +104947,8 @@
20210124,
138
],
- "commit": "727aa7809b2e3ea09a36c61740d04e316ee21070",
- "sha256": "1c83gialj6ydm1h4075fk70yr84199s6235jfzc9c7h44jf88gvn"
+ "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d",
+ "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2"
}
},
{
@@ -104528,14 +105097,14 @@
"repo": "dougm/vagrant-tramp",
"unstable": {
"version": [
- 20200118,
- 2324
+ 20210217,
+ 704
],
"deps": [
"dash"
],
- "commit": "f67925928dd844b74e4002f433e6f0ebd3aae357",
- "sha256": "1s022vcjzm78v1j7z29pda3lk9x93fvks4qw5v9kh2yzsrxdq4h8"
+ "commit": "5f00b42a0c023c461cef7af4de7652d90c788b4d",
+ "sha256": "1mshxcbwdjs2fs7lzqhs3pqbmdmy2fyzkf9b6r8rsxqlisa4x6sn"
}
},
{
@@ -104643,11 +105212,11 @@
"repo": "thisirs/vc-auto-commit",
"unstable": {
"version": [
- 20170107,
- 1333
+ 20210216,
+ 1517
],
- "commit": "446f664f4ec835532f4f18ba18b5fb731f6030aa",
- "sha256": "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav"
+ "commit": "56f478016a541b395092a9d3cdc0da84a37b30a1",
+ "sha256": "1aw5j6akrkzr4pgf10scbfqr9axny3pf3k7yslg7g5ss1fd71afl"
}
},
{
@@ -104658,11 +105227,11 @@
"repo": "thisirs/vc-check-status",
"unstable": {
"version": [
- 20170107,
- 1334
+ 20210216,
+ 1525
],
- "commit": "37734beb16bfd8633ea328059bf9a47eed826d5c",
- "sha256": "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra"
+ "commit": "d95ef8f0799cd3dd83726ffa9b01b076f378ce34",
+ "sha256": "10sr9qxfx64f7a2kj93vi7lmm1pdj6qf81ci0ykkmrffmjdlf846"
}
},
{
@@ -105062,15 +105631,15 @@
"repo": "applied-science/emacs-vega-view",
"unstable": {
"version": [
- 20200520,
- 1202
+ 20210227,
+ 1507
],
"deps": [
"cider",
"parseedn"
],
- "commit": "8a9e3f9344fd1b81ec52ea9655313c0490ab5d7b",
- "sha256": "1b49lszx5gs9yc1zisklqqgijygdnfy2zryhipn7i1nvmpjzglv9"
+ "commit": "bb8159ad25886d81fcc2d3a9ec5af7ef669a87a6",
+ "sha256": "18g0fygi8dgwj2harnrqvilv0v3rrrdphqybmnshjmnfngkak55s"
}
},
{
@@ -105883,11 +106452,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20210209,
- 356
+ 20210217,
+ 737
],
- "commit": "a3fadd28370aa43f03d4f7b197be8fa074f311f5",
- "sha256": "02vy7kxpv3k1viyf977apk0nmr53wb988h8zv19w1llp9lwa578f"
+ "commit": "e19da61668783239e47b1a7390fca10f38ceffa9",
+ "sha256": "04x9514vl8315racjn3c4b1kp6wiy33d1q7b637zfzsf6w72ybpa"
}
},
{
@@ -105898,14 +106467,14 @@
"repo": "jixiuf/vterm-toggle",
"unstable": {
"version": [
- 20210130,
- 1149
+ 20210226,
+ 1800
],
"deps": [
"vterm"
],
- "commit": "277a2071426562c385f87ef265dfafaf5051afb3",
- "sha256": "10y2qxz3rz746sbfmkff0rh1vcjjdlkc9dw5gy5k1qnj8b3mi8pg"
+ "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03",
+ "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m"
}
},
{
@@ -105989,8 +106558,8 @@
"repo": "mihaiolteanu/vuiet",
"unstable": {
"version": [
- 20210208,
- 827
+ 20210216,
+ 751
],
"deps": [
"bind-key",
@@ -105999,8 +106568,8 @@
"s",
"versuri"
],
- "commit": "7063ccde4269925827283553f794bfe48866ffda",
- "sha256": "1bkwlwa95v967bpafzkgjv0ac4h8nknjlwdsgslvanfxz046py15"
+ "commit": "196683c3860793f2255bd0b3091ac9d538fa3ba7",
+ "sha256": "1465fx3h6ylgqg98m08ja0f48xwsxqai1vnigbb1fwlaxg3k23lm"
},
"stable": {
"version": [
@@ -106085,11 +106654,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20210201,
- 2305
+ 20210226,
+ 23
],
- "commit": "54c3ccd9b3fa9becc4b108046b117ccd6384449d",
- "sha256": "024drmvh1qv2sbl5nxvyrqbwlk4wk8bfsa08rn21rhlbnwknb5ip"
+ "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37",
+ "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph"
}
},
{
@@ -106648,11 +107217,14 @@
"repo": "eschulte/emacs-web-server",
"unstable": {
"version": [
- 20201217,
- 1252
+ 20210209,
+ 58
],
- "commit": "4d865cc4720f668aed7a8c3bcfddfbf534ecfb67",
- "sha256": "14kx3anbffs53hdcq7347b3rd33lk6ajvwrz5mhnnj1kmdxy7dxh"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "3aa5084bcb733aa77997b9210b4437903f6f29ce",
+ "sha256": "1cg27byi1g0s3yfzdkji4xzc15ci5kqb2j0mj5dfdms4db12dir4"
}
},
{
@@ -106699,14 +107271,14 @@
"repo": "emacs-love/weblorg",
"unstable": {
"version": [
- 20210211,
- 255
+ 20210222,
+ 102
],
"deps": [
"templatel"
],
- "commit": "95ee894dea36ac1f0d39266169123ee1ba7674ed",
- "sha256": "1ap1nk9f560qvggvpknnk33xjbk7n4hisiv98xin20s60vjwspx3"
+ "commit": "96aa798389536eee543ffeb0fa3c34dbd123c359",
+ "sha256": "0mjgw2rs67h6jgpjnidsbb4xly8dmxwgblas5vi1ddqfppzchgfr"
},
"stable": {
"version": [
@@ -106885,11 +107457,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20210212,
- 1514
+ 20210227,
+ 1749
],
- "commit": "2c0ade85ef96ce311dcf10f915af5c3696c333bf",
- "sha256": "173csa3pv5230q9r9iz5j3nf34m8kd9jcrcvc17yv5bp7njmak4d"
+ "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56",
+ "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp"
}
},
{
@@ -107570,15 +108142,15 @@
"repo": "bmag/emacs-purpose",
"unstable": {
"version": [
- 20210211,
- 1713
+ 20210214,
+ 1451
],
"deps": [
"imenu-list",
"let-alist"
],
- "commit": "76b2298c27e69941ed5200363fbcac7487875f83",
- "sha256": "0slbhn09vbv10mxmgym0fmk4yf28q9aj2bnmkf2fh3p766ps9n1a"
+ "commit": "cb61b9381ef9865e725c4641588d7b8945d35003",
+ "sha256": "0ppx6kbc03l18z0dwd6y0anf8bqnf9vcpdz7h552q8sycrrwfq0h"
},
"stable": {
"version": [
@@ -108123,8 +108695,8 @@
"repo": "abo-abo/worf",
"unstable": {
"version": [
- 20210128,
- 1005
+ 20210224,
+ 1905
],
"deps": [
"ace-link",
@@ -108132,8 +108704,8 @@
"swiper",
"zoutline"
],
- "commit": "718ad44ff340e0298ee843130067f42d799350a4",
- "sha256": "16nqx4ridk6asibxhp9l8pw33kc862i42wkjm14m8r5y6gi67k7d"
+ "commit": "eed052db551f60483b4189e9c87cbb16f6d5947a",
+ "sha256": "1800q96gchagwqplpwscgjqb9f7zcc0qb2z07cbq6a17dc4rqcpl"
},
"stable": {
"version": [
@@ -108582,11 +109154,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20210212,
- 2334
+ 20210224,
+ 2052
],
- "commit": "3e5c9db36b9a01b485fffd12219a1685ea1e1fc6",
- "sha256": "03496m1vs7kkh2rwymj5nbr2cv07s3vdlic9mm30rim0cpw3gax6"
+ "commit": "df7001159f7e8c9a61c0e360e8ea47b51deb38d9",
+ "sha256": "1hcm86w7mkc3ms2hy1fljjnk88yin1lax6ww3aq7r2yijjsv9a4w"
}
},
{
@@ -109087,8 +109659,8 @@
20210110,
640
],
- "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7",
- "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6"
+ "commit": "9f0cd128fd118fbdf9ea64816c38c0d45adb9733",
+ "sha256": "0c326d218p8pp1dcs1zz3q2mgvda82c9drh73hgb8n610f2gvd9d"
}
},
{
@@ -109356,8 +109928,8 @@
20200511,
2005
],
- "commit": "91159ce448e3bc9cc5759051e2b126599567893e",
- "sha256": "1f0zb417y40iwx3x116lyp74hv9x6z5c500ydvig3qsjf7l82dx2"
+ "commit": "96068216a4f0c4894bf780cd36164fe840cf81d5",
+ "sha256": "11wrvmnr74pqga8a00gd4zskan8wkgah9fyn0bwgp0x4qx4xni17"
}
},
{
@@ -109981,11 +110553,11 @@
"repo": "ryuslash/yoshi-theme",
"unstable": {
"version": [
- 20210201,
- 605
+ 20210216,
+ 29
],
- "commit": "77036b1067c16451cbc9fdca254f31b6725b795b",
- "sha256": "0dm9rd0dr1dv6adq4rmj3z9l94y2jq1kd8p1d2r3qw6jqz8w035d"
+ "commit": "eb2a38c71a955fa934ac7a907b9924b3755e40c7",
+ "sha256": "0zvk10mgy3q10qmigqx2g1vfxvrwzs27lq4gq0qkh7k4qish2zgx"
},
"stable": {
"version": [
@@ -110039,11 +110611,11 @@
"repo": "spiderbit/ytdious",
"unstable": {
"version": [
- 20210207,
- 1841
+ 20210228,
+ 2111
],
- "commit": "6005ff920b7df97724094b1afa2a6a3d0fcc6a60",
- "sha256": "17dp67awxpv8zi961rbhzgzkyxvnj2498p6ld0bjh3v7nqg0zfwg"
+ "commit": "941460b51e43ef6764e15e2b9c4af54c3e56115f",
+ "sha256": "0ihqzxahqvk8jnn05k06lzhi6pd9c1a2q7qqybnmds85amkwmsad"
}
},
{
@@ -110360,25 +110932,25 @@
"repo": "NicolasPetton/zerodark-theme",
"unstable": {
"version": [
- 20210212,
- 956
+ 20210216,
+ 1640
],
"deps": [
"all-the-icons"
],
- "commit": "744c1a5b06277f0f9b70abb30a93b35818773532",
- "sha256": "1v5by5kq7ifqz172x80y3ddlkywl3dccvqvz6skxq7rz8w4gx5d3"
+ "commit": "65a4b57d064cd4bfe61750d105206c3654ac5bba",
+ "sha256": "1jiyz68pswbmh5fbkwndw83kim150rg2wz7i2a5lac3vj7zqr0nc"
},
"stable": {
"version": [
4,
- 6
+ 7
],
"deps": [
"all-the-icons"
],
- "commit": "df22536a244293591575e56970bf83814faa7c14",
- "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6"
+ "commit": "342055346446bb8306ac2d3d2ac1f4236c84a404",
+ "sha256": "1r5s4mvwlxsb9ylr6dkfxpm1l0pbqkmn5gwjdcfk762cnxlam8cm"
}
},
{
@@ -110389,15 +110961,15 @@
"repo": "EFLS/zetteldeft",
"unstable": {
"version": [
- 20201230,
- 2127
+ 20210214,
+ 1135
],
"deps": [
"ace-window",
"deft"
],
- "commit": "09d31b083e0d08bd4dda3e60af44711c090140b0",
- "sha256": "14hawr28rcr4scjchjx71g6wvvnym9ai20iz615a751iilg4mw7a"
+ "commit": "8ea36747ff499e82a911c367eba8f7423c6301a4",
+ "sha256": "0p0hz0s3fzpig3vinj7wv3vs29ba5rshw4glxrk3q1hlv3hh4q4s"
},
"stable": {
"version": [
@@ -110796,15 +111368,15 @@
"repo": "egh/zotxt-emacs",
"unstable": {
"version": [
- 20210115,
- 456
+ 20210222,
+ 347
],
"deps": [
"deferred",
"request"
],
- "commit": "87d8c4836c5f43530db8f00a66b7b69087236875",
- "sha256": "01w529yr96kx7xg2w670ci61aljd1alrbqy1qxnj9yiymqsnmys1"
+ "commit": "a760009b9ecfa0b3362e77a6b44453821768d02e",
+ "sha256": "0vfdpgb0ln3xrx4i32mqisaj7qm2yx73rhagx6adr8hjw78gysfy"
},
"stable": {
"version": [
@@ -110902,14 +111474,14 @@
"repo": "fourier/ztree",
"unstable": {
"version": [
- 20210210,
- 2022
+ 20210215,
+ 2111
],
"deps": [
"cl-lib"
],
- "commit": "6eee81d2691009ce60b2edf7c298b227caf1b0d6",
- "sha256": "1xmimjflylssx63g1kpd5n34gdlpivgg9ih8nwplad57bxiy2yqb"
+ "commit": "dc5f76923436ea87b802b56a54185b6888177a8c",
+ "sha256": "17y1hjhygh2kq487ab1s8n2ba9npdmqg6354jv3gha6ar3mib1qi"
}
},
{
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix
deleted file mode 100644
index a151006a99..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/26.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-import ./generic.nix (rec {
- version = "26.3";
- sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
- patches = [
- ./clean-env-26.patch
- ./tramp-detect-wrapped-gvfsd-26.patch
- ];
-})
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix
index 1037c0cd91..8bc65bad8b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/27.nix
@@ -2,7 +2,6 @@ import ./generic.nix (rec {
version = "27.1";
sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
patches = [
- ./clean-env.patch
./tramp-detect-wrapped-gvfsd.patch
];
})
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch
deleted file mode 100644
index 88befda899..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Dump temacs in an empty environment to prevent -dev paths from ending
-up in the dumped image.
-
-diff --git a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
- ln -f temacs$(EXEEXT) $@
- else
- unset EMACS_HEAP_EXEC; \
-- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
-+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
- ifneq ($(PAXCTL_dumped),)
- $(PAXCTL_dumped) $@
- endif
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
deleted file mode 100644
index 2ffe8b777a..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Dump temacs in an empty environment to prevent -dev paths from ending
-up in the dumped image.
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fd05a45df5..13f529c253 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
- lisp.mk $(etc)/DOC $(lisp) \
- $(lispsource)/international/charprop.el ${charsets}
- ifeq ($(DUMPING),unexec)
-- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
-+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
- ifneq ($(PAXCTL_dumped),)
- $(PAXCTL_dumped) emacs$(EXEEXT)
- endif
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
index 70e253dd6d..6726790d50 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix
@@ -63,6 +63,12 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
rm -fr .git
'')
+ # Reduce closure size by cleaning the environment of the emacs dumper
+ ''
+ substituteInPlace src/Makefile.in \
+ --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
+ ''
+
''
substituteInPlace lisp/international/mule-cmds.el \
--replace /usr/share/locale ${gettext}/share/locale
@@ -130,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets"
- ++ lib.optional nativeComp "--with-nativecomp"
+ ++ lib.optional nativeComp "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix
index 3c57d3bc81..b8fcc678fa 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
};
- patches = [ ./clean-env.patch ];
-
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config autoconf automake ];
@@ -57,6 +55,11 @@ stdenv.mkDerivation rec {
# Fix sandbox impurities.
substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd'
substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd'
+
+
+ # Reduce closure size by cleaning the environment of the emacs dumper
+ substituteInPlace src/Makefile.in \
+ --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
'';
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupp/default.nix
index e134113e23..c31c1fe10c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jupp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jupp/default.nix
@@ -1,31 +1,41 @@
-{ lib, stdenv, fetchurl, ncurses, gpm }:
+{ lib
+, stdenv
+, fetchurl
+, ncurses
+, gpm
+}:
stdenv.mkDerivation rec {
-
pname = "jupp";
- version = "39";
+ version = "40";
srcName = "joe-3.1${pname}${version}";
src = fetchurl {
urls = [
"https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz"
- "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
- sha256 = "14gys92dy3kq9ikigry7q2x4w5v2z76d97vp212bddrxiqy5np8d";
+ "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz"
+ ];
+ sha256 = "S+1DnN5/K+KU6W5J7z6RPqkPvl6RTbiIQD46J+gDWxo=";
};
preConfigure = "chmod +x ./configure";
- buildInputs = [ ncurses gpm ];
+ buildInputs = [
+ gpm
+ ncurses
+ ];
configureFlags = [
"--enable-curses"
- "--enable-termcap"
- "--enable-termidx"
"--enable-getpwnam"
"--enable-largefile"
+ "--enable-termcap"
+ "--enable-termidx"
];
meta = with lib; {
+ homepage = "http://www.mirbsd.org/jupp.htm";
+ downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/";
description = "A portable fork of Joe's editor";
longDescription = ''
This is the portable version of JOE's Own Editor, which is currently
@@ -35,8 +45,8 @@ stdenv.mkDerivation rec {
and has a lot of bugs fixed. It is based upon an older version of joe
because these behave better overall.
'';
- homepage = "http://www.mirbsd.org/jupp.htm";
- license = licenses.gpl1;
+ license = licenses.gpl1Only;
maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
index 7ac56d9cb1..451507885c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/wrapper.nix
@@ -9,7 +9,7 @@ in
symlinkJoin {
name = "kakoune-${kakoune.version}";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
paths = [ kakoune ] ++ requestedPlugins;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix
index e0704cdbc8..aa7b7b1944 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix
@@ -29,7 +29,8 @@ in
inherit sha256;
};
- buildInputs = [ makeWrapper libXScrnSaver ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ libXScrnSaver ];
desktopItem = makeDesktopItem {
name = "kodestudio";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
index 63be87ee86..90879b352e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = metadata.sha256;
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
index cb53eb9d9d..b552528556 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix
@@ -16,11 +16,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
- version = "5.5";
+ version = "5.6.1";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
- sha256 = "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr";
+ sha256 = "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix
index 208339c2e3..8e86683f9b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
# The default build script tries to get the version through Git, so we
# replace it
- prePatch = ''
+ postPatch = ''
cat << EOF > build.rs
use std::env;
use std::fs::File;
@@ -31,13 +31,13 @@ rustPlatform.buildRustPackage rec {
f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
}
EOF
+
+ # Install the binary ourselves, since the Makefile doesn't have the path
+ # containing the target architecture
+ sed -e "/target\/release/d" -i Makefile
'';
- buildPhase = ''
- make build
- '';
-
- installPhase = ''
+ postInstall = ''
make install PREFIX="${placeholder "out"}"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
index 5c6c6c1a8d..41ff62a619 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix
@@ -106,7 +106,7 @@ let
preferLocalBuild = true;
- buildInputs = [makeWrapper];
+ nativeBuildInputs = [ makeWrapper ];
passthru = { unwrapped = neovim; };
meta = neovim.meta // {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
index 9206b296b9..f968b85c6f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
@@ -56,7 +56,8 @@ stdenv.mkDerivation {
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
- buildInputs = [ makeWrapper perl python unzip libicns imagemagick ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl python unzip libicns imagemagick ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix
new file mode 100644
index 0000000000..1c6f005863
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix
@@ -0,0 +1,74 @@
+{ lib
+, stdenv
+, fetchurl
+, gettext
+, help2man
+, pkg-config
+, texinfo
+, makeWrapper
+, boehmgc
+, readline
+, guiSupport ? false, tcl, tcllib, tk
+, miSupport ? true, json_c
+, nbdSupport ? true, libnbd
+, textStylingSupport ? true
+, dejagnu
+}:
+
+let
+ isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+in stdenv.mkDerivation rec {
+ pname = "poke";
+ version = "1.0";
+
+ src = fetchurl {
+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+ hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo=";
+ };
+
+ postPatch = ''
+ patchShebangs .
+ '';
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ gettext
+ help2man
+ pkg-config
+ texinfo
+ ] ++ lib.optional guiSupport makeWrapper;
+
+ buildInputs = [ boehmgc readline ]
+ ++ lib.optional guiSupport tk
+ ++ lib.optional miSupport json_c
+ ++ lib.optional nbdSupport libnbd
+ ++ lib.optional textStylingSupport gettext
+ ++ lib.optional (!isCross) dejagnu;
+
+ configureFlags = lib.optionals guiSupport [
+ "--with-tcl=${tcl}/lib"
+ "--with-tk=${tk}/lib"
+ "--with-tkinclude=${tk.dev}/include"
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = !isCross;
+ checkInputs = lib.optionals (!isCross) [ dejagnu ];
+
+ postFixup = lib.optionalString guiSupport ''
+ wrapProgram "$out/bin/poke-gui" \
+ --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version}
+ '';
+
+ meta = with lib; {
+ description = "Interactive, extensible editor for binary data";
+ homepage = "http://www.jemarch.net/poke";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres metadark ];
+ platforms = platforms.unix;
+ };
+}
+
+# TODO: Enable guiSupport by default once it's more than just a stub
diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix
index e66febbf7f..0d50c24d39 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
-, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
+, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
let
version = "3.5.18";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix
index e474ff5f19..6e3580a563 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/supertux-editor/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ];
installPhase = ''
mkdir -p $out/bin $out/lib/supertux-editor
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix
index 6ea6b6c609..7ed3dee9b6 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim-configurable.nix
@@ -29,7 +29,7 @@ let
"/Applications/MacVim.app/Contents/MacOS"
"/Applications/MacVim.app/Contents/bin"
];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# We need to do surgery on the resulting app. We can't just make a wrapper for vim because this
# is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's
# path to locate the bundle. We can use symlinks for other executables and resources though.
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
index c30b52782e..d2c91f155d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix
@@ -57,7 +57,8 @@ in
# When no extensions are requested, we simply redirect to the original
# non-wrapped vscode executable.
runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
- buildInputs = [ vscode makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ vscode ];
dontPatchELF = true;
dontStrip = true;
meta = vscode.meta;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
rename to third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
index 66ad424253..a6b4af7892 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "6.9.11-60";
+ version = "6.9.12-1";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
- sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0";
+ sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -77,7 +77,8 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "http://www.imagemagick.org/";
+ homepage = "https://legacy.imagemagick.org/";
+ changelog = "https://legacy.imagemagick.org/script/changelog.php";
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
index 902fb43047..0a90b84892 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "4.11.2";
+ version = "4.12.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "sha256-gE00Pukkf5wXP+SGqJgKJeLR82VtH/iwFNYkBb4Z8q0=";
+ sha256 = "sha256-qbG0Ii3Xmj1UGGS+n+LdiNPAHBkpQZMGEzrDvOcaUNA=";
};
libPath = lib.makeLibraryPath (with xorg; [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix
new file mode 100644
index 0000000000..174733a4fd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_8 }:
+
+stdenv.mkDerivation rec {
+ pname = "blockbench-electron";
+ version = "3.7.5";
+
+ src = fetchurl {
+ url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
+ sha256 = "0qqklhncd4khqmgp7jg7wap2rzkrg8b6dflmz0wmm5zxxp5vcy1c";
+ name = "${pname}-${version}.AppImage";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ name = "${pname}-${version}";
+ inherit src;
+ };
+
+ dontUnpack = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin $out/share/${pname} $out/share/applications
+ cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+ cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop
+ cp -a ${appimageContents}/usr/share/icons $out/share
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/resources/app.asar \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+ '';
+
+ meta = with lib; {
+ description = "A boxy 3D model editor powered by Electron";
+ homepage = "https://blockbench.net/";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.ronthecookie ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
index 31dff2f9c2..82007caea9 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "14.1.5";
+ version = "14.4.3";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
- hash = "sha256-dM/DGtUDnJBD4Cfhm/zbxfgBhUcIlEzlF4z3cmQuW14=";
+ hash = "sha256-0wBjZg6IvjVTzAGeXTBBZjIN6s9NxKV0r76YK9h4fFk=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
index 1c4f05b42d..57d1f794d0 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
@@ -1,9 +1,8 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
-gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }:
-
-assert mpi != null;
+gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi,
+spaceNavSupport ? true, libspnav, qtx11extras }:
let
pythonPackages = python3Packages;
@@ -34,7 +33,7 @@ in mkDerivation rec {
matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
GitPython # for addon manager
scipy pyyaml # (at least for) PyrateWorkbench
- ]);
+ ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ];
cmakeFlags = [
"-DBUILD_QT5=ON"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
index 8fde04d0d1..bb81a374fe 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix
@@ -11,7 +11,7 @@ in symlinkJoin {
paths = [ gimp ] ++ selectedPlugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in gimp-${versionBranch} gimp-console-${versionBranch}; do
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix b/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix
index cdfb2f6687..daa540d31e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/glimpse/wrapper.nix
@@ -12,7 +12,7 @@ symlinkJoin {
paths = [ glimpse ] ++ selectedPlugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix
index 24e064e721..583dcf7c61 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-shared"
+ "--with-frozenpaths"
"--with-quantum-depth=${toString quantumdepth}"
"--with-gslib=yes"
];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
index 7e3238e94b..312316b339 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix
@@ -15,7 +15,8 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
};
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
inherit jre;
# JAR files that are intended to be used by other packages
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix
index cca7b1fc3a..c558a6bb06 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/with-extensions.nix
@@ -10,7 +10,7 @@ symlinkJoin {
paths = [ inkscape ] ++ inkscapeExtensions;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
rm -f $out/bin/inkscape
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
index bd9ad301d3..204d87a59c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
description = "Popular photo organizer for the GNOME desktop";
homepage = "https://wiki.gnome.org/Apps/Shotwell";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [domenkozar];
+ maintainers = with maintainers; [];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
index 98348129d9..b00f7f3321 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchgit, cmake, pkg-config, zlib, libpng, cairo, freetype
-, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre
-, wrapGAppsHook
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype
+, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook
}:
stdenv.mkDerivation rec {
- name = "solvespace-2.3-20190501";
- rev = "e7b75f19c34c923780db776592b47152650d8f22";
- src = fetchgit {
- url = "https://github.com/solvespace/solvespace";
- inherit rev;
- sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2";
+ pname = "solvespace";
+ version = "v3.0.rc2";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm";
fetchSubmodules = true;
};
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
+# include(GetGitCommitHash)
# and instead uncomment the following, adding the complete git hash of the checkout you are using:
-# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
- +set(GIT_COMMIT_HASH $rev)
+ +set(GIT_COMMIT_HASH $version)
EOF
'';
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A parametric 3d CAD program";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = [ maintainers.edef ];
platforms = platforms.linux;
homepage = "http://solvespace.com";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
index 313920d815..1dfc4393c4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/wrapper.nix
@@ -17,7 +17,7 @@ let
tesseractWithData = tesseractBase.overrideAttrs (_: {
inherit tesseractBase tessdata;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
index 0c5c8f3ff2..3187f573de 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/unigine-valley/default.nix
@@ -38,7 +38,7 @@ in
sourceRoot = "Unigine_Valley-${version}";
instPath = "lib/unigine/valley";
- buildInputs = [file makeWrapper];
+ nativeBuildInputs = [file makeWrapper];
libPath = lib.makeLibraryPath [
stdenv.cc.cc # libstdc++.so.6
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
index 2076723a37..ad94c79e0f 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
@@ -2,9 +2,9 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
qtwebengine,
- grantlee,
+ grantlee, grantleetheme,
kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
- akonadi, akonadi-mime, kcontacts, kmime,
+ akonadi, akonadi-mime, kcontacts, kmime, libkleo,
}:
mkDerivation {
@@ -16,9 +16,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtwebengine
- grantlee
+ grantlee grantleetheme
kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
- akonadi-mime kcontacts kmime
+ akonadi-mime kcontacts kmime libkleo
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
index 58390cba22..3e5ccc9cda 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
@@ -1,6 +1,6 @@
-From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001
+From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
-Date: Mon, 13 Jul 2020 11:41:19 -0500
+Date: Sun, 31 Jan 2021 11:00:03 -0600
Subject: [PATCH 1/3] akonadi paths
---
@@ -11,10 +11,10 @@ Subject: [PATCH 1/3] akonadi paths
4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
-index 23b4a1f..c13b658 100644
+index 31e0cf2..6436e87 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -61,7 +61,7 @@ public:
+@@ -48,7 +48,7 @@ public:
[]() {
QCoreApplication::instance()->exit(255);
});
@@ -23,7 +23,7 @@ index 23b4a1f..c13b658 100644
}
~StorageProcessControl() override
-@@ -84,7 +84,7 @@ public:
+@@ -70,7 +70,7 @@ public:
[]() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
});
@@ -33,10 +33,10 @@ index 23b4a1f..c13b658 100644
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
-index 4e58f7e..e8bb532 100644
+index c98946c..aa307ca 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
+@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
@@ -46,10 +46,10 @@ index 4e58f7e..e8bb532 100644
}
return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index cac40f5..527649b 100644
+index d595a3a..99324f6 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@@ -57,7 +57,7 @@ index cac40f5..527649b 100644
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
-@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
const bool defaultInternalServer = true;
@@ -75,7 +75,7 @@ index cac40f5..527649b 100644
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
-@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
}
@@ -88,7 +88,7 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -97,7 +97,7 @@ index cac40f5..527649b 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
-@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings)
+@@ -127,9 +117,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi");
}
@@ -107,17 +107,17 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
-@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings)
- settings.setValue(QStringLiteral("Name"), mDatabaseName);
- settings.setValue(QStringLiteral("Host"), mHostName);
- settings.setValue(QStringLiteral("Options"), mConnectionOptions);
-- if (!mMysqldPath.isEmpty()) {
-- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
-- }
- settings.setValue(QStringLiteral("StartServer"), mInternalServer);
- settings.endGroup();
- settings.sync();
-@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
+ settings.setValue(QStringLiteral("Name"), mDatabaseName);
+ settings.setValue(QStringLiteral("Host"), mHostName);
+ settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+- if (!mMysqldPath.isEmpty()) {
+- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
+- }
+ settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+ settings.endGroup();
+ settings.sync();
+@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer()
#endif
// generate config file
@@ -127,10 +127,10 @@ index cac40f5..527649b 100644
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 09cdbd5..1c8996b 100644
+index dd273fc..05288d9 100644
--- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@@ -140,7 +140,7 @@ index 09cdbd5..1c8996b 100644
QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
-@@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) {
@@ -154,7 +154,7 @@ index 09cdbd5..1c8996b 100644
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
-@@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings)
+@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -177,14 +177,14 @@ index 09cdbd5..1c8996b 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) {
-@@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
- settings.setValue(QStringLiteral("Port"), mHostPort);
- }
- settings.setValue(QStringLiteral("Options"), mConnectionOptions);
-- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
- settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
- settings.setValue(QStringLiteral("StartServer"), mInternalServer);
- settings.endGroup();
+@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
+ settings.setValue(QStringLiteral("Port"), mHostPort);
+ }
+ settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
+ settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
+ settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+ settings.endGroup();
--
-2.25.4
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
index ac9b3146e1..24f59f6791 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
@@ -1,6 +1,6 @@
-From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001
+From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
-Date: Mon, 13 Jul 2020 11:41:35 -0500
+Date: Sun, 31 Jan 2021 11:00:15 -0600
Subject: [PATCH 2/3] akonadi timestamps
---
@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] akonadi timestamps
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 527649b..08c3dd4 100644
+index 99324f6..3c170a8 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
@@ -22,5 +22,5 @@ index 527649b..08c3dd4 100644
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--
-2.25.4
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
index 1a0bc000c8..3aa61da73e 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
@@ -1,6 +1,6 @@
-From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001
+From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
-Date: Mon, 13 Jul 2020 11:41:55 -0500
+Date: Sun, 31 Jan 2021 11:01:24 -0600
Subject: [PATCH 3/3] akonadi revert make relocatable
---
@@ -9,10 +9,10 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d927471..83a74c0 100644
+index 4bb5fec..35720b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -330,9 +330,6 @@ configure_package_config_file(
+@@ -343,9 +343,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@@ -23,29 +23,23 @@ index d927471..83a74c0 100644
install(FILES
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
-index 421e1df..e3abf27 100644
+index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.cmake.in
-@@ -24,8 +24,8 @@ if(BUILD_TESTING)
- find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
- endif()
+@@ -1,10 +1,10 @@
+ @PACKAGE_INIT@
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
- find_dependency(Boost "@Boost_MINIMUM_VERSION@")
-
-@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
-
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
- ####################################################################################
- # CMAKE_AUTOMOC
+ # set the directories
+ if(NOT AKONADI_INSTALL_DIR)
--
-2.25.4
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
index d24e19f89e..e0b0e2324b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
- signond,
+ signond, lzma,
}:
mkDerivation {
@@ -21,7 +21,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin
- ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond
+ ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond
];
propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix
index 69a56254d6..ef27380a33 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/ark/default.nix
@@ -1,18 +1,12 @@
-{
- mkDerivation, lib, config,
-
- extra-cmake-modules, kdoctools,
-
- breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n,
- kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons,
-
- libarchive, libzip,
-
- # Archive tools
- p7zip, lrzip,
-
- # Unfree tools
- unfreeEnableUnrar ? false, unrar,
+{ mkDerivation, lib, config
+, extra-cmake-modules, kdoctools
+, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
+, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
+, libarchive, libzip
+# Archive tools
+, p7zip, lrzip
+# Unfree tools
+, unfreeEnableUnrar ? false, unrar
}:
let
@@ -21,20 +15,23 @@ in
mkDerivation {
pname = "ark";
- meta = {
- description = "Graphical file compression/decompression utility";
- license = with lib.licenses;
- [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
- maintainers = [ lib.maintainers.ttuegel ];
- };
outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
buildInputs = [ libarchive libzip ] ++ extraTools;
+
propagatedBuildInputs = [
breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
kitemmodels kparts kpty kservice kwidgetsaddons
];
qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
+
+ meta = with lib; {
+ description = "Graphical file compression/decompression utility";
+ license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;
+ maintainers = [ maintainers.ttuegel ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
index b316ab4e56..c7ef5c4615 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
+ akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
@@ -11,16 +11,9 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- patches = [
- # Patch for Qt 5.15.2 until version 20.12.0
- (fetchpatch {
- url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch";
- sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
+ akonadi akonadi-mime akonadi-notes kcalutils kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix
index 33f392fdcc..f8719c353b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix
@@ -91,6 +91,7 @@ let
kalarm = callPackage ./kalarm.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
kalzium = callPackage ./kalzium.nix {};
+ kamoso = callPackage ./kamoso.nix {};
kapman = callPackage ./kapman.nix {};
kapptemplate = callPackage ./kapptemplate.nix { };
kate = callPackage ./kate.nix {};
@@ -109,10 +110,9 @@ let
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
- kdenlive = callPackage ./kdenlive.nix {};
+ kdenlive = callPackage ./kdenlive {};
kdepim-runtime = callPackage ./kdepim-runtime {};
kdepim-addons = callPackage ./kdepim-addons.nix {};
- kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kdialog = callPackage ./kdialog.nix {};
kdiamond = callPackage ./kdiamond.nix {};
diff --git a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
index 3774c7e00b..a558ad2667 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
@@ -5,7 +5,7 @@
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
- wayland, qtwayland
+ wayland, qtbase, qtwayland
}:
mkDerivation {
@@ -13,6 +13,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
+ broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedUserEnvPkgs = [ baloo ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
index e3bba77f97..d659c551bd 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
+++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
index 2a8b82352b..f19ee16098 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
- ffmpeg_3, kio
+ ffmpeg_3, kio, taglib
}:
mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ ffmpeg_3 kio ];
+ buildInputs = [ ffmpeg_3 kio taglib ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix
index 1aeff53186..95a89b01b8 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kio, kparts, kxmlgui, qtscript, solid
+ kio, kparts, kxmlgui, qtbase, qtscript, solid
}:
mkDerivation {
@@ -9,6 +9,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
+ broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
index 981c184d15..7f2c284ad7 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
+ akonadi, akonadi-mime, calendarsupport, eventviews,
kdiagram, kldap, kmime, pimcommon, qtbase
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
+ akonadi akonadi-mime calendarsupport eventviews kdiagram
kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix b/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix
index 452c514215..2672d815fb 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kaddressbook.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
- kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
+ kcrash, kdbusaddons, ki18n, kontactinterface, kparts,
kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
qgpgme, qtbase,
}:
@@ -13,17 +13,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- patches = [
- # Patch for Qt 5.15.2 until version 20.12.0
- (fetchpatch {
- url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch";
- sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853";
- })
- ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
- kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
+ kdbusaddons ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix b/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix
index 70ee3f7418..8709f26bd1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kalarm.nix
@@ -3,12 +3,13 @@
extra-cmake-modules,
kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools,
- kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
- knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
+ kguiaddons, ki18n, kiconthemes, kidletime, kjobwidgets, kcmutils,
+ kdelibs4support, kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
+ kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
- pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
+ pimcommon, kpimtextedit, messagelib,
qtx11extras,
@@ -24,12 +25,13 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools
- kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
- knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
+ kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils kdelibs4support
+ kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
+ kxmlgui phonon
- kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
- kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
- pimcommon kpimtextedit kdepim-apps-libs messagelib
+ kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
+ kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
+ kmime pimcommon kpimtextedit messagelib
qtx11extras
];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix b/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix
new file mode 100644
index 0000000000..3e5eb53858
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/kamoso.nix
@@ -0,0 +1,41 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, wrapQtAppsHook
+, qtdeclarative
+, qtgraphicaleffects
+, qtquickcontrols2
+, kirigami2
+, kpurpose
+, gst_all_1
+, pcre
+}:
+
+let
+ gst = with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad ];
+
+in
+mkDerivation {
+ pname = "kamoso";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
+ buildInputs = [ pcre ] ++ gst;
+ propagatedBuildInputs = [
+ qtdeclarative
+ qtgraphicaleffects
+ qtquickcontrols2
+ kirigami2
+ kpurpose
+ ];
+
+ cmakeFlags = [
+ "-DOpenGL_GL_PREFERENCE=GLVND"
+ "-DGSTREAMER_VIDEO_INCLUDE_DIR=${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
+ ];
+
+ qtWrapperArgs = [
+ "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}"
+ ];
+
+ meta.license = with lib.licenses; [ lgpl21Only gpl3Only ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
index f4dd7ec145..0287830485 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
gettext,
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
- python
+ qtbase, python
}:
mkDerivation {
@@ -11,6 +11,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.rittelle ];
+ broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
index 94656b0267..a7da03ffdd 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kcoreaddons, ki18n, kio, kwidgetsaddons, samba
+ kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase,
}:
mkDerivation {
@@ -9,7 +9,8 @@ mkDerivation {
meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
+ broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
+ buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/kde/kdenlive.nix
rename to third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/kde/ffmpeg-path.patch
rename to third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/kde/mlt-path.patch b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/kde/mlt-path.patch
rename to third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-addons.nix b/third_party/nixpkgs/pkgs/applications/kde/kdepim-addons.nix
index 0939b0ecd2..42532644a1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-addons.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdepim-addons.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
- kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
+ kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
}:
@@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
- kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
+ kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix
deleted file mode 100644
index 19f476fd78..0000000000
--- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-apps-libs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- mkDerivation, lib, kdepimTeam,
- extra-cmake-modules, kdoctools,
- akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
- kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
-}:
-
-mkDerivation {
- pname = "kdepim-apps-libs";
- meta = {
- license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
- maintainers = kdepimTeam;
- };
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [
- akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
- kcontacts ki18n kiconthemes kio libkleo pimcommon prison
- ];
- outputs = [ "out" "dev" ];
-}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix
index fa3fe03303..e742f56667 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmail.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kmail.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
- kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
+ kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
@@ -19,7 +19,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
- kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
+ kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
index a449a1e4f5..d4d49c6a94 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kompare.nix
@@ -12,15 +12,5 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
-
- patches = [
- (fetchpatch {
- # Portaway from Obsolete methods of QPrinter
- # Part of v20.12.0
- url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
- sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
- })
- ];
-
outputs = [ "out" "dev" ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix
index 72fcf8ff22..eb188ccef1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/konqueror.nix
@@ -2,7 +2,7 @@
, mkDerivation
, extra-cmake-modules, kdoctools
, kdelibs4support, kcmutils, khtml, kdesu
-, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
+, qtbase, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
}:
mkDerivation {
@@ -24,5 +24,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ ];
+ broken = lib.versionOlder qtbase.version "5.13";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix
index 3dfa28e9df..801c6845e4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kontact.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kontact.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
qtwebengine,
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
- akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
+ akonadi, grantleetheme, kontactinterface, kpimtextedit,
mailcommon, libkdepim, pimcommon
}:
@@ -17,7 +17,7 @@ mkDerivation {
buildInputs = [
qtwebengine
kcmutils kcrash kdbusaddons kparts kwindowsystem
- akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
+ akonadi grantleetheme kontactinterface kpimtextedit
mailcommon libkdepim pimcommon
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix b/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix
index f28e0406b1..a6a2842777 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/korganizer.nix
@@ -5,7 +5,7 @@
phonon,
knewstuff,
akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
- calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
+ calendarsupport, eventviews, incidenceeditor, kcalutils,
kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
kpimtextedit, pimcommon,
}:
@@ -22,7 +22,7 @@ mkDerivation {
phonon
knewstuff
akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
- calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
+ calendarsupport eventviews incidenceeditor kcalutils
kholidays kidentitymanagement kldap kmailtransport kontactinterface
kpimtextedit pimcommon
];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpat.nix b/third_party/nixpkgs/pkgs/applications/kde/kpat.nix
index d1e47af6b7..96bd6dd542 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kpat.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kpat.nix
@@ -5,6 +5,7 @@
, shared-mime-info
, libkdegames
, freecell-solver
+, black-hole-solver
}:
mkDerivation {
@@ -14,6 +15,7 @@ mkDerivation {
shared-mime-info
];
buildInputs = [
+ black-hole-solver
knewstuff
libkdegames
freecell-solver
diff --git a/third_party/nixpkgs/pkgs/applications/kde/krdc.nix b/third_party/nixpkgs/pkgs/applications/kde/krdc.nix
index 01cc39d989..b0e79b0ff8 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/krdc.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/krdc.nix
@@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools, makeWrapper,
kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
- kwindowsystem, libvncserver, freerdp
+ kwindowsystem, libvncserver, freerdp, qtbase,
}:
mkDerivation {
@@ -21,5 +21,6 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
+ broken = lib.versionOlder qtbase.version "5.14";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
index d47a550441..6709a1f072 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
- kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
+ kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qca-qt5, qtwebengine, syntax-highlighting
}:
@@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
- kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
+ kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5
syntax-highlighting
];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
index 5ff13eaf24..f78d29db6b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
@@ -4,1731 +4,1795 @@
{
akonadi = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-20.08.3.tar.xz";
- sha256 = "1hwaan45cyw2nmfmdp5pbhvm00xdxy9la68ms3sa8a67zcsfljhl";
- name = "akonadi-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz";
+ sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k";
+ name = "akonadi-20.12.1.tar.xz";
};
};
akonadi-calendar = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-20.08.3.tar.xz";
- sha256 = "18rwvn5i6i4ng335rxpwx3a2m4vyq96w9m3fa1gvmr8ls7vkaqrk";
- name = "akonadi-calendar-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz";
+ sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5";
+ name = "akonadi-calendar-20.12.1.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-tools-20.08.3.tar.xz";
- sha256 = "1pnm3xi26bnbjmnv9zwi9w5rkr1pdry50hzy3gxw7b0g11zz036w";
- name = "akonadi-calendar-tools-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz";
+ sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q";
+ name = "akonadi-calendar-tools-20.12.1.tar.xz";
};
};
akonadiconsole = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadiconsole-20.08.3.tar.xz";
- sha256 = "061r0p9pj22x0hiz6piz4vramll3w5xy92sx8nfhcp2gmnvj9890";
- name = "akonadiconsole-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz";
+ sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz";
+ name = "akonadiconsole-20.12.1.tar.xz";
};
};
akonadi-contacts = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-contacts-20.08.3.tar.xz";
- sha256 = "18n9x41fmh4q9q9lfv882iwk6j1hvgpl11y4qn873vwr9sdrcf4s";
- name = "akonadi-contacts-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz";
+ sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl";
+ name = "akonadi-contacts-20.12.1.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-import-wizard-20.08.3.tar.xz";
- sha256 = "0gny0rxvyks5w4rdb73ly06lyvz7kcfvff1268bn6i96xr83kmim";
- name = "akonadi-import-wizard-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz";
+ sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz";
+ name = "akonadi-import-wizard-20.12.1.tar.xz";
};
};
akonadi-mime = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-mime-20.08.3.tar.xz";
- sha256 = "12ps633y64mj72iryd9z2nmrf7lxbkqj7xnzj28549cvg6jizgl7";
- name = "akonadi-mime-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz";
+ sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5";
+ name = "akonadi-mime-20.12.1.tar.xz";
};
};
akonadi-notes = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-notes-20.08.3.tar.xz";
- sha256 = "1z90r37lqc7ydmily730idd4s8rcbr6i3a8x9m647snbala16z36";
- name = "akonadi-notes-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz";
+ sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm";
+ name = "akonadi-notes-20.12.1.tar.xz";
};
};
akonadi-search = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akonadi-search-20.08.3.tar.xz";
- sha256 = "0izpkvjybp6r79rai0p5j74bm0f8ksgsl3z34ggb51j6vj9rla7h";
- name = "akonadi-search-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz";
+ sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488";
+ name = "akonadi-search-20.12.1.tar.xz";
};
};
akregator = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/akregator-20.08.3.tar.xz";
- sha256 = "1gqh820s5by3r9lz7r16r0krh916idsks6sgy26hcrwfmva45wn5";
- name = "akregator-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz";
+ sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k";
+ name = "akregator-20.12.1.tar.xz";
};
};
analitza = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/analitza-20.08.3.tar.xz";
- sha256 = "16s6kjyclj73lq8z8mvrbsl75h1nrnv7syp6wpip6gvfs5ynai90";
- name = "analitza-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz";
+ sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd";
+ name = "analitza-20.12.1.tar.xz";
};
};
ark = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ark-20.08.3.tar.xz";
- sha256 = "03kwjp2nj570k9ph8bgj042sjj4x0h9jwv8nwx0pfpcxkgxv5pzy";
- name = "ark-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz";
+ sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm";
+ name = "ark-20.12.1.tar.xz";
};
};
artikulate = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/artikulate-20.08.3.tar.xz";
- sha256 = "0bx97qi6zi7jmlzm3g7qamnzg0966g4w9xpskbxbr4cgjr312x19";
- name = "artikulate-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz";
+ sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca";
+ name = "artikulate-20.12.1.tar.xz";
};
};
audiocd-kio = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/audiocd-kio-20.08.3.tar.xz";
- sha256 = "01n4nyda7l7by1nyx2sgxdl8qkdfndk0w6hj0qc6a7fllcfj5cpb";
- name = "audiocd-kio-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz";
+ sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1";
+ name = "audiocd-kio-20.12.1.tar.xz";
};
};
baloo-widgets = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/baloo-widgets-20.08.3.tar.xz";
- sha256 = "0ciidrsvwc3ppxhw7w5116q4lfbsvij9jsvyzm292pmjln2vikrg";
- name = "baloo-widgets-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz";
+ sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3";
+ name = "baloo-widgets-20.12.1.tar.xz";
};
};
blinken = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/blinken-20.08.3.tar.xz";
- sha256 = "1gfw0w66nm3sx81bnr0p0yz1bhjj63lvd3cr86x3b2pny5rcw1da";
- name = "blinken-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz";
+ sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks";
+ name = "blinken-20.12.1.tar.xz";
};
};
bomber = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/bomber-20.08.3.tar.xz";
- sha256 = "1nw1a9cf0nqgk00hvzcqch3bl97lx6bih0wsax5q0z1kzwlz0kgr";
- name = "bomber-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz";
+ sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y";
+ name = "bomber-20.12.1.tar.xz";
};
};
bovo = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/bovo-20.08.3.tar.xz";
- sha256 = "06pbivyvfgjx6zkadvwfwnrg9vjy4rf52k2a74qjcnl2ms16sr1g";
- name = "bovo-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz";
+ sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv";
+ name = "bovo-20.12.1.tar.xz";
};
};
calendarsupport = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/calendarsupport-20.08.3.tar.xz";
- sha256 = "09w06n745764fs440nh0piy5sahfn50kh3zrljhgzadcij6165vd";
- name = "calendarsupport-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz";
+ sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp";
+ name = "calendarsupport-20.12.1.tar.xz";
};
};
cantor = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/cantor-20.08.3.tar.xz";
- sha256 = "1njqycx0v3zq5mdcvfdfgxs8vgl01v80s27qgapsxxrgr9hgxbhl";
- name = "cantor-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz";
+ sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2";
+ name = "cantor-20.12.1.tar.xz";
};
};
cervisia = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/cervisia-20.08.3.tar.xz";
- sha256 = "1bsc72kxcmzx25408ngzqzj4a0168vqfr3a2gvmm6d8klbgpm3gv";
- name = "cervisia-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz";
+ sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf";
+ name = "cervisia-20.12.1.tar.xz";
};
};
dolphin = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/dolphin-20.08.3.tar.xz";
- sha256 = "107n763qix95b1hgy86hddpj9x2clzhaiw8q8yjn9lzj1rz5facx";
- name = "dolphin-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz";
+ sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp";
+ name = "dolphin-20.12.1.tar.xz";
};
};
dolphin-plugins = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/dolphin-plugins-20.08.3.tar.xz";
- sha256 = "0fmay0sycfj9s7zyxbldgcal5lj2psi0n9zrgq812s5qr4rb5c8c";
- name = "dolphin-plugins-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz";
+ sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj";
+ name = "dolphin-plugins-20.12.1.tar.xz";
};
};
dragon = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/dragon-20.08.3.tar.xz";
- sha256 = "14qsb7h8w58i9jsh1gpcj8pwjgy7y3mqfy51hca82yrd82z5b9rn";
- name = "dragon-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz";
+ sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s";
+ name = "dragon-20.12.1.tar.xz";
};
};
elisa = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/elisa-20.08.3.tar.xz";
- sha256 = "0893nbj0jsapnfd09cp961k2m7lq6sjvzynpa4hfp9ch1jbc912c";
- name = "elisa-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz";
+ sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy";
+ name = "elisa-20.12.1.tar.xz";
};
};
eventviews = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/eventviews-20.08.3.tar.xz";
- sha256 = "158j5g3i0wbbxpg9jmr50dvbpms4c4vgcnpmn3b3vfbszzwsy6rg";
- name = "eventviews-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz";
+ sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc";
+ name = "eventviews-20.12.1.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ffmpegthumbs-20.08.3.tar.xz";
- sha256 = "186hpq949r3xx2a64nqjy4pcn67d6kdvsy80zr238lgb9qqcqygi";
- name = "ffmpegthumbs-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz";
+ sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g";
+ name = "ffmpegthumbs-20.12.1.tar.xz";
};
};
filelight = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/filelight-20.08.3.tar.xz";
- sha256 = "1jljsnjdhnqphh1kanj6hi2rswq3i9119iah1j33jy5pladcyf5q";
- name = "filelight-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz";
+ sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i";
+ name = "filelight-20.12.1.tar.xz";
};
};
granatier = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/granatier-20.08.3.tar.xz";
- sha256 = "195bc2rcz11v76c0cwa9mb7rfixjn7sb0a52wrzz0sf9624m0rcs";
- name = "granatier-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz";
+ sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3";
+ name = "granatier-20.12.1.tar.xz";
};
};
grantlee-editor = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/grantlee-editor-20.08.3.tar.xz";
- sha256 = "1k2rdicd68jdk3pazyn3q0vj99n0vnkpzkrnacpymkjy85cjgrv9";
- name = "grantlee-editor-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz";
+ sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh";
+ name = "grantlee-editor-20.12.1.tar.xz";
};
};
grantleetheme = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/grantleetheme-20.08.3.tar.xz";
- sha256 = "07b7v5v2vyz3vyj1jjzryzaak8bbqg8a2caxwb6s7cwhy19y6my5";
- name = "grantleetheme-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz";
+ sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx";
+ name = "grantleetheme-20.12.1.tar.xz";
};
};
gwenview = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/gwenview-20.08.3.tar.xz";
- sha256 = "09mwp3z97hgd7c15w0hz8k61qn5icb81rj27nxzy877ph1xnrixc";
- name = "gwenview-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz";
+ sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1";
+ name = "gwenview-20.12.1.tar.xz";
};
};
incidenceeditor = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/incidenceeditor-20.08.3.tar.xz";
- sha256 = "15kkl8z1nig9qyxfrq54c3sqh1xs1lzlbm5rphj34y0yb8dbn8kx";
- name = "incidenceeditor-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz";
+ sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac";
+ name = "incidenceeditor-20.12.1.tar.xz";
+ };
+ };
+ itinerary = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz";
+ sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9";
+ name = "itinerary-20.12.1.tar.xz";
};
};
juk = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/juk-20.08.3.tar.xz";
- sha256 = "1jvj0r4grm55cnck4apnh4fh44mv1ycm0pprrkh57iwj1dlf7kif";
- name = "juk-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz";
+ sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r";
+ name = "juk-20.12.1.tar.xz";
};
};
k3b = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz";
- sha256 = "0qg2p6gdg0clgv6qab5vr0i451m9hqqmpwq335w8m9nwb6wg30cx";
- name = "k3b-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz";
+ sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp";
+ name = "k3b-20.12.1.tar.xz";
};
};
kaccounts-integration = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-integration-20.08.3.tar.xz";
- sha256 = "006cglw5ai274a1r5jbk109mdrvw8v6fp3cdyi1kbrq7lp3123a2";
- name = "kaccounts-integration-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz";
+ sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92";
+ name = "kaccounts-integration-20.12.1.tar.xz";
};
};
kaccounts-providers = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-providers-20.08.3.tar.xz";
- sha256 = "1vpv366bzj0sk7dqyxrq06a8ixgaaqi125mf2gmybvhj5yvrn3fp";
- name = "kaccounts-providers-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz";
+ sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq";
+ name = "kaccounts-providers-20.12.1.tar.xz";
};
};
kaddressbook = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kaddressbook-20.08.3.tar.xz";
- sha256 = "00mia1jh2c5rcnsyx3wizjdg65pvpazfb8ayppjzv4rrc2nhr9nn";
- name = "kaddressbook-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz";
+ sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp";
+ name = "kaddressbook-20.12.1.tar.xz";
};
};
kajongg = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kajongg-20.08.3.tar.xz";
- sha256 = "0wr045xqm1q03vy0jbgrldpdc9k3lgnhd39yhi574la367ayffpa";
- name = "kajongg-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz";
+ sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk";
+ name = "kajongg-20.12.1.tar.xz";
};
};
kalarm = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kalarm-20.08.3.tar.xz";
- sha256 = "0194rapyvnpmhkba0rgclrai1ywx9anr8dski0j6z1yg0kgav8df";
- name = "kalarm-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz";
+ sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0";
+ name = "kalarm-20.12.1.tar.xz";
};
};
kalarmcal = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kalarmcal-20.08.3.tar.xz";
- sha256 = "1i9hi3y4j2pmdmlj13kl13vfplxrh8w23fxz0mmawi1wn533fp66";
- name = "kalarmcal-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz";
+ sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5";
+ name = "kalarmcal-20.12.1.tar.xz";
};
};
kalgebra = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kalgebra-20.08.3.tar.xz";
- sha256 = "0k7miil5ilrw68j6xl9g6cf3zfw7g52h0gfwd5j248nx2nxr150c";
- name = "kalgebra-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz";
+ sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm";
+ name = "kalgebra-20.12.1.tar.xz";
};
};
kalzium = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kalzium-20.08.3.tar.xz";
- sha256 = "1r80bnpdrybsdwcblpj7cg32dv90l79gs0i42gpm6inilfr3vp5n";
- name = "kalzium-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz";
+ sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj";
+ name = "kalzium-20.12.1.tar.xz";
};
};
kamera = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kamera-20.08.3.tar.xz";
- sha256 = "06fwxdgbyywdrf1r0w17w3chfr0s8jhqswz9chmdfds9f2bb45cr";
- name = "kamera-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz";
+ sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq";
+ name = "kamera-20.12.1.tar.xz";
};
};
kamoso = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kamoso-20.08.3.tar.xz";
- sha256 = "0zhl3va65ajz3hdggg0jvvgvj14s461pjw9adw9bnfcbs4jzkl2y";
- name = "kamoso-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz";
+ sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb";
+ name = "kamoso-20.12.1.tar.xz";
};
};
kanagram = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kanagram-20.08.3.tar.xz";
- sha256 = "1cyx8yq03xaw34ic69ghz9gafk8l30qinp0kkp9a1wh4pry8rnxf";
- name = "kanagram-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz";
+ sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q";
+ name = "kanagram-20.12.1.tar.xz";
};
};
kapman = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kapman-20.08.3.tar.xz";
- sha256 = "0nh1f0v026rib5ahj1mhvs99yabrgdq71bis465vfpm4favnirzy";
- name = "kapman-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz";
+ sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9";
+ name = "kapman-20.12.1.tar.xz";
};
};
kapptemplate = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kapptemplate-20.08.3.tar.xz";
- sha256 = "1r98ym9sazjzknxfw58hjiyxhmi49fyhrdn02v0b8fm711vprxab";
- name = "kapptemplate-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz";
+ sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6";
+ name = "kapptemplate-20.12.1.tar.xz";
};
};
kate = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kate-20.08.3.tar.xz";
- sha256 = "1m7ximinknc0l9zqv4p25ybn6zysz59l4vvdb9xkhjp53aqskdz9";
- name = "kate-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz";
+ sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk";
+ name = "kate-20.12.1.tar.xz";
};
};
katomic = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/katomic-20.08.3.tar.xz";
- sha256 = "1v31x6371r9ccvc676vq5dlpkp4829xf0r37dnvdxlfm22mgsdnk";
- name = "katomic-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz";
+ sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id";
+ name = "katomic-20.12.1.tar.xz";
};
};
kbackup = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kbackup-20.08.3.tar.xz";
- sha256 = "1sayzvj46ckhn5zgp7qi6zmrmd7bjh5mg05mcl5pfwv4dcvxkrng";
- name = "kbackup-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz";
+ sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym";
+ name = "kbackup-20.12.1.tar.xz";
};
};
kblackbox = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kblackbox-20.08.3.tar.xz";
- sha256 = "0vka2pswbza1z8f97nhxcjrczx4w1x0qyjpzs9ycn9a14smqpsrh";
- name = "kblackbox-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz";
+ sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7";
+ name = "kblackbox-20.12.1.tar.xz";
};
};
kblocks = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kblocks-20.08.3.tar.xz";
- sha256 = "1jc063xn6dphydf49kv0izzy0nv06dr412xxjvkp7vccwv9qd5gf";
- name = "kblocks-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz";
+ sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s";
+ name = "kblocks-20.12.1.tar.xz";
};
};
kbounce = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kbounce-20.08.3.tar.xz";
- sha256 = "0863vlirljvf101mdv6jxprj9axs4cikrnld3wvxrcqw3w2dy6wy";
- name = "kbounce-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz";
+ sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm";
+ name = "kbounce-20.12.1.tar.xz";
};
};
kbreakout = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kbreakout-20.08.3.tar.xz";
- sha256 = "14nd1dnbdyxv59y8iildhydhxgal38hvj7bk6544glwl8yalak8z";
- name = "kbreakout-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz";
+ sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd";
+ name = "kbreakout-20.12.1.tar.xz";
};
};
kbruch = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kbruch-20.08.3.tar.xz";
- sha256 = "03s1hl4h8rsx0gn7wqfssi1ga4igx48jb47gpw6f9rfjm8f199vb";
- name = "kbruch-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz";
+ sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi";
+ name = "kbruch-20.12.1.tar.xz";
};
};
kcachegrind = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcachegrind-20.08.3.tar.xz";
- sha256 = "17j06z9cpj5qhfbp1xgw4qmhi4jckf2i99c9brys4ifb3p0rkbrs";
- name = "kcachegrind-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz";
+ sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi";
+ name = "kcachegrind-20.12.1.tar.xz";
};
};
kcalc = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcalc-20.08.3.tar.xz";
- sha256 = "1mk30fkv51w3fqlpkzgm1yj5sp98h26kkphplqkjva5v6s1jzmjy";
- name = "kcalc-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz";
+ sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw";
+ name = "kcalc-20.12.1.tar.xz";
};
};
kcalutils = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcalutils-20.08.3.tar.xz";
- sha256 = "1i2yh4gvdwlylj7f7p32g1z7lzh3p19rrbd96l1gqhy700f2whpw";
- name = "kcalutils-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz";
+ sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs";
+ name = "kcalutils-20.12.1.tar.xz";
};
};
kcharselect = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcharselect-20.08.3.tar.xz";
- sha256 = "1p6rijjfa2jk4vr0ivjn6p5qf2ys5kvhw0cwfyjs45ff7zg0s2ga";
- name = "kcharselect-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz";
+ sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb";
+ name = "kcharselect-20.12.1.tar.xz";
};
};
kcolorchooser = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcolorchooser-20.08.3.tar.xz";
- sha256 = "1874qa04whiivyydxfcn0f1xch515ga1af4ym42zqz64j3kq7i47";
- name = "kcolorchooser-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz";
+ sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z";
+ name = "kcolorchooser-20.12.1.tar.xz";
};
};
kcron = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kcron-20.08.3.tar.xz";
- sha256 = "1piwssyg9fvah25gql6w0n8xf634f6gy475cz52gb1bl7rp72q6j";
- name = "kcron-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz";
+ sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc";
+ name = "kcron-20.12.1.tar.xz";
};
};
kdebugsettings = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdebugsettings-20.08.3.tar.xz";
- sha256 = "11xnvr9qib3hnp48whsw659c724s2114p5dr3fswvhm3hkw1aky7";
- name = "kdebugsettings-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz";
+ sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1";
+ name = "kdebugsettings-20.12.1.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdeconnect-kde-20.08.3.tar.xz";
- sha256 = "0x10ga81qlsahavmv356xzjxyds41y2b4v338rqcyqkxvfmxj01k";
- name = "kdeconnect-kde-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz";
+ sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw";
+ name = "kdeconnect-kde-20.12.1.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-scripts-20.08.3.tar.xz";
- sha256 = "0x8ba4mlxx17vk674738xln2dy696b148fa3s87za4yb4jj9gc5n";
- name = "kde-dev-scripts-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz";
+ sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5";
+ name = "kde-dev-scripts-20.12.1.tar.xz";
};
};
kde-dev-utils = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-utils-20.08.3.tar.xz";
- sha256 = "0k7zb1km89nnqfi2p1mhp6dvwkhmgbcgw89301acag34yy954dvn";
- name = "kde-dev-utils-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz";
+ sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r";
+ name = "kde-dev-utils-20.12.1.tar.xz";
};
};
kdeedu-data = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdeedu-data-20.08.3.tar.xz";
- sha256 = "1k164h4n8r4yjlll5900fz764lr0qiy3q1fpcpkr8f1n7qs7f797";
- name = "kdeedu-data-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz";
+ sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp";
+ name = "kdeedu-data-20.12.1.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-mobipocket-20.08.3.tar.xz";
- sha256 = "0ifxbwn7pmxr7y4ri617a303b27nqwqa418isgfrfk11jc4yyxhq";
- name = "kdegraphics-mobipocket-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz";
+ sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd";
+ name = "kdegraphics-mobipocket-20.12.1.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-thumbnailers-20.08.3.tar.xz";
- sha256 = "0mbzkw7pxcfmkpb8ivhahnxkkrkjhmbjqy2l9gqx35gp5855gmxf";
- name = "kdegraphics-thumbnailers-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz";
+ sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w";
+ name = "kdegraphics-thumbnailers-20.12.1.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdenetwork-filesharing-20.08.3.tar.xz";
- sha256 = "0id19wmiivdrx10r1hwbwi7bx6g1v9g5lpbhlmfrapvy82ijfmbg";
- name = "kdenetwork-filesharing-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz";
+ sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv";
+ name = "kdenetwork-filesharing-20.12.1.tar.xz";
};
};
kdenlive = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdenlive-20.08.3.tar.xz";
- sha256 = "187d5khqq9ckmqp8amd7ghlvig1z97w2jzm9s4zsfhjzyqv3d3wz";
- name = "kdenlive-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz";
+ sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv";
+ name = "kdenlive-20.12.1.tar.xz";
};
};
kdepim-addons = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdepim-addons-20.08.3.tar.xz";
- sha256 = "17m8pwiig46pc6x4ylvymb3b6c7xcm2df3vjma665kcir1dr0q7p";
- name = "kdepim-addons-20.08.3.tar.xz";
- };
- };
- kdepim-apps-libs = {
- version = "20.08.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz";
- sha256 = "08iw1p9mv4jic7pk6skxc5anp7k46lhcdqxpq1i6wlhbrk6bpsvg";
- name = "kdepim-apps-libs-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz";
+ sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0";
+ name = "kdepim-addons-20.12.1.tar.xz";
};
};
kdepim-runtime = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdepim-runtime-20.08.3.tar.xz";
- sha256 = "0zz2zwq3gr177vgkwz6b70q4n2ra4ym58f167pgvi9kxv3884fib";
- name = "kdepim-runtime-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz";
+ sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq";
+ name = "kdepim-runtime-20.12.1.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-kioslaves-20.08.3.tar.xz";
- sha256 = "1kwzms0qha058cm92d4f8pr89r3bqaqx5zfw6gz05s6lg892j5in";
- name = "kdesdk-kioslaves-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz";
+ sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4";
+ name = "kdesdk-kioslaves-20.12.1.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-thumbnailers-20.08.3.tar.xz";
- sha256 = "10fc0agpvzpqdxqynd70vzya0g1nbdw0ylbnl9w35n9jhww42jff";
- name = "kdesdk-thumbnailers-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz";
+ sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23";
+ name = "kdesdk-thumbnailers-20.12.1.tar.xz";
};
};
kdf = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdf-20.08.3.tar.xz";
- sha256 = "02k5nhsf1zzkx9cl3r2500pj2zfmvjhlfsb3smgpka6in7iivxyp";
- name = "kdf-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz";
+ sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1";
+ name = "kdf-20.12.1.tar.xz";
};
};
kdialog = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdialog-20.08.3.tar.xz";
- sha256 = "0knl6176bjazjiacg1qqaldlqcjlb3bi829sliq1sdh4lzzwrbzk";
- name = "kdialog-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz";
+ sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4";
+ name = "kdialog-20.12.1.tar.xz";
};
};
kdiamond = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kdiamond-20.08.3.tar.xz";
- sha256 = "0ls1kg3wank1al46knq12jilmp8gaa4rn7zbgflcrhgy5gw8l5px";
- name = "kdiamond-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz";
+ sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4";
+ name = "kdiamond-20.12.1.tar.xz";
};
};
keditbookmarks = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/keditbookmarks-20.08.3.tar.xz";
- sha256 = "0m8ap5hvjgldj9hdk6shpkv8xylhhjla2xn1zs86pvj4la3zh4f8";
- name = "keditbookmarks-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz";
+ sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p";
+ name = "keditbookmarks-20.12.1.tar.xz";
};
};
kfind = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kfind-20.08.3.tar.xz";
- sha256 = "10i5mw6q2parq5w7pi955kgfvdlw8hwis2p7r9vkvabjdk69nkdr";
- name = "kfind-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz";
+ sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp";
+ name = "kfind-20.12.1.tar.xz";
};
};
kfloppy = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kfloppy-20.08.3.tar.xz";
- sha256 = "1cp0pwgldscc7va508gk43im3fv0lsxd5sbhpw8kxlzjlpbwlp8v";
- name = "kfloppy-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz";
+ sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84";
+ name = "kfloppy-20.12.1.tar.xz";
};
};
kfourinline = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kfourinline-20.08.3.tar.xz";
- sha256 = "0h1n44dncr2siw447n7b0gkx3380vajvqjsgjvapkg7m7bmz7nsv";
- name = "kfourinline-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz";
+ sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5";
+ name = "kfourinline-20.12.1.tar.xz";
};
};
kgeography = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kgeography-20.08.3.tar.xz";
- sha256 = "1mk5cip55chc8pmh8wfl7an5x076ywisr0i7isqcjaij2cv54283";
- name = "kgeography-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz";
+ sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h";
+ name = "kgeography-20.12.1.tar.xz";
};
};
kget = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kget-20.08.3.tar.xz";
- sha256 = "144ydk8bbfirph464mkkvwpnynj465i2ynhm8n9d330kcrhnaxd0";
- name = "kget-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz";
+ sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha";
+ name = "kget-20.12.1.tar.xz";
};
};
kgoldrunner = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kgoldrunner-20.08.3.tar.xz";
- sha256 = "101cdl04wb6xbq95b51ax36570y9ahkcy5gccqsyvc307ij9yg7r";
- name = "kgoldrunner-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz";
+ sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh";
+ name = "kgoldrunner-20.12.1.tar.xz";
};
};
kgpg = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kgpg-20.08.3.tar.xz";
- sha256 = "1ip21yal37yxg5i5sfy6lgfb3sz9lld0dwa7a1w4lbddf9w3akd6";
- name = "kgpg-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz";
+ sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a";
+ name = "kgpg-20.12.1.tar.xz";
};
};
khangman = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/khangman-20.08.3.tar.xz";
- sha256 = "1zwdd2gpjkld3vkawp0lj83il257ryxf8wpmbgzn1wz8sxxi01jj";
- name = "khangman-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz";
+ sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7";
+ name = "khangman-20.12.1.tar.xz";
};
};
khelpcenter = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/khelpcenter-20.08.3.tar.xz";
- sha256 = "1xan4awwgs08k7ksfy80rfcxqd6bi8i1fjdgy55hh7wshv76zf5r";
- name = "khelpcenter-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz";
+ sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6";
+ name = "khelpcenter-20.12.1.tar.xz";
};
};
kidentitymanagement = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kidentitymanagement-20.08.3.tar.xz";
- sha256 = "0vkydvf4yw3qlqrg9m1zdm6j0c1crxdvc7l24yls9fjbj957vbls";
- name = "kidentitymanagement-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz";
+ sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9";
+ name = "kidentitymanagement-20.12.1.tar.xz";
};
};
kig = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kig-20.08.3.tar.xz";
- sha256 = "1dvizdfkvl7p7hr4xm4zh51lpr8qr3s5j5zz162s7arr7sws4w8h";
- name = "kig-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz";
+ sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz";
+ name = "kig-20.12.1.tar.xz";
};
};
kigo = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kigo-20.08.3.tar.xz";
- sha256 = "0sx3klivzn8h96mpnbkiv2nbi2l6w0j6fclj7q3ql3cm81jh6n15";
- name = "kigo-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz";
+ sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa";
+ name = "kigo-20.12.1.tar.xz";
};
};
killbots = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/killbots-20.08.3.tar.xz";
- sha256 = "1j41my0brpqpvd8xibv39z4x4kmw1sqz7wy7ibhh0zir3jh64n83";
- name = "killbots-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz";
+ sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3";
+ name = "killbots-20.12.1.tar.xz";
};
};
kimagemapeditor = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kimagemapeditor-20.08.3.tar.xz";
- sha256 = "1m9mrksdl08ijmpmx3lhdysnm70mrnqz9rlbcn1h95p2sq0bk8cg";
- name = "kimagemapeditor-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz";
+ sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8";
+ name = "kimagemapeditor-20.12.1.tar.xz";
};
};
kimap = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kimap-20.08.3.tar.xz";
- sha256 = "16paglkqgnyzwjydhn02qw7zg0d4casir4bsfch15wdmqv389mrg";
- name = "kimap-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz";
+ sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v";
+ name = "kimap-20.12.1.tar.xz";
};
};
kio-extras = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kio-extras-20.08.3.tar.xz";
- sha256 = "0i7k9asc97r9z4lfk5hyf7mcbx0za7j6v4dhqn43j5v4x2i0201c";
- name = "kio-extras-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz";
+ sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg";
+ name = "kio-extras-20.12.1.tar.xz";
};
};
kio-gdrive = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kio-gdrive-20.08.3.tar.xz";
- sha256 = "0pp0nvsnfdm8vskw194qjfac4agnlsjm44w1704b5sqx6i27dafy";
- name = "kio-gdrive-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz";
+ sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0";
+ name = "kio-gdrive-20.12.1.tar.xz";
};
};
kipi-plugins = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kipi-plugins-20.08.3.tar.xz";
- sha256 = "1pplhv8yjfl1ifx9ykf4w2lgma8jvshihmd5c5mz9liqk3lawq15";
- name = "kipi-plugins-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz";
+ sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d";
+ name = "kipi-plugins-20.12.1.tar.xz";
};
};
kirigami-gallery = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kirigami-gallery-20.08.3.tar.xz";
- sha256 = "0l100ng8ai55s0vl8nkpq4vysy2nc6sk1dbisc2mp7br74ykyfp9";
- name = "kirigami-gallery-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz";
+ sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh";
+ name = "kirigami-gallery-20.12.1.tar.xz";
};
};
kiriki = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kiriki-20.08.3.tar.xz";
- sha256 = "1gddjii84cbz1dg8k0pnd3dyzar4lvj03j9v84vabggjjjbpir0f";
- name = "kiriki-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz";
+ sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q";
+ name = "kiriki-20.12.1.tar.xz";
};
};
kiten = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kiten-20.08.3.tar.xz";
- sha256 = "0n9mq86gcl6s2f45l8lbp4gsdj356l78xjkdvm14f6qlh81vsqlc";
- name = "kiten-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz";
+ sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m";
+ name = "kiten-20.12.1.tar.xz";
};
};
kitinerary = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kitinerary-20.08.3.tar.xz";
- sha256 = "169pmy5fyjkbya8r2kdkd9s83sim0jplc3lx8bv2xh6r10mvzgm6";
- name = "kitinerary-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz";
+ sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz";
+ name = "kitinerary-20.12.1.tar.xz";
};
};
kjumpingcube = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kjumpingcube-20.08.3.tar.xz";
- sha256 = "19246jwwd686x8i0jrvz2c8mpkf6qhm7rnskzin59dqzr76xrpgz";
- name = "kjumpingcube-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz";
+ sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69";
+ name = "kjumpingcube-20.12.1.tar.xz";
};
};
kldap = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kldap-20.08.3.tar.xz";
- sha256 = "1ihaazsnb9r30m2qhzcp2ns9f5fs7l3agsc9f9wxi4cyw73bq0n3";
- name = "kldap-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz";
+ sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3";
+ name = "kldap-20.12.1.tar.xz";
};
};
kleopatra = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kleopatra-20.08.3.tar.xz";
- sha256 = "1r879g7hw3c5cww58z0kvqj47pgzbiq1vpgxz847smrylqajcpyi";
- name = "kleopatra-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz";
+ sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6";
+ name = "kleopatra-20.12.1.tar.xz";
};
};
klettres = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/klettres-20.08.3.tar.xz";
- sha256 = "0irc0f7vjznlsczan30zzprbnvgnbg19vabr97cw9rkkfa28azx9";
- name = "klettres-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz";
+ sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk";
+ name = "klettres-20.12.1.tar.xz";
};
};
klickety = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/klickety-20.08.3.tar.xz";
- sha256 = "1qsm9grmy0bnalpdghg48xi68zzk6ysmg6n0d74ldmmnirv3r0zf";
- name = "klickety-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz";
+ sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6";
+ name = "klickety-20.12.1.tar.xz";
};
};
klines = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/klines-20.08.3.tar.xz";
- sha256 = "1l95ph1sjp3r1q065k3rj18lm36krl7bh41zgqh021p692ywc48c";
- name = "klines-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz";
+ sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c";
+ name = "klines-20.12.1.tar.xz";
};
};
kmag = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmag-20.08.3.tar.xz";
- sha256 = "0y44gz3qn91vl840xz25l5kc5jj82k5qqxkgsvvyld2s99rif84k";
- name = "kmag-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz";
+ sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj";
+ name = "kmag-20.12.1.tar.xz";
};
};
kmahjongg = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmahjongg-20.08.3.tar.xz";
- sha256 = "0wgp9m7xzf5ysmrrnyng4p4jypvzfnqkyw62gknl0qhk531cgq3h";
- name = "kmahjongg-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz";
+ sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z";
+ name = "kmahjongg-20.12.1.tar.xz";
};
};
kmail = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmail-20.08.3.tar.xz";
- sha256 = "0g59s7wl0n4bp8kw559rdlamlqxl47qvwfms9kr9ign35rvs0ghg";
- name = "kmail-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz";
+ sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw";
+ name = "kmail-20.12.1.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmail-account-wizard-20.08.3.tar.xz";
- sha256 = "0vama5a02dfgxrl4iz88lbi8dvq3d9b055xil770d90pwp0sljcz";
- name = "kmail-account-wizard-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz";
+ sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin";
+ name = "kmail-account-wizard-20.12.1.tar.xz";
};
};
kmailtransport = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmailtransport-20.08.3.tar.xz";
- sha256 = "07552qj3ngwvyss7f8cy87c0gmzc47agn54wk85qq0v1fwr73n6z";
- name = "kmailtransport-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz";
+ sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm";
+ name = "kmailtransport-20.12.1.tar.xz";
};
};
kmbox = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmbox-20.08.3.tar.xz";
- sha256 = "0ipmwcicn3qklybqy9v41lh7byn7j62ja8b0xf06z9nliwkk4b0b";
- name = "kmbox-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz";
+ sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd";
+ name = "kmbox-20.12.1.tar.xz";
};
};
kmime = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmime-20.08.3.tar.xz";
- sha256 = "1ndbx712vm4v0fi7p8j28d8z35h3bmsixc97z5r9dg03v1kzd36v";
- name = "kmime-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz";
+ sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2";
+ name = "kmime-20.12.1.tar.xz";
};
};
kmines = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmines-20.08.3.tar.xz";
- sha256 = "1mn5hip3vnzmkk1hy14glsplp7f5pm56yv0d5mz25icfgw0xa6lp";
- name = "kmines-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz";
+ sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic";
+ name = "kmines-20.12.1.tar.xz";
};
};
kmix = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmix-20.08.3.tar.xz";
- sha256 = "00gm93faqmqx0hhkxi3k2pn6sq82k2f622vqgk7mwznkpg66mf4k";
- name = "kmix-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz";
+ sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p";
+ name = "kmix-20.12.1.tar.xz";
};
};
kmousetool = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmousetool-20.08.3.tar.xz";
- sha256 = "09qznykysr42rzz5cmqvhvz91cr8dbzwjd73hwaib2lfs3c2cgbl";
- name = "kmousetool-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz";
+ sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk";
+ name = "kmousetool-20.12.1.tar.xz";
};
};
kmouth = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmouth-20.08.3.tar.xz";
- sha256 = "0ajhnl1sjllfb42nyafpirmlgcs6waqp8qxvgsz5dk5zkb8daqmr";
- name = "kmouth-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz";
+ sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc";
+ name = "kmouth-20.12.1.tar.xz";
};
};
kmplot = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kmplot-20.08.3.tar.xz";
- sha256 = "0cv7q1wmbb3fkf4s6ns4q1il5zr4q02b3xghpp661ma82d8jhjcy";
- name = "kmplot-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz";
+ sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm";
+ name = "kmplot-20.12.1.tar.xz";
};
};
knavalbattle = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/knavalbattle-20.08.3.tar.xz";
- sha256 = "1028i8zl5ynm3vvqajsms2hq8gmmjmjc5dc6r3jyh6r964vxq3nq";
- name = "knavalbattle-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz";
+ sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn";
+ name = "knavalbattle-20.12.1.tar.xz";
};
};
knetwalk = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/knetwalk-20.08.3.tar.xz";
- sha256 = "13pspvi2p68irpbr3f2ck78qmvfl3vahm5qjw2fwhidhpindf9nl";
- name = "knetwalk-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz";
+ sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8";
+ name = "knetwalk-20.12.1.tar.xz";
};
};
knights = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/knights-20.08.3.tar.xz";
- sha256 = "0zqb87mr2x085hi3r9cvdrx2kvxmclh4ffi1ajcb8v1f79wiwzin";
- name = "knights-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz";
+ sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb";
+ name = "knights-20.12.1.tar.xz";
};
};
knotes = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/knotes-20.08.3.tar.xz";
- sha256 = "0ysw8js2s6njilg4v4vqrl1bzcmqvk42l68pzvyflr112zviqz28";
- name = "knotes-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz";
+ sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0";
+ name = "knotes-20.12.1.tar.xz";
};
};
kolf = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kolf-20.08.3.tar.xz";
- sha256 = "1ywyny8iq2sxglsvpgw6p3w3w567k6cw6waywfcfy0lcnfarg1n0";
- name = "kolf-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz";
+ sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv";
+ name = "kolf-20.12.1.tar.xz";
};
};
kollision = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kollision-20.08.3.tar.xz";
- sha256 = "1l8a32bni40jz5jna0ip9ggbx7zp1hhiw2mip7v8f6qc4arbknl8";
- name = "kollision-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz";
+ sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn";
+ name = "kollision-20.12.1.tar.xz";
};
};
kolourpaint = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kolourpaint-20.08.3.tar.xz";
- sha256 = "0d64gnnb553rxscr8710h5bx8ijxd87jrbix07k41y79i5x60irh";
- name = "kolourpaint-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz";
+ sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay";
+ name = "kolourpaint-20.12.1.tar.xz";
};
};
kompare = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kompare-20.08.3.tar.xz";
- sha256 = "0r9m2vcw9hbdkfdy24pfpqs2b5r0jyxh1ma2h66hfv4ycd470ilc";
- name = "kompare-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz";
+ sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh";
+ name = "kompare-20.12.1.tar.xz";
};
};
konqueror = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/konqueror-20.08.3.tar.xz";
- sha256 = "1ssjj83jcbcq8i7wx5zd12z7crh2zg6awbpy38maq3c7747nqz7k";
- name = "konqueror-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz";
+ sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y";
+ name = "konqueror-20.12.1.tar.xz";
};
};
konquest = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/konquest-20.08.3.tar.xz";
- sha256 = "1wq0j02dzdah6yhx8r2cg191617hid9fs780yr317fprkwkgb8cb";
- name = "konquest-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz";
+ sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57";
+ name = "konquest-20.12.1.tar.xz";
};
};
konsole = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/konsole-20.08.3.tar.xz";
- sha256 = "0jjidy756x8n456qbm977a73l8229kk8i489jh52296k8pkh6yjx";
- name = "konsole-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz";
+ sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n";
+ name = "konsole-20.12.1.tar.xz";
};
};
kontact = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kontact-20.08.3.tar.xz";
- sha256 = "0qasgxvq7xps0zxk4hf2sizmy90mxyq70m2pq49pq17ij2pa9ynl";
- name = "kontact-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz";
+ sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz";
+ name = "kontact-20.12.1.tar.xz";
};
};
kontactinterface = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kontactinterface-20.08.3.tar.xz";
- sha256 = "1ah2814js08sm49ykarqdw7z03w4fbym5cc4vwmzimcvh2bc78j3";
- name = "kontactinterface-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz";
+ sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j";
+ name = "kontactinterface-20.12.1.tar.xz";
+ };
+ };
+ kontrast = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz";
+ sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br";
+ name = "kontrast-20.12.1.tar.xz";
+ };
+ };
+ konversation = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz";
+ sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4";
+ name = "konversation-20.12.1.tar.xz";
};
};
kopete = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kopete-20.08.3.tar.xz";
- sha256 = "1lsab66k0xq1g0w0cxcpadmf9kkc09x8wwbv4i8y3aj2mn7849gh";
- name = "kopete-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz";
+ sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl";
+ name = "kopete-20.12.1.tar.xz";
};
};
korganizer = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/korganizer-20.08.3.tar.xz";
- sha256 = "112h6vn2y9d3q3z62cwg3zrak3xgx9affibc9cvr6fzhp4z0x9ps";
- name = "korganizer-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz";
+ sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm";
+ name = "korganizer-20.12.1.tar.xz";
+ };
+ };
+ kosmindoormap = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz";
+ sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx";
+ name = "kosmindoormap-20.12.1.tar.xz";
};
};
kpat = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kpat-20.08.3.tar.xz";
- sha256 = "1id4b9jkphi8pp29gc2vb3n9f0g8kl9yy5v8cnyv3jq673aj0fs9";
- name = "kpat-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz";
+ sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659";
+ name = "kpat-20.12.1.tar.xz";
};
};
kpimtextedit = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kpimtextedit-20.08.3.tar.xz";
- sha256 = "1m4r5zbhbjvj3za78xfp3dibyf7mp9gan5ir5zd0k2p7adp3i652";
- name = "kpimtextedit-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz";
+ sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4";
+ name = "kpimtextedit-20.12.1.tar.xz";
};
};
kpkpass = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kpkpass-20.08.3.tar.xz";
- sha256 = "0zw3xx5mi38za0xbvld97f5bqvwwgyz47kybyrdm7jrhvmmiiiis";
- name = "kpkpass-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz";
+ sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2";
+ name = "kpkpass-20.12.1.tar.xz";
+ };
+ };
+ kpmcore = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz";
+ sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v";
+ name = "kpmcore-20.12.1.tar.xz";
+ };
+ };
+ kpublictransport = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz";
+ sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq";
+ name = "kpublictransport-20.12.1.tar.xz";
};
};
kqtquickcharts = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kqtquickcharts-20.08.3.tar.xz";
- sha256 = "0l7v8vrc7by0w0yshnh21jaqhspmhkvm5cd0hpay6jc9v2azkcf3";
- name = "kqtquickcharts-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz";
+ sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc";
+ name = "kqtquickcharts-20.12.1.tar.xz";
};
};
krdc = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/krdc-20.08.3.tar.xz";
- sha256 = "1g9lxdldljh5a2s4g7g9b98lij168l99ah0vr6nvdl53n35pfr8n";
- name = "krdc-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz";
+ sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh";
+ name = "krdc-20.12.1.tar.xz";
};
};
kreversi = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kreversi-20.08.3.tar.xz";
- sha256 = "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi";
- name = "kreversi-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz";
+ sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a";
+ name = "kreversi-20.12.1.tar.xz";
};
};
krfb = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/krfb-20.08.3.tar.xz";
- sha256 = "13nypbcdhh53wq72w59z5q46a09g1w4yyi1pmsjwa8r7jnk8cafk";
- name = "krfb-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz";
+ sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6";
+ name = "krfb-20.12.1.tar.xz";
};
};
kross-interpreters = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kross-interpreters-20.08.3.tar.xz";
- sha256 = "0mr5vpbbcv66s6dyrrypy1ai6ba744z8cn4r0iwys35p6am075qj";
- name = "kross-interpreters-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz";
+ sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs";
+ name = "kross-interpreters-20.12.1.tar.xz";
};
};
kruler = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kruler-20.08.3.tar.xz";
- sha256 = "1vhl8acccdqfdj7lci8r2mig9qf1js4f8v7b4fqljpnc3gdg8749";
- name = "kruler-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz";
+ sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q";
+ name = "kruler-20.12.1.tar.xz";
};
};
kshisen = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kshisen-20.08.3.tar.xz";
- sha256 = "1vy8qh8s60a4ikyw3sh4cbr3p3fk35d4dwdqc263gn4skyrsb1l9";
- name = "kshisen-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz";
+ sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds";
+ name = "kshisen-20.12.1.tar.xz";
};
};
ksirk = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksirk-20.08.3.tar.xz";
- sha256 = "1kxc1b05r8x6pvaiwpvjpgrr88qkm5qs4d3s1ym8rki60c724qpl";
- name = "ksirk-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz";
+ sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz";
+ name = "ksirk-20.12.1.tar.xz";
};
};
ksmtp = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksmtp-20.08.3.tar.xz";
- sha256 = "1p9clzvmsym2fijwvs3s0zqx57bk82mlks52j5ni3il6lvklaayc";
- name = "ksmtp-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz";
+ sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg";
+ name = "ksmtp-20.12.1.tar.xz";
};
};
ksnakeduel = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksnakeduel-20.08.3.tar.xz";
- sha256 = "03ydbwknn20gadjpwcw0z8zw777hgj8j10w4gvp2dwpb07rdg1pn";
- name = "ksnakeduel-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz";
+ sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc";
+ name = "ksnakeduel-20.12.1.tar.xz";
};
};
kspaceduel = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kspaceduel-20.08.3.tar.xz";
- sha256 = "1ii3lnxd11d3ihl8j1abh9qn9q0qq8ra9hbrwjs5df2kk36bnirj";
- name = "kspaceduel-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz";
+ sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78";
+ name = "kspaceduel-20.12.1.tar.xz";
};
};
ksquares = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksquares-20.08.3.tar.xz";
- sha256 = "1ch7lbylzb9ngdzvpzqq5f30gkm2l4rzk6iqa8xm53rawr7jjqcy";
- name = "ksquares-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz";
+ sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2";
+ name = "ksquares-20.12.1.tar.xz";
};
};
ksudoku = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksudoku-20.08.3.tar.xz";
- sha256 = "0hnqbd3krxi3zwj8p4n9ydhwfwhw8wljhjdfv0llv0nhj1wb89p9";
- name = "ksudoku-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz";
+ sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km";
+ name = "ksudoku-20.12.1.tar.xz";
};
};
ksystemlog = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ksystemlog-20.08.3.tar.xz";
- sha256 = "11fc2mn4hkcibpxp7s2gihpp05yix7ws84a0bm6vjiqlidmrk192";
- name = "ksystemlog-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz";
+ sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0";
+ name = "ksystemlog-20.12.1.tar.xz";
};
};
kteatime = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kteatime-20.08.3.tar.xz";
- sha256 = "1vj738s2a7nnrvxi847mdmn1vg79kh9k8gqaflcwnvyxanf6n4f7";
- name = "kteatime-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz";
+ sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx";
+ name = "kteatime-20.12.1.tar.xz";
};
};
ktimer = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktimer-20.08.3.tar.xz";
- sha256 = "1rc1z93s24b7p2ixr4xbpg0sj8ls90gzfijwj9f8b0lrwd905ysv";
- name = "ktimer-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz";
+ sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w";
+ name = "ktimer-20.12.1.tar.xz";
};
};
ktnef = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktnef-20.08.3.tar.xz";
- sha256 = "1lj93sqyi522k91jiyf7d26vx5sgn5njhyaf8plsfz5rj82dw1m4";
- name = "ktnef-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz";
+ sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd";
+ name = "ktnef-20.12.1.tar.xz";
+ };
+ };
+ ktorrent = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz";
+ sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc";
+ name = "ktorrent-20.12.1.tar.xz";
};
};
ktouch = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktouch-20.08.3.tar.xz";
- sha256 = "1ssxd7f75866rn5k192bnm016d8674q13ibcgmaxqsmr7wqkyd39";
- name = "ktouch-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz";
+ sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib";
+ name = "ktouch-20.12.1.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-accounts-kcm-20.08.3.tar.xz";
- sha256 = "0039svbzx7fphyk6cw4hb8k4h7l6q31pbwvp6pvls450rycz8i8y";
- name = "ktp-accounts-kcm-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz";
+ sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53";
+ name = "ktp-accounts-kcm-20.12.1.tar.xz";
};
};
ktp-approver = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-approver-20.08.3.tar.xz";
- sha256 = "1kqsdw7vkcd0ka98y2r7qz7dp5hsrr2m8k1xlh3gpj7fdxpla2bh";
- name = "ktp-approver-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz";
+ sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k";
+ name = "ktp-approver-20.12.1.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-auth-handler-20.08.3.tar.xz";
- sha256 = "0wbhg458ysipwma8sygimasq71sbrzmx3vwqi51ai8y5hwrx04j4";
- name = "ktp-auth-handler-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz";
+ sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7";
+ name = "ktp-auth-handler-20.12.1.tar.xz";
};
};
ktp-call-ui = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-call-ui-20.08.3.tar.xz";
- sha256 = "1fh8bz9kc6f8v28x12xp3vw19swgcq07zyjzhd6qcnwf1bv6gl7i";
- name = "ktp-call-ui-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz";
+ sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy";
+ name = "ktp-call-ui-20.12.1.tar.xz";
};
};
ktp-common-internals = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-common-internals-20.08.3.tar.xz";
- sha256 = "193yx4g1fwlwysy5scb7m24wqmvwmfyyb9sv7arw7zn5czlg480z";
- name = "ktp-common-internals-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz";
+ sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16";
+ name = "ktp-common-internals-20.12.1.tar.xz";
};
};
ktp-contact-list = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-list-20.08.3.tar.xz";
- sha256 = "0093z17r1xqlb1zlgxfayrnrkyl8zmnnasfd8i97dx712wmbbxxa";
- name = "ktp-contact-list-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz";
+ sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j";
+ name = "ktp-contact-list-20.12.1.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-runner-20.08.3.tar.xz";
- sha256 = "063jylnq3gm0s0jh1xs6b591a161sb6gdi840l40mqlhhg7i8x55";
- name = "ktp-contact-runner-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz";
+ sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb";
+ name = "ktp-contact-runner-20.12.1.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-desktop-applets-20.08.3.tar.xz";
- sha256 = "1i69qzfa455phjnd5ycflyggcbq7ycn2cc7a3ni5195isjzq6r6s";
- name = "ktp-desktop-applets-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz";
+ sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74";
+ name = "ktp-desktop-applets-20.12.1.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-filetransfer-handler-20.08.3.tar.xz";
- sha256 = "0a26ziacl3fkd0a0h1579jnwjzjlsz0zymj9k4da4sb60zad5y72";
- name = "ktp-filetransfer-handler-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz";
+ sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3";
+ name = "ktp-filetransfer-handler-20.12.1.tar.xz";
};
};
ktp-kded-module = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-kded-module-20.08.3.tar.xz";
- sha256 = "105vh6b7a0v02arksbwxn30slpcg11cpvb7dqmvf041iyr13sqsv";
- name = "ktp-kded-module-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz";
+ sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf";
+ name = "ktp-kded-module-20.12.1.tar.xz";
};
};
ktp-send-file = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-send-file-20.08.3.tar.xz";
- sha256 = "08pp3029jplc6rcbav40cgy787gn3jjl312gbgvnwzglxaqvcg4b";
- name = "ktp-send-file-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz";
+ sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1";
+ name = "ktp-send-file-20.12.1.tar.xz";
};
};
ktp-text-ui = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktp-text-ui-20.08.3.tar.xz";
- sha256 = "1anxl9wa5ndyi9r9w0kpivx8nv1xpx28xjvkdplkc75cc1wl88sw";
- name = "ktp-text-ui-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz";
+ sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61";
+ name = "ktp-text-ui-20.12.1.tar.xz";
};
};
ktuberling = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/ktuberling-20.08.3.tar.xz";
- sha256 = "0q6ynmn6w5q65a77fq8n9vxqswrimln22b1zfgxmb2i3qwnhkrmz";
- name = "ktuberling-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz";
+ sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j";
+ name = "ktuberling-20.12.1.tar.xz";
};
};
kturtle = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kturtle-20.08.3.tar.xz";
- sha256 = "0riv76vwvz94zixqhhwkxw8sz2r2xqai39yh9hr31d28q9rza384";
- name = "kturtle-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz";
+ sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb";
+ name = "kturtle-20.12.1.tar.xz";
};
};
kubrick = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kubrick-20.08.3.tar.xz";
- sha256 = "03k73gr33dr3va69vc70fsfcdwkqz70bg87yk2l2j33x8wsgl4wx";
- name = "kubrick-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz";
+ sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i";
+ name = "kubrick-20.12.1.tar.xz";
};
};
kwalletmanager = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kwalletmanager-20.08.3.tar.xz";
- sha256 = "1l07vxl2x3jl8553rbvr3p0k3rc95nmrw4vhxxynl3102xshrg5i";
- name = "kwalletmanager-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz";
+ sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj";
+ name = "kwalletmanager-20.12.1.tar.xz";
};
};
kwave = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kwave-20.08.3.tar.xz";
- sha256 = "0zk8ik03qcc6y0vhpih8sk2jpkxwxalmqmaan2767k9h92grdpc8";
- name = "kwave-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz";
+ sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq";
+ name = "kwave-20.12.1.tar.xz";
};
};
kwordquiz = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/kwordquiz-20.08.3.tar.xz";
- sha256 = "1kiqk3xyd0l7kqdxqjqs8mw4drcdbdri9xxi5gcav57ndcinknqb";
- name = "kwordquiz-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz";
+ sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p";
+ name = "kwordquiz-20.12.1.tar.xz";
};
};
libgravatar = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libgravatar-20.08.3.tar.xz";
- sha256 = "09dvx2rb1j7q4r0gkbhz0vjk8ya3njqprpjqdhwcq7xwc2j9h0hr";
- name = "libgravatar-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz";
+ sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j";
+ name = "libgravatar-20.12.1.tar.xz";
};
};
libkcddb = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkcddb-20.08.3.tar.xz";
- sha256 = "0r36hs79hmq0znsds0d04lj7ffs6l2d866kyn1z1fdwr9b3crirg";
- name = "libkcddb-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz";
+ sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k";
+ name = "libkcddb-20.12.1.tar.xz";
};
};
libkcompactdisc = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkcompactdisc-20.08.3.tar.xz";
- sha256 = "1nglk3kbx5czqla3cnpnf1fk71pf2cl9h6rgb40ak1xw4z31d456";
- name = "libkcompactdisc-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz";
+ sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib";
+ name = "libkcompactdisc-20.12.1.tar.xz";
};
};
libkdcraw = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkdcraw-20.08.3.tar.xz";
- sha256 = "1806i99qsrmixdg5b0hyi8h55fk00q6wxsnrblbwcmsb268jddp7";
- name = "libkdcraw-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz";
+ sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3";
+ name = "libkdcraw-20.12.1.tar.xz";
};
};
libkdegames = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkdegames-20.08.3.tar.xz";
- sha256 = "1ccbcwwqb53bgqlr1rq9plpw21mipxp8rsi1f7l0p1jzpw054p08";
- name = "libkdegames-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz";
+ sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng";
+ name = "libkdegames-20.12.1.tar.xz";
};
};
libkdepim = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkdepim-20.08.3.tar.xz";
- sha256 = "1v77g02v5sdqprh8psx5xpjgf8v91il60ca59yivm5jvc3hdf3f6";
- name = "libkdepim-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz";
+ sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f";
+ name = "libkdepim-20.12.1.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkeduvocdocument-20.08.3.tar.xz";
- sha256 = "0ghkx6x5sn5fl934ybhl32knwv9zky0n1vkjw2w93lpms45xmw76";
- name = "libkeduvocdocument-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz";
+ sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w";
+ name = "libkeduvocdocument-20.12.1.tar.xz";
};
};
libkexiv2 = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkexiv2-20.08.3.tar.xz";
- sha256 = "1lh3947w6xgzl2r1wm6m4kd478q6bv89f0c3c38ldv30imfw7rfl";
- name = "libkexiv2-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz";
+ sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0";
+ name = "libkexiv2-20.12.1.tar.xz";
};
};
libkgapi = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkgapi-20.08.3.tar.xz";
- sha256 = "1kmgf9v9rvb67l7aw5xsx7v44l4pz8rl6p09lk26irq7gd4k68la";
- name = "libkgapi-20.08.3.tar.xz";
- };
- };
- libkgeomap = {
- version = "20.08.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkgeomap-20.08.3.tar.xz";
- sha256 = "14ipksxnvgk2s1sw7a70153iy9aik9mf4i7k8y3pzdr3l3155ayk";
- name = "libkgeomap-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz";
+ sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d";
+ name = "libkgapi-20.12.1.tar.xz";
};
};
libkipi = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkipi-20.08.3.tar.xz";
- sha256 = "1b5qby7xm926qnzrf1zpb89fwx1a2syhqnznmdjxifj499p1jqjb";
- name = "libkipi-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz";
+ sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg";
+ name = "libkipi-20.12.1.tar.xz";
};
};
libkleo = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkleo-20.08.3.tar.xz";
- sha256 = "1d6dal4qnrikg6ma2ird4b2sdivqqkkhamvd3s1srcxppc3aiq79";
- name = "libkleo-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz";
+ sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a";
+ name = "libkleo-20.12.1.tar.xz";
};
};
libkmahjongg = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkmahjongg-20.08.3.tar.xz";
- sha256 = "0xabp1vzbzs52m3bb9nzm1d9md1n4j4pr13izn6nv28ja7477nnm";
- name = "libkmahjongg-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz";
+ sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x";
+ name = "libkmahjongg-20.12.1.tar.xz";
};
};
libkomparediff2 = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libkomparediff2-20.08.3.tar.xz";
- sha256 = "0nk0jkf0jwaz1yqzzp44c6xyjgw42gclkcvw8w61w1f8sdl40wb8";
- name = "libkomparediff2-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz";
+ sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3";
+ name = "libkomparediff2-20.12.1.tar.xz";
};
};
libksane = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libksane-20.08.3.tar.xz";
- sha256 = "0d2cnmvk16g1vnx9jd7jvp3bpw07ss54khmhqip8iskkvcfll9j0";
- name = "libksane-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz";
+ sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j";
+ name = "libksane-20.12.1.tar.xz";
};
};
libksieve = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/libksieve-20.08.3.tar.xz";
- sha256 = "0bhpdqynazssql2iivvpb9l8npa441345gcn59fc0va6barl9sam";
- name = "libksieve-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz";
+ sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz";
+ name = "libksieve-20.12.1.tar.xz";
+ };
+ };
+ libktorrent = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz";
+ sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv";
+ name = "libktorrent-20.12.1.tar.xz";
};
};
lokalize = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/lokalize-20.08.3.tar.xz";
- sha256 = "0iab8sd1qh7h0zna7lc3v43z6rcmxba9v4nynhl5miiac4r6ddr8";
- name = "lokalize-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz";
+ sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx";
+ name = "lokalize-20.12.1.tar.xz";
};
};
lskat = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/lskat-20.08.3.tar.xz";
- sha256 = "1rcmh592w5gd5b69czfxycypidj74y2d91cw92rccariadz9vnjz";
- name = "lskat-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz";
+ sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d";
+ name = "lskat-20.12.1.tar.xz";
};
};
mailcommon = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/mailcommon-20.08.3.tar.xz";
- sha256 = "0bhs60cz4qcrqkmw2sm6cd2laq8lzj9vcwi8kjqkajsidh342wdv";
- name = "mailcommon-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz";
+ sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338";
+ name = "mailcommon-20.12.1.tar.xz";
};
};
mailimporter = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/mailimporter-20.08.3.tar.xz";
- sha256 = "0w6yfgqx0adlkwx32vmb23kl6n50737jiabmad3pnhqw8rv41h80";
- name = "mailimporter-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz";
+ sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc";
+ name = "mailimporter-20.12.1.tar.xz";
};
};
marble = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/marble-20.08.3.tar.xz";
- sha256 = "1xpxgy724z97k063fdk0l3mrl8i6nvnhj35b4987jqji76i92ffb";
- name = "marble-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz";
+ sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5";
+ name = "marble-20.12.1.tar.xz";
+ };
+ };
+ markdownpart = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz";
+ sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk";
+ name = "markdownpart-20.12.1.tar.xz";
};
};
mbox-importer = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/mbox-importer-20.08.3.tar.xz";
- sha256 = "1qh0f93df228cqlcqdwc7g6im3g0gkfmzir3ccsmb5iv0ygvjl6f";
- name = "mbox-importer-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz";
+ sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n";
+ name = "mbox-importer-20.12.1.tar.xz";
};
};
messagelib = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/messagelib-20.08.3.tar.xz";
- sha256 = "16amni6qrq96h8jr313gc7k9frwr20d4pk9y2i61a1xm2w3xsqd4";
- name = "messagelib-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz";
+ sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7";
+ name = "messagelib-20.12.1.tar.xz";
};
};
minuet = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/minuet-20.08.3.tar.xz";
- sha256 = "1l45g7labnyz0pkwcfhjl5a3ypr7cy3bsshr06ab85364yjwazvi";
- name = "minuet-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz";
+ sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2";
+ name = "minuet-20.12.1.tar.xz";
};
};
okular = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/okular-20.08.3.tar.xz";
- sha256 = "1q59ikcwsfgjc0202daingxv15iarnzba6szdncznzcafd6hhk9z";
- name = "okular-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz";
+ sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c";
+ name = "okular-20.12.1.tar.xz";
};
};
palapeli = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/palapeli-20.08.3.tar.xz";
- sha256 = "107z3izfznrq7g5aqb5a7r8a4ibaia90g334d7wwvd7prm7hdgfp";
- name = "palapeli-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz";
+ sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm";
+ name = "palapeli-20.12.1.tar.xz";
};
};
parley = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/parley-20.08.3.tar.xz";
- sha256 = "0wli09zkk5z50y1gzp5wc9k056xjaadlq97j09lf6lqyg6kb56ya";
- name = "parley-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz";
+ sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a";
+ name = "parley-20.12.1.tar.xz";
+ };
+ };
+ partitionmanager = {
+ version = "20.12.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz";
+ sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65";
+ name = "partitionmanager-20.12.1.tar.xz";
};
};
picmi = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/picmi-20.08.3.tar.xz";
- sha256 = "1lkpazsi9dyb2y9q5bk56d80x7x035rf4hdap25i8qfj3ilykv3w";
- name = "picmi-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz";
+ sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03";
+ name = "picmi-20.12.1.tar.xz";
};
};
pimcommon = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/pimcommon-20.08.3.tar.xz";
- sha256 = "0mpl7li2y5xjzk4hdb85d1x7cz15cicd91c1krlw74q7pbrjinlq";
- name = "pimcommon-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz";
+ sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57";
+ name = "pimcommon-20.12.1.tar.xz";
};
};
pim-data-exporter = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/pim-data-exporter-20.08.3.tar.xz";
- sha256 = "0f08c16d3730fbdsbrwlr9w5c4l9xcmd1bdbv5m38h5r2ddlkvzr";
- name = "pim-data-exporter-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz";
+ sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc";
+ name = "pim-data-exporter-20.12.1.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/pim-sieve-editor-20.08.3.tar.xz";
- sha256 = "1falzw2a2v912fdzlyljsw9rcy1whrn9ys9ccrskkpvjn8y444x4";
- name = "pim-sieve-editor-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz";
+ sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1";
+ name = "pim-sieve-editor-20.12.1.tar.xz";
};
};
poxml = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/poxml-20.08.3.tar.xz";
- sha256 = "0gzg3vbsjrfhs1jg59g7b3gf3b4qajiffkb94njkz8v1f0fadlxp";
- name = "poxml-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz";
+ sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk";
+ name = "poxml-20.12.1.tar.xz";
};
};
print-manager = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/print-manager-20.08.3.tar.xz";
- sha256 = "18nl9gpmzz4g9fqzyvbh858nxz23b2vyi505qacqvcrz13r0l78z";
- name = "print-manager-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz";
+ sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y";
+ name = "print-manager-20.12.1.tar.xz";
};
};
rocs = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/rocs-20.08.3.tar.xz";
- sha256 = "0bd9x7kh2s4z79ff9byd3ly7k040c574zwrrgi8sq21yd531hxhj";
- name = "rocs-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz";
+ sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb";
+ name = "rocs-20.12.1.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/signon-kwallet-extension-20.08.3.tar.xz";
- sha256 = "1s0syq9aw2q34k1wxrpjqqi12xay1h0vc4s2d8l184hzzg8qq71i";
- name = "signon-kwallet-extension-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz";
+ sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb";
+ name = "signon-kwallet-extension-20.12.1.tar.xz";
};
};
spectacle = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/spectacle-20.08.3.tar.xz";
- sha256 = "16dwbsk9hik7gmz9s4x78hibz4x9d1fpx8x2i2giry5hwzknfcw4";
- name = "spectacle-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz";
+ sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l";
+ name = "spectacle-20.12.1.tar.xz";
};
};
step = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/step-20.08.3.tar.xz";
- sha256 = "05ljsmgpra1az64yddy8idi46cv3afaf2v4n7d5j81a8vvlz7fj1";
- name = "step-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz";
+ sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k";
+ name = "step-20.12.1.tar.xz";
};
};
svgpart = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/svgpart-20.08.3.tar.xz";
- sha256 = "0wwq576dblqmfknr0qs8kskw7nar6hah95fqicdn97xdy4nvzhc6";
- name = "svgpart-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz";
+ sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry";
+ name = "svgpart-20.12.1.tar.xz";
};
};
sweeper = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/sweeper-20.08.3.tar.xz";
- sha256 = "0i4zvbljdzkj47vh8kizam7vsc9k7mvf8dqd2j6ixr4p0cqvw5a8";
- name = "sweeper-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz";
+ sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl";
+ name = "sweeper-20.12.1.tar.xz";
};
};
umbrello = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/umbrello-20.08.3.tar.xz";
- sha256 = "1hh5gyggb4f3pjip8dfvx00hi83gj65c92jgzkzahj7p35mkplgl";
- name = "umbrello-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz";
+ sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl";
+ name = "umbrello-20.12.1.tar.xz";
};
};
yakuake = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/yakuake-20.08.3.tar.xz";
- sha256 = "05zd2xm5vgrgz0bxbkh1mpiknlqzpzk5jb74lnd5x7wn5b80ngv0";
- name = "yakuake-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz";
+ sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa";
+ name = "yakuake-20.12.1.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.08.3";
+ version = "20.12.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.08.3/src/zeroconf-ioslave-20.08.3.tar.xz";
- sha256 = "1afga0liiy9n98kb0gmxzbb6ckhdgbrdc4ig1x9pwp98wr1fzmcg";
- name = "zeroconf-ioslave-20.08.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz";
+ sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas";
+ name = "zeroconf-ioslave-20.12.1.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
index db5a5d00fc..924e006c4c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "0.9.14-4";
+ version = "0.9.26";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-ZEpHeBeP2LpjABWD1eQxUORUKsRWvZ8WYa5IxSRLeXc=";
+ hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/9menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/9menu/default.nix
new file mode 100644
index 0000000000..8e6b7b3bcb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/9menu/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, meson
+, ninja
+, libX11
+, libXext
+}:
+
+stdenv.mkDerivation rec {
+ pname = "9menu";
+ version = "unstable-2021-02-24";
+
+ src = fetchFromGitHub {
+ owner = "arnoldrobbins";
+ repo = pname;
+ rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8";
+ sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0=";
+ };
+
+ nativeBuildInputs = [ pkg-config meson ninja ];
+ buildInputs = [ libX11 libXext ];
+
+ meta = with lib; {
+ homepage = "https://github.com/arnoldrobbins/9menu";
+ description = "Simple X11 menu program for running commands";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = libX11.meta.platforms;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix
index f16d6e1573..c359d606a8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ape/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
inherit pname;
version = "2019-08-10";
- buildInputs = [ swiProlog makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ swiProlog ];
src = fetchFromGitHub {
owner = "Attempto";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch
new file mode 100644
index 0000000000..6aacbcc65b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch
@@ -0,0 +1,24 @@
+From e7446c9bcb47674c9d0ee3b5bab129e9b86eb1c9 Mon Sep 17 00:00:00 2001
+From: Walter Franzini
+Date: Fri, 7 Jun 2019 17:57:11 +0200
+Subject: [PATCH] musl does not support rewind pipe, make it build anyway
+
+---
+ src/formats.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/formats.c b/src/formats.c
+index f3efe764..477bf451 100644
+--- a/src/formats.c
++++ b/src/formats.c
+@@ -424,7 +424,6 @@ static void UNUSED rewind_pipe(FILE * fp)
+ /* To fix this #error, either simply remove the #error line and live without
+ * file-type detection with pipes, or add support for your compiler in the
+ * lines above. Test with cat monkey.wav | ./sox --info - */
+- #error FIX NEEDED HERE
+ #define NO_REWIND_PIPE
+ (void)fp;
+ #endif
+--
+2.19.2
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix
index dd5dbde528..946150d2b8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
# configure.ac uses pkg-config only to locate libopusfile
nativeBuildInputs = optional enableOpusfile pkg-config;
+ patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
+
buildInputs =
optional (enableAlsa && stdenv.isLinux) alsaLib ++
optional enableLibao libao ++
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix
index 6e276d592b..b7e738cfc1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
};
- buildInputs = [ snack tcl tk makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ snack tcl tk ];
installPhase = ''
mkdir -p $out/{bin,nix-support,share/wavesurfer/}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
index 4a023849f3..d50f363798 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
patchShebangs install.sh
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
index 9921fdc7a7..039dfe59ff 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
@@ -7,6 +7,7 @@
, jackaudioSupport ? false, libjack2
, cudaSupport ? config.cudaSupport or false, cudatoolkit
, colladaSupport ? true, opencollada
+, spaceNavSupport ? false, libspnav
, makeWrapper
, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
, embree, gmp
@@ -56,7 +57,8 @@ stdenv.mkDerivation rec {
])
++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit
- ++ optional colladaSupport opencollada;
+ ++ optional colladaSupport opencollada
+ ++ optional spaceNavSupport libspnav;
postPatch = ''
# allow usage of dynamically linked embree
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
new file mode 100644
index 0000000000..5c6e9a0f9f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
@@ -0,0 +1,77 @@
+{ lib, fetchFromGitHub
+, meson, ninja, pkg-config, wrapGAppsHook
+, desktop-file-utils, gsettings-desktop-schemas, libnotify
+, python3Packages, gettext
+, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3
+, steam-run-native
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "bottles";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = "bottlesdevs";
+ repo = pname;
+ rev = version;
+ sha256 = "1hbjnd06h0h47gcwb1s1b9py5nwmia1m35da6zydbl70vs75imhn";
+ };
+
+ postPatch = ''
+ chmod +x build-aux/meson/postinstall.py
+ patchShebangs build-aux/meson/postinstall.py
+ '';
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ gettext
+ appstream-glib
+ desktop-file-utils
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ glib
+ gobject-introspection
+ gsettings-desktop-schemas
+ gspell
+ gtk3
+ libnotify
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ pycairo
+ pygobject3
+ lxml
+ dbus-python
+ gst-python
+ liblarch
+ ] ++ [ steam-run-native ];
+
+ format = "other";
+ strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
+ dontWrapGApps = true; # prevent double wrapping
+
+ preConfigure = ''
+ substituteInPlace build-aux/meson/postinstall.py \
+ --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'"
+ substituteInPlace src/runner.py \
+ --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \
+ --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}"
+ '';
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ meta = with lib; {
+ description = "An easy-to-use wineprefix manager";
+ homepage = "https://github.com/bottlesdevs/Bottles";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ bloomvdomino ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
index 1471af254f..7f2ee5a288 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
@@ -26,11 +26,11 @@
mkDerivation rec {
pname = "calibre";
- version = "5.11.0";
+ version = "5.12.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-PI+KIMnslhoagv9U6Mcmo9Onfu8clVqASNlDir8JzUw=";
+ sha256 = "sha256-N3/y1kSWyM36LpwbimftJ67h4zfk2j9hcvUi/pQL3YU=";
};
patches = [
@@ -179,7 +179,7 @@ mkDerivation rec {
free and open source and great for both casual users and computer experts.
'';
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3Plus;
- maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
+ maintainers = with maintainers; [ pSub AndersonTorres ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cataract/build.nix b/third_party/nixpkgs/pkgs/applications/misc/cataract/build.nix
index f894dc91bd..0adab84830 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cataract/build.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cataract/build.nix
@@ -5,7 +5,7 @@
, pkg-config
, libxml2
, exiv2
-, imagemagick
+, imagemagick6
, version
, sha256
, rev }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ glib libxml2 exiv2 imagemagick ];
+ buildInputs = [ glib libxml2 exiv2 imagemagick6 ];
prePatch = ''
sed -i 's|#include |#include |' src/jpeg-utils.cpp
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
index 74dd82a3c6..524f898553 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake makeWrapper ];
- buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];
+ buildInputs = [ fftw ncurses5 libpulseaudio ];
buildFlags = [ "ENABLE_PULSE=1" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix
index 630ee3c368..fafcf3d544 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchpatch, lib, stdenv
+{ fetchFromGitHub, lib, stdenv
, autoreconfHook, intltool, pkg-config
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
index e3a0046205..c47dd972cc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/clipmenu/default.nix
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [ "PREFIX=$(out)" ];
- buildInputs = [ makeWrapper ];
- nativeBuildInputs = [ xsel clipnotify ];
+ nativeBuildInputs = [ makeWrapper xsel clipnotify ];
postFixup = ''
sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,'
diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix
index 5b310373ee..d043823a06 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "coolreader";
- version = "3.2.51";
+ version = "3.2.53";
src = fetchFromGitHub {
owner = "buggins";
repo = pname;
rev = "cr${version}";
- sha256 = "sha256-rRWZHkuSNhAHwxKjpRgcNXO9vs/MDAgEuhRs8mRPjP4=";
+ sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
index f4dafd9e13..aa19ce2c53 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
- version = "1.13.1";
+ version = "1.13.2";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fgXhWouqStfxWs6cFNVxWI1INVYswVUTOuLr09utxpY=";
+ sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio=";
};
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
index 774fcc75b2..68c9019f6e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "7.3.5"; # When updating also update fetchedMavenDeps.sha256
+ version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
- sha256 = "sha256-gEE7rndOaXzruWL7TG+QgVkq1+06tIZwyGzU9cFc+oU=";
+ sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk=";
};
fetchedMavenDeps = stdenv.mkDerivation {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
maven
];
- buildPhase = "mvn package -Dmaven.repo.local=$out/.m2";
+ buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms";
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "sha256-jT0Z154rVmafUbb6dqYSl3cUxMuK5MR4HUsprkrgSDw=";
+ outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
};
buildInputs = [
@@ -80,16 +80,30 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
- mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+ runHook preBuild
+
+ mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms
+
+ runHook postBuild
'';
installPhase =
let
productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product";
+
+ platformMap = {
+ aarch64-linux = "aarch64";
+ x86_64-darwin = "x86_64";
+ x86_64-linux = "x86_64";
+ };
+
+ systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}");
in
if stdenv.isDarwin then ''
+ runHook preInstall
+
mkdir -p $out/Applications $out/bin
- cp -r ${productTargetPath}/macosx/cocoa/x86_64/DBeaver.app $out/Applications
+ cp -r ${productTargetPath}/macosx/cocoa/${systemPlatform}/DBeaver.app $out/Applications
sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini
@@ -98,9 +112,13 @@ stdenv.mkDerivation rec {
wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \
--prefix JAVA_HOME : ${jdk.home} \
--prefix PATH : ${jdk}/bin
+
+ runHook postInstall
'' else ''
+ runHook preInstall
+
mkdir -p $out/
- cp -r ${productTargetPath}/linux/gtk/x86_64/dbeaver $out/dbeaver
+ cp -r ${productTargetPath}/linux/gtk/${systemPlatform}/dbeaver $out/dbeaver
# Patch binaries.
interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
@@ -117,6 +135,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/pixmaps
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
+
+ runHook postInstall
'';
meta = with lib; {
@@ -129,7 +149,7 @@ stdenv.mkDerivation rec {
Teradata, Firebird, Derby, etc.
'';
license = licenses.asl20;
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
maintainers = with maintainers; [ jojosch ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix
index 36e2923522..649fbe55fa 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ding/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
};
- buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ aspellEnv fortune gnugrep tk tre ];
patches = [ ./dict.patch ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
index eed07a2356..65e86bb7db 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
@@ -1,12 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, pkg-config, which, perl, libXrandr
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
+, gtk3, wayland, wayland-protocols
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
}:
stdenv.mkDerivation rec {
pname = "dunst";
- version = "1.5.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "dunst-project";
@@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo dbus gdk-pixbuf glib libX11 libXScrnSaver
libXinerama libnotify pango xorgproto librsvg libXrandr
+ gtk3 wayland wayland-protocols
];
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix
index 6ee546fa7c..0e072aa649 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/flavours/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "flavours";
- version = "0.3.5";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "Misterio77";
repo = pname;
rev = "v${version}";
- sha256 = "1lvbq026ap02f22mv45s904a0f81dr2f07j6bq0wnwl5wd5w0wpj";
+ sha256 = "0nys1sh4qwda1ql6aq07bhyvhjp5zf0qm98kr4kf2fmr87ddc12q";
};
- cargoSha256 = "0wgi65k180mq1q6j4nma0wpfdvl67im5v5gmhzv1ap6xg3bicdg1";
+ cargoSha256 = "0bmmxiv8bd09kgxmhmynslfscsx2aml1m1glvid3inaipylcq45h";
meta = with lib; {
description = "An easy to use base16 scheme manager/builder that integrates with any workflow";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix
index 29c6df8a72..5810607e8d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "free42";
- version = "2.5.24a";
+ version = "3.0";
src = fetchFromGitHub {
owner = "thomasokken";
repo = pname;
rev = "v${version}";
- sha256 = "xP0kzpmX6Q5Dg7azvyUZIdoi52AYkUmiCkUA1aVY+nQ=";
+ sha256 = "jzNopLndYH9dIdm30pyDaZNksHwS4i5LTZUXRmcrTp8=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
index 20aefe2ab1..e19e89ec6c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
dateutil gflags httplib2 parsedatetime six vobject
- google_api_python_client oauth2client uritemplate
+ google-api-python-client oauth2client uritemplate
libnotify
] ++ lib.optional (!isPy3k) futures;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix
index c6617cc232..34f4aa71a3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix
@@ -4,8 +4,8 @@
, pkg-config
, gettext
, fetchFromGitLab
-, python3
-, libhandy_0
+, python3Packages
+, libhandy
, libpwquality
, wrapGAppsHook
, gtk3
@@ -15,9 +15,9 @@
, desktop-file-utils
, appstream-glib }:
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "gnome-passwordsafe";
- version = "3.99.2";
+ version = "5.0";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "World";
repo = "PasswordSafe";
rev = version;
- sha256 = "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf";
+ sha256 = "8EFKLNK7rZlYL2g/7FmaC5r5hcdblsnod/aB8NYiBvY=";
};
nativeBuildInputs = [
@@ -44,26 +44,13 @@ python3.pkgs.buildPythonApplication rec {
gtk3
glib
gdk-pixbuf
- libhandy_0
+ libhandy
];
- propagatedBuildInputs = with python3.pkgs; [
+ propagatedBuildInputs = with python3Packages; [
pygobject3
construct
-
- # pykeepass 3.2.1 changed some exception types, and is not backwards compatible.
- # Remove override once the MR is merged upstream.
- # https://gitlab.gnome.org/World/PasswordSafe/-/merge_requests/79
- (pykeepass.overridePythonAttrs (old: rec {
- version = "3.2.0";
- src = fetchPypi {
- pname = "pykeepass";
- inherit version;
- sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1";
- };
- propagatedBuildInputs = old.propagatedBuildInputs ++ [ pycryptodome ];
- }))
-
+ pykeepass
] ++ [
libpwquality # using the python bindings
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock
index eed618a5cb..73bc5d068d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock
@@ -1,20 +1,20 @@
GEM
remote: https://rubygems.org/
specs:
- concurrent-ruby (1.1.7)
+ concurrent-ruby (1.1.8)
crass (1.0.6)
execjs (2.7.0)
- ffi (1.13.1)
+ ffi (1.14.2)
gemojione (4.3.3)
json
github-markup (3.0.5)
- gollum (5.1.2)
+ gollum (5.2.1)
gemojione (~> 4.1)
- gollum-lib (~> 5.0)
+ gollum-lib (~> 5.1)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1.0)
- mustache (>= 0.99.5, < 1.0.0)
- octicons (~> 8.5)
+ mustache-sinatra (~> 1.0)
+ octicons (~> 12.0)
rss (~> 0.2.9)
sass (~> 3.5)
sinatra (~> 2.0)
@@ -22,40 +22,44 @@ GEM
sprockets (~> 3.7)
sprockets-helpers (~> 1.2)
therubyrhino (~> 2.1.0)
- uglifier (~> 3.2)
+ uglifier (~> 4.2)
useragent (~> 0.16.2)
- gollum-lib (5.0.6)
+ gollum-lib (5.1)
gemojione (~> 4.1)
github-markup (~> 3.0)
gollum-rugged_adapter (~> 1.0)
loofah (~> 2.3)
nokogiri (~> 1.8)
- octicons (~> 8.5)
+ octicons (~> 12.0)
rouge (~> 3.1)
twitter-text (= 1.14.7)
gollum-rugged_adapter (1.0)
mime-types (>= 1.15)
rugged (~> 0.99)
- json (2.3.1)
+ json (2.5.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
- loofah (2.8.0)
+ loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2020.1104)
- mini_portile2 (2.4.0)
+ mime-types-data (3.2021.0225)
+ mini_portile2 (2.5.0)
multi_json (1.15.0)
mustache (0.99.8)
+ mustache-sinatra (1.0.1)
+ mustache (<= 0.99.8)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
- nokogiri (1.10.10)
- mini_portile2 (~> 2.4.0)
- octicons (8.5.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ octicons (12.1.0)
nokogiri (>= 1.6.3.1)
+ racc (1.5.2)
rack (2.2.3)
rack-protection (2.1.0)
rack
@@ -63,10 +67,10 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
- rouge (3.25.0)
+ rouge (3.26.0)
rss (0.2.9)
rexml
- ruby2_keywords (0.0.2)
+ ruby2_keywords (0.0.4)
rugged (0.99.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
@@ -95,7 +99,7 @@ GEM
tilt (2.0.10)
twitter-text (1.14.7)
unf (~> 0.1.0)
- uglifier (3.2.0)
+ uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix
index fc80a5ddb8..4a365b5a17 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/gollum/gollum";
changelog = "https://github.com/gollum/gollum/blob/v${version}/HISTORY.md";
license = licenses.mit;
- maintainers = with maintainers; [ jgillich primeos nicknovitski ];
+ maintainers = with maintainers; [ erictapen jgillich nicknovitski ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix
index d259167856..690eba645d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix
@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.8";
};
crass = {
groups = ["default"];
@@ -34,10 +34,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
+ sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
type = "gem";
};
- version = "1.13.1";
+ version = "1.14.2";
};
gemojione = {
dependencies = ["json"];
@@ -61,15 +61,15 @@
version = "3.0.5";
};
gollum = {
- dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
+ dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx";
+ sha256 = "0n89c77amabvv4aq8jq5r6581hqzw79w8khr13w6kvv6iabq1vaz";
type = "gem";
};
- version = "5.1.2";
+ version = "5.2.1";
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
@@ -77,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4";
+ sha256 = "0p721ymkf2xcskjgr9308b6g581cbxgvhprj9srqskssxvsfdsln";
type = "gem";
};
- version = "5.0.6";
+ version = "5.1";
};
gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
@@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
- version = "2.3.1";
+ version = "2.5.1";
};
kramdown = {
dependencies = ["rexml"];
@@ -131,10 +131,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
+ sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
type = "gem";
};
- version = "2.8.0";
+ version = "2.9.0";
};
mime-types = {
dependencies = ["mime-types-data"];
@@ -152,20 +152,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
+ sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
type = "gem";
};
- version = "3.2020.1104";
+ version = "3.2021.0225";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
multi_json = {
groups = ["default"];
@@ -187,6 +187,17 @@
};
version = "0.99.8";
};
+ mustache-sinatra = {
+ dependencies = ["mustache"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rvdwg1zk3sybpi9hzn6jj0k8rndkq19y7cl0jmqr0g2xx21z7mr";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
mustermann = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
@@ -199,15 +210,15 @@
version = "1.1.1";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+ sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
- version = "1.10.10";
+ version = "1.11.1";
};
octicons = {
dependencies = ["nokogiri"];
@@ -215,10 +226,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fy6shpfmla58dxx3kb2zi1hs7vmdw6pqrksaa8yrva05s4l3y75";
+ sha256 = "0kpy7h7pffjqb2xbmld7nwnb2x6rll3yz5ccr7nrqnrk2d3cmpmn";
type = "gem";
};
- version = "8.5.0";
+ version = "12.1.0";
+ };
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
};
rack = {
groups = ["default"];
@@ -277,10 +298,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.25.0";
+ version = "3.26.0";
};
rss = {
dependencies = ["rexml"];
@@ -298,10 +319,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+ sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem";
};
- version = "0.0.2";
+ version = "0.0.4";
};
rugged = {
groups = ["default"];
@@ -427,10 +448,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wmqvn4xncw6h3d5gp2a44170zwxfyj3iq4rsjp16zarvzbdmgnz";
+ sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f";
type = "gem";
};
- version = "3.2.0";
+ version = "4.2.0";
};
unf = {
dependencies = ["unf_ext"];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
index fad86b8974..cebbcfe59b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
- version = "8.6";
+ version = "8.8";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "sha256-RAqTwi65YskQhsjlHxQqy50R5s8z2yriWLkrg5J/eTc=";
+ sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo=";
};
patches = (substituteAll {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix
index 6c3ba132d0..22444e2205 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/opt
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix
new file mode 100644
index 0000000000..8f6284c7d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier
+, appindicatorSupport ? true, libayatana-appindicator-gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gxkb";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "zen-tools";
+ repo = "gxkb";
+ rev = "v${version}";
+ sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069";
+ };
+
+ nativeBuildInputs = [ pkg-config autoreconfHook ];
+ buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3;
+
+ configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
+ outputs = [ "out" "man" ];
+
+ meta = with lib; {
+ description = "X11 keyboard indicator and switcher";
+ homepage = "https://zen-tools.github.io/gxkb/";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.omgbebebe ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix
index 9f1431a234..5c50ac2453 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/icesl/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
} else throw "Unsupported architecture";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
cp -r ./ $out
mkdir $out/oldbin
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 65c747c40a..161aeb7720 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.1.0)
+ activesupport (6.1.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -10,19 +10,19 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
- concurrent-ruby (1.1.7)
+ concurrent-ruby (1.1.8)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.13.1)
+ ffi (1.14.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.5)
+ i18n (1.8.9)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
addressable (~> 2.4)
@@ -61,17 +61,19 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
- listen (3.3.3)
+ listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
- mini_portile2 (2.4.0)
- minitest (5.14.2)
- nokogiri (1.10.10)
- mini_portile2 (~> 2.4.0)
+ mini_portile2 (2.5.0)
+ minitest (5.14.4)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
+ racc (1.5.2)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -82,7 +84,7 @@ GEM
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- tzinfo (2.0.3)
+ tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
zeitwerk (2.4.2)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
index cc7be93510..bda211e6f7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
+ sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h";
type = "gem";
};
- version = "6.1.0";
+ version = "6.1.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.8";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
+ sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
type = "gem";
};
- version = "1.13.1";
+ version = "1.14.2";
};
forwardable-extended = {
groups = ["default"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+ sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
- version = "1.8.5";
+ version = "1.8.9";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -250,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
+ sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj";
type = "gem";
};
- version = "3.3.3";
+ version = "3.4.1";
};
mercenary = {
groups = ["default"];
@@ -270,31 +270,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+ sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
- version = "5.14.2";
+ version = "5.14.4";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+ sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
- version = "1.10.10";
+ version = "1.11.1";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -317,6 +317,16 @@
};
version = "4.0.6";
};
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
rb-fsevent = {
groups = ["default"];
platforms = [];
@@ -396,10 +406,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
+ sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
- version = "2.0.3";
+ version = "2.0.4";
};
unicode-display_width = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 969909ca6d..e93f78e83c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.1.0)
+ activesupport (6.1.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -17,24 +17,26 @@ GEM
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
- concurrent-ruby (1.1.7)
+ concurrent-ruby (1.1.8)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
- faraday (1.1.0)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
+ faraday-net_http (1.0.1)
fast-stemmer (1.0.2)
- ffi (1.13.1)
+ ffi (1.14.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.5)
+ i18n (1.8.9)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
addressable (~> 2.4)
@@ -64,7 +66,7 @@ GEM
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
- jekyll-polyglot (1.3.3)
+ jekyll-polyglot (1.4.0)
jekyll (>= 3.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
@@ -90,31 +92,33 @@ GEM
liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
- listen (3.3.3)
+ listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2020.1104)
- mini_portile2 (2.4.0)
- minitest (5.14.2)
+ mime-types-data (3.2021.0225)
+ mini_portile2 (2.5.0)
+ minitest (5.14.4)
multipart-post (2.1.1)
- nokogiri (1.10.10)
- mini_portile2 (~> 2.4.0)
- octokit (4.19.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
+ racc (1.5.2)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
- rdoc (6.2.1)
+ rdoc (6.3.0)
rexml (3.2.4)
rouge (3.26.0)
- ruby2_keywords (0.0.2)
+ ruby2_keywords (0.0.4)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
@@ -124,7 +128,7 @@ GEM
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tomlrb (1.3.0)
- tzinfo (2.0.3)
+ tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
yajl-ruby (1.4.1)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
index bfbe428c86..ee348a80c4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v";
+ sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h";
type = "gem";
};
- version = "6.1.0";
+ version = "6.1.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -90,10 +90,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+ sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
- version = "1.1.7";
+ version = "1.1.8";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -127,15 +127,25 @@
version = "2.7.0";
};
faraday = {
- dependencies = ["multipart-post" "ruby2_keywords"];
+ dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
+ sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
type = "gem";
};
- version = "1.1.0";
+ version = "1.3.0";
+ };
+ faraday-net_http = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ type = "gem";
+ };
+ version = "1.0.1";
};
fast-stemmer = {
groups = ["default"];
@@ -164,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
+ sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
type = "gem";
};
- version = "1.13.1";
+ version = "1.14.2";
};
forwardable-extended = {
groups = ["default"];
@@ -216,10 +226,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+ sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
- version = "1.8.5";
+ version = "1.8.9";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -303,10 +313,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8";
+ sha256 = "0klf363dsdsi90rsnc9047b3hbg88gagkq2sqzmmg5r1nhy7hyyr";
type = "gem";
};
- version = "1.3.3";
+ version = "1.4.0";
};
jekyll-redirect-from = {
dependencies = ["jekyll"];
@@ -458,10 +468,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha";
+ sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj";
type = "gem";
};
- version = "3.3.3";
+ version = "3.4.1";
};
mercenary = {
groups = ["default"];
@@ -489,30 +499,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
+ sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
type = "gem";
};
- version = "3.2020.1104";
+ version = "3.2021.0225";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+ sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+ sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
- version = "5.14.2";
+ version = "5.14.4";
};
multipart-post = {
groups = ["default"];
@@ -525,15 +535,15 @@
version = "2.1.1";
};
nokogiri = {
- dependencies = ["mini_portile2"];
+ dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+ sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
type = "gem";
};
- version = "1.10.10";
+ version = "1.11.1";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@@ -541,10 +551,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
+ sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
type = "gem";
};
- version = "4.19.0";
+ version = "4.20.0";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -567,6 +577,16 @@
};
version = "4.0.6";
};
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
rb-fsevent = {
groups = ["default"];
platforms = [];
@@ -593,10 +613,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08862mr1575j8g32wma4pv2qwj4xpllk29i5j61hgf9nwn64afhc";
+ sha256 = "1rz1492df18161qwzswm86gav0dnqz715kxzw5yfnv0ka43d4zc4";
type = "gem";
};
- version = "6.2.1";
+ version = "6.3.0";
};
rexml = {
groups = ["default"];
@@ -623,10 +643,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
+ sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem";
};
- version = "0.0.2";
+ version = "0.0.4";
};
safe_yaml = {
groups = ["default"];
@@ -687,10 +707,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg";
+ sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
- version = "2.0.3";
+ version = "2.0.4";
};
unicode-display_width = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
index 28c7de12c8..3828fc654d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
dontUnpack = true;
- buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ];
installPhase =
if stdenv.isDarwin then ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
index 32572ffcdb..6388d005fe 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix
@@ -12,7 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = ".";
- buildInputs = [ unzip makeWrapper icoutils ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip icoutils ];
patches = [
(substituteAll {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
index 60905be3b1..4c5a443ba0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
- version = "0.26.8";
+ version = "0.26.10";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
- sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq";
+ sha256 = "sha256-h2jCmLZ2pRlK8VblQosBX0ZcoHDnn4oYeSqzA3y1Tzg=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
index c302a4b4a0..1c87747eac 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix
@@ -6,7 +6,6 @@
, curl
, doxygen
, fetchFromGitHub
-, fetchpatch
, ffmpeg_3
, libmediainfo
, libraw
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
index 12843ffb98..75013f0931 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "mob";
- version = "1.2.0";
+ version = "1.3.0";
goPackagePath = "github.com/remotemobprogramming/mob";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
- sha256 = "sha256-hBzSf3UUW2FUp1jG1sPt7vN1iDybdMox/h6xHVrM7DY=";
+ sha256 = "sha256-uzWr6wWO6niocJ8yLc1Uu9Wt/FXlCuQrC0RJkgVlphM=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mpvc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mpvc/default.nix
index 64b55cce7a..69aca239d3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mpvc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mpvc/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation {
wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
'';
- buildInputs = [ socat makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ socat ];
meta = with lib; {
description = "A mpc-like control interface for mpv";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
index 76009b96a3..3f898a1324 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@@ -34,23 +34,20 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
- "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
- sha256 = "AkPx7X00kEds7B1syXJPSV1+TJlqQ7NnR6w9wSG2BRw=";
+ "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
+ sha256 = "1acy0dny04c8rdxqvsq70aa7vd8rgyjarcrf57mhh26ai5wiw81s";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
- unpackPhase = ''
- gzip -dc $src > obsidian.asar
- '';
-
installPhase = ''
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
- --add-flags $out/share/electron/obsidian.asar
+ --add-flags $out/share/obsidian/app.asar
- install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar
+ install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
+ install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
install -m 444 -D "${desktopItem}/share/applications/"* \
-t $out/share/applications/
diff --git a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
index 7b91d245f8..2bb3d14e1d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
};
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o
diff --git a/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
index 28becefa5b..b3e93ce512 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/openjump/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
cd $out; unzip $src
'';
- buildInputs = [unzip makeWrapper];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
installPhase = ''
dir=$(echo $out/OpenJUMP-*)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmscout-server/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmscout-server/default.nix
new file mode 100644
index 0000000000..a3815dae00
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/osmscout-server/default.nix
@@ -0,0 +1,65 @@
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
+, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
+, libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf
+, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
+}:
+
+let
+ date = fetchFromGitHub {
+ owner = "HowardHinnant";
+ repo = "date";
+ rev = "a2fdba1adcb076bf9a8343c07524afdf09aa8dcc";
+ sha256 = "00sf1pbaz0g0gsa0dlm23lxk4h46xm1jv1gzbjj5rr9sf1qccyr5";
+ };
+in
+mkDerivation rec {
+ pname = "osmscout-server";
+ version = "1.17.1";
+
+ src = fetchFromGitHub {
+ owner = "rinigus";
+ repo = "osmscout-server";
+ rev = version;
+ sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9";
+ fetchSubmodules = true;
+ };
+
+ # Two patches required to work with valhalla 3.1
+ patches = [
+ # require C++14 to match latest Valhalla
+ (fetchpatch {
+ url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch";
+ sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0";
+ })
+ # add Valhalla 3.1 config
+ (fetchpatch {
+ url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch";
+ sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz";
+ })
+ ];
+
+ nativeBuildInputs = [ qmake pkg-config qttools ];
+ buildInputs = [
+ kirigami2 qtquickcontrols2 qtlocation
+ mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
+ libpostal sqlite marisa kyotocabinet boost protobuf date
+ ];
+
+ # OSMScout server currently defaults to an earlier version of valhalla,
+ # but valhalla 3.1 support has been added. (See patches above)
+ # Replace the default valhalla.json with the valhalla 3.1 version
+ postPatch = ''
+ mv data/valhalla.json-3.1 data/valhalla.json
+ '';
+
+ # Choose to build the kirigami UI variant
+ qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ];
+
+ meta = with lib; {
+ description = "Maps server providing tiles, geocoder, and router";
+ homepage = "https://github.com/rinigus/osmscout-server";
+ license = licenses.gpl3Only;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/0001-fix-locale.patch b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/0001-fix-locale.patch
new file mode 100644
index 0000000000..2ae1a17ca8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/0001-fix-locale.patch
@@ -0,0 +1,17 @@
+diff --git a/python/lib/lng.py b/python/lib/lng.py
+index a390d920..00c3527e 100755
+--- a/python/lib/lng.py
++++ b/python/lib/lng.py
+@@ -12,11 +12,7 @@ class Lang(object):
+
+ class iLang(object):
+ def __init__(self):
+- if(os.environ["DEBIAN_PACKAGE"] == "TRUE"):
+- languages = os.listdir('/usr/share/locale')
+- else:
+- languages = os.listdir(Variables.playonlinux_env+'/lang/locale')
+-
++ languages = os.listdir('@out@/share/playonlinux/lang/locale')
+ if(os.environ["POL_OS"] == "Mac"):
+ wxLocale = wx.Locale().FindLanguageInfo(os.environ["RLANG"])
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix
index d805aa0c0a..320d771bc6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix
@@ -9,7 +9,7 @@
, imagemagick
, netcat-gnu
, p7zip
-, python2
+, python3
, unzip
, wget
, wine
@@ -22,6 +22,9 @@
, jq
, xorg
, libGL
+, steam-run-native
+# needed for avoiding crash on file selector
+, gsettings-desktop-schemas
}:
let
@@ -54,9 +57,10 @@ let
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ];
- python = python2.withPackages(ps: with ps; [
- wxPython
+ python = python3.withPackages(ps: with ps; [
+ wxPython_4_1
setuptools
+ natsort
]);
in stdenv.mkDerivation {
@@ -68,8 +72,16 @@ in stdenv.mkDerivation {
sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma";
};
+ patches = [
+ ./0001-fix-locale.patch
+ ];
+
nativeBuildInputs = [ makeWrapper ];
+ preBuild = ''
+ makeFlagsArray+=(PYTHON="python -m py_compile")
+ '';
+
buildInputs = [
xorg.libX11
libGL
@@ -77,6 +89,7 @@ in stdenv.mkDerivation {
];
postPatch = ''
+ substituteAllInPlace python/lib/lng.py
patchShebangs python tests/python
sed -i "s/ %F//g" etc/PlayOnLinux.desktop
'';
@@ -87,8 +100,16 @@ in stdenv.mkDerivation {
install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
- makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
- --prefix PATH : ${binpath}
+ makeWrapper $out/share/playonlinux/playonlinux{,-wrapper} \
+ --prefix PATH : ${binpath} \
+ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/GConf
+ # steam-run is needed to run the downloaded wine executables
+ mkdir -p $out/bin
+ cat > $out/bin/playonlinux <
++#include
+ #include
+ #include
+ #include
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/robomongo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/robomongo/default.nix
index e8bba1f7a3..af5285909c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/robomongo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/robomongo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
+{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix
new file mode 100644
index 0000000000..6df8dc781e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "senv";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "SpectralOps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "014422sdks2xlpsgvynwibz25jg1fj5s8dcf8b1j6djgq5glhfaf";
+ };
+
+ vendorSha256 = "05n55yf75r7i9kl56kw9x6hgmyf5bva5dzp9ni2ws0lb1389grfc";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Friends don't let friends leak secrets on their terminal window";
+ homepage = "https://github.com/SpectralOps/senv";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
index 6dad2eaf81..c904c22126 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
@@ -19,7 +19,7 @@
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p "$out/lib/SideQuest" "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
new file mode 100644
index 0000000000..1221db1ad9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, libspnav, libX11, mesa_glu }:
+
+stdenv.mkDerivation {
+ pname = "spacenav-cube-example";
+ version = libspnav.version;
+
+ src = libspnav.src;
+
+ sourceRoot = "source/examples/cube";
+
+ buildInputs = [ libX11 mesa_glu libspnav ];
+
+ configureFlags = [ "--disable-debug" ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp cube $out/bin/spacenav-cube-example
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "http://spacenav.sourceforge.net/";
+ description = "An example application to test the spacenavd driver";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ sohalt ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
index 2b97d2f018..62a6d4785f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs=";
+ sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo=";
};
- vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw=";
+ vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
# used at runtime, but not installed by default
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
new file mode 100644
index 0000000000..16d56eeaa9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "stork";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jameslittle230";
+ repo = "stork";
+ rev = "v${version}";
+ sha256 = "sha256-pBJ9n1pQafXagQt9bnj4N1jriczr47QLtKiv+UjWgTg=";
+ };
+
+ cargoSha256 = "sha256-u8L4ZeST4ExYB2y8E+I49HCy41dOfhR1fgPpcVMVDuk=";
+
+ meta = with lib; {
+ description = "Impossibly fast web search, made for static sites";
+ homepage = "https://github.com/jameslittle230/stork";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ chuahou ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix
index 2f0a58b8e4..0b97110b1d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix
@@ -49,7 +49,8 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
'';
- buildInputs = [ ant jdk8 makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ];
buildPhase = ''
runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix
index a008b49ba7..f5dbd0510a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix
@@ -35,7 +35,8 @@ let
categories = "Graphics;2DGraphics;3DGraphics;";
};
- buildInputs = [ ant jdk8 makeWrapper gtk3 gsettings-desktop-schemas ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ];
postPatch = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix
index 1804f3c04e..b396c578c9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tabula/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
index b3f26c87c5..ee781c75e6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,19 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls }:
+{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, python3, bash }:
stdenv.mkDerivation rec {
pname = "taskwarrior";
- version = "2.5.2";
+ version = "2.5.3";
- src = fetchFromGitHub {
- owner = "GothenburgBitFactory";
- repo = "taskwarrior";
- rev = "v${version}";
- sha256 = "0jv5b56v75qhdqbrfsddfwizmbizcsv3mn8gp92nckwlx9hrk5id";
- fetchSubmodules = true;
- };
+ srcs = [
+ (fetchurl {
+ url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz";
+ sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj";
+ })
+ (fetchurl {
+ url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/tests-${version}.tar.gz";
+ sha256 = "165xmf9h6rb7l6l9nlyygj0mx9bi1zyd78z0lrl3nadhmgzggv0b";
+ })
+ ];
+
+ sourceRoot = "task-${version}";
+
+ postUnpack = ''
+ mv test ${sourceRoot}
+ '';
nativeBuildInputs = [ cmake libuuid gnutls ];
+ doCheck = true;
+ preCheck = ''
+ find test -type f -exec sed -i \
+ -e "s|/usr/bin/env python3|${python3.interpreter}|" \
+ -e "s|/usr/bin/env bash|${bash}/bin/bash|" \
+ {} +
+ '';
+ checkTarget = "test";
+
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
@@ -28,6 +46,6 @@ stdenv.mkDerivation rec {
homepage = "https://taskwarrior.org";
license = licenses.mit;
maintainers = with maintainers; [ marcweber ];
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
index e42d48c8f0..bc3e8dfd6d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
@@ -1,4 +1,7 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
buildGoModule rec {
pname = "ticker";
@@ -6,13 +9,17 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "achannarasappa";
- repo = "ticker";
+ repo = pname;
rev = "v${version}";
sha256 = "sha256-U2TYUB4RHUBPoXe/te+QpXglbVcrT6SItiDrA7ODX6w=";
};
vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")
+ '';
+
# Tests require internet
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix b/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
index 03ed031be8..319ba3643d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/translate-shell/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix
index 87c49a19a1..d780f9e35d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix
@@ -1,37 +1,50 @@
-{ lib, fetchFromGitHub, asciidoc-full, gettext
-, gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg
-, udisks2, wrapGAppsHook
-, python3Packages
+{ lib
+, fetchFromGitHub
+, asciidoc-full
+, buildPythonApplication
+, docopt
+, gettext
+, gobject-introspection
+, gtk3
+, keyutils
+, libappindicator-gtk3
+, libnotify
+, librsvg
+, nose
+, pygobject3
+, pyyaml
+, udisks2
+, wrapGAppsHook
}:
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
pname = "udiskie";
- version = "2.2.0";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
- rev = version;
- sha256 = "0kn5w6bm3rmbszphzbxpjfnkawb2naa230svzkpmh3n6dcdvk4qa";
+ rev = "v${version}";
+ hash = "sha256-eucAFMzLf2RfMfVgFTfPAgVNpDADddvTUZQO/XbBhGo=";
};
nativeBuildInputs = [
+ asciidoc-full # Man page
gettext
- asciidoc-full # For building man page.
gobject-introspection
wrapGAppsHook
];
buildInputs = [
- librsvg # required for loading svg icons (udiskie uses svg icons)
gobject-introspection
- libnotify
gtk3
- udisks2
libappindicator-gtk3
+ libnotify
+ librsvg # Because it uses SVG icons
+ udisks2
];
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = [
docopt
pygobject3
pyyaml
@@ -44,7 +57,7 @@ python3Packages.buildPythonApplication rec {
cp -v doc/udiskie.8 $out/share/man/man8/
'';
- checkInputs = with python3Packages; [
+ checkInputs = [
nose
keyutils
];
@@ -54,9 +67,23 @@ python3Packages.buildPythonApplication rec {
'';
meta = with lib; {
- description = "Removable disk automounter for udisks";
- license = licenses.mit;
homepage = "https://github.com/coldfix/udiskie";
+ description = "Removable disk automounter for udisks";
+ longDescription = ''
+ udiskie is a udisks2 front-end that allows to manage removeable media such
+ as CDs or flash drives from userspace.
+
+ Its features include:
+ - automount removable media
+ - notifications
+ - tray icon
+ - command line tools for manual un-/mounting
+ - LUKS encrypted devices
+ - unlocking with keyfiles (requires udisks 2.6.4)
+ - loop devices (mounting iso archives)
+ - password caching (requires python keyutils 0.3)
+ '';
+ license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix
index 61ebfb0fcc..71f67baa6c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
++ lib.optional withGeoClue geoclue2
diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
index 0cbe325f62..d730f96634 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, meson
, pkg-config
, ninja
@@ -36,6 +37,17 @@ stdenv.mkDerivation rec {
sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
};
+ patches = [
+ # XXX: REMOVE ON NEXT VERSION BUMP
+ # Fixes compatibility of the bluetooth and network modules with linux kernel
+ # >=5.11
+ # c.f. https://github.com/Alexays/Waybar/issues/994
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/1015.patch";
+ sha256 = "sha256-jQZEM3Yru2yxcXAzapU47DoAv4ZoabrV80dH42I2OFk=";
+ })
+ ];
+
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook cmake
] ++ lib.optional withMediaPlayer gobject-introspection;
@@ -82,7 +94,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
- maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
+ maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault ];
platforms = platforms.unix;
homepage = "https://github.com/alexays/waybar";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix
index 32c1f0eaa6..27694174d7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
};
- buildInputs = [ tcl tk xlibsWrapper makeWrapper ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ tcl tk xlibsWrapper ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
index 10034fbe1b..365f621786 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [libX11 makeWrapper libXaw];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [libX11 libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix
index 60e3bb9fd5..49f78729a3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix
@@ -4,8 +4,7 @@ symlinkJoin {
paths = with zathura_core; [ man dev out ] ++ plugins;
-
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = let
fishCompletion = "share/fish/vendor_completions.d/zathura.fish";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix
index 988a322e9f..b0d05d928c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix
@@ -1,4 +1,4 @@
-{ version ? "release", stdenv, lib, fetchFromGitHub, buildGoModule, coreutils }:
+{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }:
let
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index 6e772c7931..0de942a172 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -30,6 +30,7 @@
, libXrandr
, libXrender
, libXScrnSaver
+, libxshmfence
, libXtst
, mesa
, nspr
@@ -72,6 +73,7 @@ rpath = lib.makeLibraryPath [
libXi
libXrandr
libXrender
+ libxshmfence
libXtst
libuuid
mesa
@@ -88,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.19.88";
+ version = "1.21.73";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "jySedvm9V3O4kri1PgoqC0OsC1gvB0Nwx8leoUZnHK0=";
+ sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
index be3d8295f9..daead82e48 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
postInstall = "make PREFIX=$out copy-data";
# Sometimes tests fail when run in parallel
- cargoParallelTestThreads = false;
+ dontUseCargoParallelThreads = true;
meta = with lib; {
description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index d93fc5ceb4..6c77ed3d18 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -250,13 +250,10 @@ let
symbol_level = 0;
fieldtrial_testing_like_official_build = true;
- # Google API keys, see:
- # http://www.chromium.org/developers/how-tos/api-keys
- # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
- # please get your own set of keys.
+ # Google API key, see: https://www.chromium.org/developers/how-tos/api-keys
+ # Note: The API key is for NixOS/nixpkgs use ONLY.
+ # For your own distribution, please get your own set of keys.
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
- google_default_client_id = "404761575300.apps.googleusercontent.com";
- google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py
new file mode 100755
index 0000000000..1aafc6147f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3Packages.feedparser python3Packages.requests
+
+# This script prints the Git commit message for stable channel updates.
+
+import re
+import textwrap
+
+import feedparser
+import requests
+
+feed = feedparser.parse('https://chromereleases.googleblog.com/feeds/posts/default')
+html_tags = re.compile(r'<[^>]+>')
+
+for entry in feed.entries:
+ if entry.title != 'Stable Channel Update for Desktop':
+ continue
+ url = requests.get(entry.link).url.split('?')[0]
+ content = entry.content[0].value
+ if re.search(r'Linux', content) is None:
+ continue
+ #print(url) # For debugging purposes
+ version = re.search(r'\d+(\.\d+){3}', content).group(0)
+ print('chromium: TODO -> ' + version)
+ print('\n' + url)
+ if fixes := re.search(r'This update includes .+ security fixes\.', content):
+ fixes = html_tags.sub('', fixes.group(0))
+ zero_days = re.search(r'Google is aware of reports that .+ in the wild\.', content)
+ if zero_days:
+ fixes += " " + zero_days.group(0)
+ print('\n' + '\n'.join(textwrap.wrap(fixes, width=72)))
+ if cve_list := re.findall(r'CVE-[^: ]+', content):
+ cve_string = ' '.join(cve_list)
+ print("\nCVEs:\n" + '\n'.join(textwrap.wrap(cve_string, width=72)))
+ break # We only care about the most recent stable channel update
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index a236e50218..9db51f2421 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,26 +1,26 @@
{
"stable": {
- "version": "88.0.4324.182",
- "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
- "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
+ "version": "89.0.4389.82",
+ "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
+ "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
"deps": {
"gn": {
- "version": "2020-11-05",
+ "version": "2021-01-07",
"url": "https://gn.googlesource.com/gn",
- "rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
- "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
+ "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
+ "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
}
},
"chromedriver": {
- "version": "88.0.4324.96",
- "sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41",
- "sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp"
+ "version": "89.0.4389.23",
+ "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r",
+ "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3"
}
},
"beta": {
- "version": "89.0.4389.58",
- "sha256": "1ppjkilfn84hq55wsb33xswlp1x8v34np5hq2wbh62ny6j8dbvwz",
- "sha256bin64": "1k4f380h2rghn81agdw8bkifpb690sr0ykjgbnis3kl68hbkp8a5",
+ "version": "89.0.4389.72",
+ "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
+ "sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby",
"deps": {
"gn": {
"version": "2021-01-07",
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "90.0.4421.5",
- "sha256": "0605ibr2fr13rmmxs7lw4dh25i9r6ic08ykdr7002m4rp8kxwsw6",
- "sha256bin64": "05mlm9l6q1w9rxid7cvaazzbw79wj9fjw6ka7wpr0gz4r3gmazsb",
+ "version": "90.0.4430.11",
+ "sha256": "0rzg1yji1rxddxcy03lwqv9rdqnk3c25v2g57mq9n37c6jqisyq4",
+ "sha256bin64": "015a1agwwf5g7x70rzfb129h6r7hfd86593853nqgy1m9yprxqab",
"deps": {
"gn": {
"version": "2021-02-09",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6b8a3b1c33..f1b1b26ae3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation {
libPath = lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
- (lib.getDev alsaLib)
atk
cairo
curl
@@ -128,7 +127,6 @@ stdenv.mkDerivation {
pango
libheimdal
libpulseaudio
- (lib.getDev libpulseaudio)
systemd
ffmpeg
] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index fb340ee1ac..7518e39938 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -23,7 +23,7 @@
, ffmpegSupport ? true
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, waylandSupport ? true, libxkbcommon
-, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages
+, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, gssSupport ? true, kerberos
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
@@ -111,6 +111,13 @@ let
else stdenv;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
+
+ # --enable-release adds -ffunction-sections & LTO that require a big amount of
+ # RAM and the 32-bit memory space cannot handle that linking
+ # We also disable adding "-g" for easier linking
+ releaseFlags = if stdenv.is32bit
+ then [ "--disable-release" "--disable-debug-symbols" ]
+ else [ "--enable-release" ];
in
buildStdenv.mkDerivation ({
@@ -296,9 +303,9 @@ buildStdenv.mkDerivation ({
++ lib.optional drmSupport "--enable-eme=widevine"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
- else [ "--disable-debug" "--enable-release"
+ else ([ "--disable-debug"
"--enable-optimize"
- "--enable-strip" ])
+ "--enable-strip" ] ++ releaseFlags))
++ lib.optional enableOfficialBranding "--enable-official-branding"
++ extraConfigureFlags;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
index 78eef77555..deea3decc2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.1.4";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE=";
+ sha256 = "sha256-Y+BiXKxlUSZXaLcz75l333ZBkKyII9IyTmKQwjshBkE=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix
index 917da034c3..8656b4aaa2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix
@@ -1,34 +1,56 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook
-, help2man, luafilesystem, luajit, sqlite
-, webkitgtk, gtk3, gst_all_1, glib-networking
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, wrapGAppsHook
+, help2man
+, glib-networking
+, gst_all_1
+, gtk3
+, luafilesystem
+, luajit
+, sqlite
+, webkitgtk
}:
stdenv.mkDerivation rec {
pname = "luakit";
- version = "2.2.1";
+ version = "2.3";
src = fetchFromGitHub {
owner = "luakit";
repo = pname;
rev = version;
- sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc=";
+ hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM=";
};
nativeBuildInputs = [
- pkg-config help2man wrapGAppsHook
+ pkg-config
+ help2man
+ wrapGAppsHook
];
-
buildInputs = [
- webkitgtk luafilesystem luajit sqlite gtk3
+ gtk3
glib-networking # TLS support
- ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good
- gst-plugins-bad gst-plugins-ugly gst-libav ]);
+ luafilesystem
+ luajit
+ sqlite
+ webkitgtk
+ ] ++ ( with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-bad
+ gst-plugins-ugly
+ gst-libav
+ ]);
+
+ # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
+ # TODO: why is not this the default? The test runner adds
+ # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
+ # scripts don't add an equivalent
preBuild = ''
- # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
- # TODO: why is not this the default? The test runner adds
- # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
- # scripts don't add an equivalent
export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
'';
@@ -52,6 +74,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
+ homepage = "https://luakit.github.io/";
description = "Fast, small, webkit-based browser framework extensible in Lua";
longDescription = ''
Luakit is a highly configurable browser framework based on the WebKit web
@@ -60,9 +83,8 @@ stdenv.mkDerivation rec {
power users, developers and anyone who wants to have fine-grained control
over their web browser’s behaviour and interface.
'';
- homepage = "https://luakit.github.io/";
license = licenses.gpl3Only;
- platforms = platforms.unix;
maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
index 861b5a15ee..1f8cb74646 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
homepage = "https://nyxt.atlas.engineer";
license = licenses.bsd3;
maintainers = with maintainers; [ lewo ];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
index 8207040f1b..df672e5160 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -16,14 +16,14 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
- version = "29.0.1";
+ version = "29.1.0";
src = fetchFromGitHub {
githubBase = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
- sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq";
+ sha256 = "02blhk3v7gpnicd7s5l5fpqvdvj2279g3rq8xyhcd4sw6qnms8m6";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 9b0a9078ee..9264bbb156 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -33,9 +33,6 @@
, gmp
-# Pluggable transport dependencies
-, python27
-
# Wrapper runtime
, coreutils
, glibcLocales
@@ -91,19 +88,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "10.0.9";
+ version = "10.0.13";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM=";
+ sha256 = "sha256-KxJKS/ymbkAg8LjMFz3BDSupPk5cNB1pFz9fFyRTndk=";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs=";
+ sha256 = "sha256-4glc2qP6AdHtWc8zW+varG30rlAXpeFyKjqDPsmiVfI=";
};
};
in
diff --git a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix
index 03d1911333..1dd0b408a1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix
@@ -28,7 +28,7 @@ let
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
inherit sha256;
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index f1fb506ee9..f1c98e0ed8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "argocd";
- version = "1.8.5";
+ version = "1.8.6";
commit = "28aea3dfdede00443b52cc584814d80e8f896200";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
- sha256 = "sha256-JjxibnGSDTjd0E9L3X2wnl9G713IYBs+O449RdrT19w=";
+ sha256 = "sha256-kJ3/1owK5T+FbcvjmK2CO+i/KwmVZRSGzF6fCt8J9E8=";
};
vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
index de032cc60e..a251886ebd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }:
buildGoModule rec {
pname = "cloudfoundry-cli";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix
index 4f3dfcfc03..659e8ee417 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -1,9 +1,12 @@
-{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, bash
+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, jdk8, bash
, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2
}:
let
- common = { version, sha256, dependencies-sha256, tomcat, opensslPkg ? openssl }:
+ maven-jdk8 = maven.override {
+ jdk = jdk8;
+ };
+ common = { version, sha256, dependencies-sha256, maven, tomcat, opensslPkg ? openssl }:
let
# compile the hadoop tarball from sources, it requires some patches
binary-distributon = stdenv.mkDerivation rec {
@@ -131,6 +134,7 @@ in {
dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r";
tomcat = tomcat_6_0_48;
opensslPkg = openssl_1_0_2;
+ maven = maven-jdk8;
};
hadoop_2_8 = common {
version = "2.8.4";
@@ -138,6 +142,7 @@ in {
dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03";
tomcat = tomcat_6_0_48;
opensslPkg = openssl_1_0_2;
+ maven = maven-jdk8;
};
hadoop_2_9 = common {
version = "2.9.1";
@@ -145,17 +150,20 @@ in {
dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x";
tomcat = tomcat_6_0_48;
opensslPkg = openssl_1_0_2;
+ maven = maven-jdk8;
};
hadoop_3_0 = common {
version = "3.0.3";
sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5";
dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m";
tomcat = null;
+ maven = maven-jdk8;
};
hadoop_3_1 = common {
version = "3.1.1";
sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd";
dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn";
tomcat = null;
+ maven = maven-jdk8;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix
new file mode 100644
index 0000000000..edd19a25f9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix
@@ -0,0 +1,11 @@
+{ callPackage }:
+
+{
+
+ helm-diff = callPackage ./helm-diff.nix {};
+
+ helm-s3 = callPackage ./helm-s3.nix {};
+
+ helm-secrets = callPackage ./helm-secrets.nix {};
+
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
new file mode 100644
index 0000000000..ce6491bfba
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -0,0 +1,35 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "helm-diff";
+ version = "3.1.3";
+
+ src = fetchFromGitHub {
+ owner = "databus23";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4=";
+ };
+
+ vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA=";
+
+ # NOTE: Remove the install and upgrade hooks.
+ postPatch = ''
+ sed -i '/^hooks:/,+2 d' plugin.yaml
+ '';
+
+ postInstall = ''
+ install -dm755 $out/${pname}
+ mv $out/bin $out/${pname}/
+ mv $out/${pname}/bin/{helm-,}diff
+ install -m644 -Dt $out/${pname} plugin.yaml
+ '';
+
+ meta = with lib; {
+ description = "A Helm plugin that shows a diff";
+ inherit (src.meta) homepage;
+ license = licenses.apsl20;
+ maintainers = with maintainers; [ yurrriq ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
new file mode 100644
index 0000000000..661048a0c7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -0,0 +1,38 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+ pname = "helm-s3";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "hypnoglow";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc=";
+ };
+
+ vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I=";
+
+ # NOTE: Remove the install and upgrade hooks.
+ postPatch = ''
+ sed -i '/^hooks:/,+2 d' plugin.yaml
+ '';
+
+ checkPhase = ''
+ make test-unit
+ '';
+
+ postInstall = ''
+ install -dm755 $out/${pname}
+ mv $out/bin $out/${pname}/
+ install -m644 -Dt $out/${pname} plugin.yaml
+ '';
+
+ meta = with lib; {
+ description = "A Helm plugin that shows a diff";
+ inherit (src.meta) homepage;
+ license = licenses.apsl20;
+ maintainers = with maintainers; [ yurrriq ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
new file mode 100644
index 0000000000..d53abe3569
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }:
+
+stdenv.mkDerivation rec {
+ pname = "helm-secrets";
+ version = "3.4.1";
+
+ src = fetchFromGitHub {
+ owner = "jkroepke";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ getopt sops ];
+
+ # NOTE: helm-secrets is comprised of shell scripts.
+ dontBuild = true;
+
+ # NOTE: Remove the install and upgrade hooks.
+ postPatch = ''
+ sed -i '/^hooks:/,+2 d' plugin.yaml
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -dm755 $out/${pname} $out/${pname}/scripts
+ install -m644 -Dt $out/${pname} plugin.yaml
+ cp -r scripts/* $out/${pname}/scripts
+ wrapProgram $out/${pname}/scripts/run.sh \
+ --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]}
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A Helm plugin that helps manage secrets";
+ inherit (src.meta) homepage;
+ license = licenses.apsl20;
+ maintainers = with maintainers; [ yurrriq ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix
new file mode 100644
index 0000000000..edad7fa1bc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix
@@ -0,0 +1,48 @@
+{ stdenv, symlinkJoin, lib, makeWrapper
+, writeText
+}:
+
+helm:
+
+let
+ wrapper = {
+ plugins ? [],
+ extraMakeWrapperArgs ? ""
+ }:
+ let
+
+ initialMakeWrapperArgs = [
+ "${helm}/bin/helm" "${placeholder "out"}/bin/helm"
+ "--argv0" "$0" "--set" "HELM_PLUGINS" "${pluginsDir}"
+ ];
+
+ pluginsDir = symlinkJoin {
+ name = "helm-plugins";
+ paths = plugins;
+ };
+in
+ symlinkJoin {
+ name = "helm-${lib.getVersion helm}";
+
+ # Remove the symlinks created by symlinkJoin which we need to perform
+ # extra actions upon
+ postBuild = ''
+ rm $out/bin/helm
+ makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs}
+ '';
+ paths = [ helm pluginsDir ];
+
+ preferLocalBuild = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+ passthru = { unwrapped = helm; };
+
+ meta = helm.meta // {
+ # To prevent builds on hydra
+ hydraPlatforms = [];
+ # prefer wrapper over the package
+ priority = (helm.meta.priority or 0) - 1;
+ };
+ };
+in
+ lib.makeOverridable wrapper
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index 72fcc2f9c3..5ac152c849 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.138.4";
+ version = "0.138.6";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk=";
+ sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg=";
};
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
index a7d99fc5bd..1c7a39d91b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "sha256-GfQjgtjFynYa8SfQyoGjsyXEv0XuaK8ZbTcMhQGkcTg=";
+ sha256 = "sha256-WcIcI+y8tTY0YfyuR/DUCjN1xbGpCOBWvEHBo+q2EV8=";
};
- vendorSha256 = "sha256-Xj9nC9ijLVmrSvgKq33yUyMO+RmeDkf7FKKCehP4GFE=";
+ vendorSha256 = "sha256-pSiJfQTvJ6OisdrWTH6mOcAn/wBA1OcVaGtOwBe1qvQ=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix
index 08dfa8bcdf..78cbaca80a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kube-capacity";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
index d4ec9cf5ef..c218e1b492 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,19 +20,21 @@
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.19.5";
+ version = "1.20.4";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "15bv620fj4x731f2z2a9dcdss18rk379kc40g49bpqsdn42jjx2z";
+ sha256 = "0nni351ya688dphdkpyq94p3wjw2kigg85kmalwdpv5wpz1abl5g";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
outputs = [ "out" "man" "pause" ];
+ patches = [ ./fixup-addonmanager-lib-path.patch ];
+
postPatch = ''
# go env breaks the sandbox
substituteInPlace "hack/lib/golang.sh" \
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
postBuild = ''
./hack/update-generated-docs.sh
- (cd build/pause && cc pause.c -o pause)
+ (cd build/pause/linux && cc pause.c -o pause)
'';
installPhase = ''
@@ -61,14 +63,19 @@ stdenv.mkDerivation rec {
install -D _output/local/go/bin/''${p##*/} -t $out/bin
done
- install -D build/pause/pause -t $pause/bin
+ install -D build/pause/linux/pause -t $pause/bin
installManPage docs/man/man1/*.[1-9]
- cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
+ # Unfortunately, kube-addons-main.sh only looks for the lib file in either the current working dir
+ # or in /opt. We have to patch this for now.
+ substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \
+ --subst-var out
+
+ chmod +x $out/bin/kube-addons
patchShebangs $out/bin/kube-addons
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
- cp ${./mk-docker-opts.sh} $out/bin/mk-docker-opts.sh
+ cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh
for tool in kubeadm kubectl; do
installShellCompletion --cmd $tool \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch
new file mode 100644
index 0000000000..ef2904bdcf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/fixup-addonmanager-lib-path.patch
@@ -0,0 +1,23 @@
+diff --git a/cluster/addons/addon-manager/kube-addons-main.sh b/cluster/addons/addon-manager/kube-addons-main.sh
+index 849973470d1..e4fef30eaea 100755
+--- a/cluster/addons/addon-manager/kube-addons-main.sh
++++ b/cluster/addons/addon-manager/kube-addons-main.sh
+@@ -17,17 +17,7 @@
+ # Import required functions. The addon manager is installed to /opt in
+ # production use (see the Dockerfile)
+ # Disabling shellcheck following files as the full path would be required.
+-if [ -f "kube-addons.sh" ]; then
+- # shellcheck disable=SC1091
+- source "kube-addons.sh"
+-elif [ -f "/opt/kube-addons.sh" ]; then
+- # shellcheck disable=SC1091
+- source "/opt/kube-addons.sh"
+-else
+- # If the required source is missing, we have to fail.
+- log ERR "== Could not find kube-addons.sh (not in working directory or /opt) at $(date -Is) =="
+- exit 1
+-fi
++source "@out@/bin/kube-addons-lib.sh"
+
+ # The business logic for whether a given object should be created
+ # was already enforced by salt, and /etc/kubernetes/addons is the
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
deleted file mode 100755
index 22a459f513..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/mk-docker-opts.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2014 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate Docker daemon options based on flannel env file.
-
-# exit on any error
-set -e
-
-usage() {
- echo "$0 [-f FLANNEL-ENV-FILE] [-d DOCKER-ENV-FILE] [-i] [-c] [-m] [-k COMBINED-KEY]
-
-Generate Docker daemon options based on flannel env file
-OPTIONS:
- -f Path to flannel env file. Defaults to /run/flannel/subnet.env
- -d Path to Docker env file to write to. Defaults to /run/docker_opts.env
- -i Output each Docker option as individual var. e.g. DOCKER_OPT_MTU=1500
- -c Output combined Docker options into DOCKER_OPTS var
- -k Set the combined options key to this value (default DOCKER_OPTS=)
- -m Do not output --ip-masq (useful for older Docker version)
-" >/dev/stderr
- exit 1
-}
-
-flannel_env="/run/flannel/subnet.env"
-docker_env="/run/docker_opts.env"
-combined_opts_key="DOCKER_OPTS"
-indiv_opts=false
-combined_opts=false
-ipmasq=true
-val=""
-
-while getopts "f:d:icmk:" opt; do
- case $opt in
- f)
- flannel_env=$OPTARG
- ;;
- d)
- docker_env=$OPTARG
- ;;
- i)
- indiv_opts=true
- ;;
- c)
- combined_opts=true
- ;;
- m)
- ipmasq=false
- ;;
- k)
- combined_opts_key=$OPTARG
- ;;
- \?)
- usage
- ;;
- esac
-done
-
-if [[ $indiv_opts = false ]] && [[ $combined_opts = false ]]; then
- indiv_opts=true
- combined_opts=true
-fi
-
-if [[ -f "${flannel_env}" ]]; then
- source "${flannel_env}"
-fi
-
-if [[ -n "$FLANNEL_SUBNET" ]]; then
- # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
- DOCKER_OPT_BIP="--bip=$FLANNEL_SUBNET"
-fi
-
-if [[ -n "$FLANNEL_MTU" ]]; then
- # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
- DOCKER_OPT_MTU="--mtu=$FLANNEL_MTU"
-fi
-
-if [[ "$FLANNEL_IPMASQ" = true ]] && [[ $ipmasq = true ]]; then
- # shellcheck disable=SC2034 # Variable name referenced in OPT_LOOP below
- DOCKER_OPT_IPMASQ="--ip-masq=false"
-fi
-
-eval docker_opts="\$${combined_opts_key}"
-docker_opts+=" "
-
-echo -n "" >"${docker_env}"
-
-# OPT_LOOP
-for opt in $(compgen -v DOCKER_OPT_); do
- eval val=\$"${opt}"
-
- if [[ "$indiv_opts" = true ]]; then
- echo "$opt=\"$val\"" >>"${docker_env}"
- fi
-
- docker_opts+="$val "
-done
-
-if [[ "$combined_opts" = true ]]; then
- echo "${combined_opts_key}=\"${docker_opts}\"" >>"${docker_env}"
-fi
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
index 81ca2283d2..66ff583e8c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.17.1";
+ version = "1.18.0";
- vendorSha256 = "1flny2f7n3vqhl9vkwsqxvzl8q3fv8v0h1p0d0qaqp9lgn02q3bh";
+ vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1m4kw77j4swwg3vqwmwrys7cq790w4g6y4gvdg33z9n1y9xzqys3";
+ sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
index ffc682ca4d..e53a9c39ea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8qY99sEEOFY2eMfuZSWv49nw1LKVHn50P1gYQN6y2f4=";
+ sha256 = "sha256-GyWvwgLtE8N+HLmGKUOjv5HXl2sdnecjh5y6VCOs+/0=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix
index 6ae5903383..99c43aeeee 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix
@@ -6,6 +6,6 @@
callPackage ./generic.nix {
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
- version = "1.0.3";
- sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi";
+ version = "1.0.4";
+ sha256 = "0znaxz9mzbqb59p6rwa5h89m344m2ci39jsx8dfh1v5fc17r0fcq";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
index 071636ec44..76230b8e10 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
- buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre pythonPackages.python pythonPackages.numpy ]
++ optional RSupport R;
untarDir = "${pname}-${version}-bin-without-hadoop";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
new file mode 100644
index 0000000000..364f7653ef
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
@@ -0,0 +1,44 @@
+From bea6307ec2a77d90d59c13940381d73ec0f05b70 Mon Sep 17 00:00:00 2001
+From: Graham Christensen
+Date: Mon, 1 Mar 2021 10:57:44 -0500
+Subject: [PATCH] Disable NIC tests that fail in the Nix sandbox.
+
+---
+ agent/managedInstances/fingerprint/fingerprint_integ_test.go | 2 ++
+ agent/ssm/service_test.go | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/agent/managedInstances/fingerprint/fingerprint_integ_test.go b/agent/managedInstances/fingerprint/fingerprint_integ_test.go
+index a1f969ff..631ea1f5 100644
+--- a/agent/managedInstances/fingerprint/fingerprint_integ_test.go
++++ b/agent/managedInstances/fingerprint/fingerprint_integ_test.go
+@@ -28,12 +28,14 @@ func TestHostnameInfo(t *testing.T) {
+ }
+
+ func TestPrimaryIpInfo(t *testing.T) {
++ t.Skip("The Nix build sandbox has no non-loopback IPs, causing this test to fail.");
+ ip, err := primaryIpInfo()
+ assert.NoError(t, err, "expected no error fetching the primary ip")
+ assert.NotEmpty(t, ip, "expected to fetch primary ip")
+ }
+
+ func TestMacAddrInfo(t *testing.T) {
++ t.Skip("The Nix build sandbox has no non-loopback interfaces, causing this test to fail.");
+ mac, err := macAddrInfo()
+ assert.NoError(t, err, "expected no error fetching the mac addr")
+ assert.NotEmpty(t, mac, "expected to fetch mac address")
+diff --git a/agent/ssm/service_test.go b/agent/ssm/service_test.go
+index f4b34f83..d8216dba 100644
+--- a/agent/ssm/service_test.go
++++ b/agent/ssm/service_test.go
+@@ -85,6 +85,7 @@ func (suite *SsmServiceTestSuite) TestUpdateEmptyInstanceInformation() {
+ // Test function for update instance information
+ // This function update the agent name, agent statuc, and agent version.
+ func (suite *SsmServiceTestSuite) TestUpdateInstanceInformation() {
++ suite.T().Skip("The Nix build sandbox has no interfaces for IP and MAC address reports.");
+ // Give mock value to test UpdateInstanceInformation, assert the error is nil, assert the log.Debug function get called.
+ response, err := suite.sdkService.UpdateInstanceInformation(suite.logMock, "2.2.3.2", "active", "Amazon-ssm-agent")
+ assert.Nil(suite.T(), err, "Err should be nil")
+--
+2.29.2
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch
new file mode 100644
index 0000000000..234e510d3d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch
@@ -0,0 +1,46 @@
+From 473e3f8544915a35b3a45c548743978b34e5310e Mon Sep 17 00:00:00 2001
+From: Cole Helbling
+Date: Tue, 2 Mar 2021 00:24:00 -0800
+Subject: [PATCH] version-gen: don't use unnecessary constants
+
+This prevents the tool from being built with Nix, because this project
+doesn't use Go modules (or something; I'm not really familiar with Go,
+much less Go + Nix).
+---
+ agent/version/versiongenerator/version-gen.go | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/agent/version/versiongenerator/version-gen.go b/agent/version/versiongenerator/version-gen.go
+index d710effc..55c9a001 100644
+--- a/agent/version/versiongenerator/version-gen.go
++++ b/agent/version/versiongenerator/version-gen.go
+@@ -22,8 +22,6 @@ import (
+ "path/filepath"
+ "strings"
+ "text/template"
+-
+- "github.com/aws/amazon-ssm-agent/agent/appconfig"
+ )
+
+ const versiongoTemplate = `// This is an autogenerated file and should not be edited.
+@@ -59,7 +57,7 @@ func main() {
+ versionStr := strings.TrimSpace(string(versionContent))
+
+ fmt.Printf("Agent Version: %v", versionStr)
+- if err := ioutil.WriteFile(filepath.Join("VERSION"), []byte(versionStr), appconfig.ReadWriteAccess); err != nil {
++ if err := ioutil.WriteFile(filepath.Join("VERSION"), []byte(versionStr), 0600); err != nil {
+ log.Fatalf("Error writing to VERSION file. %v", err)
+ }
+
+@@ -108,7 +106,7 @@ func main() {
+
+ releaseNoteOutFile := strings.Join(releaseNoteLines, "\n")
+
+- if err = ioutil.WriteFile(filepath.Join(releaseNotesFile), []byte(releaseNoteOutFile), appconfig.ReadWriteAccess); err != nil {
++ if err = ioutil.WriteFile(filepath.Join(releaseNotesFile), []byte(releaseNoteOutFile), 0600); err != nil {
+ log.Fatalf("Error writing to RELEASENOTES.md file. %v", err)
+ }
+
+--
+2.30.0
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 928fb351c6..3aa583f3ae 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,63 +1,110 @@
-{ lib, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
+{ lib
+, writeShellScriptBin
+, buildGoPackage
+, makeWrapper
+, fetchFromGitHub
+, coreutils
+, nettools
+, dmidecode
+, util-linux
+, bashInteractive
+}:
+let
+ # Tests use lsb_release, so we mock it (the SSM agent used to not
+ # read from our /etc/os-release file, but now it does) because in
+ # reality, it won't (shouldn't) be used when active on a system with
+ # /etc/os-release. If it is, we fake the only two fields it cares about.
+ fake-lsb-release = writeShellScriptBin "lsb_release" ''
+ . /etc/os-release || true
+
+ case "$1" in
+ -i) echo "''${NAME:-unknown}";;
+ -r) echo "''${VERSION:-unknown}";;
+ esac
+ '';
+in
buildGoPackage rec {
- pname = "amazon-ssm-agent";
- version = "2.3.1319.0";
+ pname = "amazon-ssm-agent";
+ version = "3.0.755.0";
goPackagePath = "github.com/aws/${pname}";
- subPackages = [
- "agent"
- "agent/framework/processor/executer/outofproc/worker"
- "agent/framework/processor/executer/outofproc/worker"
- "agent/framework/processor/executer/outofproc/sessionworker"
- "agent/session/logging"
- "agent/cli-main"
- ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
- rev = version;
- owner = "aws";
- repo = pname;
- sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv";
+ rev = version;
+ owner = "aws";
+ repo = "amazon-ssm-agent";
+ hash = "sha256-yVQJL1MJ1JlAndlrXfEbNLQihlbLhSoQXTKzJMRzhao=";
};
+ patches = [
+ # Some tests use networking, so we skip them.
+ ./0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
+
+ # They used constants from another package that I couldn't figure
+ # out how to resolve, so hardcoded the constants.
+ ./0002-version-gen-don-t-use-unnecessary-constants.patch
+ ];
+
+ preConfigure = ''
+ rm -r ./Tools/src/goreportcard
+ printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
+
+ substituteInPlace agent/platform/platform_unix.go \
+ --replace "/usr/bin/uname" "${coreutils}/bin/uname" \
+ --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \
+ --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'
+
+ substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \
+ --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode
+
+ substituteInPlace agent/session/shell/shell_unix.go \
+ --replace '"script"' '"${util-linux}/bin/script"'
+
+ echo "${version}" > VERSION
+ '';
+
preBuild = ''
- mv go/src/${goPackagePath}/vendor strange-vendor
- mv strange-vendor/src go/src/${goPackagePath}/vendor
+ cp -r go/src/${goPackagePath}/vendor/src go
- cd go/src/${goPackagePath}
- echo ${version} > VERSION
+ pushd go/src/${goPackagePath}
- substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \
- --replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' ""
+ # Note: if this step fails, please patch the code to fix it! Please only skip
+ # tests if it is not feasible for the test to pass in a sandbox.
+ make quick-integtest
- go run agent/version/versiongenerator/version-gen.go
- substituteInPlace agent/appconfig/constants_unix.go \
- --replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \
- --replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \
- --replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger
- cd -
+ make pre-release
+ make pre-build
+
+ popd
'';
postBuild = ''
- mv go/bin/agent go/bin/amazon-ssm-agent
- mv go/bin/worker go/bin/ssm-document-worker
- mv go/bin/sessionworker go/bin/ssm-session-worker
- mv go/bin/logging go/bin/ssm-session-logger
- mv go/bin/cli-main go/bin/ssm-cli
+ pushd go/bin
+
+ rm integration-cli versiongenerator generator
+
+ mv core amazon-ssm-agent
+ mv agent ssm-agent-worker
+ mv cli-main ssm-cli
+ mv worker ssm-document-worker
+ mv logging ssm-session-logger
+ mv sessionworker ssm-session-worker
+
+ popd
'';
- postInstall = ''
- wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin
+ postFixup = ''
+ wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin
'';
meta = with lib; {
description = "Agent to enable remote management of your Amazon EC2 instance configuration";
- homepage = "https://github.com/aws/amazon-ssm-agent";
- license = licenses.asl20;
- platforms = platforms.unix;
+ homepage = "https://github.com/aws/amazon-ssm-agent";
+ license = licenses.asl20;
+ platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin manveru ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
index a5b6e7d2f5..804659e084 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,24 +1,26 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
+{ lib, buildGoModule, fetchFromGitHub }:
+buildGoModule rec {
pname = "terraform-docs";
- version = "0.9.1";
-
- goPackagePath = "github.com/segmentio/${pname}";
+ version = "0.11.2";
src = fetchFromGitHub {
- owner = "segmentio";
- repo = pname;
- rev = "v${version}";
- sha256 = "00sfzdqhf8g85m03r6mbzfas5vvc67iq7syb8ljcgxg8l1knxnjx";
+ owner = "terraform-docs";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k=";
};
+ vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0=";
+
+ subPackages = [ "." ];
+
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.version=${version}")
'';
meta = with lib; {
description = "A utility to generate documentation from Terraform modules in various output formats";
- homepage = "https://github.com/segmentio/terraform-docs/";
+ homepage = "https://github.com/terraform-docs/terraform-docs/";
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 198a05621a..4ec886a34f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -398,10 +398,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/helm",
"repo": "terraform-provider-helm",
- "rev": "v1.3.2",
- "sha256": "0mpbf03483jqrwd9cx4pdn2pcv4swfs5nbp021gaqr0jf1w970x6",
+ "rev": "v2.0.2",
+ "sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb",
"vendorSha256": null,
- "version": "1.3.2"
+ "version": "2.0.2"
},
"heroku": {
"owner": "terraform-providers",
@@ -504,9 +504,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
"repo": "terraform-provider-kubernetes",
- "rev": "v1.13.3",
- "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i",
- "version": "1.13.3"
+ "rev": "v2.0.2",
+ "sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf",
+ "vendorSha256": null,
+ "version": "2.0.2"
},
"kubernetes-alpha": {
"owner": "hashicorp",
@@ -1071,9 +1072,9 @@
"vultr": {
"owner": "vultr",
"repo": "terraform-provider-vultr",
- "rev": "v1.5.0",
- "sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd",
- "version": "1.5.0"
+ "rev": "v2.1.3",
+ "sha256": "sha256-fvqkzg3j2TYAMbPc8Ifh35sBe0D76LYH6Ut5Ugdyexg=",
+ "version": "2.1.3"
},
"wavefront": {
"owner": "terraform-providers",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
index e1f1a0ef38..f97bbce83f 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils curl jq moreutils
+#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix
# shellcheck shell=bash
# vim: ft=sh
#
@@ -161,7 +161,8 @@ if [[ -z "$vendorSha256" ]]; then
exit 1
fi
rm -f vendor_log.txt
- vendorSha256=${BASH_REMATCH[1]}
+ # trim the results in case it they have a sha256: prefix or contain more than one line
+ vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1)
# Deal with nix unstable
if [[ $vendorSha256 = sha256-* ]]; then
vendorSha256=$(nix to-base32 "$vendorSha256")
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index 59a7039fb2..4a6e95057a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
@@ -117,7 +117,7 @@ let
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name meta;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = pluginDir + ''
mkdir -p $out/bin/
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
index b97b586996..f28754005e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -2,29 +2,45 @@
buildGoModule rec {
pname = "waypoint";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JeuVrlm6JB8MgSUmgMLQPuPmlKSScSdsVga9jUwLWHM=";
+ sha256 = "sha256-FTBBDKFUoyC+Xdm3+2QWXK57fLwitYrFP89OvAyHHVY=";
};
deleteVendor = true;
- vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY=";
+ vendorSha256 = "sha256-ihelAumTRgLALevJdVq3V3SISitiRPCQZUh2h5/eczA=";
nativeBuildInputs = [ go-bindata ];
# GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway
buildPhase = ''
+ runHook preBuild
make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY=""
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
install -D waypoint $out/bin/waypoint
+ runHook postInstall
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ # `version` tries to write to ~/.config/waypoint
+ export HOME="$TMPDIR"
+
+ $out/bin/waypoint --help
+ $out/bin/waypoint version # | grep "Waypoint v${version}"
+ runHook postInstallCheck
+ '';
+
+ # Binary is static
dontPatchELF = true;
dontPatchShebangs = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index dae9ad3bc3..51f62529e9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -17,11 +17,6 @@ buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
- installPhase = ''
- mkdir -p $out/bin
- cp -p $releaseDir/cfdyndns $out/bin/
- '';
-
meta = with lib; {
description = "CloudFlare Dynamic DNS Client";
homepage = "https://github.com/colemickens/cfdyndns";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 2223b8f549..6c13543932 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, rustPlatform
, fetchFromGitLab
, meson
@@ -17,18 +18,22 @@
, gst_all_1
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "newsflash";
- version = "1.2.2";
+ version = "1.3.0";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
- hash = "sha256-TeheK14COX1NIrql74eI8Wx4jtpUP1eO5mugT5LzlPY=";
+ hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8=";
};
- cargoHash = "sha256-Fbj4sabrwpfa0QNEN4l91y/6AuPIKu7QPzYNUO6RtU0=";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA=";
+ };
patches = [
# Post install tries to generate an icon cache & update the
@@ -54,7 +59,11 @@ rustPlatform.buildRustPackage rec {
# Provides glib-compile-resources to compile gresources
glib
- ];
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
buildInputs = [
gtk3
@@ -76,13 +85,6 @@ rustPlatform.buildRustPackage rec {
gst-plugins-bad
]);
- # Unset default rust phases to use meson & ninja instead
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
- installCheckPhase = null;
-
meta = with lib; {
description = "A modern feed reader designed for the GNOME desktop";
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
index d0ce431be7..1438d61f99 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
- version = "3.8.4";
+ version = "3.9.0";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
- sha256 = "sha256-2NC5Y8WxVYrzpuqDzhXXJ16b04Em1HqZaE2VK9tmfYk=";
+ sha256 = "sha256-pprWJIYAFYSTPhWVCW4dz3GWeAS53Vo8UXiyQ56Mwjo=";
};
buildInputs = [ qtwebengine qttools ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
for ownCloud/Nextcloud.
'';
homepage = "https://github.com/martinrotter/rssguard";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ jluttine ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index 2e5713627e..b58c30aee5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.98";
+ version = "3.1.103";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "d2d17a5ea821a580c55680294fce9ecf7012ef86c086c742414ec5bcb8468972";
+ sha256 = "da635a01ae7d15ba31b41081ab3e0214b8c5ab5e4662c381246495d7d1eba9be";
};
postPatch = ''
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
terminaltables
zxcvbn
# plugins
- transmissionrpc
+ transmission-rpc
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix
index 8eb688bcd5..f206c645ae 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix
@@ -44,6 +44,6 @@ in python.pkgs.buildPythonPackage rec {
changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix
index 5ba6b57d5b..b0d215c47b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix
@@ -6,17 +6,6 @@ let
defaultOverrides = commonOverrides ++ [
(mkOverride "aiofiles" "0.5.0"
"98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
- (self: super: {
- py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec {
- version = "7.0.0";
- src = fetchFromGitHub {
- owner = "workhorsy";
- repo = "py-cpuinfo";
- rev = "v${version}";
- sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
- };
- });
- })
];
python = python3.override {
@@ -62,6 +51,6 @@ in python.pkgs.buildPythonPackage {
changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
index 17ace3021d..714ca1c899 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/snort/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73";
};
- buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index 748d3c89ae..a12e914097 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, cmake
, flex
@@ -10,47 +11,48 @@
, curl
, libmaxminddb
, gperftools
-, python
+, python3
, swig
, gettext
-, fetchpatch
, coreutils
+, ncurses
+, caf
}:
-let
- preConfigure = (import ./script.nix {inherit coreutils;});
-in
+
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.2.4";
+ version = "4.0.0";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "11dy4w810jms75nrr3n3dy5anrl5ksb5pmnk31z37k60hg9q9afm";
+ sha256 = "0m7zy5k2595vf5xr2r4m75rfsdddigrv2hilm1c3zaif4srxmvpj";
};
nativeBuildInputs = [ cmake flex bison file ];
- buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]
+ buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ]
++ lib.optionals stdenv.isDarwin [ gettext ];
- #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
- inherit preConfigure;
-
- patches = lib.optionals stdenv.cc.isClang [
- # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
- (fetchpatch {
- url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch";
- sha256 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84";
- extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/";
- stripLen = 1;
- })
- ];
+ outputs = [ "out" "lib" "py" ];
cmakeFlags = [
- "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
+ "-DCAF_ROOT=${caf}"
+ "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages"
"-DENABLE_PERFTOOLS=true"
"-DINSTALL_AUX_TOOLS=true"
];
+ postInstall = ''
+ for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do
+ substituteInPlace $file \
+ --replace "/bin/rm" "${coreutils}/bin/rm" \
+ --replace "/bin/cat" "${coreutils}/bin/cat"
+ done
+
+ for file in $out/share/zeek/policy/misc/trim-trace-file.zeek $out/share/zeek/base/frameworks/logging/postprocessors/scp.zeek $out/share/zeek/base/frameworks/logging/postprocessors/sftp.zeek; do
+ substituteInPlace $file --replace "/bin/rm" "${coreutils}/bin/rm"
+ done
+ '';
+
meta = with lib; {
description = "Powerful network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix
deleted file mode 100644
index 4c8bbcf22c..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/script.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{coreutils}:
-''
- sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek
- sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek
- sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek
- sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek
-
- sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek
- sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek
- sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek
- sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek
- sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek
- sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek
- sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek
- sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek
- sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek
- sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek
- sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek
- sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek
- sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek
- sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek
- sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek
- sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek
- sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek
- sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek
- sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek
- sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek
- sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek
- sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek
- sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek
- sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek
- sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek
- sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek
- sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek
- sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek
- sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek
- sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek
- sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek
- sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek
- sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek
- sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek
- sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek
- sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek
- sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek
- sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek
- sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek
- sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek
- sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek
- sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek
- sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek
- sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek
- sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek
- sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek
- sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek
- sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek
- sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek
- sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek
- sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek
- sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek
- sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek
- sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek
- sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek
- sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek
- sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek
- sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek
- sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek
- sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek
- sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek
-''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix
index 7a8c3d395f..5ed87334c4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ike/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.shrew.net/software";
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
platforms = platforms.unix;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
license = licenses.sleepycat;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
index 7ed3b16738..3ee835610f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -22,7 +22,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
cjson
sipsimple
twisted
- google_api_python_client
+ google-api-python-client
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
index bb5776b65e..c579220cdd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -2,13 +2,12 @@
let
pname = "deltachat-electron";
- version = "1.15.1";
+ version = "1.15.2";
name = "${pname}-${version}";
src = fetchurl {
- url =
- "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
- sha256 = "sha256-lItI1aIFHYQ3wGRVn4Yw0nA7qgfhyHT/43kKbY/1cgI=";
+ url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
+ sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index f5f20202fc..caf80c2460 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.21",
+ "version": "1.7.22",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "10.2.0",
+ "electronVersion": "11.2.3",
"files": [
"package.json",
{
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index f706a4399b..f147918cdc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.21";
+ version = "1.7.22";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "sha256-tpFiKaJB6KN97ipN3OCTyxpiS0b980MQ1Ynxj8CjCuI=";
+ sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 285e525efb..a75b02ef8a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.21";
+ version = "1.7.22";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "sha256-JJXl+jDlXw8fZ1ZeeAACvilbqG9zanCmBsHy6BEla8M=";
+ sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 667e8cdaec..0fea57ea9c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -26,7 +26,8 @@ buildGoModule rec {
doCheck = false;
- buildInputs = [ makeWrapper olm ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ olm ];
# Upstream issue: https://github.com/tulir/gomuks/issues/260
patches = lib.optional stdenv.isLinux (substituteAll {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index f3736bfc64..cbbe74481c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
ar x $src
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
index 3b6b9bfc6f..42ea1c52fa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub
, qmake, pkg-config, olm, wrapQtAppsHook
-, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
+, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects
, python3Packages, pyotherside, libXScrnSaver
}:
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix
index e5221d861d..6d6e70ff26 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix
@@ -1,7 +1,7 @@
-{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools,
- qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats,
- autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper,
- twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }:
+{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools
+, qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats
+, autoPatchelfHook, desktop-file-utils, imagemagick
+, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }:
mkDerivation rec {
pname = "ripcord";
@@ -19,9 +19,9 @@ mkDerivation rec {
};
nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ];
- buildInputs = [ libsodium libopus libGL alsaLib ] ++
- [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++
- (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
+ buildInputs = [ libsodium libopus libGL alsaLib ]
+ ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ]
+ ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
fontsConf = makeFontsConf {
fontDirectories = [ twemoji-color-font ];
@@ -60,10 +60,8 @@ mkDerivation rec {
meta = with lib; {
description = "Desktop chat client for Slack and Discord";
homepage = "https://cancel.fm/ripcord/";
-
# See: https://cancel.fm/ripcord/shareware-redistribution/
license = licenses.unfreeRedistributable;
-
maintainers = with maintainers; [ infinisil ];
platforms = [ "x86_64-linux" ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 44642ab8a9..8f09c37d25 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -41,11 +41,11 @@ let
pname = "slack";
- x86_64-darwin-version = "4.12.2";
- x86_64-darwin-sha256 = "0qflv2glfy7d77zjgqi7qcjr53c9dni26gmqkg9vk2xijmmd3xy7";
+ x86_64-darwin-version = "4.13.0";
+ x86_64-darwin-sha256 = "1f155fgbdmqxy7324lxj3ysx1p332rzpwy06iac90rm6irf5v57f";
- x86_64-linux-version = "4.12.2";
- x86_64-linux-sha256 = "sha256-G5uQI078N7AbhEJs6a/17Hoi5DSdwvYLM1T/ttrEw4s=";
+ x86_64-linux-version = "4.13.0";
+ x86_64-linux-sha256 = "1hqvynkhbkfwxvfgjqv91x5k7qlzayjr5mmf8rz0ncp4j4d3x9mq";
version = {
x86_64-darwin = x86_64-darwin-version;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 2c7efe42a8..566e62ae7f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -23,12 +23,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.6.0";
+ version = "2.6.1";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "18ifmvll0nnmjf8ba6r23ri9i4fggy7k2dqs3qf4f52cklmlfj06";
+ sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index bc66d77e22..041ec5e7c5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
index 668e614c47..e5a2c201d8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Lightweight Tox client";
homepage = "https://github.com/uTox/uTox";
license = licenses.gpl3;
- maintainers = with maintainers; [ domenkozar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
index 4389ee153c..0224edc652 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh";
};
- buildInputs = [ dpkg makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ dpkg ];
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 966583d208..09a5d781c4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -23,12 +23,12 @@ let
version = {
x86_64-darwin = "3.21.3959";
- x86_64-linux = "3.21.2936";
+ x86_64-linux = "3.22.2937";
}.${system} or throwSystem;
sha256 = {
x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
- x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6";
+ x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
}.${system} or throwSystem;
meta = with lib; {
@@ -95,9 +95,17 @@ let
buildInputs = atomEnv.packages;
- unpackPhase = "dpkg-deb -x $src .";
+ unpackPhase = ''
+ runHook preUnpack
+
+ dpkg-deb -x $src .
+
+ runHook postUnpack
+ '';
installPhase = ''
+ runHook preInstall
+
mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
@@ -106,6 +114,8 @@ let
# Desktop file
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
+
+ runHook postInstall
'';
runtimeDependencies = [
@@ -134,17 +144,29 @@ let
];
unpackPhase = ''
+ runHook preUnpack
+
xar -xf $src
cd com.wearezeta.zclient.mac.pkg
+
+ runHook postUnpack
'';
buildPhase = ''
+ runHook preBuild
+
cat Payload | gunzip -dc | cpio -i
+
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/Applications
cp -r Wire.app $out/Applications
+
+ runHook postInstall
'';
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index c431b5d0ce..efb913fca7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -2,7 +2,6 @@
, lib
, fetchurl
, makeWrapper
-, fetchFromGitHub
# Dynamic libraries
, alsaLib
, atk
@@ -31,14 +30,13 @@
assert pulseaudioSupport -> libpulseaudio != null;
let
- version = "5.5.7011.0206";
+ version = "5.5.7938.0228";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
- sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02";
+ sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY=";
};
};
- dontUnpack = true;
libs = lib.makeLibraryPath ([
# $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found'
@@ -68,8 +66,10 @@ let
xorg.libXtst
] ++ lib.optional (pulseaudioSupport) libpulseaudio);
-in stdenv.mkDerivation {
- name = "zoom-${version}";
+in stdenv.mkDerivation rec {
+ pname = "zoom";
+ inherit version;
+ src = srcs.${stdenv.hostPlatform.system};
dontUnpack = true;
@@ -80,7 +80,7 @@ in stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir $out
- tar -C $out -xf ${srcs.${stdenv.hostPlatform.system}}
+ tar -C $out -xf ${src}
mv $out/usr/* $out/
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
index a177499154..6b143abda3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -5,12 +5,12 @@
let
pname = "zulip";
- version = "5.5.0";
+ version = "5.6.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
- sha256 = "059zfcvaq8wnsz2lfd4gdb17b6nngqk3vgisy2kb29ifqf3lpzqi";
+ sha256 = "19sdmkxxzaidb89m8k56p94hq2yaxwn9islzrzwb86f50hlrq46w";
name="${pname}-${version}.AppImage";
};
@@ -34,7 +34,7 @@ in appimageTools.wrapType2 {
description = "Desktop client for Zulip Chat";
homepage = "https://zulip.com";
license = licenses.asl20;
- maintainers = with maintainers; [ jonafato ];
+ maintainers = with maintainers; [ andersk jonafato ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix
index b52a81932e..380aad6c32 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix
@@ -12,9 +12,7 @@ stdenv.mkDerivation rec {
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
- buildInputs = [ makeWrapper ];
-
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
postPatch = ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
index 58952f28b5..daa0889973 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
@@ -27,12 +27,12 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "3.0.1";
+ version = "3.1";
pname = "weechat";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "0f50kib8l99vlp9wqszq2r2g5panzphsgs7viga8lyc83v229b33";
+ sha256 = "06w147wzrzp6xbqiz6s5nq5xdjy7jn3f18xajxy50pynjd6vmfh5";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch
new file mode 100644
index 0000000000..45e620db25
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/0001-hardcode-json-file-path.patch
@@ -0,0 +1,35 @@
+From 5dd2593369645b11a9dc03e1930617d2f5dbd039 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
+Date: Wed, 11 Nov 2020 11:48:49 +0100
+Subject: [PATCH] hardcode json file path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ wee_slack.py | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/wee_slack.py b/wee_slack.py
+index a3d779c..5942289 100644
+--- a/wee_slack.py
++++ b/wee_slack.py
+@@ -5136,13 +5136,7 @@ def create_slack_debug_buffer():
+
+ def load_emoji():
+ try:
+- weechat_dir = w.info_get('weechat_dir', '')
+- weechat_sharedir = w.info_get('weechat_sharedir', '')
+- local_weemoji, global_weemoji = ('{}/weemoji.json'.format(path)
+- for path in (weechat_dir, weechat_sharedir))
+- path = (global_weemoji if os.path.exists(global_weemoji) and
+- not os.path.exists(local_weemoji) else local_weemoji)
+- with open(path, 'r') as ef:
++ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
+ emojis = json.loads(ef.read())
+ if 'emoji' in emojis:
+ print_error('The weemoji.json file is in an old format. Please update it.')
+--
+2.29.0
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 089271812a..679e278c8a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wee-slack";
- version = "2.6.0";
+ version = "2.7.0";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
- sha256 = "0s4qd1z40c1bczkvc840jwjmzbv7nyj06xqs1si9v54qmkh4gaq4";
+ sha256 = "sha256-6Z/H15bKe0PKpNe9PCgc5mLOii3CILCAVon7EgzIkx8=";
};
patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
paths = with python3Packages; [ websocket_client six ];
}}/${python3Packages.python.sitePackages}";
})
- ./hardcode-json-file-path.patch
+ ./0001-hardcode-json-file-path.patch
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch
deleted file mode 100644
index 7413a9229c..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/wee_slack.py
-+++ b/wee_slack.py
-@@ -4560,8 +4560,7 @@
-
- def load_emoji():
- try:
-- DIR = w.info_get('weechat_dir', '')
-- with open('{}/weemoji.json'.format(DIR), 'r') as ef:
-+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
- emojis = json.loads(ef.read())
- if 'emoji' in emojis:
- print_error('The weemoji.json file is in an old format. Please update it.')
diff --git a/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
index bac0048cc2..e6332832e3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl";
};
- buildInputs = [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix
index 3ad2762a2c..420b9b28cc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
notmuch
oauth2client
- google_api_python_client
+ google-api-python-client
tqdm
setuptools
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index a9cea58902..4a13cf68a8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -34,6 +34,7 @@
, enablePluginBsfilter ? true
, enablePluginClamd ? true
, enablePluginDillo ? true
+, enablePluginFancy ? useGtk3, libsoup, webkitgtk
, enablePluginFetchInfo ? true
, enablePluginLibravatar ? enablePluginRavatar
, enablePluginLitehtmlViewer ? true, gumbo
@@ -87,6 +88,7 @@ let
{ flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; }
{ flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; }
{ flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; }
+ { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; }
{ flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; }
{ flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; }
{ flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; }
@@ -153,7 +155,6 @@ in stdenv.mkDerivation rec {
"--disable-jpilot" # Missing jpilot library
"--disable-gdata-plugin" # Complains about missing libgdata, even when provided
- "--disable-fancy-plugin" # Missing libwebkit-1.0 library
] ++
(map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features);
@@ -172,7 +173,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "The user-friendly, lightweight, and fast email client";
homepage = "https://www.claws-mail.org/";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
index 050082c6f9..ea3f09b8f4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
@@ -4,7 +4,7 @@ symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome3.evolution-data-server ] ++ plugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for i in $out/bin/* $out/libexec/**; do
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 1d1dc030c3..cab43750a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -44,7 +44,7 @@ python2Packages.buildPythonApplication rec {
homepage = "https://www.mailpile.is/";
license = [ licenses.asl20 licenses.agpl3 ];
platforms = platforms.linux;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
knownVulnerabilities = [
"Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104"
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
index 874fa0d42e..eecf8f0f67 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mutt";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
- sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2";
+ sha256 = "165mpivdhvhavglykwlz0hss2akxd6i6l40rgxs29mjzi52irqw1";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index e86e847e8f..5c129803ce 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
{
- version = "78.7.1";
+ version = "78.8.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/af/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/af/thunderbird-78.8.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "b9d7bacd982db97e531775ceca569e011603dbd2806a64bce43ef2ff30e6c8f4";
+ sha256 = "9e4334e885fd43138f32138976e7539ed3e438d18322764aa21df5c30b38d987";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ar/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ar/thunderbird-78.8.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "144647297e15556de5273e4f41712fc348b3dd401d71356d556c1ed09221037d";
+ sha256 = "b51e15fcb534d82909cd3578cc02bc9b1f5f79cddab89349009b6edf7292208f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ast/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ast/thunderbird-78.8.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "9adb0d16ab633e4ffa3628969ccb542488fc299da5250c058828144f6f773781";
+ sha256 = "75d944c21a5077fab03dc474bcadb09a21392f25ffe5f5baa1e6ec1b59d319cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/be/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/be/thunderbird-78.8.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "3e54fa9ca34bcc11d411a979ed6bcd0a68b67da08cdba49e1f8a59794bc2dff0";
+ sha256 = "3b28e58054f40d60cdde6cb0789d5f885dd695c459666680aad53a67cefa4ec2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/bg/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/bg/thunderbird-78.8.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "d576d3193c8e263d44942043b7e13c8861b2234ebb66969ac2cd20f84d6d769f";
+ sha256 = "fd5e34527ff0f33b7c072e34f0e6a8c27963bb4849b3876ef6a4a0243b89b3cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/br/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/br/thunderbird-78.8.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "cd85058134a3b1364049d11a32bd964f8f9488fb48ece65d32fbb9005831b1d4";
+ sha256 = "de272588fe4ef2f24b9a73952f408ff0e22aa3dc481007cbd8dd64e3552e65be";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ca/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ca/thunderbird-78.8.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "5bf9ac27b8401f7c1479cacddc48e6310e6ac52e038f824193788dd6883512a6";
+ sha256 = "fda9add048104e2709421add69957c79914dc3ec65b29f2bdf90f345d397ff8d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cak/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cak/thunderbird-78.8.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "dfa2f97ee07f80adc5ded391bf01aea36e2aaf5a12ca9a510c5842756d9b9f8e";
+ sha256 = "d9c394a8f69ce1442c5444d1f6fd7350922fd9616e1dc696399fbdfd539f99b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cs/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cs/thunderbird-78.8.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "c76d755c9b54921a4edc9521aea2c51aa6301d954154fa6228195193000be56f";
+ sha256 = "c5cea000c58d4f42d54306835fe1c15ca358286e3f4b48862857ae6dc531859b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cy/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cy/thunderbird-78.8.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "09475639dec1e370360c1c257b88ab45fbf2251bd22d1d50e9df078b035b8560";
+ sha256 = "9e790ef1f09af98e84bd3246fd4cfa679cca354532472a5323eeb4bafa92f7a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/da/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/da/thunderbird-78.8.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "74cc98d1d99e9fd101e86051cf9aee26b40cfcb6203892adf6fd45fad5934926";
+ sha256 = "62d2af10af31a472a3a2d2b3aa582c96d92466428aac3f1f007003cfcbe0c106";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/de/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/de/thunderbird-78.8.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "509648ba2c7d9ef4db1755ae5e017d3dc1c73c5a3a94a293bbc9a505b5349e2a";
+ sha256 = "98bdf6c67d230b46014526d756a06dc2897de3f24f027fac3abb8550e5e608bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/dsb/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/dsb/thunderbird-78.8.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "03dff2bbcb39d967c96934675134acd3ec74b39df3b6cc76846229ff92653483";
+ sha256 = "2350e2884af5757ef7d61e37fe2090a5e0f504a2c192c78d66af982f9e4a9d92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/el/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/el/thunderbird-78.8.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "d6ec9ccdd2945d6de1718f32b551e922da1808d59acec937a16addaa0004e94a";
+ sha256 = "bfc20efee36a77fa124d6980396c2a51e0d59d1480ba32f53b550986ebda61a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-CA/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-CA/thunderbird-78.8.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "bc97cadcf95bd0273708e1ea5cc8cdddd29f11b280213c1bd4f35a50d446763e";
+ sha256 = "094cb02d5bb3ae13025005c458befa34428a9338e6bc489fc7cf14d70ec42e00";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-GB/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-GB/thunderbird-78.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "82fd7e16cc8d5df4e775187d7f3e32b9b1dab3647cd766cec1649c39d08d5165";
+ sha256 = "3ca1112e55371d628b518ce12d4bcef08ff1ae71a0820405e236b2399cf1d6f9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-US/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-US/thunderbird-78.8.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "463c1164b80f0f8bcb72f04fb0c17e32a637df988c0ea14d90469b1d7a958f82";
+ sha256 = "074aa418d841d65f8c702cd86046595ce715e3156d8cd7f0da9dba48580b230c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-AR/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/es-AR/thunderbird-78.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "1ce69e73e8326e316d056a98efe601e7300714f1b65f69e2fcd175123fdca96b";
+ sha256 = "4f4552f137958ab583183237322cb48327242e8354689aba9c557e448abed7f9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-ES/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/es-ES/thunderbird-78.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "a04161f56944527f8537d46e046fbed715a554e4dc581aa636f1cec3fb1e1351";
+ sha256 = "61787b7e70a6722e5921246bedf1182d7f52b28f1abc218b5bad7544fbe7dc87";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/et/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/et/thunderbird-78.8.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "36c2e7ae029b65976b92cff62c3c3a97e8c44a73c2f5e48415260b23a23ff653";
+ sha256 = "b85fd3bcea1284b79d5a8816ff0056060b4bad22ffeb2b2e50f6b8bbc61da8c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/eu/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/eu/thunderbird-78.8.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "538a42bb6eb11360fa70bd06058dbd47f2a3eec53fbbfe0232ddfbbeb4a4187c";
+ sha256 = "a80cbc3f5227a6712ae04fa3a6f553c91c8ee757e9f58483ed3db300e7661fc5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fa/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fa/thunderbird-78.8.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "6e2b18166237fdf0d020570957ee7d0815d846a0aca8df2036cdf99e651cfce9";
+ sha256 = "fee67058c3b6b6ab5ef10c2bdd9ac9cdc86c1a65177f86b9b39e69435923feb8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fi/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fi/thunderbird-78.8.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "1769213bf789a21572014d4d97c823db14e11f7a32b91d57d98bebe39a80786d";
+ sha256 = "c3e2b90ec439de73a4afead978bc53e64966dda277d7b40cc0c2080df4180238";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fr/thunderbird-78.8.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "60017c2151aed3782567d9c10817e89c738d6bce322fd33f1188bc25dc12ac3f";
+ sha256 = "c7dc2fb5a67a5e3d884276c74dbed0d975db2686b7c9e47ee3b8e9cacba248db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fy-NL/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fy-NL/thunderbird-78.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "3878ce39135e30a76c67182765f5fa7fc38b7019021aa86f0806028f67a7dfd5";
+ sha256 = "13a0b3041c1178ea08fd4a65968f3e3a244a1e2a09931a1b9e142bb39db3da2a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ga-IE/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ga-IE/thunderbird-78.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "b2e66dd3fe5a78d2eb6691bc91521b3f22fbb5be88c556e2d5158057db0d6cfd";
+ sha256 = "e53725b3e31b9d397a3c92d2cb1bc5cdc206b5fa3310dbce3fcf8b82bdd50af4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gd/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/gd/thunderbird-78.8.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "c4722ceb4eca2afaa3502f2bc419b0ffc6cd2600100c5a91bf2cb7cdda60cd66";
+ sha256 = "04fc55448d9a12b4dc0995b48e0744868195f633b3489f0c38e4d154f9a2d1f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/gl/thunderbird-78.8.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "0f34fd28523062c90c521b40b0a67ad23e3b2ba05fe5c03cc1da29d480fde1e3";
+ sha256 = "18db14f47f958e4eaf8954805df109819124e4f0ea1713781add31105b258c4e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/he/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/he/thunderbird-78.8.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "8cf8a0b5e1bd3ed116ac1dcbcb1857db9ccff8452ff0d1f3ac2957cada5883c8";
+ sha256 = "99b47c6caa14ddf6af2d5ebdcad25f2d53300f8599c8b9f0304ab374dd0d2ebb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hr/thunderbird-78.8.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "827d0c46d404d871661af45d301645a1c888941741c1b6cad27c7c37aed52800";
+ sha256 = "29ce83e46a61c22c3bd4e4cbacc0fd7ec04a36460bfbeb76b62eaa752a0d10e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hsb/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hsb/thunderbird-78.8.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "83e965004f0293c324393914cc931ccfa608360982d338859da1e7e2ae0f333f";
+ sha256 = "a3f3fae8b4b0eb67dc4ea7f12aff3246effa7e61ee07d626cb05802ce1dbb2d8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hu/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hu/thunderbird-78.8.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "120ca3f7b356c57d7fa2af63ebcb974ad0ba313fe9c615afa5553b2e7ab75e62";
+ sha256 = "3207c91a73d67f21d809d1508bbd103a453ebe18db85dc099ff7be75b4d0752e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hy-AM/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hy-AM/thunderbird-78.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "7d0c2c5854f0a5a2288cacb6bf0d2f8ecd838dffcc8ccd040f993af94cb92d13";
+ sha256 = "80a659841237012e80c88530602c0845ddb42ad0d7fea4fb56d8026924cf50c6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/id/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/id/thunderbird-78.8.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "29462ae0dd0eaa8ac9370b8fc46ad8ad679ef44996a7f80468890b8a75ce4a29";
+ sha256 = "ab68d00bab6baa18c3ab0f5d77d6c0575e1af687e0473b61c69ba329d8ec392a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/is/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/is/thunderbird-78.8.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "084aee31331bb0bbdf466d3c3a6bb1834dfbdddaefe0e8c6e1d4a91eec0725ca";
+ sha256 = "69ba962cdd99500b3d65a9dee4a29780e2d2c807ad9ae5260fcae37593f2038d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/it/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/it/thunderbird-78.8.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "f180ceb0cd9f2e1d3e975f30fffa968e938b18ebb3c45108b6758d36989918e6";
+ sha256 = "0ddd769c4cc7a145bfe4f5a03b208e95ecea0219766b1351ce160c3c731eeb3e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ja/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ja/thunderbird-78.8.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "662f124e3a32ab9e6b6fbefed9b58779060d927558bbc9527d83936191e3e044";
+ sha256 = "45d8db5b361aa6c941ffa13651fd7c2a44db52f70ddf67bae9b5a0e3513db05b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ka/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ka/thunderbird-78.8.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "2faece980493b0071e5d62a579f4e1c4d792a63293949d81fa96e70468044acc";
+ sha256 = "66a0cbb3fccda23ac1f6547e69fce19bbf843882baa9d92ba8eb2f325cabe22d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kab/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/kab/thunderbird-78.8.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "7382fc4e006bcb05c0db2dc88f8aad32a3abbce2bcb32f28d6271658caf934b8";
+ sha256 = "e3d03fabe85a31756db1a0ff27e7ac29e4ca127f2f87612aa12c698171b3a610";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/kk/thunderbird-78.8.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "c8c52e06cd3ac3a02dc0081a82b25223a1da5a918335f770660122c8a6ba750c";
+ sha256 = "2367aa9c3e5e1b94a2661d8bdd56c39f3cbf95058c2c77639fecc01fe674b305";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ko/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ko/thunderbird-78.8.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "67928b2f6861b1071ff76c457f6aef4a9eb0d80f896331bdb847543c62b0dd11";
+ sha256 = "1c728ae7c8fc39c38aec45240f9c25879b7fe028d60ad1089e8564d5915eb3ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/lt/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/lt/thunderbird-78.8.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "aec1acfb847cea57772197d81d122e97915b03358c984293d40f6ce759b9e77a";
+ sha256 = "9f70983576df0e51a508941b0714bb43c3eb7ce494abfc1e3cf5b8a471c42047";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ms/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ms/thunderbird-78.8.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "9a4411e932789040abc939a64b9ad979104ffe868a969dabc27022dc9ff822fd";
+ sha256 = "19962ca7f30a397f2668e1dcb71ee5a5ffbefc1cf2c66d27978895fb06e2816f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nb-NO/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nb-NO/thunderbird-78.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "c7cfcd78108d931c60e9a061ed459da9df0cee27b16085fd1c6f3d71d54cd2fd";
+ sha256 = "fa4d681a30cb5d00771614de4ec40b92c5a593262818dd86dca79ca7ac0e7881";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nl/thunderbird-78.8.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "44e9a143f00636a9287b2f0774720fd372de25fff9de8ceb468bc81de1d7ade3";
+ sha256 = "ca2f0bbb087020e045c38068aa64b0f562aa9d3b08d76227f0cffaa84258b467";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nn-NO/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nn-NO/thunderbird-78.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "75269ac3171d14ca6145c3d00ba004489f89fc9210cf3af0d4e0248e24dac273";
+ sha256 = "97777d687d9bae2f495940a59dd513431f5ffa4520ce08a9af35db32783965d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pa-IN/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pa-IN/thunderbird-78.8.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "ef98d53446ad294eaa861919cc8e9e70f4f6458d3a4210a43ec37bd919db8aa7";
+ sha256 = "c50088c6b911c10fa7ca84ce284ffaa45c4a81a5276277809972c080c5bb3321";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pl/thunderbird-78.8.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "682c6b2a5e808e65e1e233fb48bbd68058a7f2745648d01d6342c90316b8135c";
+ sha256 = "1391c90597bb89e9edaaf58dc46894d84619649a2f7aa68a69bef41a167c4cab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-BR/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pt-BR/thunderbird-78.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "761988b180f3077cd9710324fd87ec577de5f5ee11c79404b416c64ba322c65a";
+ sha256 = "11229cb39877d227071809e4a53fdd078813241e736e3cb9b4868fff0329560d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-PT/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pt-PT/thunderbird-78.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "9182a7064d0f98a49b34b9bf78ae4d63fe6b588c51ceb48ffe0974455e767867";
+ sha256 = "e29d5d58d86af538700f69f6102c5f5dff3102173febfe559c959f15b8d19838";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/rm/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/rm/thunderbird-78.8.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "33a8bec5ee7240fb44e350139f60e1d7c92361020bba2857634af03e40ee0f87";
+ sha256 = "53925070690b9cb88e62e73b52ceac7663bcc9af82834a6028a1fc83e8fe954b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ro/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ro/thunderbird-78.8.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "a50168d1b5e62d7bec9d75714612614b9d2342fdc6b8f89959d50d1505cbf7d0";
+ sha256 = "ac6e9b71f0008560768dbf3675c3a2d99e1436d810cc35705219d1141cd5657c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ru/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ru/thunderbird-78.8.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "555e630090fbc41711e88d0a8e822febf0619333c2bcace5bdfbfdfdddfbb0dd";
+ sha256 = "e70c93d3ac2ab6bd0b618b43ecb34fb5dd756325cc2b524249b6ba47d0abcf47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/si/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/si/thunderbird-78.8.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "f977bd3fb4caaefb03eb8c967ae4850c0b7b2b8dfa0f7d7cedfba0847788cdb3";
+ sha256 = "ffebac6b9c87abe040a25a39e9f84c05f8d143afe54bb293828945ccd694b44f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sk/thunderbird-78.8.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "f1e5c9787a2ae8f8aaceef1ca2963884031a6cb8dc0ab3c3230fa0021156cfc4";
+ sha256 = "bb9be9c2427965ef4007bef0e6da049680959ecb47fa120a49a78418def11aee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sl/thunderbird-78.8.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "59a97046285bca3e5b8ba396d3afef69fe2cb5a41347e4e0a21e9ff66c03ae12";
+ sha256 = "3889b8b457cc078dd0c5a3ef0564a285622fb2295ce003322eb76227876397af";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sq/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sq/thunderbird-78.8.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "ed0cf7d341d42dedeaa224f7f1f8e005172134da591f65664a4aca717e6db44a";
+ sha256 = "2ba1e13b129c81e2fcf2382481d477ee9209bcbd413b357426659c4c59951fd4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sr/thunderbird-78.8.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "fd61b2e8e048f162e59a1a428100e6d0556d7120de1f8b46decdfe60509de0d7";
+ sha256 = "5eb98fb8b36f0ada831306b37eb63ab3b959baf55e0adb0641400eb7cf143e4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sv-SE/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sv-SE/thunderbird-78.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "87afa3b4b12848de156ea61d1727dea1ef5b86bc83b583df55f089bd1d1bec1e";
+ sha256 = "20f9c865e9c2ac8c7af880126748e6a7260d310b1c4abd142631a5507d3a7715";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/th/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/th/thunderbird-78.8.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "0e9b959424106680bced6d924c184d1306f7f1fd34fb4d3e4d8a54cb191500bd";
+ sha256 = "da966ee74484fea59f0a431639f9745f600c65e1d50ba625c7dcb04edf8f3b12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/tr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/tr/thunderbird-78.8.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "f2d037cea39d2698e71a0885587302644450149434ac7c3234c7ae32c5f4d103";
+ sha256 = "15e7953aafcd2476c8f0a5bbde7c5bd4be634dc8ccb6e7c599e49885e653a1c4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/uk/thunderbird-78.8.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "663aa8509cc75c074697509981bf54ab00eeddc50c53acc0221225c3d7c63f9f";
+ sha256 = "d5b81175250441ef8850d3d62886223ebb824554180e78537367afc63fe13b6c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uz/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/uz/thunderbird-78.8.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "892209fbe5d48532710feab4ad8f38f9387e10b088d91a12c9778bc465af194c";
+ sha256 = "7a8ed91075d4d3f884a9fbd750bdd57b51b781cc299bc9648adbcb218524d3c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/vi/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/vi/thunderbird-78.8.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "a66d1d470f4a76cfa8b31fa3d60acb91cc7657455f9aebf930e127c2acbf4c8f";
+ sha256 = "38b0e4005a2023191ea237e54328040e2dd9c92f38d6a00b57ab0ef1114b2f60";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-CN/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/zh-CN/thunderbird-78.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "10830b4a84ca22c19ee329cb00b92816e9b74f99c99a1ba6cfc86171470d655d";
+ sha256 = "196c4f43f93cb3bced090a62d229799a7e5f4f174ed2304ed6013eba4eaa53db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-TW/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/zh-TW/thunderbird-78.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "b88200643a70ba3391cfd3be6cbc7bb178c6170f26041d4153021736d03365f0";
+ sha256 = "ad26a1b2a35acdc290eb6709b96880b1e72fb66d70443a83b1da9d9f16a4eb2d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/af/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/af/thunderbird-78.8.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "e78e2ef7411b3e6c0f2ed5c0729dfdc144f94e8575f2f30ae1cbaeb7c73188dc";
+ sha256 = "af7973120feb000127c70c53d84efd256f5758751fe1f1c77fa1daa1cccfdded";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ar/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ar/thunderbird-78.8.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "42c3f3b177a50afd6640db6815e7c159048cebb6dd5613c2fdf9ef18871d40cf";
+ sha256 = "49581a6febcca71de9b67ca92ed0cab6f52863e59754575effe629b6c7d9f627";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ast/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ast/thunderbird-78.8.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "b8fb786756051169d96a4fecf05cdabf4becc8fbcabd56ba676e96286a80b9d2";
+ sha256 = "a1462259b3157128582889f266ed8b36656de974a64faec39e461fc64de78403";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/be/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/be/thunderbird-78.8.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "4e3f8f26b1321d130fb16b5eb30c3b3c3a7863e6d43ee9604f1a6da97228c85f";
+ sha256 = "c677a9d1802e58c9fce12058da7f3c504f4b4f67a727897e0f0e8d8005fe26cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/bg/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/bg/thunderbird-78.8.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "0385b615dfb21f33b3e84b6c9213d3d8980379bb4be07967f5309888078ac177";
+ sha256 = "0424f520fed1d43ac5145d7607b775f7d4f6f880e41e9638085a9a185bf160e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/br/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/br/thunderbird-78.8.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "e338d6b439577af562c4dbcd2951176d2c6cf87254203e6d20602de4563484c0";
+ sha256 = "1be23d98643548dd40007db54ffcbf6df52e80c74f05d92175bf2109ef4308f3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ca/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ca/thunderbird-78.8.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "71f1b5f1b35a9c5712ba6cedbf3de96f4a3814655c44ed1cda48d4e5a56c3e03";
+ sha256 = "d743f55888ed0d0e4acd31e158fd8db3f7709f534cd570696216c2adcb081c99";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cak/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cak/thunderbird-78.8.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "0f616eb61c0de3e38d2092ae215613ba104be279027259def8bca4082bd74cd3";
+ sha256 = "875378354c62fa050d1559539df54e7d5dcf1fecbb4cda733648dc5488121b6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cs/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cs/thunderbird-78.8.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "8de26b3daa7b087fb94a349e909da703867665fb2b4add360584c8d61f0c84ee";
+ sha256 = "677239766430bd055e83a25a03ad825602b88c5b6e236dbf8c7f36abc3956fa3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cy/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cy/thunderbird-78.8.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "74e28fb04e08bcfd68215eec443fde725077850e412798c1f0870e776ecbeeb1";
+ sha256 = "e14dd47506b180b29bd8ed3e70c9d0e66ac264dbbe374bcf82b6849ff1b92c18";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/da/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/da/thunderbird-78.8.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "d50f37a31e4e5805084fa14bf639057b543deac99738871c402ad9af9684ce20";
+ sha256 = "ea8f4fc8eaf461da09050a03282dfeec7ca1987c5741f875546ad22dc904748a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/de/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/de/thunderbird-78.8.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "7aa84ada2e6cb6b467a618b234a7cd0370f5d71fd1eb0f5da1addb6478665ad3";
+ sha256 = "f60f678ee1ee593b99fb95116ac7d157d860c0fabe8b37865fd5b703634e9c78";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/dsb/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/dsb/thunderbird-78.8.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "e273b80d5039097a34e7e2c96f65aca112e68d72a82782e783ea9412e49ab21f";
+ sha256 = "fbc2d5841e1ab6401d4ff4cf1f03102c4bf59662e4687354f36f15efebdf92f9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/el/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/el/thunderbird-78.8.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "f31dfc543cca8d8f3c6e1cc40f8a07ead7b231222c8e04e5e2202c315c4708d8";
+ sha256 = "ef9d01738f186aa87e55e41d3ba835fe0d3a616d6ab2c0115849577e98aafb66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-CA/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-CA/thunderbird-78.8.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "534f8008886a3028c09afb1c030923359f8ee0c85c6e961faa4c974b6c2c30da";
+ sha256 = "3ed96eb3b0f4a301ee350cad37b0544391aa937757ac1e6f0be9b20f13207915";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-GB/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-GB/thunderbird-78.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "c9c138e5d92847c0c0ec82d1799fddf1267b95a5f6ef2cae7820f560aff53732";
+ sha256 = "eef090aed2c10f3275f1161e34fec1ed46af057c52279765797297eb2b7d7053";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-US/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-US/thunderbird-78.8.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "6ec06f3a432301745ed24607b0549602ae31bf6e051ca9a4079f4cd6caf2041f";
+ sha256 = "163c1289f515179281c44e1c4eebdcff4a3d641cc91ae8acc57c8e43ab07c07c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-AR/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/es-AR/thunderbird-78.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "8debebc56ee0fbcbf2507f98f28f7807b55d4d768bd40c7820aa9e4f7dc9f0ad";
+ sha256 = "e84f8d773bc91ccb45b4295b05e2154a831b54ed5156d5979bfa6b54f0a33e70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-ES/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/es-ES/thunderbird-78.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "58ac431d1b48a1c8224e414577a7405f20336cd990f6e4d8399e304cc5f38a3f";
+ sha256 = "c40e97e1d321ada605a4d441452705b24b6968662b118d074780b2f864dfa62f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/et/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/et/thunderbird-78.8.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "a80917893c189acbd745e56820b7f4fce1ebf14e99be8700db75817ffa3eccf5";
+ sha256 = "4a69f41eb0c60a63cc0f4b4580ad12b7ac0328062dd66bbb7d63e276594e3007";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/eu/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/eu/thunderbird-78.8.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "f305db54f9cc504777ee9d329ca1da97a8642f7505903b2744cb7d86382b0ccf";
+ sha256 = "bec059640483556ab03dcf53c966fcf3fb46cf8a1f38b14f0981f0cb75411943";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fa/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fa/thunderbird-78.8.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "0a90e573bf94097f790dec0ef2771266bf115c0c4768c3952758f8c17f7cfb70";
+ sha256 = "8a186051fb3d7b7e2293d2b591fb0f9708be6985e4ff8b9e1809cd98bf44690b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fi/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fi/thunderbird-78.8.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "264104b86cd034927586520b6c4df25b1c75da4d97ea18bffd74261e553b4eb5";
+ sha256 = "6c407bc175f75f84ec83386cc8ea7fcdd4b25523326e86755f033f2512446007";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fr/thunderbird-78.8.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "2cbca14d94252f24dd50c971fd5ad367b4b3c0d3ccfd2d9ce8b18cb1df62a82c";
+ sha256 = "429fe2900ac9caf79d386f3826898b6fed6302030fa7b7c2e7386cc3d849eab5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fy-NL/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fy-NL/thunderbird-78.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "d60c543f59ebdb539b9d3799d77f4ad1d05738cc5d1b78d016a7d2f036d72095";
+ sha256 = "718807d6cf9af7d205bc273343e60b8f7ddeb531253f738a3275afc65c659916";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ga-IE/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ga-IE/thunderbird-78.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "2d0a19e3a702a72866af8c8e9aac64e9c41b3b1bc44de53ec42b56efd657cd63";
+ sha256 = "900ac6c3d62879521ca5a39622994d8d2d352271f088f6e7cc142d533a146800";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gd/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/gd/thunderbird-78.8.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "93eaaf7d5c6cdf1947e25fbd053185f09f60329ba729a53f12d272f24dca6bf7";
+ sha256 = "3e5fcc21742434445d3508690d90ff9782bdc4a9568e422899897293333c51e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/gl/thunderbird-78.8.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "02d78333abaed79e7a2fccc6af3edef3077e08cadcc83fa2856779b6d24e9113";
+ sha256 = "8c83f977b0ec5ef8b25e0ae0b7735590d1c5a42bebd90ca3f53a6a50ab8e1f12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/he/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/he/thunderbird-78.8.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "d4dd60245672fc23e114d2cfef40ff69faf08a2f188969deff7d084d8aebd64f";
+ sha256 = "7aa66ca6d1c58a1e55c8b76aa0a872af69dec41e403176a95bae7f1b73941eec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hr/thunderbird-78.8.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "0aba235af4ebdd924d9d909755dd059025c1b502ab0056a24ef0eb5aea05b9ae";
+ sha256 = "7341f850d220f9e66bf018d27e44cb8906c31fbe7346d850b4b646b517eedf7c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hsb/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hsb/thunderbird-78.8.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "acc53828d809a21b3a5bc6b00cf5681b376284e4818c8db250f61a3117573f78";
+ sha256 = "a4ed28817e4680f53271bf3c24a5479f00bc9c8614c141065462e396bb46be36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hu/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hu/thunderbird-78.8.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "39aac6a7e96fbc71c9e537f4312fa528c0f3b56a5d669638ca2a4ff2a4823cb8";
+ sha256 = "0331825ce5c8595e0270f5c92b3818abd53514a2304b55d41d264175c01c100b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hy-AM/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hy-AM/thunderbird-78.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "bb1fdc6084ca5d761823b5391aa237d14d62f783007cbb2d6ccff1b69a7b3142";
+ sha256 = "aecb16b8b69fbcd65b3ce43595f00a67214616f85f936d9b8f395fda3bec1769";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/id/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/id/thunderbird-78.8.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "340b91be60235a91b1a130d68e9b5ddc16d63eba381cc59efd2d396764bf2327";
+ sha256 = "aea434ed29197b5a6afe21fe5b1fa361bf3ef17bee6cdb7fd3d1f5e76fd8b8ea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/is/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/is/thunderbird-78.8.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "4f3b255119669de976714089d11532342eb6c1ede95e98d8de09413cdaf28c4c";
+ sha256 = "7747d287ce2f13f8b136f9186168cfbcb7e9e9bf65d949dd9291f69afdd63999";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/it/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/it/thunderbird-78.8.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "1fdda6110ef1eec5702490dfb786fadeb6bbb73fa849526327baebdf3aeaf348";
+ sha256 = "0c5cbc6a5ccdb940e6e5ed2ec2970f9b252c9106e51d9342b665cc3625283c9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ja/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ja/thunderbird-78.8.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "fd10c2307c71e143d76dfba7d26ea15a6a211878bcf1287128d5706018fb3083";
+ sha256 = "60b05dbf93b1947fa3fe8b3c85eb700f0e15ec702c0d1ffd1a9b494517482041";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ka/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ka/thunderbird-78.8.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "b796f8b6aaa28a23726afe915b741b7c89ed73f4e731bf7fad3848aade16001c";
+ sha256 = "0b80a9e27408e9ab91cbfe1682b5a0679723f22164390ddf6f77992b90bb6ec6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kab/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/kab/thunderbird-78.8.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "35941699918a3177b092c650a73d8bc8f6d06bdf8cbc5c33e492d93f6cb0f198";
+ sha256 = "d7b61aaca643ad9e0e8a61256e5ff42d855353d93fdcfc40641046385196f7fa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/kk/thunderbird-78.8.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "3ea99defb54f2e672d48b424e842c876ad0ceacd87cd19cc643acb55586948ea";
+ sha256 = "c9140b1223585cb5c95c17cea964c0658875b24e4f126f67e13766cc2880daf1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ko/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ko/thunderbird-78.8.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "4cfa908b81773b57486b8144eb61c949c70615eafc1b3d050b6ceb6292958769";
+ sha256 = "3486ddea77036a357636235d2839d4e3abb8bb703d6b2aeab4dab7bd510d2975";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/lt/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/lt/thunderbird-78.8.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "0d668e8a27f7044c610cff1028f245d2952abf6320ce905365bd42a39df85c23";
+ sha256 = "07d85f0ad5ae0992076369c5e7082b1846c53122953de8e7cdb947ddbb741bfa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ms/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ms/thunderbird-78.8.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "a632e60198e189d33e87a01c084179bdfb8f8c1d1547dfa4747dec325d1c04c7";
+ sha256 = "d063f14194c3e89a5379a9d9d0edd38f987040269cf69a0e60b1a2fe5e8773a1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nb-NO/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nb-NO/thunderbird-78.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "d0336060f8e8b632462df91dc0e3ba33f2a7dbf1da6084d41961c05fbbedd46b";
+ sha256 = "129ee98d2f0d899664face9c7e4214b9f120141ffa230f5f195efd013e7bfcb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nl/thunderbird-78.8.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "4e9c1921dac5ce0008b7380d810d5ee4530c4d336c79c6a274c657ea338a4ca1";
+ sha256 = "df58d1e22671e09219719c86580dd605e6def1dc6f65c63306b5d3624382542a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nn-NO/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nn-NO/thunderbird-78.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "c33045aaa5d9054022431cf66f03ba2485ea7c68553ea245b73c8cf33b4458fc";
+ sha256 = "12041cf3f1edaa62eafa5b338b890482d85df33ca4b1506a007aa862d31a5c0c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pa-IN/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pa-IN/thunderbird-78.8.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "8b3810587f61e029a2536cb0eceb8b0b26656adf9ce17e8a7f020ed41b6e5724";
+ sha256 = "479250fc9203ec4895341ea37bda544c47c972ea12b8e2462539533c90a7b384";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pl/thunderbird-78.8.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "01c8e6ba91037b8e5f713fd7d0dc9b6025aa3dc83fd8b13f1490dd849ec5e87f";
+ sha256 = "a4563a29cea75560c0de441a1fc311cdefb938bc91feea283b8e18da7252a3fe";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-BR/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pt-BR/thunderbird-78.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "9ab3d18699c6de55a198028592da01b576d67920375cbc2154d356bdf7fd4ccc";
+ sha256 = "45414f14d31eb81f2b590fb702d5a586069c32a1b854116dd88a4104abd15fce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-PT/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pt-PT/thunderbird-78.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "3446b5b82aeb058ff880d82fa7da923231a7104bcef77bc08f640490c79b24b5";
+ sha256 = "f12515b2b18a1cd7040d35e9452a6b2b4f3bd2ebc277815d9f85167fcd61b645";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/rm/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/rm/thunderbird-78.8.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "0e1ba7a270021b2df2f189715ddd6b0d540c35dbfb3f45d8216b24e29c6ecd25";
+ sha256 = "ba4b770ef2ac9663120bd6b7f4f42647e995e6db2ca3bbdcbfeea9734e6ba985";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ro/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ro/thunderbird-78.8.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "9845b2e33d758474c44e46804c7c49255f3acf9f25c8afa299320828cefb3ec8";
+ sha256 = "cae153b7ba51b3c86568bf672fc13edf2029a2b6b5dfe44dc0b493bcb2228855";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ru/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ru/thunderbird-78.8.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "60dc7072a6dfa0723972522d4a06be75c99e6e1b423e68e91af276f2a325913b";
+ sha256 = "39241b2643770adde562ac748c69456eba9a4fcaef257c47bdc72938ee3119f7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/si/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/si/thunderbird-78.8.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "fd08c36b8143196ca73aade09e3a8292bab0ce8b6e6d18705eed2594f342ce86";
+ sha256 = "8df14f85560561334caf28ad280e093fbaa8fa6af32fde417e8f29088a31ccb3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sk/thunderbird-78.8.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "068d927b94908224c7a789bfe33d1e884228d82d3f30e573a0006136d5841c5f";
+ sha256 = "42ac111340581dc6f067d26f6aa51fb354e27d38af5b61deb34d6e79ec015011";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sl/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sl/thunderbird-78.8.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "27d3a7f5549c48fa2724dc98b8df72bf2b843b0cc34d55371f050ca217cd2ed3";
+ sha256 = "07c234d2ec1e512a177a2f87713dcb3bd0d9b8a8683e840f767a041f127fe73a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sq/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sq/thunderbird-78.8.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "b8d3ca545ff88c854b13e1ee89793b33df39f3d6713aae8fb4a2fa3be2d6f73f";
+ sha256 = "da4a269007d5cc4f4077a5f6da98d5d34fceb7a4043598bee4776aaf867a64d3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sr/thunderbird-78.8.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "10d0f70e52bbb8b0978ff6c26359120bb537cc9f15b47a93744ad8ee6dbd7b96";
+ sha256 = "6719dba0153c8f60b4ce6fb0d68b2f52f8b7840f5659a1ad884bf2a4b6455a3a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sv-SE/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sv-SE/thunderbird-78.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "15fd51de4cd82eaadfb0c9a5231cd6c8f83a58eca1eb66acafa037ca8ae76767";
+ sha256 = "140c6b0ea0171443714951064d60de5372c85e04e2c3282a86e7b11e682737c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/th/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/th/thunderbird-78.8.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "07a6289101aa3d105c2a358ea53d1045bfc3616cd909e57b5a577bcba38dba0f";
+ sha256 = "99a659426d84ee98f94c9162ce49c1d098529a233ffb7cbfd5a7e26eda23b554";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/tr/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/tr/thunderbird-78.8.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "6253f5e59cf07cfe8bbdd566b27ad9cd56aab29f40c42df1368d7e14d064a27a";
+ sha256 = "e5bdb857cb059119c1a3de847947125d2caeef7a5c9f75e0e1a4f3bdaa8c168b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uk/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/uk/thunderbird-78.8.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "e4e37d8194d8df48810afc47463d044e4b4b9fdd0752b0199e4c6a7aa1b46d60";
+ sha256 = "3a6530c8bb8976aec06b71fdb3eb4a4fcf3fef27668f1323b7c934026f9b7429";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uz/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/uz/thunderbird-78.8.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "983d9701e367017ada3b6583d9e6985a73609c642968f1c82ec9b08644fe82b5";
+ sha256 = "ce246a13ed9cc8a03212f0b74f24907e75502a8cdf9ebf59f0153882dfa96c28";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/vi/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/vi/thunderbird-78.8.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "b743d0c18257880cf0d7c463a0e39f6029fede79a534bef9dbd5ffe6ba3b10e7";
+ sha256 = "bfa8c72c3c2cf08f36bb13b9844574aecb3e69636ede5a60e24a7d816ee7aa0e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-CN/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/zh-CN/thunderbird-78.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "8cc5d4a05eef0498fe12476e7ee7a91dce0c69234b78278cc7985505708ff8ab";
+ sha256 = "68c8f68454806be4cff160621b97c897a752db5498c48dd45889f861d741c0b3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-TW/thunderbird-78.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/zh-TW/thunderbird-78.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "5070474b2ac89d09e45bced9513b0f317d4dce76c57ce5f82c75feafb6d49ec3";
+ sha256 = "79ad159cb37d2c68a26dba5298cc62eb25a0f46c845bd3f556e198658b62bede";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d91239c3a6..78a9ef0dbb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "78.7.1";
+ version = "78.8.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "328p14mgcam4dxx0asbgp4v2v559bwbw7z2kxd5yfwkna040r9ccrkkirma5580z9vkwb0rcjlmai9wrbacxrg8hg65d8vylvnkampy";
+ "18hx7qi4nwfbygh1ykczvs7vyvmcqwj4x838lpillimzwjd7chyrbjz2b2h15ckfgndbrxmwvvd3v50bj04xpqigvz18g46nav1mly7";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
index da36589aee..2723f34204 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -10,7 +10,6 @@
, itstool
, libayatana-appindicator-gtk3
, perlPackages
-, glibcLocales
, meson
, ninja
}:
diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix
index 77d08692f6..124ee9a20e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix
@@ -1,30 +1,33 @@
{
lib,
buildPythonApplication,
- stdenv,
substituteAll,
fetchFromGitHub,
isPy3k,
flask,
flask-httpauth,
+ flask-socketio,
stem,
+ psutil,
pyqt5,
pycrypto,
- pysocks,
- pytest,
+ pyside2,
+ pytestCheckHook,
+ qrcode,
qt5,
requests,
+ unidecode,
tor,
obfs4,
}:
let
- version = "2.2";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "micahflee";
repo = "onionshare";
rev = "v${version}";
- sha256 = "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4";
+ sha256 = "sha256-H09x3OF6l1HLHukGPvV2rZUjW9fxeKKMZkKbY9a2m9I=";
};
meta = with lib; {
description = "Securely and anonymously send and receive files";
@@ -51,63 +54,76 @@ let
maintainers = with maintainers; [ lourkeur ];
};
- common = buildPythonApplication {
- pname = "onionshare-common";
- inherit version meta src;
-
- disable = !isPy3k;
- propagatedBuildInputs = [
- flask
- flask-httpauth
- stem
- pyqt5
- pycrypto
- pysocks
- requests
- ];
- buildInputs = [
- tor
- obfs4
- ];
-
+in rec {
+ onionshare = buildPythonApplication {
+ pname = "onionshare-cli";
+ inherit version meta;
+ src = "${src}/cli";
patches = [
+ # hardcode store paths of dependencies
(substituteAll {
src = ./fix-paths.patch;
inherit tor obfs4;
inherit (tor) geoip;
})
];
- postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out";
+ disable = !isPy3k;
+ propagatedBuildInputs = [
+ flask
+ flask-httpauth
+ flask-socketio
+ stem
+ psutil
+ pycrypto
+ requests
+ unidecode
+ ];
- doCheck = false;
- };
-in
-{
- onionshare = stdenv.mkDerivation {
- pname = "onionshare";
- inherit version meta;
+ buildInputs = [
+ tor
+ obfs4
+ ];
- dontUnpack = true;
+ checkInputs = [
+ pytestCheckHook
+ ];
- inherit common;
- installPhase = ''
- mkdir -p $out/bin
- cp $common/bin/onionshare -t $out/bin
+ preCheck = ''
+ # Tests use the home directory
+ export HOME="$(mktemp -d)"
'';
};
- onionshare-gui = stdenv.mkDerivation {
- pname = "onionshare-gui";
+
+ onionshare-gui = buildPythonApplication {
+ pname = "onionshare";
inherit version meta;
+ src = "${src}/desktop/src";
+ patches = [
+ # hardcode store paths of dependencies
+ (substituteAll {
+ src = ./fix-paths-gui.patch;
+ inherit tor obfs4;
+ inherit (tor) geoip;
+ })
+ ];
+
+ disable = !isPy3k;
+ propagatedBuildInputs = [
+ onionshare
+ pyqt5
+ pyside2
+ psutil
+ qrcode
+ ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
- dontUnpack = true;
-
- inherit common;
- installPhase = ''
- mkdir -p $out/bin
- cp $common/bin/onionshare-gui -t $out/bin
- wrapQtApp $out/bin/onionshare-gui
+ preFixup = ''
+ wrapQtApp $out/bin/onionshare
'';
+
+ doCheck = false;
+
+ pythonImportsCheck = [ "onionshare" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch
new file mode 100644
index 0000000000..cdc2e3d47d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch
@@ -0,0 +1,37 @@
+
+--- a/onionshare/gui_common.py
++++ b/onionshare/gui_common.py
+@@ -376,29 +376,10 @@ class GuiCommon:
+ }
+
+ def get_tor_paths(self):
+- if self.common.platform == "Linux":
+- tor_path = shutil.which("tor")
+- obfs4proxy_file_path = shutil.which("obfs4proxy")
+- prefix = os.path.dirname(os.path.dirname(tor_path))
+- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
+- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
+- elif self.common.platform == "Windows":
+- base_path = self.get_resource_path("tor")
+- tor_path = os.path.join(base_path, "Tor", "tor.exe")
+- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
+- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
+- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
+- elif self.common.platform == "Darwin":
+- base_path = self.get_resource_path("tor")
+- tor_path = os.path.join(base_path, "tor")
+- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
+- elif self.common.platform == "BSD":
+- tor_path = "/usr/local/bin/tor"
+- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
+- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
+- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
++ tor_path = "@tor@/bin/tor"
++ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
++ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
++ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
+
+ return (
+ tor_path,
diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch
index ddd0c75334..a290dd8841 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch
+++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch
@@ -1,68 +1,31 @@
-diff --git a/onionshare/common.py b/onionshare/common.py
-index 3373462..7fd245b 100644
---- a/onionshare/common.py
-+++ b/onionshare/common.py
-@@ -87,66 +87,16 @@ class Common(object):
- ),
- "share",
- )
-- if not os.path.exists(prefix):
-- # While running tests during stdeb bdist_deb, look 3 directories up for the share folder
-- prefix = os.path.join(
-- os.path.dirname(
-- os.path.dirname(os.path.dirname(os.path.dirname(prefix)))
-- ),
-- "share",
-- )
--
-- elif self.platform == "BSD" or self.platform == "Linux":
-- # Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode
-- prefix = os.path.join(sys.prefix, "share/onionshare")
--
-- elif getattr(sys, "frozen", False):
-- # Check if app is "frozen"
-- # https://pythonhosted.org/PyInstaller/#run-time-information
-- if self.platform == "Darwin":
-- prefix = os.path.join(sys._MEIPASS, "share")
-- elif self.platform == "Windows":
-- prefix = os.path.join(os.path.dirname(sys.executable), "share")
-+ else:
-+ prefix = "@common@/share/onionshare"
-
- return os.path.join(prefix, filename)
-
+--- a/onionshare_cli/common.py
++++ b/onionshare_cli/common.py
+@@ -86,33 +86,10 @@ class Common:
+ return path
+
def get_tor_paths(self):
- if self.platform == "Linux":
-- tor_path = "/usr/bin/tor"
-- tor_geo_ip_file_path = "/usr/share/tor/geoip"
-- tor_geo_ipv6_file_path = "/usr/share/tor/geoip6"
-- obfs4proxy_file_path = "/usr/bin/obfs4proxy"
+- tor_path = shutil.which("tor")
+- if not tor_path:
+- raise CannotFindTor()
+- obfs4proxy_file_path = shutil.which("obfs4proxy")
+- prefix = os.path.dirname(os.path.dirname(tor_path))
+- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
+- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
- elif self.platform == "Windows":
-- base_path = os.path.join(
-- os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor"
-- )
-- tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe")
-- obfs4proxy_file_path = os.path.join(
-- os.path.join(base_path, "Tor"), "obfs4proxy.exe"
-- )
-- tor_geo_ip_file_path = os.path.join(
-- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip"
-- )
-- tor_geo_ipv6_file_path = os.path.join(
-- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6"
-- )
+- base_path = self.get_resource_path("tor")
+- tor_path = os.path.join(base_path, "Tor", "tor.exe")
+- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
+- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
+- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
- elif self.platform == "Darwin":
-- base_path = os.path.dirname(
-- os.path.dirname(os.path.dirname(self.get_resource_path("")))
-- )
-- tor_path = os.path.join(base_path, "Resources", "Tor", "tor")
-- tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip")
-- tor_geo_ipv6_file_path = os.path.join(
-- base_path, "Resources", "Tor", "geoip6"
-- )
-- obfs4proxy_file_path = os.path.join(
-- base_path, "Resources", "Tor", "obfs4proxy"
-- )
+- tor_path = shutil.which("tor")
+- if not tor_path:
+- raise CannotFindTor()
+- obfs4proxy_file_path = shutil.which("obfs4proxy")
+- prefix = os.path.dirname(os.path.dirname(tor_path))
+- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
+- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
- elif self.platform == "BSD":
- tor_path = "/usr/local/bin/tor"
- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
@@ -72,63 +35,6 @@ index 3373462..7fd245b 100644
+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
-
+
return (
tor_path,
-diff --git a/setup.py b/setup.py
-index 9af72fc..53ca47b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -70,41 +70,41 @@ classifiers = [
- ]
- data_files = [
- (
-- os.path.join(sys.prefix, "share/applications"),
-+ "share/applications",
- ["install/org.onionshare.OnionShare.desktop"],
- ),
- (
-- os.path.join(sys.prefix, "share/icons/hicolor/scalable/apps"),
-+ "share/icons/hicolor/scalable/apps",
- ["install/org.onionshare.OnionShare.svg"],
- ),
- (
-- os.path.join(sys.prefix, "share/metainfo"),
-+ "share/metainfo",
- ["install/org.onionshare.OnionShare.appdata.xml"],
- ),
-- (os.path.join(sys.prefix, "share/onionshare"), file_list("share")),
-- (os.path.join(sys.prefix, "share/onionshare/images"), file_list("share/images")),
-- (os.path.join(sys.prefix, "share/onionshare/locale"), file_list("share/locale")),
-+ ( "share/onionshare", file_list("share")),
-+ ( "share/onionshare/images", file_list("share/images")),
-+ ( "share/onionshare/locale", file_list("share/locale")),
- (
-- os.path.join(sys.prefix, "share/onionshare/templates"),
-+ "share/onionshare/templates",
- file_list("share/templates"),
- ),
- (
-- os.path.join(sys.prefix, "share/onionshare/static/css"),
-+ "share/onionshare/static/css",
- file_list("share/static/css"),
- ),
- (
-- os.path.join(sys.prefix, "share/onionshare/static/img"),
-+ "share/onionshare/static/img",
- file_list("share/static/img"),
- ),
- (
-- os.path.join(sys.prefix, "share/onionshare/static/js"),
-+ "share/onionshare/static/js",
- file_list("share/static/js"),
- ),
- ]
- if not platform.system().endswith("BSD") and platform.system() != "DragonFly":
- data_files.append(
- (
-- "/usr/share/nautilus-python/extensions/",
-+ "share/nautilus-python/extensions/",
- ["install/scripts/onionshare-nautilus.py"],
- )
- )
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index c7a05f37ca..3e1d5073f5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,47 +1,29 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11
-, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11
+, mkDerivation, qtbase, qttools, qtmultimedia, qtscript
+, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "eiskaltdcpp";
- version = "2.2.10";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "eiskaltdcpp";
repo = "eiskaltdcpp";
rev = "v${version}";
- sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
+ sha256 = "0ln8dafa8sni3289g30ndv1wr3ij5lz4abcb2qwcabb79zqxl8hy";
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
+ buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
+ (perl.withPackages (p: with p; [
+ GetoptLong
+ RpcXML
+ TermShellUI
+ ])) ]
++ lib.optional stdenv.isDarwin libiconv;
- patches = [
- (fetchpatch {
- url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch";
- sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas";
- })
- (fetchpatch {
- url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch";
- sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx";
- })
- (fetchpatch {
- url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch";
- sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x";
- })
- (fetchpatch {
- url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch";
- sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9";
- })
- (fetchpatch {
- url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch";
- sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8";
- })
- ];
-
cmakeFlags = [
"-DUSE_ASPELL=ON"
- "-DUSE_QT_QML=ON"
"-DFREE_SPACE_BAR_C=ON"
"-DUSE_MINIUPNP=ON"
"-DLOCAL_MINIUPNP=ON"
@@ -54,6 +36,11 @@ stdenv.mkDerivation rec {
"-DWITH_LUASCRIPTS=ON"
];
+ preFixup = ''
+ substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \
+ --replace "/usr/local" "$out"
+ '';
+
meta = with lib; {
description = "A cross-platform program that uses the Direct Connect and ADC protocols";
homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix
index 85a5217ff6..a39b4aab83 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
homepage = "http://retroshare.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684)
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
index 557914439a..fe8743ee1c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p";
};
- buildInputs = [ makeWrapper jdk ant ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jdk ant ];
buildPhase = "ant";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix
new file mode 100644
index 0000000000..4ef89e2616
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix
@@ -0,0 +1,111 @@
+{ lib, stdenv, fetchFromGitHub, mkYarnPackage, writeText, python3Packages }:
+
+let
+ version = "0.2.3";
+ src = fetchFromGitHub {
+ owner = "ngoduykhanh";
+ repo = "PowerDNS-Admin";
+ rev = "v${version}";
+ sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw";
+ };
+
+ pythonDeps = with python3Packages; [
+ flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify
+ mysqlclient sqlalchemy
+ configobj bcrypt requests ldap pyotp qrcode dnspython_1
+ gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
+ lima pytimeparse pyyaml
+ ];
+
+ assets = mkYarnPackage {
+ inherit src version;
+ packageJSON = ./package.json;
+ yarnNix = ./yarndeps.nix;
+
+ nativeBuildInputs = pythonDeps;
+ patchPhase = ''
+ sed -i -r -e "s|'cssmin',\s?'cssrewrite'|'cssmin'|g" powerdnsadmin/assets.py
+ '';
+ buildPhase = ''
+ # The build process expects the directory to be writable
+ # with node_modules at a specific path
+ # https://github.com/ngoduykhanh/PowerDNS-Admin/blob/master/.yarnrc
+
+ approot=deps/powerdns-admin-assets
+
+ ln -s $node_modules $approot/powerdnsadmin/static/node_modules
+ FLASK_APP=$approot/powerdnsadmin/__init__.py flask assets build
+ '';
+ installPhase = ''
+ # https://github.com/ngoduykhanh/PowerDNS-Admin/blob/54b257768f600c5548a1c7e50eac49c40df49f92/docker/Dockerfile#L43
+ mkdir $out
+ cp -r $approot/powerdnsadmin/static/{generated,assets,img} $out
+ find $node_modules/icheck/skins/square -name '*.png' -exec cp {} $out/generated \;
+
+ mkdir $out/fonts
+ cp $node_modules/ionicons/dist/fonts/* $out/fonts
+ cp $node_modules/bootstrap/dist/fonts/* $out/fonts
+ cp $node_modules/font-awesome/fonts/* $out/fonts
+ '';
+ distPhase = "true";
+ };
+
+ assetsPy = writeText "assets.py" ''
+ from flask_assets import Environment
+ assets = Environment()
+ assets.register('js_login', 'generated/login.js')
+ assets.register('js_validation', 'generated/validation.js')
+ assets.register('css_login', 'generated/login.css')
+ assets.register('js_main', 'generated/main.js')
+ assets.register('css_main', 'generated/main.css')
+ '';
+in stdenv.mkDerivation rec {
+ pname = "powerdns-admin";
+
+ inherit src version;
+
+ nativeBuildInputs = [ python3Packages.wrapPython ];
+
+ pythonPath = pythonDeps;
+
+ gunicornScript = ''
+ #!/bin/sh
+ if [ ! -z $CONFIG ]; then
+ exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app(config='$CONFIG')" "$@"
+ fi
+
+ exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app()" "$@"
+ '';
+
+ postPatch = ''
+ rm -r powerdnsadmin/static powerdnsadmin/assets.py
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ # Nasty hack: call wrapPythonPrograms to set program_PYTHONPATH (see tribler)
+ wrapPythonPrograms
+
+ mkdir -p $out/share $out/bin
+ cp -r powerdnsadmin $out/share/powerdnsadmin
+
+ ln -s ${assets} $out/share/powerdnsadmin/static
+ ln -s ${assetsPy} $out/share/powerdnsadmin/assets.py
+
+ echo "$gunicornScript" > $out/bin/powerdns-admin
+ chmod +x $out/bin/powerdns-admin
+ wrapProgram $out/bin/powerdns-admin \
+ --set PATH ${python3Packages.python}/bin \
+ --set PYTHONPATH $out/share:$program_PYTHONPATH
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A PowerDNS web interface with advanced features";
+ homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/package.json b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/package.json
new file mode 100644
index 0000000000..cb21306308
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/package.json
@@ -0,0 +1,16 @@
+{
+ "dependencies": {
+ "admin-lte": "2.4.9",
+ "bootstrap": "^3.4.1",
+ "bootstrap-validator": "^0.11.9",
+ "datatables.net-plugins": "^1.10.19",
+ "icheck": "^1.0.2",
+ "jquery-slimscroll": "^1.3.8",
+ "jquery-ui-dist": "^1.12.1",
+ "jquery.quicksearch": "^2.4.0",
+ "jtimeout": "^3.1.0",
+ "multiselect": "^0.9.12"
+ },
+ "name": "powerdns-admin-assets",
+ "version": "0.2.3"
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh
new file mode 100755
index 0000000000..86dcb8cbf6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq
+
+# This script is based upon:
+# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
+
+set -euo pipefail
+
+if [[ $# -ne 1 || $1 == -* ]]; then
+ echo "Regenerates the Yarn dependency lock files for the powerdns-admin package."
+ echo "Usage: $0 "
+ exit 1
+fi
+
+WEB_SRC="https://raw.githubusercontent.com/ngoduykhanh/PowerDNS-Admin/v$1"
+
+wget "$WEB_SRC/package.json" -O - | jq ".name = \"powerdns-admin-assets\" | .version = \"$1\"" > package.json
+wget "$WEB_SRC/yarn.lock" -O yarn.lock
+yarn2nix --lockfile=yarn.lock > yarndeps.nix
+rm yarn.lock
diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix
new file mode 100644
index 0000000000..ce65d28c00
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix
@@ -0,0 +1,1453 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+ offline_cache = linkFarm "offline" packages;
+ packages = [
+ {
+ name = "JSONStream___JSONStream_1.3.3.tgz";
+ path = fetchurl {
+ name = "JSONStream___JSONStream_1.3.3.tgz";
+ url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz";
+ sha1 = "27b4b8fbbfeab4e71bcf551e7f27be8d952239bf";
+ };
+ }
+ {
+ name = "acorn_node___acorn_node_1.3.0.tgz";
+ path = fetchurl {
+ name = "acorn_node___acorn_node_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz";
+ sha1 = "5f86d73346743810ef1269b901dbcbded020861b";
+ };
+ }
+ {
+ name = "acorn___acorn_4.0.13.tgz";
+ path = fetchurl {
+ name = "acorn___acorn_4.0.13.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz";
+ sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+ };
+ }
+ {
+ name = "acorn___acorn_5.6.2.tgz";
+ path = fetchurl {
+ name = "acorn___acorn_5.6.2.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz";
+ sha1 = "b1da1d7be2ac1b4a327fb9eab851702c5045b4e7";
+ };
+ }
+ {
+ name = "admin_lte___admin_lte_2.4.9.tgz";
+ path = fetchurl {
+ name = "admin_lte___admin_lte_2.4.9.tgz";
+ url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz";
+ sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73";
+ };
+ }
+ {
+ name = "almond___almond_0.3.3.tgz";
+ path = fetchurl {
+ name = "almond___almond_0.3.3.tgz";
+ url = "https://registry.yarnpkg.com/almond/-/almond-0.3.3.tgz";
+ sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20";
+ };
+ }
+ {
+ name = "array_filter___array_filter_0.0.1.tgz";
+ path = fetchurl {
+ name = "array_filter___array_filter_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz";
+ sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
+ };
+ }
+ {
+ name = "array_map___array_map_0.0.0.tgz";
+ path = fetchurl {
+ name = "array_map___array_map_0.0.0.tgz";
+ url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz";
+ sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
+ };
+ }
+ {
+ name = "array_reduce___array_reduce_0.0.0.tgz";
+ path = fetchurl {
+ name = "array_reduce___array_reduce_0.0.0.tgz";
+ url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz";
+ sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
+ };
+ }
+ {
+ name = "asn1.js___asn1.js_4.10.1.tgz";
+ path = fetchurl {
+ name = "asn1.js___asn1.js_4.10.1.tgz";
+ url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz";
+ sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0";
+ };
+ }
+ {
+ name = "assert___assert_1.4.1.tgz";
+ path = fetchurl {
+ name = "assert___assert_1.4.1.tgz";
+ url = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz";
+ sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+ };
+ }
+ {
+ name = "astw___astw_2.2.0.tgz";
+ path = fetchurl {
+ name = "astw___astw_2.2.0.tgz";
+ url = "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz";
+ sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
+ };
+ }
+ {
+ name = "balanced_match___balanced_match_1.0.0.tgz";
+ path = fetchurl {
+ name = "balanced_match___balanced_match_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ }
+ {
+ name = "base64_js___base64_js_1.3.0.tgz";
+ path = fetchurl {
+ name = "base64_js___base64_js_1.3.0.tgz";
+ url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz";
+ sha1 = "cab1e6118f051095e58b5281aea8c1cd22bfc0e3";
+ };
+ }
+ {
+ name = "bn.js___bn.js_4.11.9.tgz";
+ path = fetchurl {
+ name = "bn.js___bn.js_4.11.9.tgz";
+ url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
+ sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
+ };
+ }
+ {
+ name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz";
+ path = fetchurl {
+ name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz";
+ sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d";
+ };
+ }
+ {
+ name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz";
+ path = fetchurl {
+ name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz";
+ sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e";
+ };
+ }
+ {
+ name = "bootstrap_daterangepicker___bootstrap_daterangepicker_2.1.30.tgz";
+ path = fetchurl {
+ name = "bootstrap_daterangepicker___bootstrap_daterangepicker_2.1.30.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.30.tgz";
+ sha1 = "f893dbfff5a4d7dfaab75460e8ea6969bb89689a";
+ };
+ }
+ {
+ name = "bootstrap_slider___bootstrap_slider_9.10.0.tgz";
+ path = fetchurl {
+ name = "bootstrap_slider___bootstrap_slider_9.10.0.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-9.10.0.tgz";
+ sha1 = "1103d6bc00cfbfa8cfc9a2599ab518c55643da3f";
+ };
+ }
+ {
+ name = "bootstrap_timepicker___bootstrap_timepicker_0.5.2.tgz";
+ path = fetchurl {
+ name = "bootstrap_timepicker___bootstrap_timepicker_0.5.2.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz";
+ sha1 = "10ed9f2a2f0b8ccaefcde0fcf6a0738b919a3835";
+ };
+ }
+ {
+ name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz";
+ path = fetchurl {
+ name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz";
+ sha1 = "fb7058eef53623e78f5aa7967026f98f875a9404";
+ };
+ }
+ {
+ name = "bootstrap___bootstrap_3.4.1.tgz";
+ path = fetchurl {
+ name = "bootstrap___bootstrap_3.4.1.tgz";
+ url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz";
+ sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72";
+ };
+ }
+ {
+ name = "brace_expansion___brace_expansion_1.1.11.tgz";
+ path = fetchurl {
+ name = "brace_expansion___brace_expansion_1.1.11.tgz";
+ url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz";
+ sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd";
+ };
+ }
+ {
+ name = "brorand___brorand_1.1.0.tgz";
+ path = fetchurl {
+ name = "brorand___brorand_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz";
+ sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
+ };
+ }
+ {
+ name = "browser_pack___browser_pack_6.1.0.tgz";
+ path = fetchurl {
+ name = "browser_pack___browser_pack_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz";
+ sha1 = "c34ba10d0b9ce162b5af227c7131c92c2ecd5774";
+ };
+ }
+ {
+ name = "browser_resolve___browser_resolve_1.11.2.tgz";
+ path = fetchurl {
+ name = "browser_resolve___browser_resolve_1.11.2.tgz";
+ url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz";
+ sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce";
+ };
+ }
+ {
+ name = "browserify_aes___browserify_aes_1.2.0.tgz";
+ path = fetchurl {
+ name = "browserify_aes___browserify_aes_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz";
+ sha1 = "326734642f403dabc3003209853bb70ad428ef48";
+ };
+ }
+ {
+ name = "browserify_cipher___browserify_cipher_1.0.1.tgz";
+ path = fetchurl {
+ name = "browserify_cipher___browserify_cipher_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+ sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0";
+ };
+ }
+ {
+ name = "browserify_des___browserify_des_1.0.1.tgz";
+ path = fetchurl {
+ name = "browserify_des___browserify_des_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz";
+ sha1 = "3343124db6d7ad53e26a8826318712bdc8450f9c";
+ };
+ }
+ {
+ name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+ path = fetchurl {
+ name = "browserify_rsa___browserify_rsa_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+ sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+ };
+ }
+ {
+ name = "browserify_sign___browserify_sign_4.0.4.tgz";
+ path = fetchurl {
+ name = "browserify_sign___browserify_sign_4.0.4.tgz";
+ url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz";
+ sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+ };
+ }
+ {
+ name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+ path = fetchurl {
+ name = "browserify_zlib___browserify_zlib_0.2.0.tgz";
+ url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+ sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f";
+ };
+ }
+ {
+ name = "browserify___browserify_16.2.2.tgz";
+ path = fetchurl {
+ name = "browserify___browserify_16.2.2.tgz";
+ url = "https://registry.yarnpkg.com/browserify/-/browserify-16.2.2.tgz";
+ sha1 = "4b1f66ba0e54fa39dbc5aa4be9629142143d91b0";
+ };
+ }
+ {
+ name = "buffer_from___buffer_from_1.1.0.tgz";
+ path = fetchurl {
+ name = "buffer_from___buffer_from_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz";
+ sha1 = "87fcaa3a298358e0ade6e442cfce840740d1ad04";
+ };
+ }
+ {
+ name = "buffer_xor___buffer_xor_1.0.3.tgz";
+ path = fetchurl {
+ name = "buffer_xor___buffer_xor_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz";
+ sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
+ };
+ }
+ {
+ name = "buffer___buffer_5.1.0.tgz";
+ path = fetchurl {
+ name = "buffer___buffer_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz";
+ sha1 = "c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe";
+ };
+ }
+ {
+ name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+ path = fetchurl {
+ name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+ sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+ };
+ }
+ {
+ name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
+ path = fetchurl {
+ name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
+ sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
+ };
+ }
+ {
+ name = "charm___charm_0.1.2.tgz";
+ path = fetchurl {
+ name = "charm___charm_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz";
+ sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+ };
+ }
+ {
+ name = "chart.js___chart.js_1.0.2.tgz";
+ path = fetchurl {
+ name = "chart.js___chart.js_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/chart.js/-/chart.js-1.0.2.tgz";
+ sha1 = "ad57d2229cfd8ccf5955147e8121b4911e69dfe7";
+ };
+ }
+ {
+ name = "cipher_base___cipher_base_1.0.4.tgz";
+ path = fetchurl {
+ name = "cipher_base___cipher_base_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz";
+ sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
+ };
+ }
+ {
+ name = "ckeditor___ckeditor_4.11.3.tgz";
+ path = fetchurl {
+ name = "ckeditor___ckeditor_4.11.3.tgz";
+ url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz";
+ sha1 = "91f66d7ddb5bff3874514fe539779686874ed655";
+ };
+ }
+ {
+ name = "classie___classie_1.0.0.tgz";
+ path = fetchurl {
+ name = "classie___classie_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/classie/-/classie-1.0.0.tgz";
+ sha1 = "fc9b29b47e64e374a2062fb624d05a61cd703ab2";
+ };
+ }
+ {
+ name = "combine_source_map___combine_source_map_0.8.0.tgz";
+ path = fetchurl {
+ name = "combine_source_map___combine_source_map_0.8.0.tgz";
+ url = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz";
+ sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b";
+ };
+ }
+ {
+ name = "concat_map___concat_map_0.0.1.tgz";
+ path = fetchurl {
+ name = "concat_map___concat_map_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ }
+ {
+ name = "concat_stream___concat_stream_1.6.2.tgz";
+ path = fetchurl {
+ name = "concat_stream___concat_stream_1.6.2.tgz";
+ url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz";
+ sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
+ };
+ }
+ {
+ name = "console_browserify___console_browserify_1.1.0.tgz";
+ path = fetchurl {
+ name = "console_browserify___console_browserify_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz";
+ sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+ };
+ }
+ {
+ name = "constants_browserify___constants_browserify_1.0.0.tgz";
+ path = fetchurl {
+ name = "constants_browserify___constants_browserify_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz";
+ sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+ };
+ }
+ {
+ name = "convert_source_map___convert_source_map_1.1.3.tgz";
+ path = fetchurl {
+ name = "convert_source_map___convert_source_map_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz";
+ sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
+ };
+ }
+ {
+ name = "core_util_is___core_util_is_1.0.2.tgz";
+ path = fetchurl {
+ name = "core_util_is___core_util_is_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+ };
+ }
+ {
+ name = "create_ecdh___create_ecdh_4.0.3.tgz";
+ path = fetchurl {
+ name = "create_ecdh___create_ecdh_4.0.3.tgz";
+ url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz";
+ sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff";
+ };
+ }
+ {
+ name = "create_hash___create_hash_1.2.0.tgz";
+ path = fetchurl {
+ name = "create_hash___create_hash_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz";
+ sha1 = "889078af11a63756bcfb59bd221996be3a9ef196";
+ };
+ }
+ {
+ name = "create_hmac___create_hmac_1.1.7.tgz";
+ path = fetchurl {
+ name = "create_hmac___create_hmac_1.1.7.tgz";
+ url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz";
+ sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff";
+ };
+ }
+ {
+ name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+ path = fetchurl {
+ name = "crypto_browserify___crypto_browserify_3.12.0.tgz";
+ url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+ sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec";
+ };
+ }
+ {
+ name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz";
+ path = fetchurl {
+ name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz";
+ url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz";
+ sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d";
+ };
+ }
+ {
+ name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz";
+ path = fetchurl {
+ name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz";
+ url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz";
+ sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c";
+ };
+ }
+ {
+ name = "datatables.net___datatables.net_1.10.19.tgz";
+ path = fetchurl {
+ name = "datatables.net___datatables.net_1.10.19.tgz";
+ url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz";
+ sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f";
+ };
+ }
+ {
+ name = "date_now___date_now_0.1.4.tgz";
+ path = fetchurl {
+ name = "date_now___date_now_0.1.4.tgz";
+ url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz";
+ sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+ };
+ }
+ {
+ name = "defined___defined_1.0.0.tgz";
+ path = fetchurl {
+ name = "defined___defined_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz";
+ sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+ };
+ }
+ {
+ name = "deps_sort___deps_sort_2.0.0.tgz";
+ path = fetchurl {
+ name = "deps_sort___deps_sort_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz";
+ sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
+ };
+ }
+ {
+ name = "des.js___des.js_1.0.0.tgz";
+ path = fetchurl {
+ name = "des.js___des.js_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz";
+ sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+ };
+ }
+ {
+ name = "detective___detective_5.1.0.tgz";
+ path = fetchurl {
+ name = "detective___detective_5.1.0.tgz";
+ url = "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz";
+ sha1 = "7a20d89236d7b331ccea65832e7123b5551bb7cb";
+ };
+ }
+ {
+ name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
+ path = fetchurl {
+ name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
+ url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+ sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875";
+ };
+ }
+ {
+ name = "domain_browser___domain_browser_1.2.0.tgz";
+ path = fetchurl {
+ name = "domain_browser___domain_browser_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz";
+ sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda";
+ };
+ }
+ {
+ name = "domhelper___domhelper_0.9.1.tgz";
+ path = fetchurl {
+ name = "domhelper___domhelper_0.9.1.tgz";
+ url = "https://registry.yarnpkg.com/domhelper/-/domhelper-0.9.1.tgz";
+ sha1 = "26554e5bac2c9e9585dca500978df5067d64bd00";
+ };
+ }
+ {
+ name = "duplexer2___duplexer2_0.1.4.tgz";
+ path = fetchurl {
+ name = "duplexer2___duplexer2_0.1.4.tgz";
+ url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz";
+ sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
+ };
+ }
+ {
+ name = "elliptic___elliptic_6.5.3.tgz";
+ path = fetchurl {
+ name = "elliptic___elliptic_6.5.3.tgz";
+ url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz";
+ sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6";
+ };
+ }
+ {
+ name = "eve_raphael___eve_raphael_0.5.0.tgz";
+ path = fetchurl {
+ name = "eve_raphael___eve_raphael_0.5.0.tgz";
+ url = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz";
+ sha1 = "17c754b792beef3fa6684d79cf5a47c63c4cda30";
+ };
+ }
+ {
+ name = "events___events_2.1.0.tgz";
+ path = fetchurl {
+ name = "events___events_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz";
+ sha1 = "2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5";
+ };
+ }
+ {
+ name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+ path = fetchurl {
+ name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
+ sha1 = "7fcbdb198dc71959432efe13842684e0525acb02";
+ };
+ }
+ {
+ name = "fastclick___fastclick_1.0.6.tgz";
+ path = fetchurl {
+ name = "fastclick___fastclick_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz";
+ sha1 = "161625b27b1a5806405936bda9a2c1926d06be6a";
+ };
+ }
+ {
+ name = "flot___flot_0.8.3.tgz";
+ path = fetchurl {
+ name = "flot___flot_0.8.3.tgz";
+ url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz";
+ sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f";
+ };
+ }
+ {
+ name = "font_awesome___font_awesome_4.7.0.tgz";
+ path = fetchurl {
+ name = "font_awesome___font_awesome_4.7.0.tgz";
+ url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz";
+ sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133";
+ };
+ }
+ {
+ name = "fs.realpath___fs.realpath_1.0.0.tgz";
+ path = fetchurl {
+ name = "fs.realpath___fs.realpath_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ }
+ {
+ name = "fullcalendar___fullcalendar_3.10.0.tgz";
+ path = fetchurl {
+ name = "fullcalendar___fullcalendar_3.10.0.tgz";
+ url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz";
+ sha1 = "cc5e87d518fd6550e142816a31dd191664847919";
+ };
+ }
+ {
+ name = "function_bind___function_bind_1.1.1.tgz";
+ path = fetchurl {
+ name = "function_bind___function_bind_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz";
+ sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d";
+ };
+ }
+ {
+ name = "glob___glob_7.1.2.tgz";
+ path = fetchurl {
+ name = "glob___glob_7.1.2.tgz";
+ url = "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz";
+ sha1 = "c19c9df9a028702d678612384a6552404c636d15";
+ };
+ }
+ {
+ name = "has___has_1.0.3.tgz";
+ path = fetchurl {
+ name = "has___has_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz";
+ sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796";
+ };
+ }
+ {
+ name = "hash_base___hash_base_3.0.4.tgz";
+ path = fetchurl {
+ name = "hash_base___hash_base_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz";
+ sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+ };
+ }
+ {
+ name = "hash.js___hash.js_1.1.7.tgz";
+ path = fetchurl {
+ name = "hash.js___hash.js_1.1.7.tgz";
+ url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz";
+ sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42";
+ };
+ }
+ {
+ name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+ path = fetchurl {
+ name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+ sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
+ };
+ }
+ {
+ name = "htmlescape___htmlescape_1.1.1.tgz";
+ path = fetchurl {
+ name = "htmlescape___htmlescape_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz";
+ sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
+ };
+ }
+ {
+ name = "https_browserify___https_browserify_1.0.0.tgz";
+ path = fetchurl {
+ name = "https_browserify___https_browserify_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz";
+ sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
+ };
+ }
+ {
+ name = "icheck___icheck_1.0.2.tgz";
+ path = fetchurl {
+ name = "icheck___icheck_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/icheck/-/icheck-1.0.2.tgz";
+ sha1 = "06d08da3d47ae448c153b2639b86e9ad7fdf7128";
+ };
+ }
+ {
+ name = "ieee754___ieee754_1.1.12.tgz";
+ path = fetchurl {
+ name = "ieee754___ieee754_1.1.12.tgz";
+ url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz";
+ sha1 = "50bf24e5b9c8bb98af4964c941cdb0918da7b60b";
+ };
+ }
+ {
+ name = "inflight___inflight_1.0.6.tgz";
+ path = fetchurl {
+ name = "inflight___inflight_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ }
+ {
+ name = "inherits___inherits_2.0.4.tgz";
+ path = fetchurl {
+ name = "inherits___inherits_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
+ };
+ }
+ {
+ name = "inherits___inherits_2.0.1.tgz";
+ path = fetchurl {
+ name = "inherits___inherits_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz";
+ sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+ };
+ }
+ {
+ name = "inherits___inherits_2.0.3.tgz";
+ path = fetchurl {
+ name = "inherits___inherits_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ }
+ {
+ name = "inline_source_map___inline_source_map_0.6.2.tgz";
+ path = fetchurl {
+ name = "inline_source_map___inline_source_map_0.6.2.tgz";
+ url = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz";
+ sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5";
+ };
+ }
+ {
+ name = "inputmask___inputmask_3.3.11.tgz";
+ path = fetchurl {
+ name = "inputmask___inputmask_3.3.11.tgz";
+ url = "https://registry.yarnpkg.com/inputmask/-/inputmask-3.3.11.tgz";
+ sha1 = "1421c94ae28c3dcd1b4d26337b508bb34998e2d8";
+ };
+ }
+ {
+ name = "insert_module_globals___insert_module_globals_7.1.0.tgz";
+ path = fetchurl {
+ name = "insert_module_globals___insert_module_globals_7.1.0.tgz";
+ url = "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.1.0.tgz";
+ sha1 = "dbb3cea71d3a43d5a07ef0310fe5f078aa4dbf35";
+ };
+ }
+ {
+ name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz";
+ path = fetchurl {
+ name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz";
+ sha1 = "7957ce2e78acfc956b8c43009373da91f743347e";
+ };
+ }
+ {
+ name = "ionicons___ionicons_3.0.0.tgz";
+ path = fetchurl {
+ name = "ionicons___ionicons_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ionicons/-/ionicons-3.0.0.tgz";
+ sha1 = "40b8daf4fd7a31150bd002160f66496e22a98c3c";
+ };
+ }
+ {
+ name = "is_buffer___is_buffer_1.1.6.tgz";
+ path = fetchurl {
+ name = "is_buffer___is_buffer_1.1.6.tgz";
+ url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz";
+ sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be";
+ };
+ }
+ {
+ name = "isarray___isarray_2.0.4.tgz";
+ path = fetchurl {
+ name = "isarray___isarray_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz";
+ sha1 = "38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7";
+ };
+ }
+ {
+ name = "isarray___isarray_1.0.0.tgz";
+ path = fetchurl {
+ name = "isarray___isarray_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+ };
+ }
+ {
+ name = "jquery_knob___jquery_knob_1.2.11.tgz";
+ path = fetchurl {
+ name = "jquery_knob___jquery_knob_1.2.11.tgz";
+ url = "https://registry.yarnpkg.com/jquery-knob/-/jquery-knob-1.2.11.tgz";
+ sha1 = "f37c39dbc1c7a6a6c12cdb2ed4f6bffb683f10d6";
+ };
+ }
+ {
+ name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz";
+ path = fetchurl {
+ name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz";
+ url = "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz";
+ sha1 = "06f0335f16e353a695e7206bf50503cb523a6ee5";
+ };
+ }
+ {
+ name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz";
+ path = fetchurl {
+ name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz";
+ url = "https://registry.yarnpkg.com/jquery-slimscroll/-/jquery-slimscroll-1.3.8.tgz";
+ sha1 = "8481c44e7a47687653908a28f7f70aed64c84e36";
+ };
+ }
+ {
+ name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz";
+ path = fetchurl {
+ name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/jquery-sparkline/-/jquery-sparkline-2.4.0.tgz";
+ sha1 = "1be8b7b704dd3857152708aefb1d4a4b3a69fb33";
+ };
+ }
+ {
+ name = "jquery_ui_dist___jquery_ui_dist_1.12.1.tgz";
+ path = fetchurl {
+ name = "jquery_ui_dist___jquery_ui_dist_1.12.1.tgz";
+ url = "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz";
+ sha1 = "5c0815d3cc6f90ff5faaf5b268a6e23b4ca904fa";
+ };
+ }
+ {
+ name = "jquery_ui___jquery_ui_1.12.1.tgz";
+ path = fetchurl {
+ name = "jquery_ui___jquery_ui_1.12.1.tgz";
+ url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz";
+ sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
+ };
+ }
+ {
+ name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz";
+ path = fetchurl {
+ name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz";
+ url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz";
+ sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26";
+ };
+ }
+ {
+ name = "jquery___jquery_3.3.1.tgz";
+ path = fetchurl {
+ name = "jquery___jquery_3.3.1.tgz";
+ url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz";
+ sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca";
+ };
+ }
+ {
+ name = "json_stable_stringify___json_stable_stringify_0.0.1.tgz";
+ path = fetchurl {
+ name = "json_stable_stringify___json_stable_stringify_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+ sha1 = "611c23e814db375527df851193db59dd2af27f45";
+ };
+ }
+ {
+ name = "jsonify___jsonify_0.0.0.tgz";
+ path = fetchurl {
+ name = "jsonify___jsonify_0.0.0.tgz";
+ url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz";
+ sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+ };
+ }
+ {
+ name = "jsonparse___jsonparse_1.3.1.tgz";
+ path = fetchurl {
+ name = "jsonparse___jsonparse_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz";
+ sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
+ };
+ }
+ {
+ name = "jtimeout___jtimeout_3.1.0.tgz";
+ path = fetchurl {
+ name = "jtimeout___jtimeout_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz";
+ sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893";
+ };
+ }
+ {
+ name = "jvectormap___jvectormap_1.2.2.tgz";
+ path = fetchurl {
+ name = "jvectormap___jvectormap_1.2.2.tgz";
+ url = "https://registry.yarnpkg.com/jvectormap/-/jvectormap-1.2.2.tgz";
+ sha1 = "2e4408b24a60473ff106c1e7243e375ae5ca85da";
+ };
+ }
+ {
+ name = "labeled_stream_splicer___labeled_stream_splicer_2.0.1.tgz";
+ path = fetchurl {
+ name = "labeled_stream_splicer___labeled_stream_splicer_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz";
+ sha1 = "9cffa32fd99e1612fd1d86a8db962416d5292926";
+ };
+ }
+ {
+ name = "lexical_scope___lexical_scope_1.2.0.tgz";
+ path = fetchurl {
+ name = "lexical_scope___lexical_scope_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz";
+ sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
+ };
+ }
+ {
+ name = "lodash.memoize___lodash.memoize_3.0.4.tgz";
+ path = fetchurl {
+ name = "lodash.memoize___lodash.memoize_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz";
+ sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
+ };
+ }
+ {
+ name = "md5.js___md5.js_1.3.4.tgz";
+ path = fetchurl {
+ name = "md5.js___md5.js_1.3.4.tgz";
+ url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz";
+ sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+ };
+ }
+ {
+ name = "miller_rabin___miller_rabin_4.0.1.tgz";
+ path = fetchurl {
+ name = "miller_rabin___miller_rabin_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz";
+ sha1 = "f080351c865b0dc562a8462966daa53543c78a4d";
+ };
+ }
+ {
+ name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
+ path = fetchurl {
+ name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+ sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7";
+ };
+ }
+ {
+ name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+ path = fetchurl {
+ name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
+ sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
+ };
+ }
+ {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ path = fetchurl {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+ sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+ };
+ }
+ {
+ name = "minimist___minimist_0.0.8.tgz";
+ path = fetchurl {
+ name = "minimist___minimist_0.0.8.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ }
+ {
+ name = "minimist___minimist_1.2.0.tgz";
+ path = fetchurl {
+ name = "minimist___minimist_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
+ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+ };
+ }
+ {
+ name = "mkdirp___mkdirp_0.5.1.tgz";
+ path = fetchurl {
+ name = "mkdirp___mkdirp_0.5.1.tgz";
+ url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz";
+ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ };
+ }
+ {
+ name = "module_deps___module_deps_6.1.0.tgz";
+ path = fetchurl {
+ name = "module_deps___module_deps_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz";
+ sha1 = "d1e1efc481c6886269f7112c52c3236188e16479";
+ };
+ }
+ {
+ name = "moment___moment_2.24.0.tgz";
+ path = fetchurl {
+ name = "moment___moment_2.24.0.tgz";
+ url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
+ sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
+ };
+ }
+ {
+ name = "moment___moment_2.22.2.tgz";
+ path = fetchurl {
+ name = "moment___moment_2.22.2.tgz";
+ url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz";
+ sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+ };
+ }
+ {
+ name = "morris.js___morris.js_0.5.0.tgz";
+ path = fetchurl {
+ name = "morris.js___morris.js_0.5.0.tgz";
+ url = "https://registry.yarnpkg.com/morris.js/-/morris.js-0.5.0.tgz";
+ sha1 = "725767135cfae059aae75999bb2ce6a1c5d1b44b";
+ };
+ }
+ {
+ name = "multiselect___multiselect_0.9.12.tgz";
+ path = fetchurl {
+ name = "multiselect___multiselect_0.9.12.tgz";
+ url = "https://registry.yarnpkg.com/multiselect/-/multiselect-0.9.12.tgz";
+ sha1 = "d15536e986dd6a0029b160d6613bcedf81e4c7ed";
+ };
+ }
+ {
+ name = "once___once_1.4.0.tgz";
+ path = fetchurl {
+ name = "once___once_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ }
+ {
+ name = "os_browserify___os_browserify_0.3.0.tgz";
+ path = fetchurl {
+ name = "os_browserify___os_browserify_0.3.0.tgz";
+ url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz";
+ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
+ };
+ }
+ {
+ name = "pace___pace_0.0.4.tgz";
+ path = fetchurl {
+ name = "pace___pace_0.0.4.tgz";
+ url = "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz";
+ sha1 = "d66405d5f5bc12d25441a6e26c878dbc69e77a77";
+ };
+ }
+ {
+ name = "pako___pako_1.0.6.tgz";
+ path = fetchurl {
+ name = "pako___pako_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz";
+ sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258";
+ };
+ }
+ {
+ name = "parents___parents_1.0.1.tgz";
+ path = fetchurl {
+ name = "parents___parents_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz";
+ sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
+ };
+ }
+ {
+ name = "parse_asn1___parse_asn1_5.1.1.tgz";
+ path = fetchurl {
+ name = "parse_asn1___parse_asn1_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz";
+ sha1 = "f6bf293818332bd0dab54efb16087724745e6ca8";
+ };
+ }
+ {
+ name = "path_browserify___path_browserify_0.0.0.tgz";
+ path = fetchurl {
+ name = "path_browserify___path_browserify_0.0.0.tgz";
+ url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz";
+ sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+ };
+ }
+ {
+ name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+ path = fetchurl {
+ name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ }
+ {
+ name = "path_parse___path_parse_1.0.5.tgz";
+ path = fetchurl {
+ name = "path_parse___path_parse_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz";
+ sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
+ };
+ }
+ {
+ name = "path_platform___path_platform_0.11.15.tgz";
+ path = fetchurl {
+ name = "path_platform___path_platform_0.11.15.tgz";
+ url = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz";
+ sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
+ };
+ }
+ {
+ name = "pbkdf2___pbkdf2_3.0.16.tgz";
+ path = fetchurl {
+ name = "pbkdf2___pbkdf2_3.0.16.tgz";
+ url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz";
+ sha1 = "7404208ec6b01b62d85bf83853a8064f8d9c2a5c";
+ };
+ }
+ {
+ name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
+ path = fetchurl {
+ name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+ sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa";
+ };
+ }
+ {
+ name = "process___process_0.11.10.tgz";
+ path = fetchurl {
+ name = "process___process_0.11.10.tgz";
+ url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz";
+ sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+ };
+ }
+ {
+ name = "public_encrypt___public_encrypt_4.0.2.tgz";
+ path = fetchurl {
+ name = "public_encrypt___public_encrypt_4.0.2.tgz";
+ url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz";
+ sha1 = "46eb9107206bf73489f8b85b69d91334c6610994";
+ };
+ }
+ {
+ name = "punycode___punycode_1.3.2.tgz";
+ path = fetchurl {
+ name = "punycode___punycode_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz";
+ sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+ };
+ }
+ {
+ name = "punycode___punycode_1.4.1.tgz";
+ path = fetchurl {
+ name = "punycode___punycode_1.4.1.tgz";
+ url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz";
+ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+ };
+ }
+ {
+ name = "querystring_es3___querystring_es3_0.2.1.tgz";
+ path = fetchurl {
+ name = "querystring_es3___querystring_es3_0.2.1.tgz";
+ url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz";
+ sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+ };
+ }
+ {
+ name = "querystring___querystring_0.2.0.tgz";
+ path = fetchurl {
+ name = "querystring___querystring_0.2.0.tgz";
+ url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz";
+ sha1 = "b209849203bb25df820da756e747005878521620";
+ };
+ }
+ {
+ name = "randombytes___randombytes_2.0.6.tgz";
+ path = fetchurl {
+ name = "randombytes___randombytes_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz";
+ sha1 = "d302c522948588848a8d300c932b44c24231da80";
+ };
+ }
+ {
+ name = "randomfill___randomfill_1.0.4.tgz";
+ path = fetchurl {
+ name = "randomfill___randomfill_1.0.4.tgz";
+ url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz";
+ sha1 = "c92196fc86ab42be983f1bf31778224931d61458";
+ };
+ }
+ {
+ name = "raphael___raphael_2.2.7.tgz";
+ path = fetchurl {
+ name = "raphael___raphael_2.2.7.tgz";
+ url = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz";
+ sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
+ };
+ }
+ {
+ name = "read_only_stream___read_only_stream_2.0.0.tgz";
+ path = fetchurl {
+ name = "read_only_stream___read_only_stream_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz";
+ sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
+ };
+ }
+ {
+ name = "readable_stream___readable_stream_2.3.6.tgz";
+ path = fetchurl {
+ name = "readable_stream___readable_stream_2.3.6.tgz";
+ url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
+ sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
+ };
+ }
+ {
+ name = "resolve___resolve_1.1.7.tgz";
+ path = fetchurl {
+ name = "resolve___resolve_1.1.7.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz";
+ sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+ };
+ }
+ {
+ name = "resolve___resolve_1.7.1.tgz";
+ path = fetchurl {
+ name = "resolve___resolve_1.7.1.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz";
+ sha1 = "aadd656374fd298aee895bc026b8297418677fd3";
+ };
+ }
+ {
+ name = "ripemd160___ripemd160_2.0.2.tgz";
+ path = fetchurl {
+ name = "ripemd160___ripemd160_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz";
+ sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c";
+ };
+ }
+ {
+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
+ path = fetchurl {
+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
+ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
+ };
+ }
+ {
+ name = "select2___select2_4.0.5.tgz";
+ path = fetchurl {
+ name = "select2___select2_4.0.5.tgz";
+ url = "https://registry.yarnpkg.com/select2/-/select2-4.0.5.tgz";
+ sha1 = "7aac50692561985b34d3b82ec55e226f8960d40a";
+ };
+ }
+ {
+ name = "sha.js___sha.js_2.4.11.tgz";
+ path = fetchurl {
+ name = "sha.js___sha.js_2.4.11.tgz";
+ url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz";
+ sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7";
+ };
+ }
+ {
+ name = "shasum___shasum_1.0.2.tgz";
+ path = fetchurl {
+ name = "shasum___shasum_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz";
+ sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
+ };
+ }
+ {
+ name = "shell_quote___shell_quote_1.6.1.tgz";
+ path = fetchurl {
+ name = "shell_quote___shell_quote_1.6.1.tgz";
+ url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz";
+ sha1 = "f4781949cce402697127430ea3b3c5476f481767";
+ };
+ }
+ {
+ name = "slimscroll___slimscroll_0.9.1.tgz";
+ path = fetchurl {
+ name = "slimscroll___slimscroll_0.9.1.tgz";
+ url = "https://registry.yarnpkg.com/slimscroll/-/slimscroll-0.9.1.tgz";
+ sha1 = "f675cdc601d80ada20f16004d227d156fd1187b2";
+ };
+ }
+ {
+ name = "source_map___source_map_0.5.7.tgz";
+ path = fetchurl {
+ name = "source_map___source_map_0.5.7.tgz";
+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+ };
+ }
+ {
+ name = "stream_browserify___stream_browserify_2.0.1.tgz";
+ path = fetchurl {
+ name = "stream_browserify___stream_browserify_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz";
+ sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+ };
+ }
+ {
+ name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
+ path = fetchurl {
+ name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
+ sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
+ };
+ }
+ {
+ name = "stream_http___stream_http_2.8.3.tgz";
+ path = fetchurl {
+ name = "stream_http___stream_http_2.8.3.tgz";
+ url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz";
+ sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc";
+ };
+ }
+ {
+ name = "stream_splicer___stream_splicer_2.0.0.tgz";
+ path = fetchurl {
+ name = "stream_splicer___stream_splicer_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz";
+ sha1 = "1b63be438a133e4b671cc1935197600175910d83";
+ };
+ }
+ {
+ name = "string_decoder___string_decoder_1.1.1.tgz";
+ path = fetchurl {
+ name = "string_decoder___string_decoder_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
+ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
+ };
+ }
+ {
+ name = "subarg___subarg_1.0.0.tgz";
+ path = fetchurl {
+ name = "subarg___subarg_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz";
+ sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
+ };
+ }
+ {
+ name = "syntax_error___syntax_error_1.4.0.tgz";
+ path = fetchurl {
+ name = "syntax_error___syntax_error_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz";
+ sha1 = "2d9d4ff5c064acb711594a3e3b95054ad51d907c";
+ };
+ }
+ {
+ name = "through2___through2_2.0.3.tgz";
+ path = fetchurl {
+ name = "through2___through2_2.0.3.tgz";
+ url = "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz";
+ sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+ };
+ }
+ {
+ name = "through___through_2.3.8.tgz";
+ path = fetchurl {
+ name = "through___through_2.3.8.tgz";
+ url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
+ sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+ };
+ }
+ {
+ name = "timers_browserify___timers_browserify_1.4.2.tgz";
+ path = fetchurl {
+ name = "timers_browserify___timers_browserify_1.4.2.tgz";
+ url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz";
+ sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
+ };
+ }
+ {
+ name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+ path = fetchurl {
+ name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+ sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+ };
+ }
+ {
+ name = "tty_browserify___tty_browserify_0.0.1.tgz";
+ path = fetchurl {
+ name = "tty_browserify___tty_browserify_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz";
+ sha1 = "3f05251ee17904dfd0677546670db9651682b811";
+ };
+ }
+ {
+ name = "typedarray___typedarray_0.0.6.tgz";
+ path = fetchurl {
+ name = "typedarray___typedarray_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
+ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+ };
+ }
+ {
+ name = "umd___umd_3.0.3.tgz";
+ path = fetchurl {
+ name = "umd___umd_3.0.3.tgz";
+ url = "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz";
+ sha1 = "aa9fe653c42b9097678489c01000acb69f0b26cf";
+ };
+ }
+ {
+ name = "url___url_0.11.0.tgz";
+ path = fetchurl {
+ name = "url___url_0.11.0.tgz";
+ url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz";
+ sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+ };
+ }
+ {
+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
+ path = fetchurl {
+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+ };
+ }
+ {
+ name = "util_extend___util_extend_1.0.3.tgz";
+ path = fetchurl {
+ name = "util_extend___util_extend_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz";
+ sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
+ };
+ }
+ {
+ name = "util___util_0.10.3.tgz";
+ path = fetchurl {
+ name = "util___util_0.10.3.tgz";
+ url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz";
+ sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+ };
+ }
+ {
+ name = "util___util_0.10.4.tgz";
+ path = fetchurl {
+ name = "util___util_0.10.4.tgz";
+ url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz";
+ sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901";
+ };
+ }
+ {
+ name = "vm_browserify___vm_browserify_1.0.1.tgz";
+ path = fetchurl {
+ name = "vm_browserify___vm_browserify_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.1.tgz";
+ sha1 = "a15d7762c4c48fa6bf9f3309a21340f00ed23063";
+ };
+ }
+ {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ path = fetchurl {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ }
+ {
+ name = "xtend___xtend_4.0.1.tgz";
+ path = fetchurl {
+ name = "xtend___xtend_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz";
+ sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+ };
+ }
+ ];
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
index c742d076f9..f88a2e3d8e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem
+{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg
, lsb-release, freetype, fontconfig, polkit, polkit_gnome
, pulseaudio }:
@@ -28,6 +28,19 @@ in stdenv.mkDerivation rec {
sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r";
};
+ passthru = {
+ updateScript = genericUpdater {
+ inherit pname version;
+ versionLister = writeShellScript "anydesk-versionLister" ''
+ echo "# Versions for $1:" >> "$2"
+ curl -s https://anydesk.com/en/downloads/linux \
+ | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
+ | uniq \
+ | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
+ '';
+ };
+ };
+
buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU libGL freetype fontconfig
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix
new file mode 100644
index 0000000000..acfacadd55
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, lib
+, makeWrapper, dpkg, fetchurl, autoPatchelfHook
+, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking
+}:
+
+stdenv.mkDerivation rec {
+ pname = "aws-workspaces";
+ version = "3.1.3.925";
+
+ src = fetchurl {
+ # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages
+ urls = [
+ "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
+ "https://web.archive.org/web/20210307233836/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
+ ];
+ sha256 = "5b57edb4f6f8c950164fd8104bf62df4c452ab5b16cb65d48db3636959a0f0ad";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ makeWrapper
+ ];
+
+ # Crashes at startup when stripping:
+ # "Failed to create CoreCLR, HRESULT: 0x80004005"
+ dontStrip = true;
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ kerberos
+ curl
+ lttng-ust
+ libpulseaudio
+ gtk3
+ openssl_1_1.out
+ icu
+ webkitgtk
+ librsvg
+ gdk-pixbuf
+ libsoup
+ glib-networking
+ ];
+
+ unpackPhase = ''
+ ${dpkg}/bin/dpkg -x $src $out
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv $out/opt/workspacesclient/* $out/bin
+
+ wrapProgram $out/bin/workspacesclient \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
+ --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
+ --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"
+ '';
+
+ meta = with lib; {
+ description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution";
+ homepage = "https://clients.amazonworkspaces.com";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ]; # TODO Mac support
+ maintainers = [ maintainers.mausch ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 0437a108d8..35faeb20b7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -202,7 +202,7 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
description = "Citrix Workspace";
platforms = platforms.linux;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ pmenke ];
inherit homepage;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
index 04f2efd5b0..10b3f2d175 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
@@ -18,13 +18,13 @@ let
in stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "02zlg5r704zbryx09a5rjjf7q137kj16i9qh25dw9q1y69ri619n";
+ sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index a9ddf48bae..f52373f262 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
@@ -52,7 +52,7 @@ let
url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz";
sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir ext $out
find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix
index 86126e8616..23bbd19b00 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation (rec {
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
};
- buildInputs = [ ocaml makeWrapper ncurses ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ocaml ncurses ];
preBuild = (if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
index 9d9be8966c..97ce75dfc9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
@@ -3,17 +3,17 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
- version = "1.13.1";
+ version = "1.14.0";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "1jvmcpyj4k43s4hv753pr9a1qg930nac90d5c8haqv30v1rw5pws";
+ sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd";
};
- vendorSha256 = "140b0wqp5ayyyan7ml12jqd72s00cawhmdf8g699j5sav8j6hppi";
+ vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix b/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix
index 41bc6c64da..346fd17525 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/tsung/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [
erlang
gnuplot
diff --git a/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix b/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
index 32ffbde400..bef44d4286 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/wg-bond --set PATH ${
lib.makeBinPath [ wireguard-tools ]
diff --git a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix
index a8ca37df36..e54a3cbad4 100644
--- a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix
@@ -1,15 +1,14 @@
-{
- mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
- boost, qtwebkit, qtx11extras, shared-mime-info,
- breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
- kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
- kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
- knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
- kwindowsystem, kxmlgui, sonnet, threadweaver,
- kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
- eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
- librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
- poppler, pstoedit, qca-qt5, vc
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools
+, boost, qtwebkit, qtx11extras, shared-mime-info
+, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
+, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross
+, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons
+, kwindowsystem, kxmlgui, sonnet, threadweaver
+, kcontacts, akonadi, akonadi-calendar, akonadi-contacts
+, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen
+, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon
+, poppler, pstoedit, qca-qt5, vc
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
}:
diff --git a/third_party/nixpkgs/pkgs/applications/office/docear/default.nix b/third_party/nixpkgs/pkgs/applications/office/docear/default.nix
index 683e668157..f8cd25ad78 100644
--- a/third_party/nixpkgs/pkgs/applications/office/docear/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/docear/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";
};
- buildInputs = [ oraclejre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ oraclejre ];
buildPhase = "";
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix b/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix
index 4614a54369..f46d893d89 100644
--- a/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/impressive/default.nix
@@ -16,7 +16,8 @@ in stdenv.mkDerivation {
sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl";
};
- buildInputs = [ makeWrapper pythonEnv ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ pythonEnv ];
configurePhase = ''
# Let's fail at build time if the library we're substituting in doesn't
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
index 499078611f..c2578696c6 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
@@ -5,7 +5,7 @@
, callPackage
, python3
-, imagemagick7
+, imagemagick
, ghostscript
, optipng
, tesseract
@@ -65,7 +65,7 @@ let
buildPhase = let
# Paperless has explicit runtime checks that expect these binaries to be in PATH
- extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ];
+ extraBin = lib.makeBinPath [ imagemagick ghostscript optipng tesseract unpaper ];
in ''
${python.interpreter} -m compileall $srcDir
diff --git a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix b/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
index 89cf2add21..744240c921 100644
--- a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
@@ -3,13 +3,12 @@
libksane
}:
-let
- minorVersion = "2.2";
-in mkDerivation rec {
- name = "skanlite-2.2.0";
+mkDerivation rec {
+ pname = "skanlite";
+ version = "2.2.0";
src = fetchurl {
- url = "mirror://kde/stable/skanlite/${minorVersion}/${name}.tar.xz";
+ url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ=";
};
@@ -23,8 +22,8 @@ in mkDerivation rec {
meta = with lib; {
description = "KDE simple image scanning application";
- homepage = "http://www.kde.org/applications/graphics/skanlite/";
- license = licenses.gpl2;
+ homepage = "https://apps.kde.org/skanlite";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ pshendry ];
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix
index 6c1068d458..5bbfca23d6 100644
--- a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix
@@ -1,8 +1,7 @@
-{
- lib,
- fetchurl,
- appimageTools,
- libsecret
+{ lib
+, fetchurl
+, appimageTools
+, libsecret
}:
let
@@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {
Assign an activity to each side and flip to start tracking your time.
The desktop app tell you where every minute of your day is spent.
'';
- homepage = https://timeular.com;
+ homepage = "https://timeular.com";
license = licenses.unfree;
maintainers = with maintainers; [ ktor ];
platforms = [ "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
index 552d28d1e9..1f084e182a 100644
--- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";
};
- buildInputs = [ wxGTK makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ wxGTK ];
preConfigure = "cd src";
diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
index e0f156f06c..fad87d4491 100644
--- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ];
- meta = {
- description = "Office program originally named Kingsoft Office";
- homepage = "http://wps-community.org/";
+ meta = with lib; {
+ description = "Office suite, formerly Kingsoft Office";
+ homepage = "https://www.wps.com/";
platforms = [ "x86_64-linux" ];
hydraPlatforms = [];
- license = lib.licenses.unfreeRedistributable;
- maintainers = with lib.maintainers; [ mlatus th0rgal ];
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ mlatus th0rgal ];
};
buildInputs = with xorg; [
diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
index 4c7b60c125..de0b9bada5 100644
--- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "pappl";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68=";
+ sha256 = "sha256-L4ptgAJAvyTUCVl6YotA8DnlISc9PwZM0WjXyOvxGJg=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix b/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix
new file mode 100644
index 0000000000..64f5093c4b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix
@@ -0,0 +1,74 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, pkg-config
+, doxygen
+, wrapQtAppsHook
+, pcre
+, poco
+, qtbase
+, qtsvg
+, libsForQt5
+, nlohmann_json
+, soapysdr-with-plugins
+, portaudio
+, alsaLib
+, muparserx
+, python3
+}:
+
+mkDerivation rec {
+ pname = "pothos";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "pothosware";
+ repo = "PothosCore";
+ rev = "pothos-${version}";
+ sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg";
+ fetchSubmodules = true;
+ };
+
+ patches = [
+ # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
+ ./spuce.patch
+ ];
+
+ nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
+
+ buildInputs = [
+ pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json
+ soapysdr-with-plugins portaudio alsaLib muparserx python3
+ ];
+
+ postInstall = ''
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png
+ install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml
+ rm -r $out/share/Pothos/Desktop
+ '';
+
+ dontWrapQtApps = true;
+ preFixup = ''
+ # PothosUtil does not need to be wrapped
+ wrapQtApp $out/bin/PothosFlow
+ wrapQtApp $out/bin/spuce_fir_plot
+ wrapQtApp $out/bin/spuce_iir_plot
+ wrapQtApp $out/bin/spuce_other_plot
+ wrapQtApp $out/bin/spuce_window_plot
+ '';
+
+ meta = with lib; {
+ description = "The Pothos data-flow framework";
+ homepage = "https://github.com/pothosware/PothosCore/wiki";
+ license = licenses.boost;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ eduardosm ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/radio/pothos/spuce.patch b/third_party/nixpkgs/pkgs/applications/radio/pothos/spuce.patch
new file mode 100644
index 0000000000..ed0377540a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/radio/pothos/spuce.patch
@@ -0,0 +1,101 @@
+diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt
+index fa2e580..e32113c 100644
+--- a/spuce/qt_fir/CMakeLists.txt
++++ b/spuce/qt_fir/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce fir_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES
+ make_filter.cpp
+@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11)
+
+-TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_fir_plot Gui)
+-QT5_USE_Modules(spuce_fir_plot Core)
+-QT5_USE_Modules(spuce_fir_plot Widgets)
+-QT5_USE_Modules(spuce_fir_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_fir_plot DESTINATION bin)
+
+diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt
+index 4717226..debb5f9 100644
+--- a/spuce/qt_iir/CMakeLists.txt
++++ b/spuce/qt_iir/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce iir_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES
+ make_filter.cpp
+@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_iir_plot Gui)
+-QT5_USE_Modules(spuce_iir_plot Core)
+-QT5_USE_Modules(spuce_iir_plot Widgets)
+-QT5_USE_Modules(spuce_iir_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_iir_plot DESTINATION bin)
+diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt
+index 29c270d..e1ed778 100644
+--- a/spuce/qt_other/CMakeLists.txt
++++ b/spuce/qt_other/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce window_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES make_filter.cpp)
+ ADD_LIBRARY(spuce_other STATIC ${SOURCES})
+@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC})
+ set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_other_plot Gui)
+-QT5_USE_Modules(spuce_other_plot Core)
+-QT5_USE_Modules(spuce_other_plot Widgets)
+-QT5_USE_Modules(spuce_other_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_other_plot DESTINATION bin)
+diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt
+index e95c85b..4a77ab8 100644
+--- a/spuce/qt_window/CMakeLists.txt
++++ b/spuce/qt_window/CMakeLists.txt
+@@ -6,7 +6,7 @@ Message("Project spuce window_plot")
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets)
++FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport)
+
+ set(SOURCES make_filter.cpp)
+
+@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11)
+ set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+-TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce)
+-QT5_USE_Modules(spuce_window_plot Gui)
+-QT5_USE_Modules(spuce_window_plot Core)
+-QT5_USE_Modules(spuce_window_plot Widgets)
+-QT5_USE_Modules(spuce_window_plot PrintSupport)
++TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport)
+
+ INSTALL(TARGETS spuce_window_plot DESTINATION bin)
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
index 33f00979c9..cd7405ae09 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
@@ -9,16 +9,16 @@
eigen, zlib,
- cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver
+ cfitsio, indi-full, xplanet, libnova, libraw, gsl, wcslib, stellarsolver
}:
mkDerivation rec {
pname = "kstars";
- version = "3.5.1";
+ version = "3.5.2";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
- sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";
+ sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";
};
patches = [
@@ -37,11 +37,11 @@ mkDerivation rec {
eigen zlib
- cfitsio indilib xplanet libnova libraw gsl wcslib stellarsolver
+ cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver
];
cmakeFlags = [
- "-DINDI_NIX_ROOT=${indilib}"
+ "-DINDI_NIX_ROOT=${indi-full}"
"-DXPLANET_NIX_ROOT=${xplanet}"
];
@@ -53,7 +53,7 @@ mkDerivation rec {
The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites.
For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations.
'';
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ timput hjones2199 ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix
index 054a73dec7..0e0ad06bbe 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3,
- curl, gettext, glib, indilib, libnova, wrapGAppsHook }:
+ curl, gettext, glib, indi-full, libnova, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "phd2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
- buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ];
+ buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indi-full libnova ];
cmakeFlags = [
"-DOPENSOURCE_ONLY=1"
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
index cd78b644eb..e51d181266 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja,
- git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv,
- fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg,
- libraw, libtiff, libpng, libjpeg, libheif, ffms
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook
+, git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib
+, fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg
+, libraw, libtiff, libpng, libjpeg, libheif, ffms
}:
stdenv.mkDerivation rec {
pname = "siril";
- version = "0.99.6";
+ version = "0.99.8.1";
src = fetchFromGitLab {
owner = "free-astro";
repo = pname;
rev = version;
- sha256 = "06vh8x45gv0gwlnqjwxglf12jmpdaxkiv5sixkqh20420wabx3ha";
+ sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5";
};
nativeBuildInputs = [
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtk3 cfitsio gsl exiv2 gnuplot curl opencv fftwFloat librtprocess
- libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg
+ gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib
+ libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib
];
# Necessary because project uses default build dir for flatpaks/snaps
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.siril.org/";
- description = "Astronomical image processing tool";
- license = licenses.gpl3;
+ description = "Astrophotographic image processing tool";
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
index 7eb3afd437..b42fed8da2 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -16,7 +16,7 @@ python27Packages.buildPythonApplication rec {
sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
});
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ];
# make emapper find diamond & hmmer
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
index 687a2a985f..9d9e46bc78 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, cmake, gcc, gcc-unwrapped }:
stdenv.mkDerivation rec {
- version = "3.2.1";
+ version = "3.6";
pname = "messer-slim";
src = fetchurl {
url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz";
- sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1";
+ sha256 = "sha256-djWUKB+NW2a/6oaAMcH0Ul/R/XPHvGDbwlfeFmkbMOY=";
};
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
index 30bc68fb0e..d602395b87 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/platypus/default.nix
@@ -13,7 +13,8 @@ in stdenv.mkDerivation {
sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";
};
- buildInputs = [ htslib python zlib makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ htslib python zlib ];
buildPhase = ''
patchShebangs .
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
index 32701af839..b48e13ecf0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/snpeff/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
};
- buildInputs = [ unzip jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip jre ];
sourceRoot = "snpEff";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix
index 3458638473..9ad53502cd 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
- version = "2.7.7a";
+ version = "2.7.8a";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts=";
+ sha256 = "sha256-2qqdCan67bcoUGgr5ro2LGGHDAyS/egTrT8pWX1chX0=";
};
sourceRoot = "source/source";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
index 65a19b83a7..2a232d6469 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/varscan/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0=";
};
- buildInputs = [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
index aa52fee089..27f9a5c2ab 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.31.18";
+ version = "14.31.32";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd";
+ sha256 = "sha256-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 6d70e9f984..a348c51c28 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -38,7 +38,7 @@ configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran
'';
homepage = "https://www.quantum-espresso.org/";
license = licenses.gpl2;
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = [ maintainers.costrouc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
index 70d07460a7..dac6713a49 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
@@ -2,11 +2,11 @@
let
pname = "diylc";
- version = "4.15.1";
+ version = "4.17.0";
files = {
app = fetchurl {
url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip";
- sha256 = "09vzbxas654n8npxljqljf930y5gcjfvv3r4dv97dwk5sy66xvaf";
+ sha256 = "0cysqkrddhbs7rprm8xm21c286mz4apw66fxakhzlg50kjn0nwjv";
};
icon16 = fetchurl {
url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png";
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
installPhase = ''
+ runHook preInstall
+
install -d $out/share/diylc
${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc
rm $out/share/diylc/diylc.exe
@@ -59,6 +61,8 @@ stdenv.mkDerivation rec {
${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter
EOF
chmod +x $out/bin/diylc
+
+ runHook postInstall
'';
meta = with lib; {
@@ -67,5 +71,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/bancika/diy-layout-creator/releases";
license = licenses.gpl3Plus;
platforms = platforms.linux;
+ maintainers = with maintainers; [ eduardosm ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
index 394a178761..53a67cea40 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix
@@ -18,30 +18,25 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
qmakeFlags = ["-r"];
- enableParallelBuilding = true;
+
+ # the build system tries to use 'git' at build time to find the HEAD hash.
+ # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
+ # at the end of the line to remove the git call.
+ postPatch = ''
+ substituteInPlace ./libs/librepcb/common/common.pro \
+ --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
+ '';
postInstall = ''
mkdir -p $out/share/librepcb/fontobene
cp share/librepcb/fontobene/newstroke.bene $out/share/librepcb/fontobene/
'';
- # the build system tries to use 'git' at build time to find the HEAD hash.
- # that's a no-no, so replace it with a quick hack. NOTE: the # adds a comment
- # at the end of the line to remove the git call.
- patchPhase = ''
- substituteInPlace ./libs/librepcb/common/common.pro \
- --replace 'GIT_COMMIT_SHA' 'GIT_COMMIT_SHA="\\\"${src.rev}\\\"" # '
- '';
-
- preFixup = ''
- wrapQtApp $out/bin/librepcb
- '';
-
meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://librepcb.org/";
maintainers = with maintainers; [ luz thoughtpolice ];
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index 62600ea90c..8713abe4bc 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
@@ -42,6 +42,7 @@ let
"8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q";
"8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n";
"8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd";
+ "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix
index a0f81a543f..600ae83ff9 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3";
};
- buildInputs = [ perl polyml z3 makeWrapper ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl polyml z3 ]
++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
sourceRoot = dirname;
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
index 7749f4fd72..d57db0fd0d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.26.0";
+ version = "3.27.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
- sha256 = "sha256-xCULu6ljfyrA/Idr/BJ+3rLVmQqJZPoo+a7s++u50zU=";
+ sha256 = "sha256-DSIWuMlweu9dsah5EdVCNQ9ADjYoEZongfw/Yh7/N/A=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix
index 520c47d750..fc2c1e5cba 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
};
- buildInputs = [ makeWrapper eprover ocaml perl zlib ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ eprover ocaml perl zlib ];
sourceRoot = "leo2/src";
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix
index 8e4d19973e..fe0ca1b301 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, haskell, spass }:
+{ lib, stdenv, fetchurl, haskell, spass }:
stdenv.mkDerivation {
name = "system-for-automated-deduction-2.3.25";
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix
index dffb66b2fc..8c88f47327 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix
@@ -3,7 +3,8 @@ stdenv.mkDerivation rec {
pname = "satallax";
version = "2.7";
- buildInputs = [ocaml zlib which eprover makeWrapper coq];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ocaml zlib which eprover coq];
src = fetchurl {
url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
index c4ba334b85..f002b808e0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891";
};
- buildInputs = [ makeWrapper adoptopenjdk-bin ant ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ adoptopenjdk-bin ant ];
buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist";
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 1c33d92328..da8985818e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
index 3528dbd3a6..d4fdbfd693 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/with-provers.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation {
phases = [ "buildPhase" "installPhase" ];
- buildInputs = [ why3 makeWrapper ] ++ provers;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ why3 ] ++ provers;
buildPhase = ''
mkdir -p $out/share/why3/
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
index cb0d668f53..7fb73419c0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
index cfef5960bd..e482a071bb 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
@@ -57,9 +57,14 @@ stdenv.mkDerivation rec {
mkdir -p $python/lib
mv $lib/lib/python* $python/lib/
ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary}
+ '' + optionalString javaBindings ''
+ mkdir -p $java/share/java
+ mv com.microsoft.z3.jar $java/share/java
+ moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java"
'';
outputs = [ "out" "lib" "dev" "python" ]
+ ++ optional javaBindings "java"
++ optional ocamlBindings "ocaml";
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
index e41dbb546e..331faa6b14 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix
@@ -12,11 +12,12 @@
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
- name = "R-4.0.3";
+ pname = "R";
+ version = "4.0.4";
src = fetchurl {
- url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz";
- sha256 = "03cypg2qf7v9mq9mr9alz9w5y9m5kdgwbc97bp26pyymg253m609";
+ url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
+ sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj";
};
dontUseImakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
index db6cf2600c..456ce878e4 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
'';
- buildInputs = [ util-linux makeWrapper ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ util-linux ]
++ lib.optionals enableReadline [ readline ncurses ];
makeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
index 8c391e2532..f89fe3e1db 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix
@@ -1,10 +1,9 @@
{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl
-, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
+, enableGUI ? false, libGL, libGLU, xorg, fltk
}:
-assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
index 4ed9c963ba..fabb3b08c4 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix
@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "gmsh";
- version = "4.7.1";
+ version = "4.8.0";
src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
- sha256 = "0shwi41van3k0z6rnpl3sz5nh46xbyyljwfpcp8pwxbc26aw5169";
+ sha256 = "sha256-JYd4PEsClj+divtxfJlUyu+kY+ouChLhZZMH5qDX6ms=";
};
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix
index 97b5f88e55..2866b4b946 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value
, doSymlink ? true # symlink the executables to the default location (without dimension postfix)
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
'';
preBuild = ''
- echo Building PALP optimized for ${dim} dimensions
- sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
+ echo Building PALP optimized for ${dim} dimensions
+ sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h
'';
# palp has no tests of its own. This test is an adapted sage test that failed
@@ -42,14 +43,14 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p "$out/bin"
+ mkdir -p $out/bin
for file in poly class cws nef mori; do
- cp -p $file.x "$out/bin/$file-${dim}d.x"
+ cp -p $file.x "$out/bin/$file-${dim}d.x"
done
'' + lib.optionalString doSymlink ''
- cd "$out/bin"
+ cd $out/bin
for file in poly class cws nef mori; do
- ln -sf $file-6d.x $file.x
+ ln -sf $file-6d.x $file.x
done
'';
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch
new file mode 100644
index 0000000000..374c720791
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch
@@ -0,0 +1,29 @@
+diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
+index 88a33b0349..b3321f0bec 100644
+--- a/src/sage/interfaces/singular.py
++++ b/src/sage/interfaces/singular.py
+@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect):
+ """
+ Send an interrupt to Singular. If needed, additional
+ semi-colons are sent until we get back at the prompt.
+-
+- TESTS:
+-
+- The following works without restarting Singular::
+-
+- sage: a = singular(1)
+- sage: _ = singular._expect.sendline('1+') # unfinished input
+- sage: try:
+- ....: alarm(0.5)
+- ....: singular._expect_expr('>') # interrupt this
+- ....: except KeyboardInterrupt:
+- ....: pass
+- Control-C pressed. Interrupting Singular. Please wait a few seconds...
+-
+- We can still access a::
+-
+- sage: 2*a
+- 2
+ """
+ # Work around for Singular bug
+ # http://www.singular.uni-kl.de:8002/trac/ticket/727
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch
new file mode 100644
index 0000000000..88cb66506b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch
@@ -0,0 +1,16 @@
+diff --git a/src/sage/repl/rich_output/display_manager.py b/src/sage/repl/rich_output/display_manager.py
+index fb21f7a9c9..f39470777d 100644
+--- a/src/sage/repl/rich_output/display_manager.py
++++ b/src/sage/repl/rich_output/display_manager.py
+@@ -749,9 +749,9 @@ class DisplayManager(SageObject):
+ import sage.env
+ import re
+ import os
+- with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.min.js')) as f:
++ with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.js')) as f:
+ text = f.read().replace('\n','')
+- version = re.search(r'REVISION="(\d+)"', text).group(1)
++ version = re.search(r"REVISION = '(\d+)'", text).group(1)
+ return """
+
+
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch
new file mode 100644
index 0000000000..3fdb8f768e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch
@@ -0,0 +1,131 @@
+diff --git a/src/sage/libs/eclib/interface.py b/src/sage/libs/eclib/interface.py
+index e898456720..6b98c12328 100644
+--- a/src/sage/libs/eclib/interface.py
++++ b/src/sage/libs/eclib/interface.py
+@@ -758,78 +758,78 @@ class mwrank_MordellWeil(SageObject):
+
+ sage: EQ = mwrank_MordellWeil(E, verbose=True)
+ sage: EQ.search(1)
+- P1 = [0:1:0] is torsion point, order 1
+- P1 = [-3:0:1] is generator number 1
+- saturating up to 20...Checking 2-saturation
++ P1 = [0:1:0] is torsion point, order 1
++ P1 = [-3:0:1] is generator number 1
++ saturating up to 20...Checking 2-saturation...
+ Points have successfully been 2-saturated (max q used = 7)
+- Checking 3-saturation
++ Checking 3-saturation...
+ Points have successfully been 3-saturated (max q used = 7)
+- Checking 5-saturation
++ Checking 5-saturation...
+ Points have successfully been 5-saturated (max q used = 23)
+- Checking 7-saturation
++ Checking 7-saturation...
+ Points have successfully been 7-saturated (max q used = 41)
+- Checking 11-saturation
++ Checking 11-saturation...
+ Points have successfully been 11-saturated (max q used = 17)
+- Checking 13-saturation
++ Checking 13-saturation...
+ Points have successfully been 13-saturated (max q used = 43)
+- Checking 17-saturation
++ Checking 17-saturation...
+ Points have successfully been 17-saturated (max q used = 31)
+- Checking 19-saturation
++ Checking 19-saturation...
+ Points have successfully been 19-saturated (max q used = 37)
+ done
+- P2 = [-2:3:1] is generator number 2
+- saturating up to 20...Checking 2-saturation
++ P2 = [-2:3:1] is generator number 2
++ saturating up to 20...Checking 2-saturation...
+ possible kernel vector = [1,1]
+ This point may be in 2E(Q): [14:-52:1]
+ ...and it is!
+ Replacing old generator #1 with new generator [1:-1:1]
+ Points have successfully been 2-saturated (max q used = 7)
+ Index gain = 2^1
+- Checking 3-saturation
++ Checking 3-saturation...
+ Points have successfully been 3-saturated (max q used = 13)
+- Checking 5-saturation
++ Checking 5-saturation...
+ Points have successfully been 5-saturated (max q used = 67)
+- Checking 7-saturation
++ Checking 7-saturation...
+ Points have successfully been 7-saturated (max q used = 53)
+- Checking 11-saturation
++ Checking 11-saturation...
+ Points have successfully been 11-saturated (max q used = 73)
+- Checking 13-saturation
++ Checking 13-saturation...
+ Points have successfully been 13-saturated (max q used = 103)
+- Checking 17-saturation
++ Checking 17-saturation...
+ Points have successfully been 17-saturated (max q used = 113)
+- Checking 19-saturation
++ Checking 19-saturation...
+ Points have successfully been 19-saturated (max q used = 47)
+ done (index = 2).
+ Gained index 2, new generators = [ [1:-1:1] [-2:3:1] ]
+- P3 = [-14:25:8] is generator number 3
+- saturating up to 20...Checking 2-saturation
++ P3 = [-14:25:8] is generator number 3
++ saturating up to 20...Checking 2-saturation...
+ Points have successfully been 2-saturated (max q used = 11)
+- Checking 3-saturation
++ Checking 3-saturation...
+ Points have successfully been 3-saturated (max q used = 13)
+- Checking 5-saturation
++ Checking 5-saturation...
+ Points have successfully been 5-saturated (max q used = 71)
+- Checking 7-saturation
++ Checking 7-saturation...
+ Points have successfully been 7-saturated (max q used = 101)
+- Checking 11-saturation
++ Checking 11-saturation...
+ Points have successfully been 11-saturated (max q used = 127)
+- Checking 13-saturation
++ Checking 13-saturation...
+ Points have successfully been 13-saturated (max q used = 151)
+- Checking 17-saturation
++ Checking 17-saturation...
+ Points have successfully been 17-saturated (max q used = 139)
+- Checking 19-saturation
++ Checking 19-saturation...
+ Points have successfully been 19-saturated (max q used = 179)
+ done (index = 1).
+- P4 = [-1:3:1] = -1*P1 + -1*P2 + -1*P3 (mod torsion)
+- P4 = [0:2:1] = 2*P1 + 0*P2 + 1*P3 (mod torsion)
+- P4 = [2:13:8] = -3*P1 + 1*P2 + -1*P3 (mod torsion)
+- P4 = [1:0:1] = -1*P1 + 0*P2 + 0*P3 (mod torsion)
+- P4 = [2:0:1] = -1*P1 + 1*P2 + 0*P3 (mod torsion)
+- P4 = [18:7:8] = -2*P1 + -1*P2 + -1*P3 (mod torsion)
+- P4 = [3:3:1] = 1*P1 + 0*P2 + 1*P3 (mod torsion)
+- P4 = [4:6:1] = 0*P1 + -1*P2 + -1*P3 (mod torsion)
+- P4 = [36:69:64] = 1*P1 + -2*P2 + 0*P3 (mod torsion)
+- P4 = [68:-25:64] = -2*P1 + -1*P2 + -2*P3 (mod torsion)
+- P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion)
++ P4 = [-1:3:1] = -1*P1 + -1*P2 + -1*P3 (mod torsion)
++ P4 = [0:2:1] = 2*P1 + 0*P2 + 1*P3 (mod torsion)
++ P4 = [2:13:8] = -3*P1 + 1*P2 + -1*P3 (mod torsion)
++ P4 = [1:0:1] = -1*P1 + 0*P2 + 0*P3 (mod torsion)
++ P4 = [2:0:1] = -1*P1 + 1*P2 + 0*P3 (mod torsion)
++ P4 = [18:7:8] = -2*P1 + -1*P2 + -1*P3 (mod torsion)
++ P4 = [3:3:1] = 1*P1 + 0*P2 + 1*P3 (mod torsion)
++ P4 = [4:6:1] = 0*P1 + -1*P2 + -1*P3 (mod torsion)
++ P4 = [36:69:64] = 1*P1 + -2*P2 + 0*P3 (mod torsion)
++ P4 = [68:-25:64] = -2*P1 + -1*P2 + -2*P3 (mod torsion)
++ P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion)
+ sage: EQ
+ Subgroup of Mordell-Weil group: [[1:-1:1], [-2:3:1], [-14:25:8]]
+
+@@ -1076,7 +1076,7 @@ class mwrank_MordellWeil(SageObject):
+ sage: EQ.search(1)
+ P1 = [0:1:0] is torsion point, order 1
+ P1 = [-3:0:1] is generator number 1
+- saturating up to 20...Checking 2-saturation
++ saturating up to 20...Checking 2-saturation...
+ ...
+ P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion)
+ sage: EQ
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index b8fb415966..99a163eb0b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
@@ -71,6 +71,9 @@ stdenv.mkDerivation rec {
# fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
./patches/sagespawn-implicit-casting.patch
+
+ # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945)
+ ./patches/disable-pexpect-intermittent-failure.patch
];
# Patches needed because of package updates. We could just pin the versions of
@@ -106,6 +109,12 @@ stdenv.mkDerivation rec {
# fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
./patches/sympy-1.7-update.patch
+
+ # workaround until we use sage's fork of threejs, which contains a "version" file
+ ./patches/dont-grep-threejs-version-from-minified-js.patch
+
+ # updated eclib output has punctuation changes and tidier whitespace
+ ./patches/eclib-20210223-test-formatting.patch
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
index 179801da37..05b95140b1 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/weka/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
};
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
# The -Xmx1000M comes suggested from their download page:
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html
diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
index b15eebf871..0d827e2ad1 100644
--- a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
name = "aliza.rpm";
};
- buildInputs = [ rpmextract makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ rpmextract ];
unpackCmd = "rpmextract $curSrc";
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
index db98e0db34..3ab7d57f95 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [jre makeWrapper];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
installPhase = ''
mkdir -pv $out/{share,bin}
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
index 9a3af78240..858064a8d2 100644
--- a/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4";
};
- postPatch = ''
+ postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") ''
sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
'';
diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix
index dd61c3668c..e56282b686 100644
--- a/third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/programming/plm/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}.jar";
};
- buildInputs = [ makeWrapper jre gcc valgrind ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre gcc valgrind ];
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
index b14b874d60..a7dcd0959d 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -90,12 +90,7 @@ rustPlatform.buildRustPackage rec {
--replace xdg-open ${xdg-utils}/bin/xdg-open
'';
- installPhase = ''
- runHook preInstall
-
- install -D $releaseDir/alacritty $out/bin/alacritty
-
- '' + (
+ postInstall = (
if stdenv.isDarwin then ''
mkdir $out/Applications
cp -r extra/osx/Alacritty.app $out/Applications
@@ -126,8 +121,6 @@ rustPlatform.buildRustPackage rec {
tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
-
- runHook postInstall
'';
dontPatchELF = true;
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix
index 092d4a0e09..7dd495f977 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
let
libPath = lib.makeLibraryPath [
- stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
+ stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
+ at-spi2-atk
];
in
stdenv.mkDerivation rec {
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/bin"
mv opt "$out/"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/"
'';
dontPatchELF = true;
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index b03acb9953..5255d40b9c 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
@@ -40,7 +40,7 @@ let
paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/urxvt \
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix
index 67c660275f..87394241ef 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminus/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
};
- buildInputs = [ dpkg makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ dpkg ];
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
index ae1929565b..af2b5cdc9a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs2svn/default.nix
@@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
checkInputs = [ subversion git breezy ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index 1ffc065367..036eef1c9c 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -15,7 +15,8 @@ in
sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz";
};
- buildInputs = [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
phases = "installPhase";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 5aea15769c..565fe180ba 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287";
};
- buildInputs = [mercurial.python mercurial makeWrapper];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [mercurial.python mercurial];
installPhase = ''
binPath=$out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
index a52b11bff9..153a948d8e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "1.6.2";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "1wq8k626w3w2cnqp9gqdk7g4pjnqjjybkjgbfq5cvqsql3jdjg65";
+ sha256 = "0ndi264rrssqin03qmv7n0fpzs3kasfqykidrlcyizw1ngyfgc1a";
};
- vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g";
+ vendorSha256 = "0ywh5d41b1c5ivwngsgn46d6yb7s1wqyzl5b0j1x4mcvydi5yi98";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index f56ce386e4..defad82d5a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
- version = "1.1.5";
+ version = "1.1.7";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "098fik155viylq07az7crzbgswcvhpx0hr68xpvyx0rpri792jbq";
+ sha256 = "sha256-kEs844gj1/PW7Kkpn1tvxfruznRIh2pjHCoSWGF1upQ=";
};
- vendorSha256 = "0gll132g111vn1hdmdjpkha9rbyppz0qj1ld89gwlk2mqd57jxkd";
+ vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index 08875dabd0..f0184c6637 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602";
};
- nativeBuildInputs = [ libxslt ];
+ nativeBuildInputs = [ libxslt makeWrapper ];
- buildInputs = [ openssl makeWrapper ];
+ buildInputs = [ openssl ];
patchPhase = ''
substituteInPlace commands.cpp \
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 7f2163e67d..9933535475 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "2.16.1";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "00xh3q3gmi88qcl0a61pw532iyw4xcls5h336cjzld70ps2r89g4";
+ sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
index 942a12e239..7b8b5fed90 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
installFlags = [ "prefix=$(out)" ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# perl provides shasum
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index 5e5bba3df7..c67a575172 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildPhase = null;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 2ecc5d872b..1a1811b2f4 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildPhase = null;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
index 037de14658..ec1c44b961 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index eea7bed011..3143d7ef9c 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
install -D git-secret $out/bin/git-secret
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 87cb7452c7..add7bfc552 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
index 3cb214bd8b..5d1589446b 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -7,6 +7,7 @@
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? true
, nlsSupport ? true
+, osxkeychainSupport ? stdenv.isDarwin
, guiSupport
, withManual ? true
, pythonSupport ? true
@@ -18,11 +19,12 @@
, gzip # needed at runtime by gitweb.cgi
}:
+assert osxkeychainSupport -> stdenv.isDarwin;
assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.30.0";
+ version = "2.30.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -34,7 +36,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm";
+ sha256 = "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -64,10 +66,10 @@ stdenv.mkDerivation {
--subst-var-by gettext ${gettext}
'';
- nativeBuildInputs = [ gettext perlPackages.perl ]
+ nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x
docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ];
- buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
+ buildInputs = [curl openssl zlib expat cpio libiconv]
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [tcl tk]
++ lib.optionals withpcre2 [ pcre2 ]
@@ -114,7 +116,7 @@ stdenv.mkDerivation {
make -C contrib/subtree
'' + (lib.optionalString perlSupport ''
make -C contrib/diff-highlight
- '') + (lib.optionalString stdenv.isDarwin ''
+ '') + (lib.optionalString osxkeychainSupport ''
make -C contrib/credential/osxkeychain
'') + (lib.optionalString withLibsecret ''
make -C contrib/credential/libsecret
@@ -128,7 +130,7 @@ stdenv.mkDerivation {
installFlags = [ "NO_INSTALL_HARDLINKS=1" ];
- preInstall = (lib.optionalString stdenv.isDarwin ''
+ preInstall = (lib.optionalString osxkeychainSupport ''
mkdir -p $out/bin
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/
rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
@@ -247,8 +249,8 @@ stdenv.mkDerivation {
notSupported "$out/$prog"
done
'')
- + lib.optionalString stdenv.isDarwin ''
- # enable git-credential-osxkeychain by default if darwin
+ + lib.optionalString osxkeychainSupport ''
+ # enable git-credential-osxkeychain on darwin if desired (default)
mkdir -p $out/etc
cat > $out/etc/gitconfig << EOF
[credential]
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 08bf5eb6ba..6572b9b7fc 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8=";
};
- buildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ pkgs.makeWrapper ];
preBuild = ''
makeFlagsArray+=(prefix="$out")
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
index 81b2984087..f980ea5d01 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix
@@ -1,16 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec {
pname = "gitui";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
- sha256 = "0yq98jslbac87zdzlwqc2kcd6hqy2wnza3l8n3asss1iaqcb0ilh";
+ sha256 = "1fcv9bxfv7f7ysmnqan9vdp2z3kvdb4h4zwbr0l3cs8kbapk713n";
};
- cargoSha256 = "16riggrhk1f6lg8y46wn89ab5b1iz6lw00ngid20x4z32d2ww70f";
+ cargoSha256 = "1mnh8jza8lkw5rgkx2bnnqvk9w7l9c2ab9hmfmgx049wn42ylb41";
nativeBuildInputs = [ python3 perl ];
buildInputs = [ openssl ]
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
index 26f4606653..766cb417b7 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
@@ -2,12 +2,12 @@
let
pname = "radicle-upstream";
- version = "0.1.6";
+ version = "0.1.11";
name = "${pname}-${version}";
src = fetchurl {
url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage";
- sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar";
+ sha256 = "1j0xc9ns3andycbrrzkn6ql6739b1dimzlxq17wwpmqhni9nh673";
};
contents = appimageTools.extractType2 { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 69742b6d76..74f10a1428 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41";
};
- buildInputs = [ ruby makeWrapper ];
+ nativeBuildInputs = [ ruby makeWrapper ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 1f2a77d201..753a3443c3 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tig";
- version = "2.5.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk=";
+ sha256 = "sha256-BXs7aKUYiU5L2OjhhmJ+dkHvNcrnw5qREwOTB6npLnw=";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index aebd488fe3..3225744abc 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
};
- buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ];
patches = [ ./helper-scripts_depspathprefix.patch ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
index f6250563fc..72f6d67c2f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "2.12.2";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4=";
+ sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q=";
};
patches = [ ./import-ssl-module.patch ];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://android.googlesource.com/tools/repo";
license = licenses.asl20;
- maintainers = [ maintainers.primeos ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
index 566459afa1..c9570bb134 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
@@ -9,11 +9,11 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.13.2";
+ version = "1.13.4";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII=";
+ sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU=";
};
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 7dd8ff4397..4f87dfc7cb 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.5.0";
+ version = "7.5.2";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "1v89aza7iwph7k5phyld5m5856c5wbh8ncgg6lh7558v4xna0x57";
+ sha256 = "0qd83licmw3p7cl04dki510nsn3kxk31s18g2xlixl8zqs3h08lp";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
index ee6c8201fa..b9c352a4ea 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
@@ -137,6 +137,7 @@ stdenv.mkDerivation {
sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
+ mv config/puma.rb.example config/puma.rb
# Always require lib-files and application.rb through their store
# path, not their relative state directory path. This gets rid of
# warnings and means we don't have to link back to lib from the
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index fcb954e388..83e3d7fe14 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb
-index c5cbfcf64c..4d01f6fab8 100644
+index d9b3ee354b0..1eb0507488b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
-@@ -70,10 +70,10 @@ Rails.application.configure do
+@@ -69,10 +69,10 @@
config.action_mailer.delivery_method = :sendmail
# Defaults to:
@@ -11,17 +11,17 @@ index c5cbfcf64c..4d01f6fab8 100644
- # # arguments: '-i -t'
- # # }
+ config.action_mailer.sendmail_settings = {
-+ location: '/usr/sbin/sendmail',
++ location: '/run/wrappers/bin/sendmail',
+ arguments: '-i -t'
+ }
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index bd696a7f2c..44e3863736 100644
+index 92e7501d49d..4ee5a1127df 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
-@@ -590,7 +590,7 @@ production: &base
+@@ -1168,7 +1168,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
@@ -31,10 +31,10 @@ index bd696a7f2c..44e3863736 100644
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 0bea8a4f4b..290248547b 100644
+index bbed08f5044..2906e5c44af 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
-@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user']
+@@ -183,7 +183,7 @@
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@@ -43,7 +43,7 @@ index 0bea8a4f4b..290248547b 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -751,7 +751,7 @@
# Git
#
Settings['git'] ||= Settingslogic.new({})
@@ -52,37 +52,94 @@ index 0bea8a4f4b..290248547b 100644
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
+diff --git a/config/puma.rb.example b/config/puma.rb.example
+index 9fc354a8fe8..2352ca9b58c 100644
+--- a/config/puma.rb.example
++++ b/config/puma.rb.example
+@@ -5,12 +5,8 @@
+ # The default is "config.ru".
+ #
+ rackup 'config.ru'
+-pidfile '/home/git/gitlab/tmp/pids/puma.pid'
+-state_path '/home/git/gitlab/tmp/pids/puma.state'
+-
+-stdout_redirect '/home/git/gitlab/log/puma.stdout.log',
+- '/home/git/gitlab/log/puma.stderr.log',
+- true
++pidfile ENV['PUMA_PATH'] + '/tmp/pids/puma.pid'
++state_path ENV['PUMA_PATH'] + '/tmp/pids/puma.state'
+
+ # Configure "min" to be the minimum number of threads to use to answer
+ # requests and "max" the maximum.
+@@ -31,12 +27,12 @@ queue_requests false
+
+ # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
+ # accepted protocols.
+-bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket'
++bind "unix://#{ENV['PUMA_PATH']}/tmp/sockets/gitlab.socket"
+
+ workers 3
+
+-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+-require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer"
++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events"
++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/puma_worker_killer_initializer"
+
+ on_restart do
+ # Signal application hooks that we're about to restart
+@@ -80,7 +76,7 @@ if defined?(nakayoshi_fork)
+ end
+
+ # Use json formatter
+-require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/puma_logging/json_formatter"
+
+ json_formatter = Gitlab::PumaLogging::JSONFormatter.new
+ log_formatter do |str|
diff --git a/lib/api/api.rb b/lib/api/api.rb
-index e953f3d2ec..3a8d9f076b 100644
+index ada0da28749..8a3f5824008 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
-@@ -2,7 +2,7 @@ module API
- class API < Grape::API
+@@ -4,7 +4,7 @@ module API
+ class API < ::API::Base
include APIGuard
- LOG_FILENAME = Rails.root.join("log", "api_json.log")
+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
- NO_SLASH_URL_PART_REGEX = %r{[^/]+}
- PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
+ NO_SLASH_URL_PART_REGEX = %r{[^/]+}.freeze
+ NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
+diff --git a/lib/gitlab/authorized_keys.rb b/lib/gitlab/authorized_keys.rb
+index 50cd15b7a10..3ac89e5b8e9 100644
+--- a/lib/gitlab/authorized_keys.rb
++++ b/lib/gitlab/authorized_keys.rb
+@@ -157,7 +157,7 @@ def command(id)
+ raise KeyError, "Invalid ID: #{id.inspect}"
+ end
+
+- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}"
++ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}"
+ end
+
+ def strip(key)
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
-index a42e312b5d..ccaab9229e 100644
+index 89a4e36a232..ae379ffb27a 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
-@@ -26,7 +26,7 @@ module Gitlab
+@@ -37,7 +37,7 @@ def self.build
end
def self.full_log_path
- Rails.root.join("log", file_name)
-+ File.join(ENV["GITLAB_LOG_PATH"], file_name)
++ File.join(ENV["GITLAB_LOG_PATH"], file_name)
end
def self.cache_key
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
-index 7d7400bdab..cb25211d44 100644
+index e0e7084e27e..19fab855b90 100644
--- a/lib/gitlab/uploads_transfer.rb
+++ b/lib/gitlab/uploads_transfer.rb
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@
module Gitlab
class UploadsTransfer < ProjectTransfer
def root_dir
@@ -92,10 +149,10 @@ index 7d7400bdab..cb25211d44 100644
end
end
diff --git a/lib/system_check/app/log_writable_check.rb b/lib/system_check/app/log_writable_check.rb
-index 3e0c436d6e..28cefc5514 100644
+index 2c108f0c18d..3a16ff52d01 100644
--- a/lib/system_check/app/log_writable_check.rb
+++ b/lib/system_check/app/log_writable_check.rb
-@@ -21,7 +21,7 @@ module SystemCheck
+@@ -23,7 +23,7 @@ def show_error
private
def log_path
@@ -105,10 +162,10 @@ index 3e0c436d6e..28cefc5514 100644
end
end
diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb
-index 7026d0ba07..c56e1f7ed9 100644
+index 54dff63ab61..882da702f29 100644
--- a/lib/system_check/app/uploads_directory_exists_check.rb
+++ b/lib/system_check/app/uploads_directory_exists_check.rb
-@@ -4,12 +4,13 @@ module SystemCheck
+@@ -6,12 +6,13 @@ class UploadsDirectoryExistsCheck < SystemCheck::BaseCheck
set_name 'Uploads directory exists?'
def check?
@@ -120,15 +177,15 @@ index 7026d0ba07..c56e1f7ed9 100644
+ uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
try_fixing_it(
- "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
-+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
)
for_more_information(
- see_installation_guide_section 'GitLab'
+ see_installation_guide_section('GitLab')
diff --git a/lib/system_check/app/uploads_path_permission_check.rb b/lib/system_check/app/uploads_path_permission_check.rb
-index 7df6c06025..bb447c16b2 100644
+index 2e1cc687c43..ca69d63bcf6 100644
--- a/lib/system_check/app/uploads_path_permission_check.rb
+++ b/lib/system_check/app/uploads_path_permission_check.rb
-@@ -25,7 +25,7 @@ module SystemCheck
+@@ -27,7 +27,7 @@ def show_error
private
def rails_uploads_path
@@ -138,10 +195,10 @@ index 7df6c06025..bb447c16b2 100644
def uploads_fullpath
diff --git a/lib/system_check/app/uploads_path_tmp_permission_check.rb b/lib/system_check/app/uploads_path_tmp_permission_check.rb
-index b276a81eac..070e3ebd81 100644
+index 567c7540777..29906b1c132 100644
--- a/lib/system_check/app/uploads_path_tmp_permission_check.rb
+++ b/lib/system_check/app/uploads_path_tmp_permission_check.rb
-@@ -33,7 +33,7 @@ module SystemCheck
+@@ -35,7 +35,7 @@ def upload_path_tmp
end
def uploads_fullpath
@@ -150,14 +207,3 @@ index b276a81eac..070e3ebd81 100644
end
end
end
---- a/lib/gitlab/authorized_keys.rb
-+++ b/lib/gitlab/authorized_keys.rb
-@@ -157,7 +157,7 @@
- raise KeyError, "Invalid ID: #{id.inspect}"
- end
-
-- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}"
-+ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}"
- end
-
- def strip(key)
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix
index 268098b2d2..89e3a5ea0b 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix
@@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec {
gtksourceview4
gsettings-desktop-schemas
gnome3.adwaita-icon-theme
- gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
];
propagatedBuildInputs = with python3.pkgs; [
@@ -53,6 +52,10 @@ python3.pkgs.buildPythonApplication rec {
pycairo
];
+ # gobject-introspection and some other similar setup hooks do not currently work with strictDeps.
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
index 2944072427..f499be17f7 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/4.9.nix
@@ -21,7 +21,8 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
- buildInputs = [ makeWrapper docutils unzip ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ docutils unzip ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index c841482126..7c0a96583e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
@@ -19,7 +19,8 @@ in python3Packages.buildPythonApplication rec {
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
- buildInputs = [ makeWrapper docutils unzip ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ docutils unzip ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix
index d6d55eaa4e..56cc2a4ea5 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
version = "1.0.2";
pname = "monotone-viz";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4];
src = fetchurl {
url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
index eaad772f73..776a794d64 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
- version = "1.0.0-alpha.38";
+ version = "1.0.0-alpha.46";
src = fetchCrate {
inherit version pname;
- sha256 = "0f14jkr1yswwyqz0l47b0287vpyz0g1qmksr3hkskhbmwlkf1q2b";
+ sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5";
};
- cargoSha256 = "08p2dq48d1islk02xz1j39402fqxfh4isf8qi219aivl0yciwjn3";
+ cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp";
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
index 7b01ab21f4..1ca04a1634 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix
@@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
- buildVersion = "2039";
- sha256 = "0l82408jli7g6nc267bnnnz0zz015lvpwva5fxj53mval32ii4i8";
+ buildVersion = "2047";
+ sha256 = "03a0whifhx9py25l96xpqhb4p6hi9qmnrk2bxz6gh02sinsp3mia";
} {};
sublime-merge-dev = common {
- buildVersion = "2037";
- sha256 = "1s0g18l2msmnn6w7f126andh2dygm9l94fxxhsi64v74mkawqg82";
+ buildVersion = "2046";
+ sha256 = "04laygxr4vm6mawlfmdn2vj0dwj1swab39znsgb1d6rhysz62kjd";
dev = true;
} {};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/alass/default.nix b/third_party/nixpkgs/pkgs/applications/video/alass/default.nix
new file mode 100644
index 0000000000..c57a224ee0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/alass/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, makeWrapper
+, ffmpeg
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "alass";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "kaegi";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU=";
+ };
+
+ cargoSha256 = "sha256-6CVa/ypz37bm/3R0Gi65ovu4SIwWcgVde3Z2W1R16mk=";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/alass-cli" --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"
+ '';
+
+ meta = with lib; {
+ description = "Automatic Language-Agnostic Subtitle Synchronization";
+ homepage = "https://github.com/kaegi/alass";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ erictapen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
index 2de5899aa3..da338e1758 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, gnumake, yasm, python3Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame
@@ -57,41 +57,15 @@ let
sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p";
};
- cmakeProto = fetchurl {
- url = "https://raw.githubusercontent.com/pramsey/libght/ca9b1121c352ea10170636e170040e1af015bad1/cmake/modules/CheckPrototypeExists.cmake";
- sha256 = "1zai82gm5x55n3xvdv7mns3ja6a2k81x9zz0nk42j6s2yb0fkjxh";
- };
-
- cmakeProtoPatch = ''
- # get rid of windows headers as they will otherwise be found first
- rm -rf msvc
-
- cp ${cmakeProto} cmake/${cmakeProto.name}
- # we need to enable support for C++ for check_prototype_exists to do its thing
- substituteInPlace CMakeLists.txt --replace 'LANGUAGES C' 'LANGUAGES C CXX'
- if [ -f cmake/CheckHeadersSTDC.cmake ]; then
- sed -i cmake/CheckHeadersSTDC.cmake \
- -e '7iinclude(CheckPrototypeExists)'
- fi
- '';
-
- kodiDependency = { name, version, rev, sha256, ... } @attrs:
- let
- attrs' = builtins.removeAttrs attrs ["name" "version" "rev" "sha256"];
- in stdenv.mkDerivation ({
- name = "kodi-${lib.toLower name}-${version}";
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = name;
- inherit rev sha256;
- };
- } // attrs');
-
- ffmpeg = kodiDependency rec {
- name = "FFmpeg";
+ ffmpeg = stdenv.mkDerivation rec {
+ pname = "kodi-ffmpeg";
version = "4.3.1";
- rev = "${version}-${rel}-Beta1";
- sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = "FFmpeg";
+ rev = "${version}-${rel}-Beta1";
+ sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";
+ };
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt
@@ -110,47 +84,25 @@ let
# We can build these externally but FindLibDvd.cmake forces us to build it
# them, so we currently just use them for the src.
- libdvdcss = kodiDependency rec {
- name = "libdvdcss";
- version = "1.4.2";
- rev = "${version}-${rel}-Beta-5";
- sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
- buildInputs = [ linuxHeaders ];
- nativeBuildInputs = [ cmake pkg-config ];
- postPatch = ''
- rm -rf msvc
-
- substituteInPlace config.h.cm \
- --replace '#cmakedefine O_BINARY "''${O_BINARY}"' '#define O_BINARY 0'
- '';
- cmakeFlags = [
- "-DBUILD_SHARED_LIBS=1"
- "-DHAVE_LINUX_DVD_STRUCT=1"
- ];
+ libdvdcss = fetchFromGitHub {
+ owner = "xbmc";
+ repo = "libdvdcss";
+ rev = "1.4.2-${rel}-Beta-5";
+ sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";
};
- libdvdnav = kodiDependency rec {
- name = "libdvdnav";
- version = "6.0.0";
- rev = "${version}-${rel}-Alpha-3";
- sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
- buildInputs = [ libdvdcss libdvdread ];
- nativeBuildInputs = [ cmake pkg-config ];
- postPatch = cmakeProtoPatch;
- postInstall = ''
- mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so
- '';
+ libdvdnav = fetchFromGitHub {
+ owner = "xbmc";
+ repo = "libdvdnav";
+ rev = "6.0.0-${rel}-Alpha-3";
+ sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";
};
- libdvdread = kodiDependency rec {
- name = "libdvdread";
- version = "6.0.0";
- rev = "${version}-${rel}-Alpha-3";
- sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
- buildInputs = [ libdvdcss ];
- nativeBuildInputs = [ cmake pkg-config ];
- configureFlags = [ "--with-libdvdcss" ];
- postPatch = cmakeProtoPatch;
+ libdvdread = fetchFromGitHub {
+ owner = "xbmc";
+ repo = "libdvdread";
+ rev = "6.0.0-${rel}-Alpha-3";
+ sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";
};
kodi_platforms =
@@ -184,7 +136,6 @@ in stdenv.mkDerivation {
bluez giflib glib harfbuzz lcms2 libpthreadstubs
ffmpeg flatbuffers fmt fstrcmp rapidjson
lirc
- # libdvdcss libdvdnav libdvdread
]
++ lib.optional x11Support [
libX11 xorgproto libXt libXmu libXext.dev libXdmcp
@@ -231,10 +182,9 @@ in stdenv.mkDerivation {
cmakeFlags = [
"-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}"
- "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}"
- "-Dlibdvdcss_URL=${libdvdcss.src}"
- "-Dlibdvdnav_URL=${libdvdnav.src}"
- "-Dlibdvdread_URL=${libdvdread.src}"
+ "-Dlibdvdcss_URL=${libdvdcss}"
+ "-Dlibdvdnav_URL=${libdvdnav}"
+ "-Dlibdvdread_URL=${libdvdread}"
"-DGIT_VERSION=${kodiReleaseDate}"
"-DENABLE_EVENTCLIENTS=ON"
"-DENABLE_INTERNAL_CROSSGUID=OFF"
@@ -251,9 +201,11 @@ in stdenv.mkDerivation {
# I'm guessing there is a thing waiting to time out
doCheck = false;
- # Need these tools on the build system when cross compiling,
- # hacky, but have found no other way.
- preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ preConfigure = ''
+ cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ # Need these tools on the build system when cross compiling,
+ # hacky, but have found no other way.
CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
@@ -269,7 +221,7 @@ in stdenv.mkDerivation {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \
+ --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
([ curl systemd libmad libvdpau libcec libcec_platform libass ]
++ lib.optional nfsSupport libnfs
@@ -293,6 +245,6 @@ in stdenv.mkDerivation {
homepage = "https://kodi.tv/";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ];
+ maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
index 44e5dec6b7..3aea028e9f 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix
@@ -346,21 +346,19 @@ let self = rec {
pdfreader = mkKodiPlugin rec {
plugin = "pdfreader";
namespace = "plugin.image.pdf";
- version = "1.0.2";
+ version = "2.0.2";
- src = fetchFromGitHub rec {
- name = plugin + "-" + version + ".tar.gz";
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "0a405b95208ced8a1365ad3193eade8d1c2117ce";
- sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa";
+ src = fetchFromGitHub {
+ owner = "i96751414";
+ repo = "plugin.image.pdfreader";
+ rev = "v${version}";
+ sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
};
meta = {
homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
description = "A comic book reader";
maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
index 1776aab003..0312c34bf7 100644
--- a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
@@ -30,7 +30,8 @@ let
}
else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
- buildInputs = [ dpkg makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ dpkg ];
phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg-deb -x ${src} ./";
diff --git a/third_party/nixpkgs/pkgs/applications/video/natron/default.nix b/third_party/nixpkgs/pkgs/applications/video/natron/default.nix
index a455869ebf..bbbcf3d768 100644
--- a/third_party/nixpkgs/pkgs/applications/video/natron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/natron/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio,
- qmake4Hook, libpng, libGL, lndir }:
+ qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
let
- minorVersion = "2.1";
- version = "${minorVersion}.9";
+ minorVersion = "2.3";
+ version = "${minorVersion}.15";
OpenColorIO-Configs = fetchurl {
- url = "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
- sha256 = "9eec5a02ca80c9cd8e751013cb347ea982fdddd592a4a9215cce462e332dac51";
+ url = "https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
+ sha256 = "AZK9J+RnMyxOYcAQOAQZj5QciPQ999m6jrtBt5rdpkA=";
};
seexpr = stdenv.mkDerivation rec {
version = "1.0.1";
@@ -20,14 +20,15 @@ let
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng flex bison ];
};
- buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }:
+ buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "", postPatch ? "" }:
stdenv.mkDerivation {
- name = "openfx-${pluginName}-${version}";
+ pname = "openfx-${pluginName}";
+ version = version;
src = fetchurl {
- url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
+ url = "https://github.com/NatronGitHub/openfx-${pluginName}/releases/download/Natron-${version}/openfx-${pluginName}-Natron-${version}.tar.xz";
inherit sha256;
};
- inherit nativeBuildInputs buildInputs;
+ inherit nativeBuildInputs buildInputs postPatch;
preConfigure = ''
makeFlagsArray+=("CONFIG=release")
makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
@@ -42,14 +43,19 @@ let
url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h";
sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";
};
+ cimgversion = "89b9d062ec472df3d33989e6d5d2a8b50ba0775c";
CImgh = fetchurl {
- url = "https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h";
- sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz";
+ url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/CImg.h";
+ sha256 = "sha256-NbYpZDNj2oZ+wqoEkRwwCjiujdr+iGOLA0Pa0Ynso6U=";
+ };
+ inpainth = fetchurl {
+ url = "https://raw.githubusercontent.com/dtschump/CImg/${cimgversion}/plugins/inpaint.h";
+ sha256 = "sha256-cd28a3VOs5002GkthHkbIUrxZfKuGhqIYO4Oxe/2HIQ=";
};
plugins = map buildPlugin [
({
pluginName = "arena";
- sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+ sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pango librsvg librevenge libcdr opencolorio libxml2 libzip
@@ -65,32 +71,37 @@ let
})
({
pluginName = "io";
- sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+ sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpng ffmpeg_3 openexr opencolorio openimageio boost libGL
- seexpr
+ seexpr libraw openjpeg libwebp
];
})
({
pluginName = "misc";
- sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
+ sha256 = "XkdQyWI9ilF6IoP3yuHulNUZRPLX1m4lq/+RbXsrFEQ=";
buildInputs = [
libGL
];
- preConfigure = ''
- cp ${CImgh} CImg/CImg.h
+ postPatch = ''
+ cp '${inpainth}' CImg/Inpaint/inpaint.h
+ patch -p0 -dCImg < CImg/Inpaint/inpaint.h.patch # taken from the Makefile; it gets skipped if the file already exists
+ cp '${CImgh}' CImg/CImg.h
'';
})
];
in
stdenv.mkDerivation {
inherit version;
- name = "natron-${version}";
+ pname = "natron";
- src = fetchurl {
- url = "https://github.com/MrKepzie/Natron/releases/download/${version}/Natron-${version}.tar.xz";
- sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
+ src = fetchFromGitHub {
+ owner = "NatronGitHub";
+ repo = "Natron";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "sha256-KuXJmmIsvwl4uqmAxXqWU+273jsdWrCuUSwWn5vuu8M=";
};
nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ];
@@ -124,6 +135,5 @@ stdenv.mkDerivation {
license = lib.licenses.gpl2;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/quvi/tool.nix b/third_party/nixpkgs/pkgs/applications/video/quvi/tool.nix
index 6718fc1dc3..87c8066a97 100644
--- a/third_party/nixpkgs/pkgs/applications/video/quvi/tool.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/quvi/tool.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ lua5 curl quvi_scripts libquvi glib ];
postInstall = ''
wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
index 070bcc9068..9cda6eb0a2 100644
--- a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
@@ -1,21 +1,29 @@
-{ lib, stdenv
+{ stdenv
+, lib
, fetchFromGitHub
, rustPlatform
+, makeWrapper
+, alass
}:
rustPlatform.buildRustPackage rec {
pname = "sub-batch";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "kl";
repo = pname;
- # Upstream doesn't tag releases.
- rev = "631bd6e2d931f8a8e12798f4b6460739a14bcfff";
- sha256 = "sha256-424e40v2LBxlmgDKxvsT/iuUn/IKWPKMwih0cSQ5sFE=";
+ rev = "v${version}";
+ sha256 = "sha256-5fDnSmnnVB1RGrNrnmp40OGFF+OAhppnhOjVgnYxXr0=";
};
- cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0=";
+ cargoSha256 = "sha256-cj1htJcUPCeYbP0t15UcMv4WQAG7tUROb97v4rUeMvU=";
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/sub-batch" --prefix PATH : "${lib.makeBinPath [ alass ]}"
+ '';
meta = with lib; {
description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files";
diff --git a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix
index 3619d4ee5e..69f777541a 100644
--- a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix
@@ -15,13 +15,13 @@
python3Packages.buildPythonApplication rec {
pname = "tartube";
- version = "2.3.085";
+ version = "2.3.110";
src = fetchFromGitHub {
owner = "axcore";
repo = "tartube";
rev = "v${version}";
- sha256 = "bkz64nj6748552ZMRcL/I1lUXGpZjaATUEqv3Kkphck=";
+ sha256 = "0sdbd2lsc4bvgkwi55arjwbzwmq05abfmv6vsrvz4gsdv8s8wha5";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix b/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
index 49f5b43bb7..6501a39908 100644
--- a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
index 2d865f4181..13b27c7d6c 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
@@ -22,5 +22,6 @@ mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
platforms = with platforms; linux;
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
index 9e866d7cf4..3e9029cce0 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
- version = "0.21";
+ version = "0.22";
pname = "charliecloud";
src = fetchFromGitHub {
owner = "hpc";
repo = "charliecloud";
rev = "v${version}";
- sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc=";
+ sha256 = "sha256-+9u7WRKAJ9F70+I68xNRck5Q22XzgLKTCnjGbIcsyW8=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
index 2283b45aee..9b57be87e4 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cntr/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cntr";
- version = "1.4.1";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "cntr";
rev = version;
- sha256 = "sha256-4ogyOKuz6702/sOQNvE+UP+cvQrPPU3VjL4b0FUfRNw=";
+ sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA=";
};
- cargoSha256 = "sha256-lblvun2T1qpFiowld77Ti2MFPzhs5pOWWRbErORXYCM=";
+ cargoSha256 = "sha256-o8o/ixjYdnezQZEp78brjmR2lvQbiwCJr4Y97tHiYbk=";
meta = with lib; {
description = "A container debugging tool based on FUSE";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
index e5df1c655d..3628443674 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
- version = "2.0.26";
+ version = "2.0.27";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-q2lh02iZ7FDBPjtoKY5p3c6Vcn9Ey8DCMn/Oe7/74ug=";
+ sha256 = "sha256-LMvhSoKd652XVPzuId8Ortf0f08FUP1zCn06PgtRwkA=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
index 1d84da72c9..8a4302de64 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
@@ -10,13 +10,13 @@
buildGoPackage rec {
pname = "containerd";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
+ sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb";
};
goPackagePath = "github.com/containerd/containerd";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
index 9950537150..8a7399cf66 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
- version = "1.20.0";
+ version = "1.20.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "sha256-3rougAl0vVH01ulbnfIO2x8OCyofWlvVsvlKjoAD2NE=";
+ sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
index 59e07530fb..15ca7c9667 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
@@ -12,6 +12,7 @@
, nixosTests
, criu
, system
+, fetchpatch
}:
let
@@ -37,16 +38,24 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
- version = "0.17";
+ version = "0.18";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4=";
+ sha256 = "sha256-VjMpfj2qUQdhqdnLpZsYigfo2sM7gNl0GrE4nitp13g=";
fetchSubmodules = true;
};
+ patches = [
+ # For 0.18 some tests switched to static builds, this was reverted after 0.18 was released
+ (fetchpatch {
+ url = "https://github.com/containers/crun/commit/d26579bfe56aa36dd522745d47a661ce8c70d4e7.patch";
+ sha256 = "1xmc0wj0j2xcg0915vxn0pplc4s94rpmw0s5g8cyf8dshfl283f9";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
buildInputs = [ libcap libseccomp systemd yajl ]
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
index 207ebdf221..73f4812ee5 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
@@ -1,11 +1,11 @@
-{ lib, callPackage }:
+{ lib, callPackage, fetchFromGitHub }:
with lib;
rec {
dockerGen = {
version, rev, sha256
- , mobyRev, mobySha256
+ , moby-src
, runcRev, runcSha256
, containerdRev, containerdSha256
, tiniRev, tiniSha256, buildxSupport ? false
@@ -65,12 +65,7 @@ rec {
inherit version;
inherit docker-runc docker-containerd docker-proxy docker-tini;
- src = fetchFromGitHub {
- owner = "moby";
- repo = "moby";
- rev = mobyRev;
- sha256 = mobySha256;
- };
+ src = moby-src;
goPackagePath = "github.com/docker/docker";
@@ -211,6 +206,9 @@ rec {
maintainers = with maintainers; [ offline tailhook vdemeester periklis ];
platforms = with platforms; linux ++ darwin;
};
+
+ # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
+ inherit moby-src;
});
# Get revisions from
@@ -219,8 +217,12 @@ rec {
version = "20.10.2";
rev = "v${version}";
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51";
- mobyRev = "v${version}";
- mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
+ moby-src = fetchFromGitHub {
+ owner = "moby";
+ repo = "moby";
+ rev = "v${version}";
+ sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
+ };
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/gc.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/gc.nix
index f7bd5a4b06..52ca54501d 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/gc.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/gc.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index dd1a2da017..84604c6557 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
++ optionals libiscsiSupport [ libiscsi ]
++ optionals smbdSupport [ samba ];
- enableParallelBuilding = true;
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
outputs = [ "out" "ga" ];
@@ -102,8 +101,6 @@ stdenv.mkDerivation rec {
})
];
- hardeningDisable = [ "stackprotector" ];
-
preConfigure = ''
unset CPP # intereferes with dependency calculation
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
@@ -147,7 +144,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# the .desktop is both invalid and pointless
- test -e $out/share/applications/qemu.desktop && rm -f $out/share/applications/qemu.desktop
+ rm -f $out/share/applications/qemu.desktop
# copy qemu-ga (guest agent) to separate output
mkdir -p $ga/bin
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix
index 3a5f26bfcc..9568a0bb69 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qtemu/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }:
+{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }:
mkDerivation rec {
pname = "qtemu";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
index 3bc2df19d1..a51a58d21e 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
@@ -5,7 +5,6 @@
, openssl
, libuuid
, coreutils
-, go
, which
, makeWrapper
, cryptsetup
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
index 6dd7fd0f95..fe19f1f4a3 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
@@ -103,6 +103,8 @@ in stdenv.mkDerivation {
qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
})
++ [
+ # NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released
+ ./linux-5-11.patch
./qtx11extras.patch
];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch
new file mode 100644
index 0000000000..66b70bf0d9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/linux-5-11.patch
@@ -0,0 +1,12 @@
+diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+index 7033b45..c8178a6 100644
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -39,6 +39,7 @@
+ #endif
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
index b671c1f6fa..b90033e438 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Run graphical applications with Docker";
homepage = "https://github.com/mviereck/x11docker";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ jD91mZM2 ];
+ maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix b/third_party/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix
deleted file mode 100644
index 9371844834..0000000000
--- a/third_party/nixpkgs/pkgs/applications/window-managers/bspwm/unstable.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
-
-stdenv.mkDerivation {
- name = "bspwm-unstable-2016-09-30";
-
-
- src = fetchFromGitHub {
- owner = "baskerville";
- repo = "bspwm";
- rev = "8664c007e44de162c1597fd7e163635b274fb747";
- sha256 = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz";
- };
-
- buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
-
- buildPhase = ''
- make PREFIX=$out
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
-
- meta = {
- description = "A tiling window manager based on binary space partitioning (git version)";
- homepage = "https://github.com/baskerville/bspwm";
- maintainers = [ lib.maintainers.meisternu lib.maintainers.epitrochoid ];
- license = lib.licenses.bsd2;
- platforms = lib.platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
index 9a56f865c3..52c0a6ae04 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
@@ -2,6 +2,7 @@
, lib
, fetchFromGitHub
, pkg-config
+, libinput
, libxcb
, libxkbcommon
, wayland
@@ -15,27 +16,32 @@
stdenv.mkDerivation rec {
pname = "dwl";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
- sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE=";
+ sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
+ libinput
libxcb
libxkbcommon
wayland
wayland-protocols
wlroots
- ] ++ lib.optionals enable-xwayland [ xwayland libX11 ];
+ ] ++ lib.optionals enable-xwayland [
+ libX11
+ xwayland
+ ];
# Allow users to set their own list of patches
inherit patches;
+ # Last line of config.mk enables XWayland
prePatch = lib.optionalString enable-xwayland ''
sed -i -e '$ s|^#||' config.mk
'';
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
index ad45f01915..a1151dcf82 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,44 +1,42 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
+{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
, nixosTests }:
-# Doc generation is disabled by default when cross compiling because asciidoc
-# dependency is broken when cross compiling for now
-
-let
- cross = stdenv.buildPlatform != stdenv.targetPlatform;
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "herbstluftwm";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
- sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy";
+ sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38";
};
outputs = [
"out"
- "doc" # share/doc exists with examples even without generated html documentation
- ] ++ lib.optionals (!cross) [
+ "doc"
"man"
];
cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
- ] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF";
+ ];
nativeBuildInputs = [
cmake
pkg-config
- python3
- ] ++ lib.optional (!cross) asciidoc;
+ ];
+
+ depsBuildBuild = [
+ asciidoc-full
+ ];
buildInputs = [
libX11
libXext
libXinerama
libXrandr
+ libXft
+ freetype
];
patches = [
@@ -75,6 +73,9 @@ in stdenv.mkDerivation rec {
'';
pytestFlagsArray = [ "../tests" ];
+ disabledTests = [
+ "test_title_different_letters_are_drawn"
+ ];
passthru = {
tests.herbstluftwm = nixosTests.herbstluftwm;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix
index c918a3b5d8..305c1d728f 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "i3";
- version = "4.19.1";
+ version = "4.19.2";
src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
- sha256 = "sha256-IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c=";
+ sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk=";
};
nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
index 6f22070dbc..3581e47494 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.13.c.1";
+ version = "2.13.c.2";
pname = "i3lock-color";
src = fetchFromGitHub {
owner = "PandorasFox";
repo = "i3lock-color";
rev = version;
- sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw=";
+ sha256 = "sha256-cMj1uB2Hf7v5Rukw9c5YeUmwbdTn1+PV13bUaOWzBp0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
index be7e88a250..88d035bce6 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
@@ -6,25 +6,26 @@
, dbus
, libpulseaudio
, notmuch
+, openssl
, ethtool
}:
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.14.3";
+ version = "0.14.7";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
- sha256 = "1k9dgmd4wz9950kr35da31rhph43gmvg8dif7hg1xw41xch6bi60";
+ sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c";
};
- cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2";
+ cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9";
nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ dbus libpulseaudio notmuch ];
+ buildInputs = [ dbus libpulseaudio notmuch openssl ];
cargoBuildFlags = [
"--features=notmuch"
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
index 571c13e946..8f1a920296 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, cmake
, pkg-config
-, perl
, asciidoc
, expat
, fontconfig
@@ -34,21 +34,26 @@
, libxcb
, mkfontdir
, pcre
+, perl
}:
stdenv.mkDerivation rec {
pname = "icewm";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "bbidulock";
repo = pname;
rev = version;
- sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY=";
+ hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";
};
- nativeBuildInputs = [ cmake pkg-config perl asciidoc ];
-
+ nativeBuildInputs = [
+ asciidoc
+ cmake
+ perl
+ pkg-config
+ ];
buildInputs = [
expat
fontconfig
@@ -90,6 +95,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
+ homepage = "https://www.ice-wm.org/";
description = "A simple, lightweight X window manager";
longDescription = ''
IceWM is a window manager for the X Window System. The goal of IceWM is
@@ -104,8 +110,7 @@ stdenv.mkDerivation rec {
includes an optional external background wallpaper manager with
transparency support, a simple session manager and a system tray.
'';
- homepage = "https://www.ice-wm.org/";
- license = licenses.lgpl2;
+ license = licenses.lgpl2Only;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
index 72170401d7..04c232a3e8 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix
@@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM=";
- buildInputs = [ makeWrapper libX11 libXinerama ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ libX11 libXinerama ];
postInstall = ''
wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix
index 7615c6c4bd..cb76f0c465 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,20 +1,23 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
-, pkg-config
-, which
, autoreconfHook
-, rep-gtk
-, pango
, gdk-pixbuf-xlib
-, imlib
, gettext
-, texinfo
+, gtk2
+, imlib
+, libICE
+, libSM
, libXinerama
, libXrandr
, libXtst
-, libICE
-, libSM
+, librep
, makeWrapper
+, pango
+, pkg-config
+, rep-gtk
+, texinfo
+, which
}:
stdenv.mkDerivation rec {
@@ -26,20 +29,42 @@ stdenv.mkDerivation rec {
sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ which
- rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo
- libXinerama libXrandr libXtst libICE libSM
- makeWrapper ];
+ nativeBuildInputs = [
+ autoreconfHook
+ gettext
+ librep
+ makeWrapper
+ pkg-config
+ texinfo
+ which
+ ];
+ buildInputs = [
+ gdk-pixbuf-xlib
+ gtk2
+ imlib
+ libICE
+ libSM
+ libXinerama
+ libXrandr
+ libXtst
+ librep
+ pango
+ rep-gtk
+ ];
- patchPhase = ''
+ postPatch = ''
sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
sed -e 's|$(repexecdir)|$(libdir)/rep|g' -i src/Makefile.in
'';
+ strictDeps = true;
+
postInstall = ''
- for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \
- $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do
+ for i in $out/lib/sawfish/sawfish-menu \
+ $out/bin/sawfish-about \
+ $out/bin/sawfish-client \
+ $out/bin/sawfish-config \
+ $out/bin/sawfish; do
wrapProgram $i \
--prefix REP_DL_LOAD_PATH : "$out/lib/rep" \
--set REP_LOAD_PATH "$out/share/sawfish/lisp"
@@ -47,16 +72,17 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
+ homepage = "http://sawfish.tuxfamily.org/";
description = "An extensible, Lisp-based window manager";
longDescription = ''
- Sawfish is an extensible window manager using a Lisp-based scripting language.
- Its policy is very minimal compared to most window managers. Its aim is simply
- to manage windows in the most flexible and attractive manner possible.
- All high-level WM functions are implemented in Lisp for future extensibility
- or redefinition.
+ Sawfish is an extensible window manager using a Lisp-based scripting
+ language. Its policy is very minimal compared to most window managers. Its
+ aim is simply to manage windows in the most flexible and attractive manner
+ possible. All high-level WM functions are implemented in Lisp for future
+ extensibility or redefinition.
'';
- homepage = "https://sawfish.fandom.com/wiki/Main_Page";
- license = licenses.gpl2;
- maintainers = [ maintainers.AndersonTorres ];
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 8fef2ca662..3243e883e4 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
@@ -53,7 +53,8 @@ let
dynamicLinker =
/**/ if libc == null then null
else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*"
- else if targetPlatform.libc == "bionic" then "/system/bin/linker"
+ else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker"
+ else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64"
else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so"
else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2"
else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2"
diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
index 9ecb313f0b..502be398ea 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
@@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
- ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""}
- ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""}
+ ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""}
+ ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""}
# Clear markers
find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \;
diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index 341e285043..65f9791597 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
@@ -298,7 +298,10 @@ stdenv.mkDerivation {
# vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See
# https://clang.llvm.org/docs/Toolchain.html for all the axes one might
# break `useLLVM` into.)
- + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
+ + optionalString (isClang && gccForLibs != null
+ && targetPlatform.isLinux
+ && !(stdenv.targetPlatform.useAndroidPrebuilt or false)
+ && !(stdenv.targetPlatform.useLLVM or false)) ''
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
''
@@ -451,6 +454,8 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector pic"
'' + optionalString (targetPlatform.libc == "newlib") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
+ '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) ''
+ hardening_unsupported_flags+=" stackprotector"
'' + optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString cc.langAda or false ''
diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
index c4e266d6c5..4d57b39919 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
@@ -21,7 +21,6 @@
runtimeShell,
shadow,
skopeo,
- stdenv,
storeDir ? builtins.storeDir,
substituteAll,
symlinkJoin,
@@ -120,7 +119,7 @@ rec {
export GOPATH=$(pwd)
export GOCACHE="$TMPDIR/go-cache"
mkdir -p src/github.com/docker/docker/pkg
- ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
+ ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
index f34835eaf0..fcbf5bcabe 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
@@ -147,9 +147,15 @@ runCommand
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
+ #
+ # NOTE: Avoid displaying messages early at startup by binding
+ # inhibit-message to t. This would prevent the Emacs GUI from showing up
+ # prematurely. The messages would still be logged to the *Messages*
+ # buffer.
rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
cat >"$siteStart" < !(args.doCheck or true);
stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot {
RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
} // {
- inherit cargoDeps;
+ inherit buildAndTestSubdir cargoDeps;
+
+ cargoBuildType = buildType;
patchRegistryDeps = ./patch-registry-deps;
- nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ];
+ nativeBuildInputs = nativeBuildInputs ++ [
+ cacert
+ git
+ cargoBuildHook
+ cargoCheckHook
+ cargoInstallHook
+ cargoSetupHook
+ rustc
+ ];
+
buildInputs = buildInputs ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads;
patches = cargoPatches ++ patches;
@@ -139,147 +125,18 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
postUnpack = ''
eval "$cargoDepsHook"
- ${setupVendorDir}
-
- mkdir .cargo
- config="$(pwd)/$cargoDepsCopy/.cargo/config";
- if [[ ! -e $config ]]; then
- config=${./fetchcargo-default-config.toml};
- fi;
- substitute $config .cargo/config \
- --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
-
- cat >> .cargo/config <<'EOF'
- [target."${rust.toRustTarget stdenv.buildPlatform}"]
- "linker" = "${ccForBuild}"
- ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
- [target."${shortTarget}"]
- "linker" = "${ccForHost}"
- ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
- lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
- "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
- ''}
- ''}
- EOF
-
export RUST_LOG=${logLevel}
'' + (args.postUnpack or "");
- # After unpacking and applying patches, check that the Cargo.lock matches our
- # src package. Note that we do this after the patchPhase, because the
- # patchPhase may create the Cargo.lock if upstream has not shipped one.
- postPatch = (args.postPatch or "") + lib.optionalString validateCargoDeps ''
- cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock
- srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock
-
- echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
- if ! ${diff} $srcLockfile $cargoDepsLockfile; then
-
- # If the diff failed, first double-check that the file exists, so we can
- # give a friendlier error msg.
- if ! [ -e $srcLockfile ]; then
- echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile"
- echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build."
- exit 1
- fi
-
- if ! [ -e $cargoDepsLockfile ]; then
- echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile"
- exit 1
- fi
-
- echo
- echo "ERROR: cargoSha256 is out of date"
- echo
- echo "Cargo.lock is not the same in $cargoDepsCopy"
- echo
- echo "To fix the issue:"
- echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value'
- echo "2. Build the derivation and wait for it to fail with a hash mismatch"
- echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
- echo
-
- exit 1
- fi
- '' + ''
- unset cargoDepsCopy
- '';
-
configurePhase = args.configurePhase or ''
runHook preConfigure
runHook postConfigure
'';
- buildPhase = with builtins; args.buildPhase or ''
- ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
- runHook preBuild
-
- (
- set -x
- env \
- "CC_${rust.toRustTarget stdenv.buildPlatform}"="${ccForBuild}" \
- "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \
- "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \
- "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \
- cargo build -j $NIX_BUILD_CORES \
- ${lib.optionalString (buildType == "release") "--release"} \
- --target ${target} \
- --frozen ${concatStringsSep " " cargoBuildFlags}
- )
-
- runHook postBuild
-
- ${lib.optionalString (buildAndTestSubdir != null) "popd"}
-
- # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in
- # the pre/postBuild-hooks that need to be taken into account before gathering
- # all binaries to install.
- mkdir -p $tmpDir
- cp -r $releaseDir/* $tmpDir/
- bins=$(find $tmpDir \
- -maxdepth 1 \
- -type f \
- -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \))
- '';
-
- checkPhase = args.checkPhase or (let
- argstr = "${lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen";
- threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1";
- in ''
- ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
- runHook preCheck
- echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
- cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
- runHook postCheck
- ${lib.optionalString (buildAndTestSubdir != null) "popd"}
- '');
-
doCheck = args.doCheck or true;
strictDeps = true;
- inherit releaseDir tmpDir;
-
- installPhase = args.installPhase or ''
- runHook preInstall
-
- # rename the output dir to a architecture independent one
- mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${tmpDir}$')
- for target in "''${targets[@]}"; do
- rm -rf "$target/../../${buildType}"
- ln -srf "$target" "$target/../../"
- done
- mkdir -p $out/bin $out/lib
-
- xargs -r cp -t $out/bin <<< $bins
- find $tmpDir \
- -maxdepth 1 \
- -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
- -print0 | xargs -r -0 cp -t $out/lib
- rmdir --ignore-fail-on-non-empty $out/lib $out/bin
- runHook postInstall
- '';
-
passthru = { inherit cargoDeps; } // (args.passthru or {});
meta = {
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix b/third_party/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix
index c30e88d99b..3b36554e70 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/fetchCargoTarball.nix
@@ -21,7 +21,7 @@ in
, src ? null
, srcs ? []
, patches ? []
-, sourceRoot
+, sourceRoot ? ""
, hash ? ""
, sha256 ? ""
, cargoUpdateHook ? ""
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh
new file mode 100644
index 0000000000..54f4512d67
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -0,0 +1,35 @@
+declare -a cargoBuildFlags
+
+cargoBuildHook() {
+ echo "Executing cargoBuildHook"
+
+ runHook preBuild
+
+ if [ ! -z "${buildAndTestSubdir-}" ]; then
+ pushd "${buildAndTestSubdir}"
+ fi
+
+ (
+ set -x
+ env \
+ "CC_@rustBuildPlatform@=@ccForBuild@" \
+ "CXX_@rustBuildPlatform@=@cxxForBuild@" \
+ "CC_@rustTargetPlatform@=@ccForHost@" \
+ "CXX_@rustTargetPlatform@=@cxxForHost@" \
+ cargo build -j $NIX_BUILD_CORES \
+ --target @rustTargetPlatformSpec@ \
+ --frozen \
+ --${cargoBuildType} \
+ ${cargoBuildFlags}
+ )
+
+ if [ ! -z "${buildAndTestSubdir-}" ]; then
+ popd
+ fi
+
+ runHook postBuild
+
+ echo "Finished cargoBuildHook"
+}
+
+buildPhase=cargoBuildHook
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh
new file mode 100644
index 0000000000..8c5b1a1321
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh
@@ -0,0 +1,41 @@
+declare -a checkFlags
+
+cargoCheckHook() {
+ echo "Executing cargoCheckHook"
+
+ runHook preCheck
+
+ if [[ -n "${buildAndTestSubdir-}" ]]; then
+ pushd "${buildAndTestSubdir}"
+ fi
+
+ if [[ -z ${dontUseCargoParallelTests-} ]]; then
+ threads=$NIX_BUILD_CORES
+ else
+ threads=1
+ fi
+
+ argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen";
+
+ (
+ set -x
+ cargo test \
+ -j $NIX_BUILD_CORES \
+ ${argstr} -- \
+ --test-threads=${threads} \
+ ${checkFlags} \
+ ${checkFlagsArray+"${checkFlagsArray[@]}"}
+ )
+
+ if [[ -n "${buildAndTestSubdir-}" ]]; then
+ popd
+ fi
+
+ echo "Finished cargoCheckHook"
+
+ runHook postCheck
+}
+
+if [ -z "${checkPhase-}" ]; then
+ checkPhase=cargoCheckHook
+fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh
new file mode 100644
index 0000000000..e6ffa30070
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh
@@ -0,0 +1,49 @@
+cargoInstallPostBuildHook() {
+ echo "Executing cargoInstallPostBuildHook"
+
+ releaseDir=target/@shortTarget@/$cargoBuildType
+ tmpDir="${releaseDir}-tmp";
+
+ mkdir -p $tmpDir
+ cp -r ${releaseDir}/* $tmpDir/
+ bins=$(find $tmpDir \
+ -maxdepth 1 \
+ -type f \
+ -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \))
+
+ echo "Finished cargoInstallPostBuildHook"
+}
+
+cargoInstallHook() {
+ echo "Executing cargoInstallHook"
+
+ runHook preInstall
+
+ # rename the output dir to a architecture independent one
+
+ releaseDir=target/@shortTarget@/$cargoBuildType
+ tmpDir="${releaseDir}-tmp";
+
+ mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep "${tmpDir}$")
+ for target in "${targets[@]}"; do
+ rm -rf "$target/../../${cargoBuildType}"
+ ln -srf "$target" "$target/../../"
+ done
+ mkdir -p $out/bin $out/lib
+
+ xargs -r cp -t $out/bin <<< $bins
+ find $tmpDir \
+ -maxdepth 1 \
+ -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
+ -print0 | xargs -r -0 cp -t $out/lib
+ rmdir --ignore-fail-on-non-empty $out/lib $out/bin
+ runHook postInstall
+
+ echo "Finished cargoInstallHook"
+}
+
+
+if [ -z "${installPhase-}" ]; then
+ installPhase=cargoInstallHook
+ postBuildHooks+=(cargoInstallPostBuildHook)
+fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
new file mode 100644
index 0000000000..0fddd30582
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
@@ -0,0 +1,84 @@
+cargoSetupPostUnpackHook() {
+ echo "Executing cargoSetupPostUnpackHook"
+
+ # Some cargo builds include build hooks that modify their own vendor
+ # dependencies. This copies the vendor directory into the build tree and makes
+ # it writable. If we're using a tarball, the unpackFile hook already handles
+ # this for us automatically.
+ if [ -z $cargoVendorDir ]; then
+ unpackFile "$cargoDeps"
+ export cargoDepsCopy=$(stripHash $cargoDeps)
+ else
+ cargoDepsCopy="$sourceRoot/${cargoRoot:+$cargoRoot/}${cargoVendorDir}"
+ fi
+
+ if [ ! -d .cargo ]; then
+ mkdir .cargo
+ fi
+
+ config="$(pwd)/$cargoDepsCopy/.cargo/config";
+ if [[ ! -e $config ]]; then
+ config=@defaultConfig@
+ fi;
+
+ tmp_config=$(mktemp)
+ substitute $config $tmp_config \
+ --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
+ cat ${tmp_config} >> .cargo/config
+
+ cat >> .cargo/config <<'EOF'
+ @rustTarget@
+EOF
+
+ echo "Finished cargoSetupPostUnpackHook"
+}
+
+# After unpacking and applying patches, check that the Cargo.lock matches our
+# src package. Note that we do this after the patchPhase, because the
+# patchPhase may create the Cargo.lock if upstream has not shipped one.
+cargoSetupPostPatchHook() {
+ echo "Executing cargoSetupPostPatchHook"
+
+ cargoDepsLockfile="$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock"
+ srcLockfile="$NIX_BUILD_TOP/$sourceRoot/${cargoRoot:+$cargoRoot/}/Cargo.lock"
+
+ echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
+ if ! @diff@ $srcLockfile $cargoDepsLockfile; then
+
+ # If the diff failed, first double-check that the file exists, so we can
+ # give a friendlier error msg.
+ if ! [ -e $srcLockfile ]; then
+ echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile"
+ echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build."
+ exit 1
+ fi
+
+ if ! [ -e $cargoDepsLockfile ]; then
+ echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile"
+ exit 1
+ fi
+
+ echo
+ echo "ERROR: cargoSha256 is out of date"
+ echo
+ echo "Cargo.lock is not the same in $cargoDepsCopy"
+ echo
+ echo "To fix the issue:"
+ echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value'
+ echo "2. Build the derivation and wait for it to fail with a hash mismatch"
+ echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
+ echo
+
+ exit 1
+ fi
+
+ unset cargoDepsCopy
+
+ echo "Finished cargoSetupPostPatchHook"
+}
+
+postUnpackHooks+=(cargoSetupPostUnpackHook)
+
+if [ -z ${cargoVendorDir-} ]; then
+ postPatchHooks+=(cargoSetupPostPatchHook)
+fi
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix
new file mode 100644
index 0000000000..e8927e2b54
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix
@@ -0,0 +1,94 @@
+{ buildPackages
+, callPackage
+, cargo
+, diffutils
+, lib
+, makeSetupHook
+, maturin
+, rust
+, stdenv
+, target ? rust.toRustTargetSpec stdenv.hostPlatform
+}:
+
+let
+ targetIsJSON = lib.hasSuffix ".json" target;
+
+ # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168
+ # the "${}" is needed to transform the path into a /nix/store path before baseNameOf
+ shortTarget = if targetIsJSON then
+ (lib.removeSuffix ".json" (builtins.baseNameOf "${target}"))
+ else target;
+ ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
+ cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
+ ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
+ cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
+ rustBuildPlatform = rust.toRustTarget stdenv.buildPlatform;
+ rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform;
+ rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform;
+in {
+ cargoBuildHook = callPackage ({ }:
+ makeSetupHook {
+ name = "cargo-build-hook.sh";
+ deps = [ cargo ];
+ substitutions = {
+ inherit ccForBuild ccForHost cxxForBuild cxxForHost
+ rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;
+ };
+ } ./cargo-build-hook.sh) {};
+
+ cargoCheckHook = callPackage ({ }:
+ makeSetupHook {
+ name = "cargo-check-hook.sh";
+ deps = [ cargo ];
+ substitutions = {
+ inherit rustTargetPlatformSpec;
+ };
+ } ./cargo-check-hook.sh) {};
+
+ cargoInstallHook = callPackage ({ }:
+ makeSetupHook {
+ name = "cargo-install-hook.sh";
+ deps = [ ];
+ substitutions = {
+ inherit shortTarget;
+ };
+ } ./cargo-install-hook.sh) {};
+
+ cargoSetupHook = callPackage ({ }:
+ makeSetupHook {
+ name = "cargo-setup-hook.sh";
+ deps = [ ];
+ substitutions = {
+ defaultConfig = ../fetchcargo-default-config.toml;
+
+ # Specify the stdenv's `diff` by abspath to ensure that the user's build
+ # inputs do not cause us to find the wrong `diff`.
+ # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
+ diff = "${diffutils.nativeDrv or diffutils}/bin/diff";
+
+ # Target platform
+ rustTarget = ''
+ [target."${rust.toRustTarget stdenv.buildPlatform}"]
+ "linker" = "${ccForBuild}"
+ ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
+ [target."${shortTarget}"]
+ "linker" = "${ccForHost}"
+ ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
+ lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
+ "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ]
+ ''}
+ ''}
+ '';
+ };
+ } ./cargo-setup-hook.sh) {};
+
+ maturinBuildHook = callPackage ({ }:
+ makeSetupHook {
+ name = "maturin-build-hook.sh";
+ deps = [ cargo maturin ];
+ substitutions = {
+ inherit ccForBuild ccForHost cxxForBuild cxxForHost
+ rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;
+ };
+ } ./maturin-build-hook.sh) {};
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh
new file mode 100644
index 0000000000..7e2599d922
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh
@@ -0,0 +1,39 @@
+maturinBuildHook() {
+ echo "Executing maturinBuildHook"
+
+ runHook preBuild
+
+ if [ ! -z "${buildAndTestSubdir-}" ]; then
+ pushd "${buildAndTestSubdir}"
+ fi
+
+ (
+ set -x
+ env \
+ "CC_@rustBuildPlatform@=@ccForBuild@" \
+ "CXX_@rustBuildPlatform@=@cxxForBuild@" \
+ "CC_@rustTargetPlatform@=@ccForHost@" \
+ "CXX_@rustTargetPlatform@=@cxxForHost@" \
+ maturin build \
+ --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" \
+ --target @rustTargetPlatformSpec@ \
+ --manylinux off \
+ --strip \
+ --release \
+ ${maturinBuildFlags-}
+ )
+
+ runHook postBuild
+
+ if [ ! -z "${buildAndTestSubdir-}" ]; then
+ popd
+ fi
+
+ # Move the wheel to dist/ so that regular Python tooling can find it.
+ mkdir -p dist
+ mv target/wheels/*.whl dist/
+
+ echo "Finished maturinBuildHook"
+}
+
+buildPhase=maturinBuildHook
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-systemd-units.nix b/third_party/nixpkgs/pkgs/build-support/setup-systemd-units.nix
index 4fa2f42c39..4c7ee86669 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-systemd-units.nix
+++ b/third_party/nixpkgs/pkgs/build-support/setup-systemd-units.nix
@@ -58,7 +58,7 @@
unitDir=/etc/systemd/system
if [ ! -w "$unitDir" ]; then
- unitDir=/etc/systemd-mutable/system
+ unitDir=/nix/var/nix/profiles/default/lib/systemd/system
mkdir -p "$unitDir"
fi
declare -a unitsToStop unitsToStart
diff --git a/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix b/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix
index ffe5b0b458..efe70efe6c 100644
--- a/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/templaterpm/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation {
pname = "nix-template-rpm";
version = "0.1";
- buildInputs = [ makeWrapper python toposort rpm ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python toposort rpm ];
phases = [ "installPhase" "fixupPhase" ];
diff --git a/third_party/nixpkgs/pkgs/build-support/writers/test.nix b/third_party/nixpkgs/pkgs/build-support/writers/test.nix
index 7b7a698376..689b45a126 100644
--- a/third_party/nixpkgs/pkgs/build-support/writers/test.nix
+++ b/third_party/nixpkgs/pkgs/build-support/writers/test.nix
@@ -1,15 +1,13 @@
-{
- glib,
- haskellPackages,
- lib,
- nodePackages,
- perlPackages,
- python2Packages,
- python3Packages,
- runCommand,
- stdenv,
- writers,
- writeText
+{ glib
+, haskellPackages
+, lib
+, nodePackages
+, perlPackages
+, python2Packages
+, python3Packages
+, runCommand
+, writers
+, writeText
}:
with writers;
let
diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts.nix b/third_party/nixpkgs/pkgs/common-updater/scripts.nix
index 351db61988..26c77e8763 100644
--- a/third_party/nixpkgs/pkgs/common-updater/scripts.nix
+++ b/third_party/nixpkgs/pkgs/common-updater/scripts.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "common-updater-scripts";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
index a8f38b1a6c..f54df83219 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.09";
+ version = "5.10";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz";
+ sha256 = "sha256-dRAlNboRny8iP2dNhOHc2uvwpf/WObPC5ssKDjR2h2I=";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix
index dacfdfbcce..d737c9383f 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2.2.1";
+ version = "2.3.0";
in
fetchzip {
name = "3270font-${version}";
- url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip";
+ url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip";
- sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m";
+ sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index 95c223f31f..ee10c5bd18 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -10,7 +10,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "5.0.3";
+ version = "5.0.4";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index 77c9a7f1d7..10f8cc67c7 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,26 +1,26 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "1w1y543iypvhwx27qswkvhhiwzd3ik2jklapz2g497f3ppj834g4";
- iosevka-aile = "12dybqmcpq83xiw4k9m9fmkhj204sxb9hnqndb212vvgj3vbl0fm";
- iosevka-curly = "09rl8l9jkqhq811h35x15s4gssig0xrzvas154gg5igrdqha5kk8";
- iosevka-curly-slab = "19l13inmnaysz2mp7x4rh4zffa5n8qd3n727j54dd2581g9f0n9c";
- iosevka-etoile = "0flsdjdq0jsfblnazdw82kflzwvjvqaxzsyifgbn4flgjwy46mhm";
- iosevka-slab = "04wg7aklybwrbali53c22fs5xfgacyfkxw20bhnxqbfcsykriz11";
- iosevka-ss01 = "07a6ghjzk8kf266bgqv8khx54cxl2hfkqnjq6n5s3bbahbs3fh4x";
- iosevka-ss02 = "06prf0jigh1xi00lg46qw4kp416psv1xkijdpbvjkmxgmcbnqx2s";
- iosevka-ss03 = "03ga07y7nmcky3dschlk4cjg3lcxjqra6wvsb8q9vc39qz01cnxr";
- iosevka-ss04 = "0d17p18kbh78f4w0pvslh3r0a52d207dyp4njrqxnpzjn2w8w1kg";
- iosevka-ss05 = "1qh1z1kffid718h2mc0f6wygkwkpc1rlj29h2ljigv8kdp4kcik6";
- iosevka-ss06 = "0b6gn7j5qa23qpay08ri6z9jrqkcsb8m67d84bqs419rw0wdhmfr";
- iosevka-ss07 = "0f5bj8vn9frmmhg5b971gav7379xwlg439sm2vi79vjqlp5ls5gy";
- iosevka-ss08 = "0vqhywgly5w2j0nwmspa2ba7rk1n4jsb3lidngnpkpvpkr2w1n7z";
- iosevka-ss09 = "1ysb28qwqjkxissqsiz67l3fj5kflf94baxwjjvqqi67f72kq8m4";
- iosevka-ss10 = "11sdzyplb1bf8blzmj40brdnvy6z6yghvh91k27bf73rgdby7svk";
- iosevka-ss11 = "0jrn998c8jrkjw7sa429kkgpfp897gdbikr0j9sc5b0fyjci0qdx";
- iosevka-ss12 = "1qrnp3s3abxryi2nf8x4m5l7z83iklksr8mgwcxi07cfi8ix87jr";
- iosevka-ss13 = "0hs3m1vc3l54xj4flgyr8m4mklgqlzf3ffcvwlp8i4a5b9cdxczh";
- iosevka-ss14 = "112l7skaplmrn16h8lw5288ivcw1wm7mvilqrmdgswmvyxkpqdzg";
- iosevka-ss15 = "13bbgjmw20d1dr6h8ckc2zaq0bilx494g5p94a2ighdm5d4sbk4y";
- iosevka-ss16 = "180qfpp9ixjznk7srijbj1l2dzshb9wayqgvfmgqhl94fif23bja";
- iosevka-ss17 = "0f1r0zad32mdqgd0ik08q07ni46w6dm93npz633azn3l9ch6hd41";
+ iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k";
+ iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx";
+ iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx";
+ iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c";
+ iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi";
+ iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk";
+ iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w";
+ iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq";
+ iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59";
+ iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86";
+ iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz";
+ iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6";
+ iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr";
+ iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2";
+ iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd";
+ iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271";
+ iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i";
+ iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg";
+ iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5";
+ iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw";
+ iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k";
+ iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6";
+ iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw";
}
diff --git a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
index d7442b3452..146b832af9 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
@@ -58,15 +58,15 @@ in
stdenv.mkDerivation rec {
pname = "joypixels";
- version = "6.0.0";
+ version = "6.5.0";
src = assert !acceptLicense -> throwLicense;
with systemSpecific; fetchurl {
name = fontFile;
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = {
- darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn";
- }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s";
+ darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx";
+ }.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86";
};
dontUnpack = true;
@@ -82,9 +82,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The finest emoji you can use legally (formerly EmojiOne)";
longDescription = ''
- New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon
- designs and is 100% Unicode 13 compatible. We offer the largest selection
- of files ranging from png, svg, iconjar, sprites, and fonts.
+ Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon
+ designs and is 100% Unicode 13.1 compatible. We offer the largest
+ selection of files ranging from png, svg, iconjar, sprites, and fonts.
'';
homepage = "https://www.joypixels.com/fonts";
license =
diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
index 8774913c83..a096b49cbe 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix
@@ -1,22 +1,26 @@
{ lib, fetchzip }:
let
- version = "0.022";
+ version = "0.034";
+
in fetchzip {
name = "JuliaMono-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip";
- sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA=";
+ sha256 = "sha256:0xx3mhzs17baaich67kvwyzqg8h9ga11jrja2i8sxx4861dp1z85";
postFetch = ''
mkdir -p $out/share/fonts/truetype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
- meta = {
+ meta = with lib; {
description = "A monospaced font for scientific and technical computing";
- maintainers = with lib.maintainers; [ suhr ];
- platforms = with lib.platforms; all;
- homepage = "https://juliamono.netlify.app/";
- license = lib.licenses.ofl;
+ longDescription = ''
+ JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online).
+ '';
+ maintainers = with maintainers; [ suhr ];
+ platforms = with platforms; all;
+ homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/";
+ license = licenses.ofl;
};
}
diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
index d93e588540..530cfca742 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
@@ -4,7 +4,6 @@
, fetchFromGitHub
, fetchurl
, fetchzip
-, optipng
, cairo
, python3
, pkg-config
diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
index f5bd6335df..c43ff3a313 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder
, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
-, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml
+, defcon, fontmath, fontparts, fontpens, fonttools, lxml
, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
, pillow, six, bash, setuptools_scm }:
diff --git a/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix
index 2a2b237d52..d8eda3e923 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix
@@ -1,25 +1,25 @@
{ lib, fetchurl }:
let
- version = "2.1";
+ version = "2.2";
in fetchurl rec {
name = "scientifica-${version}";
- url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar";
+ url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar";
downloadToTemp = true;
recursiveHash = true;
- sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz";
+ sha256 = "sha256-mkZnuW+CB20t6MEpEeQR1CWkIUtqgVwrKN4sezQRaB4=";
postFetch = ''
- tar xvf $downloadedFile
+ tar xf $downloadedFile
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/fonts/misc
- cp scientifica/ttf/*.ttf $out/share/fonts/truetype
- cp scientifica/otb/*.otb $out/share/fonts/misc
- cp scientifica/bdf/*.bdf $out/share/fonts/misc
+ install scientifica/ttf/*.ttf $out/share/fonts/truetype
+ install scientifica/otb/*.otb $out/share/fonts/misc
+ install scientifica/bdf/*.bdf $out/share/fonts/misc
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix
new file mode 100644
index 0000000000..9288b9307f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
+
+stdenv.mkDerivation rec {
+ pname = "oranchelo-icon-theme";
+ version = "0.8.0.1";
+
+ src = fetchFromGitHub {
+ owner = "OrancheloTeam";
+ repo = pname;
+ rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d";
+ sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM=";
+ };
+
+ nativeBuildInputs = [
+ gtk3
+ ];
+
+ propagatedBuildInputs = [
+ plasma5Packages.breeze-icons
+ hicolor-icon-theme
+ ];
+
+ dontDropIconThemeCache = true;
+
+ installPhase = ''
+ mkdir -p $out/share/icons
+ cp -r $Oranchelo* $out/share/icons/
+ '';
+
+ meta = with lib; {
+ description = "Oranchelo icon theme";
+ homepage = "https://github.com/OrancheloTeam/oranchelo-icon-theme";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ _414owen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
index b18354910e..1d4c3866b4 100644
--- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
- version = "20210201";
+ version = "20210302";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
- sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M=";
+ sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0";
};
nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Papirus icon theme";
homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";
- license = licenses.lgpl3;
+ license = licenses.gpl3Only;
# darwin gives hash mismatch in source, probably because of file names differing only in case
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
diff --git a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix b/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
index caab674393..af8a157d49 100644
--- a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
@@ -1,13 +1,25 @@
-{ stdenv, fetchFromGitHub, imagemagick }:
+{ stdenv
+, fetchFromGitHub
+, imagemagick
+}:
stdenv.mkDerivation {
- name = "nixos-icons-2017-03-16";
- srcs = fetchFromGitHub {
+ pname = "nixos-icons";
+ version = "2021-02-24";
+
+ src = fetchFromGitHub {
owner = "NixOS";
repo = "nixos-artwork";
- rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b";
- sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a";
+ rev = "488c22aad523c709c44169d3e88d34b4691c20dc";
+ sha256 = "ZoanCzn4pqGB1fyMzMyGQVT0eIhNdL7ZHJSn1VZWVRs=";
};
- makeFlags = [ "DESTDIR=$(out)" "prefix=" ];
- nativeBuildInputs = [ imagemagick ];
+
+ nativeBuildInputs = [
+ imagemagick
+ ];
+
+ makeFlags = [
+ "DESTDIR=${placeholder "out"}"
+ "prefix="
+ ];
}
diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
index a75b2c1b65..6092d3faee 100644
--- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20210202";
+ version = "20210215";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs=";
+ sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix
index 122d0a4a65..6eea90c711 100644
--- a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "theme-jade1";
- version = "1.11";
+ version = "1.12";
src = fetchurl {
url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz";
- sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs";
+ sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
index f7f139a9ea..5297fe0568 100644
--- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
- version = "2021-01-12";
+ version = "2021-02-04";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr";
+ sha256 = "sha256-CDym+yqLu7QpqmdUpXAbJTCjQf/r9D1sl7ZdpaWaXFE=";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
index 7121aed9b1..29176c664c 100644
--- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
- version = "20.10.2";
+ version = "20.10.6.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
- sha256 = "0vxs17nbahrdix1q9xj06nflm344lfgj2mrafsvyfcr2isn61iv6";
+ sha256 = "0kcmxfz2rfav7aj5v1vv335vqzyj0n53lbhwx0g6gxxfi0x3vv6v";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10";
homepage = "https://github.com/ubuntu/yaru";
- license = with licenses; [ cc-by-sa-40 gpl3 ];
+ license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
platforms = platforms.linux;
maintainers = [ maintainers.jD91mZM2 ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
index c88c1e0f52..324ab865b1 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -33,14 +33,9 @@
let
- icon = fetchurl {
- url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg";
- sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk";
- };
-
override = substituteAll {
src = ./org.gnome.login-screen.gschema.override;
- inherit icon;
+ icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg";
};
in
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 98d87dc09c..603aaf1744 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -58,6 +58,7 @@
, shared-mime-info
, sound-theme-freedesktop
, tracker
+, tracker-miners
, tzdata
, udisks2
, upower
@@ -75,6 +76,7 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d";
};
+
# See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
prePatch = (import ../gvc-with-ucm-prePatch.nix {
inherit fetchFromGitLab;
@@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
clutter-gtk
colord
colord-gtk
+ epoxy
fontconfig
gdk-pixbuf
glib
@@ -121,6 +124,7 @@ stdenv.mkDerivation rec {
libgudev
libhandy
libkrb5
+ libnma
libpulseaudio
libpwquality
librsvg
@@ -131,13 +135,12 @@ stdenv.mkDerivation rec {
modemmanager
mutter # schemas for the keybindings
networkmanager
- libnma
polkit
samba
tracker
+ tracker-miners # for search locations dialog
udisks2
upower
- epoxy
];
patches = [
@@ -159,6 +162,11 @@ stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch";
sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU=";
})
+ # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch";
+ sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4=";
+ })
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
index 2b84442620..61f8761ce8 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, rustPlatform
, gettext
, meson
@@ -15,9 +16,11 @@
, gnome3
, libhandy
, librsvg
+, rustc
+, cargo
}:
-rustPlatform.buildRustPackage rec {
+stdenv.mkDerivation rec {
pname = "gnome-tour";
version = "3.38.0";
@@ -30,6 +33,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
appstream-glib
+ cargo
desktop-file-utils
gettext
glib # glib-compile-resources
@@ -37,6 +41,8 @@ rustPlatform.buildRustPackage rec {
ninja
pkg-config
python3
+ rustPlatform.cargoSetupHook
+ rustc
wrapGAppsHook
];
@@ -48,12 +54,6 @@ rustPlatform.buildRustPackage rec {
librsvg
];
- # Don't use buildRustPackage phases, only use it for rust deps setup
- configurePhase = null;
- buildPhase = null;
- checkPhase = null;
- installPhase = null;
-
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
index 7d143a061f..ad588be18c 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
@@ -2,18 +2,16 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-no-title-bar";
- version = "9";
+ version = "11";
src = fetchFromGitHub {
- owner = "franglais125";
+ owner = "poehlerj";
repo = "no-title-bar";
- rev = "v${version}";
- sha256 = "02zm61fg40r005fn2rvgrbsz2hbcsmp2hkhyilqbmpilw35y0nbq";
+ rev = "V_${version}";
+ sha256 = "07ddw47binlsbyvgy4xkdjvd40zyp7nwd17r6k7w54d50vmnwhvb";
};
- nativeBuildInputs = [
- glib gettext
- ];
+ nativeBuildInputs = [ glib gettext ];
patches = [
(substituteAll {
@@ -25,14 +23,13 @@ stdenv.mkDerivation rec {
makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
- uuid = "no-title-bar@franglais125.gmail.com";
+ uuid = "no-title-bar@jonaspoehler.de";
meta = with lib; {
description = "Integrates maximized windows with the top panel";
- homepage = "https://github.com/franglais125/no-title-bar";
+ homepage = "https://github.com/poehlerj/no-title-bar";
license = licenses.gpl2;
- broken = true; # https://github.com/franglais125/no-title-bar/issues/114
- maintainers = with maintainers; [ jonafato svsdep ];
+ maintainers = with maintainers; [ jonafato svsdep maxeaubrey ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
index 9a53d63860..fb2d3d57e5 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
@@ -1,24 +1,44 @@
+diff --git a/decoration.js b/decoration.js
+index d1ff3dd..ff4193f 100644
--- a/decoration.js
+++ b/decoration.js
-@@ -181,7 +181,7 @@
+@@ -223,7 +223,7 @@ var Decoration = class {
+
+ let winId = this._guessWindowXID(win);
+
+- let xprops = GLib.spawn_command_line_sync(`xprop -id ${winId}`);
++ let xprops = GLib.spawn_command_line_sync(`@xprop@ -id ${winId}`);
+ if (!xprops[0]) {
+ Utils.log_debug(`Unable to determine windows '${win.get_title()}' original state`);
+ return win._noTitleBarOriginalState = WindowState.UNKNOWN;
+@@ -237,7 +237,7 @@ var Decoration = class {
+ let prop = '_MOTIF_WM_HINTS';
+ let value = '0x2, 0x0, %s, 0x0, 0x0'.format(hide ? '0x2' : '0x1');
+
+- GLib.spawn_command_line_sync(`xprop -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`);
++ GLib.spawn_command_line_sync(`@xprop@ -id ${windId} -f ${prop} 32c -set ${prop} "${value}"`);
+ if (!hide && !win.titlebar_is_onscreen()) {
+ Utils.log_debug(`Shoving titlebar onscreen for window '${win.get_title()}'`);
+ win.shove_titlebar_onscreen();
+@@ -354,7 +354,7 @@ var Decoration = class {
let act = win.get_compositor_private();
let xwindow = act && act['x-window'];
if (xwindow) {
- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow));
+ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow));
if (xwininfo[0]) {
- let str = xwininfo[1].toString();
+ let str = ByteArray.toString(xwininfo[1]);
-@@ -207,7 +207,7 @@
+@@ -384,7 +384,7 @@ var Decoration = class {
// Try enumerating all available windows and match the title. Note that this
// may be necessary if the title contains special characters and `x-window`
// is not available.
- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST');
+ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST');
if (result[0]) {
- let str = result[1].toString();
+ let str = ByteArray.toString(result[1]);
-@@ -218,7 +218,7 @@
+@@ -395,7 +395,7 @@ var Decoration = class {
// For each window ID, check if the title matches the desired title.
for (var i = 0; i < windowList.length; ++i) {
@@ -27,30 +47,10 @@
let result = GLib.spawn_command_line_sync(cmd);
if (result[0]) {
-@@ -258,7 +258,7 @@
- }
-
- let id = this._guessWindowXID(win);
-- let cmd = 'xprop -id ' + id;
-+ let cmd = '@xprop@ -id ' + id;
-
- let xprops = GLib.spawn_command_line_sync(cmd);
- if (!xprops[0]) {
-@@ -277,7 +277,7 @@
- m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m);
- if (m) {
- let state = !!parseInt(m[2]);
-- cmd = ['xprop', '-id', id,
-+ cmd = ['@xprop@', '-id', id,
- '-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c',
- '-set', '_NO_TITLE_BAR_ORIGINAL_STATE',
- (state ? '0x1' : '0x0')];
-@@ -358,7 +358,7 @@
- let winXID = this._guessWindowXID(win);
- if (winXID == null)
- return;
-- let cmd = ['xprop', '-id', winXID,
-+ let cmd = ['@xprop@', '-id', winXID,
- '-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c',
- '-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED',
- (hide ? '0x1' : '0x0')];
+@@ -455,4 +455,4 @@ var Decoration = class {
+ let styleContent = this._updateUserStyles();
+ GLib.file_set_contents(this._userStylesPath, styleContent);
+ }
+-}
+\ No newline at end of file
++}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
index 0935bf521a..68d07e2d14 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }:
+{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-taskwhisperer";
diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix
index 8cc68b7556..8fe232dff7 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix
@@ -1,7 +1,7 @@
{ aspell, audiofile
, gsmakeDerivation
, cups
-, fetchurl
+, fetchurl, fetchpatch
, gmp, gnutls
, libffi, binutils-unwrapped
, libjpeg, libtiff, libpng, giflib, libungif
@@ -33,7 +33,13 @@ gsmakeDerivation {
portaudio
libiberty
];
- patches = [ ./fixup-paths.patch ];
+ patches = [
+ ./fixup-paths.patch
+ (fetchpatch { # for icu68 compatibility, remove with next update(?)
+ url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch";
+ sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852";
+ })
+ ];
meta = {
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix
index e945af64d9..8356a608c8 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnustep/gui/default.nix
@@ -1,4 +1,4 @@
-{ gsmakeDerivation, fetchurl, base }:
+{ gsmakeDerivation, fetchurl, fetchpatch, base }:
let
version = "0.28.0";
in
@@ -9,7 +9,13 @@ gsmakeDerivation {
sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z";
};
buildInputs = [ base ];
- patches = [ ./fixup-all.patch ];
+ patches = [
+ ./fixup-all.patch
+ (fetchpatch { # for icu68 compatibility, remove with next update(?)
+ url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch";
+ sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc";
+ })
+ ];
meta = {
description = "A GUI class library of GNUstep";
};
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index e45d25cfa3..38fcb8d40b 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
-, substituteAll
, desktop-file-utils
, pkg-config
, writeScript
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 2b0450928f..aade506483 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, gettext, kdoctools, python,
+ extra-cmake-modules, gettext, kdoctools,
cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
@@ -10,7 +10,7 @@
mkDerivation {
name = "xdg-desktop-portal-kde";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
- nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
+ nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
buildInputs = [
cups epoxy mesa pcre pipewire wayland wayland-protocols
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index 9a923025c9..fd59b173a7 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
+{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
mkXfceDerivation {
category = "apps";
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
index b0b4268db6..4e9732ce1c 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/wrapper.nix
@@ -5,7 +5,7 @@ symlinkJoin {
paths = [ thunar ] ++ thunarPlugins;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram "$out/bin/thunar" \
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix
index de8ae12b89..12f487f178 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix
@@ -102,8 +102,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### PANEL PLUGINS
- xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
-
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
deleted file mode 100644
index e35dc5922d..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
-stdenv.mkDerivation rec {
- pname = "vala-panel-appmenu-xfce";
- version = "0.6.94";
-
- src = "${fetchFromGitHub {
- owner = "rilian-la-te";
- repo = "vala-panel-appmenu";
- rev = version;
- fetchSubmodules = true;
-
- sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
- }}/subprojects/appmenu-gtk-module";
-
- nativeBuildInputs = [ cmake vala ];
- buildInputs = [ glib gtk2 gtk3 ];
-
- configurePhase = ''
- cmake . -DGTK3_INCLUDE_GDK=
- '';
- installPhase = ''
- make DESTDIR=output install
- cp -r output/var/empty/* "$out"
- '';
-
- meta = with lib; {
- description = "Port of the Unity GTK Module";
- license = licenses.lgpl3;
- maintainers = with maintainers; [ jD91mZM2 ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
deleted file mode 100644
index d8946c98a3..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2,
- glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
- xfce, libwnck3, libdbusmenu, gobject-introspection }:
-
-stdenv.mkDerivation rec {
- pname = "xfce4-vala-panel-appmenu-plugin";
- version = "0.7.3";
-
- src = fetchFromGitHub {
- owner = "rilian-la-te";
- repo = "vala-panel-appmenu";
- rev = version;
- fetchSubmodules = true;
-
- sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw";
- };
-
- nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ];
- buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
- glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
- at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
- libwnck3 libdbusmenu gobject-introspection ];
-
- patches = [
- (substituteAll {
- src = ./fix-bamf-dependency.patch;
- bamf = bamf;
- })
- ];
-
- cmakeFlags = [
- "-DENABLE_XFCE=ON"
- "-DENABLE_BUDGIE=OFF"
- "-DENABLE_VALAPANEL=OFF"
- "-DENABLE_MATE=OFF"
- "-DENABLE_JAYATANA=OFF"
- "-DENABLE_APPMENU_GTK_MODULE=OFF"
- ];
-
- preConfigure = ''
- mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
- '';
-
- passthru.updateScript = xfce.updateScript {
- inherit pname version;
- attrPath = "xfce.${pname}";
- versionLister = xfce.gitLister src.meta.homepage;
- };
-
- meta = with lib; {
- description = "Global Menu applet for XFCE4";
- license = licenses.lgpl3;
- maintainers = with maintainers; [ jD91mZM2 ];
- broken = true;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
deleted file mode 100644
index 1ed86a67f7..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-+++ source/cmake/FindBAMF.cmake 2018-05-11 17:03:44.385917811 +0200
-@@ -80,9 +80,7 @@
-
- find_program(BAMF_DAEMON_EXECUTABLE
- bamfdaemon
-- HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
-- ${CMAKE_INSTALL_FULL_LIBEXECDIR}
-- ${BAMF_LIBDIR}
-+ HINTS "@bamf@/libexec/bamf/"
- PATH_SUFFIXES bamf
- )
-
diff --git a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 4c440ab97d..2eff5e553e 100644
--- a/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
@@ -23,6 +23,7 @@
, glib
, pango
, gdk-pixbuf
+, gtk2
, libpng12
, expat
, freetype
@@ -56,7 +57,7 @@ let
gcc.cc.lib
gdk-pixbuf
glib
- gtk3
+ gtk2
libpng12
libusb-compat-0_1
pango
@@ -240,7 +241,7 @@ stdenv.mkDerivation rec {
patchelf --debug \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "${teensy_libpath}" \
- $out/share/arduino/hardware/tools/teensy
+ $out/share/arduino/hardware/tools/teensy{,_ports,_reboot,_restart,_serialmon}
''}
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix b/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix
index 7205a979e2..a8923879c0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"-C sources"
- "CC=${stdenv.cc}/bin/cc"
+ "CC=${stdenv.cc.targetPrefix}cc"
];
preInstall = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "A portable Forth compiler";
homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
license = licenses.lgpl3;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 0fcad6c333..ed8935b004 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -4,16 +4,31 @@ sourcePerArch:
, lib
, fetchurl
, autoPatchelfHook
+, makeWrapper
+# minimum dependencies
, alsaLib
-, freetype
, fontconfig
-, zlib
-, xorg
+, freetype
, libffi
+, xorg
+, zlib
+# runtime dependencies
+, cups
+# runtime dependencies for GTK+ Look and Feel
+, gtkSupport ? true
+, cairo
+, glib
+, gtk3
}:
let
cpuName = stdenv.hostPlatform.parsed.cpu.name;
+ runtimeDependencies = [
+ cups
+ ] ++ lib.optionals gtkSupport [
+ cairo glib gtk3
+ ];
+ runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
in
let result = stdenv.mkDerivation rec {
@@ -28,11 +43,19 @@ let result = stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
- xorg.libXi xorg.libXrender stdenv.cc.cc.lib
+ alsaLib # libasound.so wanted by lib/libjsound.so
+ fontconfig
+ freetype
+ stdenv.cc.cc.lib # libstdc++.so.6
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXtst
+ zlib
] ++ lib.optional stdenv.isAarch32 libffi;
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
@@ -57,6 +80,16 @@ let result = stdenv.mkDerivation rec {
cat <> "$out/nix-support/setup-hook"
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
+
+ # We cannot use -exec since wrapProgram is a function but not a command.
+ #
+ # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
+ # breaks building OpenJDK (#114495).
+ for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
+ if patchelf --print-interpreter "$bin" &> /dev/null; then
+ wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
+ fi
+ done
'';
preFixup = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
index efc94e4baf..d062c8605b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";
- version = "1.8.5";
+ version = "1.8.6";
src = fetchFromGitHub {
owner = "AdoptOpenJDK";
repo = "IcedTea-Web";
rev = "icedtea-web-${version}";
- sha256 = "sha256-AC6D6n8jLdATXIXrDTHhs2QFnIZNaaZvJyFEqfxCxYQ=";
+ sha256 = "sha256-meqbFLGwCMpFoOVAfvtriRAS8ZWr374eSN3m0CdC2aM=";
};
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix
index 2654cc467f..3799f2c921 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
rev = "15471e75f3d65b93150f414ebcaf59a03054b68d";
};
- buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool
- jdk perl ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ];
preConfigure = ''
cd aldor ;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
index 030da03add..a08ad91c4a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix
@@ -1,30 +1,28 @@
{ lib, stdenv, fetchFromGitHub, icestorm }:
-with builtins;
-
stdenv.mkDerivation rec {
pname = "arachne-pnr";
version = "2019.07.29";
src = fetchFromGitHub {
- owner = "yosyshq";
- repo = "arachne-pnr";
- rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
+ owner = "yosyshq";
+ repo = "arachne-pnr";
+ rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc";
};
enableParallelBuilding = true;
- makeFlags =
- [ "PREFIX=$(out)"
- "ICEBOX=${icestorm}/share/icebox"
- ];
+ makeFlags = [
+ "PREFIX=$(out)"
+ "ICEBOX=${icestorm}/share/icebox"
+ ];
- patchPhase = ''
+ postPatch = ''
substituteInPlace ./Makefile \
- --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}'
+ --replace 'echo UNKNOWN' 'echo ${lib.substring 0 10 src.rev}'
'';
- meta = {
+ meta = with lib; {
description = "Place and route tool for FPGAs";
longDescription = ''
Arachne-pnr implements the place and route step of
@@ -37,8 +35,8 @@ stdenv.mkDerivation rec {
the IceStorm [2] icepack command.
'';
homepage = "https://github.com/cseed/arachne-pnr";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ shell thoughtpolice ];
- platforms = lib.platforms.linux;
+ license = licenses.mit;
+ maintainers = with maintainers; [ shell thoughtpolice ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/default.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/default.nix
index 8d29c7c9a2..5445469b77 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/default.nix
@@ -1,4 +1,4 @@
-{ newScope } :
+{ lib, newScope } :
let
callPackage = newScope self;
@@ -18,4 +18,4 @@ let
egg2nix = callPackage ./egg2nix.nix { };
};
-in self
+in lib.recurseIntoAttrs self
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
index d2f2805ed7..422053ea9d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -1,4 +1,4 @@
-{ eggDerivation, fetchurl, chickenEggs }:
+{ lib, eggDerivation, fetchurl, chickenEggs }:
# Note: This mostly reimplements the default.nix already contained in
# the tarball. Is there a nicer way than duplicating code?
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
index 4c84ef8c42..10cf91579a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -18,7 +18,8 @@ in
stdenv.mkDerivation ({
name = "chicken-${name}";
propagatedBuildInputs = buildInputs;
- buildInputs = [ makeWrapper chicken ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ chicken ];
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/default.nix
index 8d29c7c9a2..5445469b77 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/default.nix
@@ -1,4 +1,4 @@
-{ newScope } :
+{ lib, newScope } :
let
callPackage = newScope self;
@@ -18,4 +18,4 @@ let
egg2nix = callPackage ./egg2nix.nix { };
};
-in self
+in lib.recurseIntoAttrs self
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 7102126206..a6d19eaeb1 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -17,7 +17,8 @@ in
stdenv.mkDerivation ({
name = "chicken-${name}";
propagatedBuildInputs = buildInputs;
- buildInputs = [ makeWrapper chicken ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ chicken ];
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
index 25cbbd4d01..0f4909f5e1 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }:
+{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }:
crystal.buildCrystalPackage rec {
pname = "crystal2nix";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
index fc5f478177..2c9999ccdb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/factor-lang/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
./fuel-dir.patch
];
- buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = with xorg; [ git rlwrap curl pkg-config perl
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM openssl unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
index 0b7ac64752..5cd0609960 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix
@@ -9,7 +9,7 @@
# 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
let
- version = "2.0.10-2";
+ version = "2.0.12";
# as of 2.0.10 a suffix is being added. That may or may not disappear and then
# come back, so just leave this here.
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
- sha256 = "sha256-ZNViZGjdJKMzKyBfOr0KWBq33hsGCi1X4hhkBmz9Q7c=";
+ sha256 = "sha256-umzvf4I6LSgWYimYLvySYDnUIxPEDiL+DGd2wT0AFbI=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
index 07b0921ec1..1502b09cca 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
- inherit version hostPlatform gnatboot langAda langGo;
+ inherit version hostPlatform gnatboot langAda langGo langJit;
};
dontDisableStatic = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
index fa7881e398..93c9dde61f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix
@@ -78,7 +78,11 @@ let majorVersion = "6";
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
- ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch;
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch {
+ url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb";
+ sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2";
+ });
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
index 2ea9033ba6..d9b4c639b5 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix
@@ -72,6 +72,10 @@ let majorVersion = "7";
})
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch {
+ url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb";
+ sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2";
+ })
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
index 4bdec26fd9..f7ec7b6ee2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -94,9 +94,6 @@ let
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ lib.optionals (targetPlatform.libc == "musl") [
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
);
@@ -147,6 +144,10 @@ let
(lib.enableFeature enablePlugin "plugin")
]
+ # Support -m32 on powerpc64le
+ ++ lib.optional (targetPlatform.system == "powerpc64le-linux")
+ "--enable-targets=powerpcle-linux"
+
# Optional features
++ lib.optional (isl != null) "--with-isl=${isl}"
++ lib.optionals (cloog != null) [
@@ -181,6 +182,9 @@ let
# On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld"
]
+ ++ lib.optional (targetPlatform.libc == "musl")
+ # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+ "--disable-libmpx"
++ lib.optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
"--disable-libsanitizer"
"--disable-symvers"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
index 4f72492923..b371cadb1d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
- version = "0.14.0";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ujQ7emfGhzpRGeZ6RGZ57hFX4aIflTcwE9IEUMYb/ZI=";
+ sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "sha256-/SudEQynLkLl7Y731Uqm9AkEugTCnq4PFFRQcwz+qL8=";
+ cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix
index 3060e6d4e5..92c1cbdfc1 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix
@@ -150,6 +150,13 @@ stdenv.mkDerivation rec {
./skip-nohup-tests.patch
./go_no_vendor_checks-1_14.patch
+ # support TZ environment variable starting with colon
+ (fetchpatch {
+ name = "tz-support-colon.patch";
+ url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch";
+ sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f";
+ })
+
# fix rare TestDontCacheBrokenHTTP2Conn failure
(fetchpatch {
url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix
index 1326310405..4432b1fe89 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix
@@ -158,6 +158,13 @@ stdenv.mkDerivation rec {
./skip-nohup-tests.patch
./skip-cgo-tests-1.15.patch
./go_no_vendor_checks.patch
+
+ # support TZ environment variable starting with colon
+ (fetchpatch {
+ name = "tz-support-colon.patch";
+ url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch";
+ sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f";
+ })
] ++ [
# breaks under load: https://github.com/golang/go/issues/25628
(if stdenv.isAarch32
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix
index 59f33db68c..87bf767f5b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
'';
maintainers = [ lib.maintainers.peti ];
- platforms = lib.platforms.gnu ++ lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
index 96ba9afc23..3a8fca2c1a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix
@@ -1,7 +1,37 @@
-{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath, Foundation, openssl }:
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, setJavaClassPath
+, makeWrapper
+# minimum dependencies
+, Foundation
+, alsaLib
+, fontconfig
+, freetype
+, glibc
+, openssl
+, perl
+, unzip
+, xorg
+, zlib
+# runtime dependencies
+, cups
+# runtime dependencies for GTK+ Look and Feel
+, gtkSupport ? true
+, cairo
+, glib
+, gtk3
+}:
let
platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64";
+ runtimeDependencies = [
+ cups
+ ] ++ lib.optionals gtkSupport [
+ cairo glib gtk3
+ ];
+ runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
common = javaVersion:
let
javaVersionPlatform = "${javaVersion}-${platform}";
@@ -50,7 +80,27 @@ let
url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar";
})
];
- nativeBuildInputs = [ unzip perl ];
+
+ buildInputs = lib.optionals stdenv.isLinux [
+ alsaLib # libasound.so wanted by lib/libjsound.so
+ fontconfig
+ freetype
+ openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so
+ stdenv.cc.cc.lib # libstdc++.so.6
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXtst
+ zlib
+ ];
+
+ # Workaround for libssl.so.10 wanted by TruffleRuby
+ # Resulting TruffleRuby cannot use `openssl` library.
+ autoPatchelfIgnoreMissingDeps = true;
+
+ nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ];
+
unpackPhase = ''
unpack_jar() {
jar=$1
@@ -136,32 +186,28 @@ let
dontStrip = true;
- # copy-paste openjdk's preFixup
preFixup = ''
+ # We cannot use -exec since wrapProgram is a function but not a
+ # command.
+ #
+ # jspawnhelper is executed from JVM, so it doesn't need to wrap it,
+ # and it breaks building OpenJDK (#114495).
+ for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do
+ if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then
+ wrapProgram "$bin" \
+ --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
+ fi
+ done
+
+ # copy-paste openjdk's preFixup
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
- '';
- postFixup = ''
- rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:$out/jre/languages/ruby/lib/cext";
- "11" = "$out/lib/jli:$out/lib/server:$out/lib:$out/languages/ruby/lib/cext";
- }.${javaVersion}
- }:${
- lib.makeLibraryPath [
- stdenv.cc.cc.lib # libstdc++.so.6
- zlib # libz.so.1
- ]}"
-
- ${lib.optionalString stdenv.isLinux ''
- for f in $(find $out -type f -perm -0100); do
- patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
- patchelf --set-rpath "$rpath" "$f" || true
- if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
- done
- ''}
+ find "$out" -name libfontmanager.so -exec \
+ patchelf --add-needed libfontconfig.so {} \;
'';
# $out/bin/native-image needs zlib to build native executables.
diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
index cd613c1b33..2ddc5b3d3a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix
@@ -12,7 +12,8 @@ in stdenv.mkDerivation {
};
propagatedBuildInputs = [ jre ] ;
- buildInputs = [ makeWrapper unzip ] ;
+ buildInputs = [ unzip ] ;
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
index 3a3e384ad9..2e03112d82 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -8,7 +8,7 @@ let
pname = "clang";
inherit version;
- src = fetch "clang" "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk";
+ src = fetch "clang" "12sm91qx2m79cvj75a9aazf2x8xybjbd593dv6v7rxficpq8i0ha";
inherit clang-tools-extra_src;
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
index 091f327550..c42e07eac4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix
@@ -11,7 +11,7 @@ in
stdenv.mkDerivation rec {
pname = "compiler-rt";
inherit version;
- src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8";
+ src = fetch pname "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy";
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
] ++ lib.optionals (stdenv.isDarwin) [
"-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
"-DCOMPILER_RT_BUILD_XRAY=OFF"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
index ca9ef4382b..e4d9f45c95 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
@@ -6,7 +6,7 @@
}:
let
- release_version = "11.0.1";
+ release_version = "11.1.0";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
@@ -17,7 +17,7 @@ let
inherit sha256;
};
- clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic";
+ clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n";
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
index 7a34977afe..6adb824f53 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
+{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
, enableShared ? !stdenv.hostPlatform.isStatic
}:
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
pname = "libc++";
inherit version;
- src = fetch "libcxx" "0gaybwkn76vhakvipxslp7pmv2wm7agxkqwk5f5aizhzc9lzdmcz";
+ src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv";
postUnpack = ''
unpackFile ${libcxxabi.src}
@@ -15,7 +15,14 @@ stdenv.mkDerivation {
mv llvm-* llvm
'';
- patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+ patches = [
+ (fetchpatch {
+ # Backported from LLVM 12, avoids clashes with commonly used "block.h" header.
+ url = "https://github.com/llvm/llvm-project/commit/19bc9ea480b60b607a3e303f20c7a3a2ea553369.patch";
+ sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78=";
+ stripLen = 1;
+ })
+ ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
index 22e4ac4abe..d941044ca6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libc++abi.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
pname = "libc++abi";
inherit version;
- src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa";
+ src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l";
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
index 1b5fe0f578..0c635cabc0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libunwind.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "libunwind";
inherit version;
- src = fetch pname "0zsixkaiwp007afxlpsf5dc7wfrv8sj9wxzjw6f1r4bjv1rv3cvd";
+ src = fetch pname "1vpqs2c358v8fbr1r8jmzkfqk12jllimjcfmgxga127ksq9b37nj";
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
index cead886f49..1a16184a6e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lld.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
pname = "lld";
inherit version;
- src = fetch pname "1dq82dkam8x2niha18v7ckh30zmzyclydzipqkf7h41r3ah0vfk0";
+ src = fetch pname "1kk61i7z5bi9i11rzsd2b388d42if1c7a45zkaa4mk0yps67hyh1";
nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
index fcc73cfdeb..2f54305736 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/lldb.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
pname = "lldb";
inherit version;
- src = fetch pname "1yzjbsn81l2r3v9js2fxrglkwvz1f2rxyxh6430nydbrs0bqklz8";
+ src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj";
patches = [ ./lldb-procfs.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
index 868da1a5b2..cb44643ff7 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
@@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec {
pname = "llvm";
inherit version;
- src = fetch pname "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c";
- polly_src = fetch "polly" "1smrqm9s0r2g9h0v0nil6y9wn2ih4l5bddk4dhgn538ngc7cxpq8";
+ src = fetch pname "199yq3a214avcbi4kk2q0ajriifkvsr0l2dkx3a666m033ihi1ff";
+ polly_src = fetch "polly" "031r23ijhx7v93a5n33m2nc0x9xyqmx0d8xg80z7q971p6qd63sq";
unpackPhase = ''
unpackFile $src
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
index 5503a98ae5..c99358cd28 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/openmp.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetch
+, fetchpatch
, cmake
, llvm
, perl
@@ -11,7 +12,16 @@ stdenv.mkDerivation rec {
pname = "openmp";
inherit version;
- src = fetch pname "19rcv25y41ww3zlfg0lwprzijl3cn7jgc0v5540jzpp7j0ds45ad";
+ src = fetch pname "0bh5cswgpc79awlq8j5i7hp355adaac7s6zaz0zwp6mkflxli1yi";
+
+ patches = [
+ # Fix compilation on aarch64-darwin, remove after the next release.
+ (fetchpatch {
+ url = "https://github.com/llvm/llvm-project/commit/7b5254223acbf2ef9cd278070c5a84ab278d7e5f.patch";
+ sha256 = "sha256-A+9/IVIoazu68FK5H5CiXcOEYe1Hpp4xTx2mIw7m8Es=";
+ stripLen = 1;
+ })
+ ];
nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
index 54a7733f4b..5f9dba0fc3 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
+{ lib, fetchFromGitHub, callPackage, wrapCCWith }:
let
version = "4.0.1";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix
index e063c4c092..c5e767a46c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mercury/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f";
};
- buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper
- readline ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ gcc flex bison texinfo jdk erlang readline ];
patchPhase = ''
# Fix calls to programs in /bin
diff --git a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix
index ab34f833d7..5de16633ed 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/";
license = licenses.bsd2;
maintainers = with maintainers; [ siraben ];
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mozart/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/mozart/binary.nix
index 8366fd77a4..b043187e6c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mozart/binary.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mozart/binary.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix b/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix
index 2e178f775b..aef02bca97 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
mkdir -p $out/bin $out/share/mu
cp -r lib $out/share/mu
- gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c
+ ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c
'';
installPhase = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/nickmqb/muon";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ];
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
index 27427e75d0..75b1a0f002 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
@@ -4,10 +4,10 @@
, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
let
- version = "1.4.2";
+ version = "1.4.4";
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
- sha256 = "0q8i56343b69f1bh48a8vxkqman9i2kscyj0lf017n3xfy1pb903";
+ sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
};
meta = with lib; {
@@ -156,13 +156,13 @@ let
nimble-unwrapped = stdenv.mkDerivation rec {
pname = "nimble-unwrapped";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v" + version;
- sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y";
+ sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
};
nativeBuildInputs = [ nim-unwrapped ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
deleted file mode 100644
index 5762bed41a..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.08.0.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, xlibsWrapper }:
-
-stdenv.mkDerivation rec {
- pname = "ocaml";
- version = "3.08.0";
-
- builder = ./builder.sh;
- src = fetchurl {
- url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
- sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
- };
- configureScript = ./configure-3.08.0;
- dontAddPrefix = "True";
- configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
- buildFlags = ["world" "bootstrap" "opt"];
- checkTarget = ["opt.opt"];
-
- meta = {
- platforms = lib.platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
deleted file mode 100644
index e3778457fd..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.10.0.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, xlibsWrapper, ncurses }:
-
-stdenv.mkDerivation (rec {
-
- pname = "ocaml";
- version = "3.10.0";
-
- src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
- sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
- };
-
- prefixKey = "-prefix ";
- configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
- buildFlags = [ "world" "bootstrap" "world.opt" ];
- buildInputs = [xlibsWrapper ncurses];
- installTargets = "install installopt";
- patchPhase = ''
- CAT=$(type -tp cat)
- sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
- '';
- postBuild = ''
- mkdir -p $out/include
- ln -sv $out/lib/ocaml/caml $out/include/caml
- '';
-
- meta = {
- homepage = "http://caml.inria.fr/ocaml";
- license = with lib.licenses; [ qpl lgpl2 ];
- description = "Most popular variant of the Caml language";
- platforms = lib.platforms.linux;
- };
-
-})
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
deleted file mode 100644
index 642b0d91b7..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.11.2.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv, fetchurl, ncurses, xlibsWrapper }:
-
-let
- useX11 = stdenv.isi686 || stdenv.isx86_64;
- useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
- inherit (lib) optionals optionalString;
-in
-
-stdenv.mkDerivation rec {
-
- pname = "ocaml";
- version = "3.11.2";
-
- src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
- sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
- };
-
- # Needed to avoid a SIGBUS on the final executable on mips
- NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
-
- patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ] ++
- [ (fetchurl {
- name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
- url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
- sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
- })
- ];
-
- prefixKey = "-prefix ";
- configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
- buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
- buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
- installTargets = "install" + optionalString useNativeCompilers " installopt";
- prePatch = ''
- CAT=$(type -tp cat)
- sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
- patch -p0 < ${./mips64.patch}
- '';
- postBuild = ''
- mkdir -p $out/include
- ln -sv $out/lib/ocaml/caml $out/include/caml
- '';
-
- meta = with lib; {
- homepage = "http://caml.inria.fr/ocaml";
- license = with licenses; [
- qpl /* compiler */
- lgpl2 /* library */
- ];
- description = "Most popular variant of the Caml language";
-
- longDescription =
- '' Objective Caml is the most popular variant of the Caml language.
- From a language standpoint, it extends the core Caml language with a
- fully-fledged object-oriented layer, as well as a powerful module
- system, all connected by a sound, polymorphic type system featuring
- type inference.
-
- The Objective Caml system is an industrial-strength implementation
- of this language, featuring a high-performance native-code compiler
- (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
- Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
- compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
- for quick development and portability. The Objective Caml
- distribution includes a comprehensive standard library, a replay
- debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
- generators, a pre-processor pretty-printer (camlp4) and a
- documentation generator (ocamldoc).
- '';
-
- platforms = with platforms; linux ++ darwin;
- };
-
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch b/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
deleted file mode 100644
index 4b867bbb1e..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nuar ocaml-3.12.1/configure ocaml-3.12.1-fix-configure/configure
---- ocaml-3.12.1/configure 2011-07-04 23:15:01.000000000 +0200
-+++ ocaml-3.12.1-fix-configure/configure 2012-06-06 22:20:40.000000000 +0200
-@@ -259,7 +259,7 @@
- bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
- mathlib="";;
- *,*-*-darwin*)
-- bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
-+ bytecccompopts="-fno-defer-pop $gcc_warnings"
- mathlib=""
- # Tell gcc that we can use 32-bit code addresses for threaded code
- # unless we are compiled for a shared library (-fPIC option)
-@@ -739,7 +739,7 @@
- *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
- if $arch64; then partialld="ld -r -arch ppc64"; fi;;
- *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
-- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
-+ amd64,gcc*,macosx,*) partialld="ld -r";;
- amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
- *,gcc*,*,*) nativecccompopts="$gcc_warnings";;
- esac
-@@ -752,8 +752,8 @@
- asppprofflags='-pg -DPROFILING';;
- alpha,*,*) as='as'
- aspp='gcc -c';;
-- amd64,*,macosx) as='as -arch x86_64'
-- aspp='gcc -arch x86_64 -c';;
-+ amd64,*,macosx) as='as'
-+ aspp='gcc -c';;
- amd64,*,solaris) as='as --64'
- aspp='gcc -m64 -c';;
- amd64,*,*) as='as'
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
deleted file mode 100644
index 781b5be098..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/3.12.1.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, ncurses, xlibsWrapper }:
-
-let
- useX11 = !stdenv.isAarch32 && !stdenv.isMips;
- useNativeCompilers = !stdenv.isMips;
- inherit (lib) optionals optionalString;
-in
-
-stdenv.mkDerivation rec {
-
- pname = "ocaml";
- version = "3.12.1";
-
- src = fetchurl {
- url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
- sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
- };
-
- prefixKey = "-prefix ";
- configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
- buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
- buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
- installTargets = "install" + optionalString useNativeCompilers " installopt";
- patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
- preConfigure = ''
- CAT=$(type -tp cat)
- sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
- '';
- postBuild = ''
- mkdir -p $out/include
- ln -sv $out/lib/ocaml/caml $out/include/caml
- '';
-
- passthru = {
- nativeCompilers = useNativeCompilers;
- };
-
- meta = with lib; {
- homepage = "http://caml.inria.fr/ocaml";
- branch = "3.12";
- license = with licenses; [
- qpl /* compiler */
- lgpl2 /* library */
- ];
- description = "Most popular variant of the Caml language";
-
- longDescription =
- ''
- OCaml is the most popular variant of the Caml language. From a
- language standpoint, it extends the core Caml language with a
- fully-fledged object-oriented layer, as well as a powerful module
- system, all connected by a sound, polymorphic type system featuring
- type inference.
-
- The OCaml system is an industrial-strength implementation of this
- language, featuring a high-performance native-code compiler (ocamlopt)
- for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
- Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
- and an interactive read-eval-print loop (ocaml) for quick development
- and portability. The OCaml distribution includes a comprehensive
- standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
- parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
- and a documentation generator (ocamldoc).
- '';
-
- platforms = with platforms; linux;
- };
-
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix
index afda859281..3e5aefc11f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.11.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "11";
- patch_version = "1";
- sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
+ patch_version = "2";
+ sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z";
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
index c422d2a15a..0662e66e0b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix
@@ -1,9 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "12";
- patch_version = "0-beta1";
- src = fetchTarball {
- url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz";
- sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm";
- };
+ patch_version = "0";
+ sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir";
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index 18440a718d..a24dca373f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
@@ -11,8 +11,8 @@
let
major = "11";
minor = "0";
- update = "9";
- build = "11";
+ update = "10";
+ build = "9";
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
@@ -22,7 +22,7 @@ let
owner = "openjdk";
repo = "jdk${major}u";
rev = "jdk-${version}";
- sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
+ sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
};
nativeBuildInputs = [ pkg-config autoconf ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix
index f9059ae2fc..655b29f653 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
-, ffmpeg_3, python, ruby }:
+, ffmpeg, python3, ruby }:
let
major = "15";
@@ -21,8 +21,8 @@ let
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
- nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+ nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 7a6cdf4d70..41f4befe46 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -83,11 +83,9 @@ let result = stdenv.mkDerivation rec {
sha256 = sha256.${stdenv.hostPlatform.system};
};
- nativeBuildInputs = [ file ]
+ nativeBuildInputs = [ file makeWrapper ]
++ lib.optional installjce unzip;
- buildInputs = [ makeWrapper ];
-
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
index 741d0ec7d1..6d7f05ebda 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
- version = "0.13.8";
+ version = "0.14.0";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
- sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391";
+ sha256 = "0dfnn5ar7zgvgvxcvw5f6vwpkgkwa017y07s7mvdv44zf4hzsj3s";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
- sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy";
+ sha256 = "1l3i7mxlzb2dkq6ff37rvnaarikxzxj0fg9i2kk26s8pz7vpqgjh";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
index c2415899f6..0feaabc92e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
# according to official documentation
- cc rasm_v*.c -O2 -lm -lrt -o rasm
+ ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm
'';
installPhase = ''
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
# use -n option to display all licenses
license = licenses.mit; # expat version
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix
index 770cc3415f..ce4250f675 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix
@@ -83,8 +83,8 @@ rec {
license = [ licenses.mit licenses.asl20 ];
};
- buildInputs = [ makeWrapper bash ]
- ++ lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security;
postPatch = ''
patchShebangs .
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
index 4b1f572beb..584b1fdbe4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -12,7 +12,8 @@ rec {
};
buildRustPackage = callPackage ../../../build-support/rust {
- inherit rustc cargo fetchCargoTarball;
+ inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
+ fetchCargoTarball rustc;
};
rustcSrc = callPackage ./rust-src.nix {
@@ -22,4 +23,9 @@ rec {
rustLibSrc = callPackage ./rust-lib-src.nix {
inherit rustc;
};
+
+ # Hooks
+ inherit (callPackage ../../../build-support/rust/hooks {
+ inherit cargo;
+ }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
index ee860d7825..aa55866def 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix
@@ -2,7 +2,7 @@
, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
pname = "rls";
inherit (rustPlatform.rust.rustc) src version;
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
preBuild = ''
# client tests are flaky
- rm tests/client.rs
+ rm ${buildAndTestSubdir}/tests/client.rs
'';
# a nightly compiler is required unless we use this cheat code.
@@ -28,8 +28,8 @@ rustPlatform.buildRustPackage {
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
- nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
+ nativeBuildInputs = [ pkg-config cmake makeWrapper ];
+ buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
index cb42235bc8..8bdbbadc9d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256;
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix
index 2e162ed5a2..11ae960a53 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix
@@ -22,11 +22,9 @@ stdenv.mkDerivation rec {
buildInputs = [texinfo];
- patchPhase = ''
+ postPatch = ''
echo '"${version}.nixos"' > version.lisp-expr
- pwd
-
# SBCL checks whether files are up-to-date in many places..
# Unfortunately, same timestamp is not good enough
sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
@@ -43,12 +41,6 @@ stdenv.mkDerivation rec {
# Fix the tests
sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
- # Use whatever `cc` the stdenv provides
- substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-
- substituteInPlace src/runtime/Config.x86-64-darwin \
- --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
''
+ (if purgeNixReferences
then
@@ -81,16 +73,24 @@ stdenv.mkDerivation rec {
optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
buildPhase = ''
+ runHook preBuild
+
sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
lib.concatStringsSep " "
(builtins.map (x: "--with-${x}") enableFeatures ++
builtins.map (x: "--without-${x}") disableFeatures)
}
(cd doc/manual ; make info)
+
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
+
INSTALL_ROOT=$out sh install.sh
+
+ runHook postInstall
''
+ lib.optionalString (!purgeNixReferences) ''
cp -r src $out/lib/sbcl
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
index 93eff278dc..a0a5f1a2b2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ jre ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
index b173de5804..66a634914d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty-bare.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ jre ncurses.dev ] ;
- buildInputs = [ makeWrapper ] ;
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix b/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
index 775a78a973..fbcbf4485a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs";
};
+ postPatch = ''
+ substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++'
+ '';
+
installPhase = ''
mkdir -p $out/bin
mv serpent $out/bin
@@ -33,6 +37,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
license = with licenses; [ wtfpl ];
maintainers = with maintainers; [ chris-martin ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
index 113b22768d..91eb9fc841 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4";
};
- buildInputs = [ cpio rsync makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ cpio rsync ];
unpackPhase = ''
${xar}/bin/xar -xf $src
diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix
index 0aee1ca1f3..218b207f24 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix
@@ -40,7 +40,8 @@ buildGoModule rec {
'';
subPackages = [ "." ];
- buildInputs = [ llvm clang-unwrapped makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ llvm clang-unwrapped ];
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
index f7e338cf43..8b74f46fd0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# Any packages that depend on the compiler have a transitive
# dependency on the Urn runtime support.
propagatedBuildInputs = [ urn-rt ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
index 5d891a6d19..2356f3cea6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix
@@ -33,13 +33,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
- version = "0.9+3905";
+ version = "0.9+3962";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
- rev = "4e741adda976260f620e5787d6db3cb28e0e35e7";
- sha256 = "0ml4c7vfzmivcc289d12m6ki82qdsg5wj00f2aamcvq1y7l4062x";
+ rev = "5d0cc54f5c36dea1d989438426a321b4554257c8";
+ sha256 = "1c85kga95lin6rcpr7cf80wr9f1a6irdrld9g23zmqdrxhick8y7";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix
index 2bc90539be..dd1660d9fe 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix
@@ -1,7 +1,24 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
-, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib
-, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg
-, swingSupport ? true }:
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, unzip
+, makeWrapper
+, setJavaClassPath
+, zulu
+# minimum dependencies
+, alsaLib
+, fontconfig
+, freetype
+, xorg
+# runtime dependencies
+, cups
+# runtime dependencies for GTK+ Look and Feel
+, gtkSupport ? stdenv.isLinux
+, cairo
+, glib
+, gtk3
+}:
let
version = "8.48.0.53";
@@ -14,14 +31,12 @@ let
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
extension = if stdenv.isDarwin then "zip" else "tar.gz";
- libraries = [
- stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype pango
- gtk2 cairo gdk-pixbuf atk
- ] ++ (lib.optionals swingSupport (with xorg; [
- xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
- xorg.libXt xorg.libXrender stdenv.cc.cc
- ]));
+ runtimeDependencies = [
+ cups
+ ] ++ lib.optionals gtkSupport [
+ cairo glib gtk3
+ ];
+ runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
@@ -33,26 +48,28 @@ in stdenv.mkDerivation {
sha256 = hash;
};
- buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip;
+ buildInputs = lib.optionals stdenv.isLinux [
+ alsaLib # libasound.so wanted by lib/libjsound.so
+ fontconfig
+ freetype
+ stdenv.cc.cc # libstdc++.so.6
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXtst
+ ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook makeWrapper
+ ] ++ lib.optionals stdenv.isDarwin [
+ unzip
+ ];
installPhase = ''
mkdir -p $out
cp -r ./* "$out/"
- jrePath="$out/jre"
-
- rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli
- rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server
- rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt
- rpath=$rpath''${rpath:+:}$jrePath/lib/amd64
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@@ -60,9 +77,19 @@ in stdenv.mkDerivation {
cat <> $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
+ '' + lib.optionalString stdenv.isLinux ''
+ # We cannot use -exec since wrapProgram is a function but not a command.
+ for bin in $( find "$out" -executable -type f ); do
+ if patchelf --print-interpreter "$bin" &> /dev/null; then
+ wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
+ fi
+ done
'';
- rpath = lib.strings.makeLibraryPath libraries;
+ preFixup = ''
+ find "$out" -name libfontmanager.so -exec \
+ patchelf --add-needed libfontconfig.so {} \;
+ '';
passthru = {
home = zulu;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix
index cbfa9997b8..c7b01877ad 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix
@@ -1,7 +1,25 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
-, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib
-, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib
-, swingSupport ? true }:
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, unzip
+, makeWrapper
+, setJavaClassPath
+, zulu
+# minimum dependencies
+, alsaLib
+, fontconfig
+, freetype
+, zlib
+, xorg
+# runtime dependencies
+, cups
+# runtime dependencies for GTK+ Look and Feel
+, gtkSupport ? stdenv.isLinux
+, cairo
+, glib
+, gtk3
+}:
let
version = "11.41.23";
@@ -14,14 +32,12 @@ let
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
extension = if stdenv.isDarwin then "zip" else "tar.gz";
- libraries = [
- stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL
- xorg.libXxf86vm alsaLib fontconfig freetype pango
- gtk2 cairo gdk-pixbuf atk zlib
- ] ++ (lib.optionals swingSupport (with xorg; [
- xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
- xorg.libXt xorg.libXrender stdenv.cc.cc
- ]));
+ runtimeDependencies = [
+ cups
+ ] ++ lib.optionals gtkSupport [
+ cairo glib gtk3
+ ];
+ runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
in stdenv.mkDerivation {
inherit version openjdk platform hash extension;
@@ -33,23 +49,29 @@ in stdenv.mkDerivation {
sha256 = hash;
};
- buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip;
+ buildInputs = lib.optionals stdenv.isLinux [
+ alsaLib # libasound.so wanted by lib/libjsound.so
+ fontconfig
+ freetype
+ stdenv.cc.cc # libstdc++.so.6
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXtst
+ zlib
+ ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook makeWrapper
+ ] ++ lib.optionals stdenv.isDarwin [
+ unzip
+ ];
installPhase = ''
mkdir -p $out
cp -r ./* "$out/"
- rpath=$rpath''${rpath:+:}$out/lib/jli
- rpath=$rpath''${rpath:+:}$out/lib/server
- rpath=$rpath''${rpath:+:}$out/lib
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@@ -57,9 +79,20 @@ in stdenv.mkDerivation {
cat <> $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
+ '' + lib.optionalString stdenv.isLinux ''
+ # We cannot use -exec since wrapProgram is a function but not a command.
+ #
+ # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
+ # breaks building OpenJDK (#114495).
+ for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
+ wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
+ done
'';
- rpath = lib.strings.makeLibraryPath libraries;
+ preFixup = ''
+ find "$out" -name libfontmanager.so -exec \
+ patchelf --add-needed libfontconfig.so {} \;
+ '';
passthru = {
home = zulu;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix
index dade163c52..81c6e546e9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "zz";
- version = "unstable-2021-01-26";
+ version = "unstable-2021-03-07";
- # commit chosen by using the latest build from http://bin.zetz.it/
+ # when updating, choose commit of the latest build on http://bin.zetz.it/
src = fetchFromGitHub {
owner = "zetzit";
repo = "zz";
- rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f";
- sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89";
+ rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4";
+ sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3";
};
nativeBuildInputs = [ makeWrapper ];
- cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg";
+ cargoSha256 = "0i3c459d4699z4dwvdw1495krdv3c2qpygrsw0cz3j0zd2n5gqj6";
postPatch = ''
# remove search path entry which would reference /build
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
- description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C";
+ description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C";
homepage = "https://github.com/zetzit/zz";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix
index 0a1b3a9a29..8a093a03d1 100644
--- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix
@@ -35,6 +35,8 @@
# IE: programs coupled with the compiler
, allowGoReference ? false
+, CGO_ENABLED ? go.CGO_ENABLED
+
, meta ? {}, ... } @ args:
@@ -75,11 +77,13 @@ let
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
buildInputs = buildInputs;
- inherit (go) GOOS GOARCH GO386 CGO_ENABLED;
+ inherit (go) GOOS GOARCH GO386;
GOHOSTARCH = go.GOHOSTARCH or null;
GOHOSTOS = go.GOHOSTOS or null;
+ inherit CGO_ENABLED;
+
GO111MODULE = "off";
GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 2f3ea3a453..441410ce13 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r";
+ sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -212,31 +212,11 @@ self: super: {
# base bound
digit = doJailbreak super.digit;
- # 2020-06-05: HACK: does not pass own build suite - `dontCheck` We should
- # generate optparse-applicative completions for the hnix executable. Sadly
- # building of the executable has been disabled for ghc < 8.10 in hnix.
- # Generating the completions should be activated again, once we default to
- # ghc 8.10.
- hnix = dontCheck (super.hnix.override {
-
- # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
- # https://github.com/haskell-nix/hnix-store/issues/104
- # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
- # the 0_4_0_0 is used
- hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
-
- });
-
- # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
- # https://github.com/haskell-nix/hnix-store/issues/104
- # Until unpin, which may hold off in time due to Stackage maintenence bottleneck
- # the 0_4_0_0 is used
- hnix-store-remote = (super.hnix-store-remote.override {
- hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
- });
+ # 2020-06-05: HACK: does not pass own build suite - `dontCheck`
+ hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
# https://github.com/haskell-nix/hnix-store/issues/127
- hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover;
+ hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover;
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@@ -684,8 +664,26 @@ self: super: {
'';
});
- # The standard libraries are compiled separately.
- idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);
+ # * The standard libraries are compiled separately.
+ # * We need multiple patches from master to fix compilation with
+ # updated dependencies (haskeline and megaparsec) which can be
+ # removed when the next idris release (1.3.4 probably) comes
+ # around.
+ idris = generateOptparseApplicativeCompletion "idris"
+ (doJailbreak (dontCheck
+ (appendPatches super.idris [
+ # compatibility with haskeline >= 0.8
+ (pkgs.fetchpatch {
+ url = "https://github.com/idris-lang/Idris-dev/commit/89a87cf666eb8b27190c779e72d0d76eadc1bc14.patch";
+ sha256 = "0fv493zlpgjsf57w0sncd4vqfkabfczp3xazjjmqw54m9rsfix35";
+ })
+ # compatibility with megaparsec >= 0.9
+ (pkgs.fetchpatch {
+ url = "https://github.com/idris-lang/Idris-dev/commit/6ea9bc913877d765048d7cdb7fc5aec60b196fac.patch";
+ sha256 = "0yms74d1xdxd1c08dnp45nb1ddzq54n6hqgzxx0r494wy614ir8q";
+ })
+ ])
+ ));
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;
@@ -845,8 +843,11 @@ self: super: {
# https://github.com/alphaHeavy/protobuf/issues/34
protobuf = dontCheck super.protobuf;
- # https://github.com/bos/text-icu/issues/32
- text-icu = dontCheck super.text-icu;
+ # Is this package still maintained? https://github.com/haskell/text-icu/issues/30
+ text-icu = overrideCabal super.text-icu (drv: {
+ doCheck = false; # https://github.com/bos/text-icu/issues/32
+ configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49
+ });
# aarch64 and armv7l fixes.
happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
@@ -968,8 +969,10 @@ self: super: {
# musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
- # dontCheck: printf double rounding behavior
- prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
+
+ # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate.
+ prettyprinter = dontCheck super.prettyprinter;
+ brittany = doJailbreak (dontCheck super.brittany); # Outdated upperbound on ghc-exactprint: https://github.com/lspitzner/brittany/issues/342
# Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73
hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch {
@@ -1408,16 +1411,8 @@ self: super: {
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
- haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) {
- # 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update
- preConfigure = ''
- substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0"
- '';
- };
+ haskell-language-server = dontCheck super.haskell-language-server;
- # 2021-02-08: Jailbreaking because of
- # https://github.com/haskell/haskell-language-server/issues/1329
- hls-tactics-plugin = doJailbreak super.hls-tactics-plugin;
# 2021-02-11: Jailbreaking because of syntax error on bound revision
hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
@@ -1492,13 +1487,6 @@ self: super: {
# Due to tests restricting base in 0.8.0.0 release
http-media = doJailbreak super.http-media;
- # Use an already merged upstream patch fixing the build with primitive >= 0.7.2
- # The version bounds were correctly specified before, so we need to jailbreak as well
- streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
- url = "https://github.com/composewell/streamly/commit/2c88cb631fdcb5c0d3a8bc936e1e63835800be9b.patch";
- sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
- });
-
# https://github.com/ekmett/half/issues/35
half = if pkgs.stdenv.isAarch64
then dontCheck super.half
@@ -1532,7 +1520,7 @@ self: super: {
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
- http-client = self.http-client_0_7_5;
+ http-client = self.http-client_0_7_6;
};
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
@@ -1591,4 +1579,27 @@ self: super: {
# Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8
yarn-lock = doJailbreak super.yarn-lock;
+
+ # Dependency to regex-tdfa-text can be removed for later regex-tdfa versions.
+ # Fix protolude compilation error by applying patch from pull-request.
+ # Override can be removed for the next release > 0.8.0.
+ yarn2nix = overrideCabal (super.yarn2nix.override {
+ regex-tdfa-text = null;
+ }) (attrs: {
+ jailbreak = true;
+ # remove dependency on regex-tdfa-text
+ # which has been merged into regex-tdfa
+ postPatch = ''
+ sed -i '/regex-tdfa-text/d' yarn2nix.cabal
+ '';
+ patches = (attrs.patches or []) ++ [
+ # fix a compilation error related to protolude 0.3
+ (pkgs.fetchpatch {
+ url = "https://github.com/Profpatsch/yarn2nix/commit/ca78cf06226819b2e78cb6cdbc157d27afb41532.patch";
+ sha256 = "1vkczwzhxilnp87apyb18nycn834y5nbw4yr1kpwlwhrhalvzw61";
+ includes = [ "*/ResolveLockfile.hs" ];
+ })
+ ];
+ });
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 60d3f42324..5e39a8047b 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -42,20 +42,13 @@ self: super: {
unix = null;
xhtml = null;
- # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the
- # hitherto unreleased next version from the '3.2' branch of the upstream git
- # repository for the time being.
- cabal-install = assert super.cabal-install.version == "3.2.0.0";
- overrideCabal super.cabal-install (drv: {
- postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
- version = "3.2.0.0-git";
- editedCabalFile = null;
- src = pkgs.fetchgit {
- url = "git://github.com/haskell/cabal.git";
- rev = "9bd4cc0591616aeae78e17167338371a2542a475";
- sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0";
- };
- });
+ cabal-install = super.cabal-install.override {
+ Cabal = super.Cabal_3_4_0_0;
+ hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
+ # Usung dontCheck to break test dependency cycles
+ edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
+ random = super.random_1_2_0;
+ };
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index b695c448be..bcce0bb897 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -102,4 +102,8 @@ self: super: {
vector = dontCheck super.vector;
mmorph = super.mmorph_1_1_3;
+
+ # https://github.com/haskellari/time-compat/issues/23
+ time-compat = dontCheck super.time-compat;
+
}
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 76f6971917..0a41a91aaa 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -43,19 +43,12 @@ self: super: {
unix = null;
xhtml = null;
- # Take the 3.4.x release candidate.
- cabal-install = assert super.cabal-install.version == "3.2.0.0";
- overrideCabal (doJailbreak super.cabal-install) (drv: {
- postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
- version = "cabal-install-3.4.0.0-rc4";
- editedCabalFile = null;
- src = pkgs.fetchgit {
- url = "git://github.com/haskell/cabal.git";
- rev = "cabal-install-3.4.0.0-rc4";
- sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk";
- };
- executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ];
- });
+ # Build cabal-install with the compiler's native Cabal.
+ cabal-install = (doJailbreak super.cabal-install).override {
+ # Use dontCheck to break test dependency cycles
+ edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
+ random = super.random_1_2_0;
+ };
# Jailbreaks & Version Updates
async = doJailbreak super.async;
@@ -87,10 +80,7 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch";
sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh";
});
- doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch {
- url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch";
- sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62";
- });
+ doctest = dontCheck (doJailbreak super.doctest_0_18_1);
generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch";
sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds";
@@ -99,10 +89,6 @@ self: super: {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
});
- regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch {
- url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
- sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";
- });
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e0fde52b01..ca8b927cc1 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -73,12 +73,15 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- - ghcide < 0.7.4 # for hls 0.9.0
- - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0
- - hls-plugin-api < 0.7.1.0 # for hls 0.9.0
- - hls-retrie-plugin < 0.1.1.1 # for hls 0.9.0
-
- # Stackage Nightly 2021-02-12
+ # Don't update yet to remain compatible with haskell-language-server-0.9.0.
+ - ghcide < 0.7.4
+ - hls-class-plugin < 1
+ - hls-explicit-imports-plugin < 0.1.0.1
+ - hls-haddock-comments-plugin < 1
+ - hls-plugin-api < 0.7.1.0
+ - hls-retrie-plugin < 0.1.1.1
+ - hls-tactics-plugin < 1
+ # Stackage Nightly 2021-03-01
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -88,11 +91,11 @@ default-package-overrides:
- ad ==4.4.1
- adjunctions ==4.4
- adler32 ==0.1.2.0
- - aeson ==1.5.5.1
+ - aeson ==1.5.6.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
- - aeson-combinators ==0.0.4.0
+ - aeson-combinators ==0.0.4.1
- aeson-commit ==1.3
- aeson-compat ==0.3.9
- aeson-default ==0.9.1.0
@@ -103,7 +106,7 @@ default-package-overrides:
- aeson-picker ==0.1.0.5
- aeson-pretty ==0.8.8
- aeson-qq ==0.8.3
- - aeson-schemas ==1.3.2
+ - aeson-schemas ==1.3.3
- aeson-with ==0.1.2.0
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.0
@@ -213,24 +216,24 @@ default-package-overrides:
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.20.0.1
- - amqp-utils ==0.4.5.0
+ - amqp-utils ==0.4.5.1
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.10.3
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- - ap-normalize ==0.1.0.0
- apecs ==0.9.2
- apecs-gloss ==0.2.4
- apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2
- api-maker ==0.1.0.0
- - app-settings ==0.2.0.12
+ - ap-normalize ==0.1.0.0
- appar ==0.1.8
- appendmap ==0.1.5
- - apply-refact ==0.9.0.0
+ - apply-refact ==0.9.1.0
- apportionment ==0.0.0.3
- - approximate ==0.3.2
+ - approximate ==0.3.4
- approximate-equality ==1.1.0.2
+ - app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- arbor-postgres ==0.0.5
- arithmoi ==0.11.0.1
@@ -239,12 +242,12 @@ default-package-overrides:
- ascii ==1.0.1.4
- ascii-case ==1.0.0.4
- ascii-char ==1.0.0.8
+ - asciidiagram ==1.3.3.3
- ascii-group ==1.0.0.4
- ascii-predicates ==1.0.0.4
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.4
- ascii-th ==1.0.0.4
- - asciidiagram ==1.3.3.3
- asif ==6.0.4
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
@@ -252,7 +255,7 @@ default-package-overrides:
- assert-failure ==0.1.2.5
- assoc ==1.0.2
- astro ==0.4.2.1
- - async ==2.2.2
+ - async ==2.2.3
- async-extra ==0.2.0.0
- async-pool ==0.9.1
- async-refresh ==0.3.0.0
@@ -267,13 +270,13 @@ default-package-overrides:
- attoparsec-iso8601 ==1.0.2.0
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- - aur ==7.0.5
- - aura ==3.2.2
+ - aur ==7.0.6
+ - aura ==3.2.3
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- - auto-update ==0.1.6
- autoexporter ==1.1.20
+ - auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0
- aws-cloudfront-signed-cookies ==0.2.0.6
@@ -281,25 +284,25 @@ default-package-overrides:
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.6
- barbies ==2.0.2.0
- - base-compat ==0.11.2
- - base-compat-batteries ==0.11.2
- - base-orphans ==0.8.4
- - base-prelude ==1.4
- - base-unicode-symbols ==0.2.4.2
- base16 ==0.3.0.1
- base16-bytestring ==0.1.1.7
- - base16-lens ==0.1.3.0
+ - base16-lens ==0.1.3.2
- base32 ==0.2.0.0
- - base32-lens ==0.1.0.0
+ - base32-lens ==0.1.1.1
- base32string ==0.9.1
- base58-bytestring ==0.1.0
- base58string ==0.10.0
- base64 ==0.4.2.3
- base64-bytestring ==1.1.0.0
- base64-bytestring-type ==1.0.1
- - base64-lens ==0.3.0
+ - base64-lens ==0.3.1
- base64-string ==0.2
+ - base-compat ==0.11.2
+ - base-compat-batteries ==0.11.2
- basement ==0.0.11
+ - base-orphans ==0.8.4
+ - base-prelude ==1.4
+ - base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
@@ -312,9 +315,9 @@ default-package-overrides:
- bibtex ==0.1.0.6
- bifunctors ==5.5.10
- bimap ==0.4.0
- - bimap-server ==0.1.0.1
- bimaps ==0.1.0.2
- - bin ==0.1
+ - bimap-server ==0.1.0.1
+ - bin ==0.1.1
- binary-conduit ==1.3.1
- binary-ext ==2.0.4
- binary-ieee754 ==0.1.0.0
@@ -323,7 +326,7 @@ default-package-overrides:
- binary-orphans ==1.0.1
- binary-parser ==0.5.6
- binary-parsers ==0.2.4.0
- - binary-search ==1.0.0.3
+ - binary-search ==2.0.0
- binary-shared ==0.8.3
- binary-tagged ==0.3
- bindings-DSL ==1.0.25
@@ -332,11 +335,11 @@ default-package-overrides:
- bindings-uname ==0.1
- bins ==0.1.2.0
- bitarray ==0.0.1.1
- - bits ==0.5.2
- - bits-extra ==0.0.2.0
+ - bits ==0.5.3
- bitset-word8 ==0.1.1.2
- - bitvec ==1.0.3.0
- - bitwise-enum ==1.0.0.3
+ - bits-extra ==0.0.2.0
+ - bitvec ==1.1.1.0
+ - bitwise-enum ==1.0.1.0
- blake2 ==0.3.0
- blanks ==0.5.0
- blas-carray ==0.1.0.1
@@ -360,8 +363,8 @@ default-package-overrides:
- boring ==0.1.3
- both ==0.1.1.1
- bound ==2.0.3
- - bounded-queue ==1.0.0
- BoundedChan ==1.0.3.0
+ - bounded-queue ==1.0.0
- boundingboxes ==0.2.3
- bower-json ==1.0.0.1
- boxes ==0.1.5
@@ -379,12 +382,12 @@ default-package-overrides:
- butcher ==1.3.3.2
- bv ==0.5
- bv-little ==1.1.1
- - byte-count-reader ==0.10.1.2
- - byte-order ==0.1.2.0
- byteable ==0.1.1
+ - byte-count-reader ==0.10.1.2
- bytedump ==1.0
+ - byte-order ==0.1.2.0
- byteorder ==1.0.4
- - bytes ==0.17
+ - bytes ==0.17.1
- byteset ==0.1.1.0
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
@@ -398,7 +401,6 @@ default-package-overrides:
- bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1
- c2hs ==0.28.7
- - ca-province-codes ==1.0.0.0
- cabal-appimage ==0.3.0.2
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
@@ -411,12 +413,13 @@ default-package-overrides:
- calendar-recycling ==0.0.0.1
- call-stack ==0.2.0
- can-i-haz ==0.3.1.0
+ - ca-province-codes ==1.0.0.0
- cardano-coin-selection ==1.0.1
- carray ==0.1.6.8
- casa-client ==0.0.1
- casa-types ==0.0.1
- - case-insensitive ==1.2.1.0
- cased ==0.1.0.0
+ - case-insensitive ==1.2.1.0
- cases ==0.1.4
- casing ==0.1.4.1
- cassava ==0.5.2.0
@@ -436,7 +439,7 @@ default-package-overrides:
- chan ==0.0.4.1
- ChannelT ==0.0.0.7
- character-cases ==0.1.0.6
- - charset ==0.3.7.1
+ - charset ==0.3.8
- charsetdetect-ae ==1.1.0.4
- Chart ==1.9.3
- chaselev-deque ==0.5.0.5
@@ -459,6 +462,7 @@ default-package-overrides:
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
+ - citeproc ==0.3.0.7
- clash-ghc ==1.2.5
- clash-lib ==1.2.5
- clash-prelude ==1.2.5
@@ -476,13 +480,13 @@ default-package-overrides:
- cmark ==0.6
- cmark-gfm ==0.2.2
- cmark-lucid ==0.1.0.0
- - cmdargs ==0.10.20
+ - cmdargs ==0.10.21
+ - codec-beam ==0.2.0
+ - codec-rpm ==0.2.2
+ - code-page ==0.2.1
- co-log ==0.4.0.1
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- - code-page ==0.2.1
- - codec-beam ==0.2.0
- - codec-rpm ==0.2.2
- Color ==0.3.0
- colorful-monoids ==0.2.1.3
- colorize-haskell ==1.0.1
@@ -491,12 +495,15 @@ default-package-overrides:
- combinatorial ==0.1.0.1
- comfort-array ==0.4
- comfort-graph ==0.0.3.1
+ - commonmark ==0.1.1.4
+ - commonmark-extensions ==0.2.0.4
+ - commonmark-pandoc ==0.2.0.1
- commutative ==0.0.2
- comonad ==5.0.8
- comonad-extras ==4.0.1
- compactmap ==0.1.4.2.1
- compdata ==0.12.1
- - compensated ==0.8.1
+ - compensated ==0.8.3
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
- composable-associations-aeson ==0.1.0.0
@@ -529,8 +536,8 @@ default-package-overrides:
- conferer-aeson ==1.0.0.0
- conferer-hspec ==1.0.0.0
- conferer-warp ==1.0.0.0
- - config-ini ==0.2.4.0
- ConfigFile ==1.1.4
+ - config-ini ==0.2.4.0
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- configurator-pg ==0.2.5
@@ -538,8 +545,8 @@ default-package-overrides:
- connection-pool ==0.2.2
- console-style ==0.0.2.1
- constraint ==0.1.4.0
- - constraint-tuples ==0.1.2
- constraints ==0.12
+ - constraint-tuples ==0.1.2
- construct ==0.3
- contravariant ==1.5.3
- contravariant-extras ==0.3.5.2
@@ -567,21 +574,22 @@ default-package-overrides:
- cron ==0.7.0
- crypto-api ==0.13.3
- crypto-cipher-types ==0.0.9
- - crypto-enigma ==0.1.1.6
- - crypto-numbers ==0.2.7
- - crypto-pubkey ==0.2.8
- - crypto-pubkey-types ==0.4.3
- - crypto-random ==0.0.9
- - crypto-random-api ==0.2.0
- cryptocompare ==0.1.2
+ - crypto-enigma ==0.1.1.6
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
- cryptohash-sha1 ==0.11.100.1
- cryptohash-sha256 ==0.11.102.0
+ - cryptohash-sha512 ==0.11.100.1
- cryptonite ==0.27
- cryptonite-conduit ==0.2.2
- cryptonite-openssl ==0.7
+ - crypto-numbers ==0.2.7
+ - crypto-pubkey ==0.2.8
+ - crypto-pubkey-types ==0.4.3
+ - crypto-random ==0.0.9
+ - crypto-random-api ==0.2.0
- csp ==1.4.0
- css-syntax ==0.1.0.0
- css-text ==0.1.3.0
@@ -618,6 +626,7 @@ default-package-overrides:
- data-default-instances-dlist ==0.0.1
- data-default-instances-old-locale ==0.0.1
- data-diverse ==4.7.0.0
+ - datadog ==0.2.5.0
- data-dword ==0.3.2
- data-endian ==0.1.1
- data-fix ==0.3.1
@@ -636,7 +645,6 @@ default-package-overrides:
- data-reify ==0.6.3
- data-serializer ==0.3.4.1
- data-textual ==0.3.0.3
- - datadog ==0.2.5.0
- dataurl ==0.1.0.0
- DAV ==1.3.4
- DBFunctor ==0.1.1.1
@@ -645,19 +653,19 @@ default-package-overrides:
- debian ==4.0.2
- debian-build ==0.10.2.0
- debug-trace-var ==0.2.0
- - dec ==0.0.3
+ - dec ==0.0.4
- Decimal ==0.5.1
- - declarative ==0.5.3
+ - declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- - deferred-folds ==0.9.15
+ - deferred-folds ==0.9.16
- dejafu ==2.4.0.1
- dense-linear-algebra ==0.1.0.0
- depq ==0.4.1.0
- deque ==0.4.3
- - derive-topdown ==0.0.2.2
- deriveJsonNoPrefix ==0.1.0.1
- - deriving-aeson ==0.2.6
+ - derive-topdown ==0.0.2.2
+ - deriving-aeson ==0.2.6.1
- deriving-compat ==0.5.10
- derulo ==1.0.10
- dhall ==1.38.0
@@ -665,17 +673,17 @@ default-package-overrides:
- dhall-json ==1.7.5
- dhall-lsp-server ==1.0.13
- dhall-yaml ==1.2.5
- - di-core ==1.0.4
- - di-monad ==1.3.1
- - diagrams-solve ==0.1.2
+ - diagrams-solve ==0.1.3
- dialogflow-fulfillment ==0.1.1.3
+ - di-core ==1.0.4
- dictionary-sharing ==0.1.0.0
- Diff ==0.4.0
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.3
- - direct-sqlite ==2.3.26
+ - di-monad ==1.3.1
- directory-tree ==0.12.1
+ - direct-sqlite ==2.3.26
- dirichlet ==0.1.0.2
- discount ==0.1.1
- disk-free-space ==0.1.0.1
@@ -687,8 +695,6 @@ default-package-overrides:
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==4.0.1
- - do-list ==1.0.1
- - do-notation ==0.1.0.2
- dockerfile ==0.2.0
- doclayout ==0.3
- doctemplates ==0.9
@@ -697,6 +703,8 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doldol ==0.4.1.2
+ - do-list ==1.0.1
+ - do-notation ==0.1.0.2
- dot ==0.3
- dotenv ==0.8.0.7
- dotgen ==0.4.3
@@ -717,7 +725,7 @@ default-package-overrides:
- Earley ==0.13.0.1
- easy-file ==0.2.2
- Ebnf2ps ==1.0.15
- - echo ==0.1.3
+ - echo ==0.1.4
- ecstasy ==0.2.1.0
- ed25519 ==0.0.5.0
- edit-distance ==0.2.2.1
@@ -736,24 +744,24 @@ default-package-overrides:
- elerea ==2.9.0
- elf ==0.30
- eliminators ==0.7
+ - elm2nix ==0.2.1
- elm-bridge ==0.6.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- - elm2nix ==0.2.1
- - elynx ==0.5.0.1
- - elynx-markov ==0.5.0.1
- - elynx-nexus ==0.5.0.1
- - elynx-seq ==0.5.0.1
- - elynx-tools ==0.5.0.1
- - elynx-tree ==0.5.0.1
+ - elynx ==0.5.0.2
+ - elynx-markov ==0.5.0.2
+ - elynx-nexus ==0.5.0.2
+ - elynx-seq ==0.5.0.2
+ - elynx-tools ==0.5.0.2
+ - elynx-tree ==0.5.0.2
- email-validate ==2.3.2.13
- emojis ==0.1
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
- entropy ==0.4.1.6
- - enum-subset-generate ==0.1.0.0
- enummapset ==0.6.0.3
- enumset ==0.0.5
+ - enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0
- envparse ==0.4.1
- envy ==2.1.0.0
@@ -767,33 +775,33 @@ default-package-overrides:
- error-or-utils ==0.1.1
- errors ==2.3.0
- errors-ext ==0.4.2
- - ersatz ==0.4.8
- - esqueleto ==3.4.0.1
+ - ersatz ==0.4.9
+ - esqueleto ==3.4.1.0
- essence-of-live-coding ==0.2.4
- essence-of-live-coding-gloss ==0.2.4
- essence-of-live-coding-pulse ==0.2.4
- essence-of-live-coding-quickcheck ==0.2.4
- etc ==0.4.1.0
- eve ==0.1.9.0
- - event-list ==0.1.2
- eventful-core ==0.2.0
- eventful-test-helpers ==0.2.0
+ - event-list ==0.1.2
- eventstore ==1.4.1
- every ==0.0.1
- exact-combinatorics ==0.2.0.9
- exact-pi ==0.5.0.1
- exception-hierarchy ==0.1.0.4
- exception-mtl ==0.4.0.1
+ - exceptions ==0.10.4
- exception-transformers ==0.4.0.9
- exception-via ==0.1.0.0
- - exceptions ==0.10.4
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
- exomizer ==1.0.0
- - exp-pairs ==0.2.1.0
- experimenter ==0.1.0.4
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10
+ - exp-pairs ==0.2.1.0
- express ==0.1.3
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
@@ -808,9 +816,10 @@ default-package-overrides:
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- fast-digits ==0.3.0.0
- - fast-logger ==3.0.2
+ - fast-logger ==3.0.3
- fast-math ==1.0.2
- fb ==2.1.1
+ - fclabels ==2.0.5
- feature-flags ==0.1.0.1
- fedora-dists ==1.1.2
- fedora-haskell-tools ==0.9
@@ -820,14 +829,14 @@ default-package-overrides:
- fgl ==5.7.0.3
- file-embed ==0.0.13.0
- file-embed-lzma ==0
- - file-modules ==0.1.2.4
- - file-path-th ==0.1.0.0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
+ - file-modules ==0.1.2.4
+ - file-path-th ==0.1.0.0
- filepattern ==0.1.2
- fileplow ==0.1.0.0
- filtrable ==0.1.4.0
- - fin ==0.1.1
+ - fin ==0.2
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
@@ -853,11 +862,11 @@ default-package-overrides:
- fn ==0.3.0.2
- focus ==1.0.2
- focuslist ==0.1.0.2
- - fold-debounce ==0.2.0.9
- - fold-debounce-conduit ==0.2.0.5
- foldable1 ==0.1.0.0
- - foldl ==1.4.10
- - folds ==0.7.5
+ - fold-debounce ==0.2.0.9
+ - fold-debounce-conduit ==0.2.0.6
+ - foldl ==1.4.11
+ - folds ==0.7.6
- follow-file ==0.0.3
- FontyFruity ==0.5.3.5
- foreign-store ==0.2
@@ -869,10 +878,10 @@ default-package-overrides:
- foundation ==0.0.25
- free ==5.1.5
- free-categories ==0.2.0.2
- - free-vl ==0.1.4
- freenect ==1.2.1
- freer-simple ==1.2.1.1
- freetype2 ==0.2.0
+ - free-vl ==0.1.4
- friendly-time ==0.4.1
- from-sum ==0.2.3.0
- frontmatter ==0.1.0.2
@@ -882,14 +891,14 @@ default-package-overrides:
- ftp-client-conduit ==0.5.0.5
- funcmp ==1.9
- function-builder ==0.3.0.1
- - functor-classes-compat ==1
+ - functor-classes-compat ==1.0.1
- fusion-plugin ==0.2.2
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
- fuzzy-dates ==0.1.1.2
- - fuzzy-time ==0.1.0.0
- fuzzyset ==0.2.0
+ - fuzzy-time ==0.1.0.0
- gauge ==0.2.5
- gd ==3000.7.3
- gdp ==0.0.3.0
@@ -905,9 +914,9 @@ default-package-overrides:
- generic-lens-core ==2.0.0.0
- generic-monoid ==0.1.0.1
- generic-optics ==2.0.0.0
- - generic-random ==1.3.0.1
- GenericPretty ==1.2.2
- - generics-sop ==0.5.1.0
+ - generic-random ==1.3.0.1
+ - generics-sop ==0.5.1.1
- generics-sop-lens ==0.2.0.1
- geniplate-mirror ==0.7.7
- genvalidity ==0.11.0.0
@@ -939,24 +948,24 @@ default-package-overrides:
- ghc-check ==0.5.0.3
- ghc-core ==0.5.6
- ghc-events ==0.15.1
- - ghc-exactprint ==0.6.3.4
+ - ghc-exactprint ==0.6.4
+ - ghcid ==0.8.7
+ - ghci-hexcalc ==0.1.1.0
+ - ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.4.20210206
- ghc-lib-parser ==8.10.4.20210206
- ghc-lib-parser-ex ==8.10.0.19
- ghc-parser ==0.2.2.0
- ghc-paths ==0.1.0.12
- - ghc-prof ==1.4.1.7
+ - ghc-prof ==1.4.1.8
- ghc-source-gen ==0.4.0.0
- ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4.1
- - ghc-trace-events ==0.1.2.1
+ - ghc-trace-events ==0.1.2.2
- ghc-typelits-extra ==0.4.2
- ghc-typelits-knownnat ==0.7.5
- - ghc-typelits-natnormalise ==0.7.3
+ - ghc-typelits-natnormalise ==0.7.4
- ghc-typelits-presburger ==0.5.2.0
- - ghci-hexcalc ==0.1.1.0
- - ghcid ==0.8.7
- - ghcjs-codemirror ==0.0.0.2
- ghost-buster ==0.1.1.0
- gi-atk ==2.0.22
- gi-cairo ==1.0.24
@@ -974,10 +983,9 @@ default-package-overrides:
- gi-gtk ==3.0.36
- gi-gtk-hs ==0.3.9
- gi-harfbuzz ==0.0.3
- - gi-pango ==1.0.23
- - gi-xlib ==2.0.9
- ginger ==0.10.1.0
- gingersnap ==0.3.1.0
+ - gi-pango ==1.0.23
- githash ==0.1.5.0
- github ==0.26
- github-release ==1.3.6
@@ -986,6 +994,7 @@ default-package-overrides:
- github-webhooks ==0.15.0
- gitlab-haskell ==0.2.5
- gitrev ==1.3.1
+ - gi-xlib ==2.0.9
- gl ==0.9
- glabrous ==2.0.2
- GLFW-b ==3.3.0.0
@@ -1000,11 +1009,11 @@ default-package-overrides:
- gothic ==0.1.5
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- - graph-wrapper ==0.2.6.0
- graphite ==0.10.0.1
- graphql-client ==1.1.0
- graphs ==0.7.1
- graphviz ==2999.20.1.0
+ - graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
- greskell ==1.2.0.1
- greskell-core ==0.1.3.6
@@ -1032,7 +1041,7 @@ default-package-overrides:
- HasBigDecimal ==0.1.1
- hasbolt ==0.1.4.4
- hashable ==1.3.0.0
- - hashable-time ==0.2.0.2
+ - hashable-time ==0.2.1
- hashids ==1.0.2.4
- hashing ==0.1.0.1
- hashmap ==1.3.3
@@ -1049,7 +1058,7 @@ default-package-overrides:
- haskell-src ==1.0.3.1
- haskell-src-exts ==1.23.1
- haskell-src-exts-util ==0.2.5
- - haskell-src-meta ==0.8.5
+ - haskell-src-meta ==0.8.7
- haskey-btree ==0.3.0.1
- hasql ==1.4.4.2
- hasql-notifications ==0.1.0.0
@@ -1057,7 +1066,7 @@ default-package-overrides:
- hasql-pool ==0.5.2
- hasql-queue ==1.2.0.2
- hasql-transaction ==1.0.0.1
- - hasty-hamiltonian ==1.3.3
+ - hasty-hamiltonian ==1.3.4
- HaTeX ==3.22.3.0
- HaXml ==1.25.5
- haxr ==3000.11.4.1
@@ -1085,12 +1094,10 @@ default-package-overrides:
- hexstring ==0.11.1
- hformat ==0.3.3.1
- hfsevents ==0.1.6
- - hgeometry ==0.11.0.0
- - hgeometry-combinatorial ==0.11.0.0
- hgrev ==0.2.6
- - hi-file-parser ==0.1.0.0
- hidapi ==0.1.5
- - hie-bios ==0.7.2
+ - hie-bios ==0.7.4
+ - hi-file-parser ==0.1.0.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
- hinfo ==0.0.3.0
@@ -1098,7 +1105,7 @@ default-package-overrides:
- hint ==0.9.0.3
- hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0
- - hkgr ==0.2.6.1
+ - hkgr ==0.2.7
- hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1
@@ -1110,7 +1117,6 @@ default-package-overrides:
- hmatrix-vector-sized ==0.1.3.0
- hmm-lapack ==0.4
- hmpfr ==0.4.4
- - hnix-store-core ==0.2.0.0
- hnock ==0.4.0
- hoauth2 ==1.16.0
- hocon ==0.1.0.4
@@ -1122,23 +1128,22 @@ default-package-overrides:
- hostname-validate ==1.0.0
- hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- - hp2pretty ==0.9
+ - hp2pretty ==0.10
- hpack ==0.34.4
- hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.1
- hpc-lcov ==1.0.1
- hprotoc ==2.4.17
- hruby ==0.3.8
- - hs-bibutils ==6.10.0.0
- - hs-functors ==0.1.7.1
- - hs-GeoIP ==0.3
- - hs-php-session ==0.0.9.3
- hsass ==0.8.0
+ - hs-bibutils ==6.10.0.0
- hsc2hs ==0.68.7
- hscolour ==1.24.4
- hsdns ==1.8
- hsebaysdk ==0.4.1.0
- hsemail ==2.2.1
+ - hs-functors ==0.1.7.1
+ - hs-GeoIP ==0.3
- hsini ==0.5.1.2
- hsinstall ==2.6
- HSlippyMap ==3.0.1
@@ -1172,6 +1177,7 @@ default-package-overrides:
- hspec-tables ==0.0.1
- hspec-wai ==0.10.1
- hspec-wai-json ==0.10.1
+ - hs-php-session ==0.0.9.3
- hsshellscript ==3.4.5
- HStringTemplate ==0.8.7
- HSvm ==0.1.1.3.22
@@ -1179,12 +1185,13 @@ default-package-overrides:
- HsYAML-aeson ==0.2.0.0
- hsyslog ==5.0.2
- htaglib ==1.2.0
- - HTF ==0.14.0.5
+ - HTF ==0.14.0.6
- html ==1.0.1.2
- html-conduit ==1.3.2.1
- html-entities ==1.1.4.3
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
+ - http2 ==2.0.5
- HTTP ==4000.3.15
- http-api-data ==0.4.1.1
- http-client ==0.6.4.1
@@ -1192,18 +1199,17 @@ default-package-overrides:
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.1
- - http-conduit ==2.3.7.4
- - http-date ==0.0.10
+ - http-conduit ==2.3.8
+ - http-date ==0.0.11
- http-directory ==0.1.8
- http-download ==0.2.0.0
+ - httpd-shed ==0.4.1.1
- http-link-header ==1.0.3.1
- http-media ==0.8.0.0
- - http-query ==0.1.0
+ - http-query ==0.1.0.1
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.7.2
- http-types ==0.12.3
- - http2 ==2.0.5
- - httpd-shed ==0.4.1.1
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.1.0
- HUnit-approx ==1.1.1.1
@@ -1216,6 +1222,7 @@ default-package-overrides:
- hw-conduit-merges ==0.2.1.0
- hw-diagnostics ==0.0.1.0
- hw-dsv ==0.4.1.0
+ - hweblib ==0.6.3
- hw-eliasfano ==0.1.2.0
- hw-excess ==0.2.3.0
- hw-fingertree ==0.1.2.0
@@ -1240,7 +1247,6 @@ default-package-overrides:
- hw-string-parse ==0.0.0.4
- hw-succinct ==0.1.0.1
- hw-xml ==0.5.1.0
- - hweblib ==0.6.3
- hxt ==9.3.1.21
- hxt-charproperties ==9.5.0.0
- hxt-css ==0.1.0.3
@@ -1252,8 +1258,8 @@ default-package-overrides:
- hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.2
- hyper ==0.2.1.0
- - hyperloglog ==0.4.3
- - hyphenation ==0.8
+ - hyperloglog ==0.4.4
+ - hyphenation ==0.8.1
- iconv ==0.4.1.3
- identicon ==0.2.2
- ieee754 ==0.8.0
@@ -1277,7 +1283,7 @@ default-package-overrides:
- indexed-traversable ==0.1.1
- infer-license ==0.2.0
- inflections ==0.4.0.6
- - influxdb ==1.9.0
+ - influxdb ==1.9.1
- ini ==0.4.1
- inj ==1.0
- inline-c ==0.9.1.4
@@ -1285,19 +1291,19 @@ default-package-overrides:
- inline-r ==0.10.4
- inliterate ==0.1.0
- input-parsers ==0.1.0.1
- - insert-ordered-containers ==0.2.3.1
- - inspection-testing ==0.4.2.4
+ - insert-ordered-containers ==0.2.4
+ - inspection-testing ==0.4.3.0
- instance-control ==0.1.2.0
- integer-logarithms ==1.0.3.1
- integer-roots ==1.0
- integration ==0.2.1
- - intern ==0.9.3
+ - intern ==0.9.4
- interpolate ==0.2.1
- interpolatedstring-perl6 ==1.0.2
- interpolation ==0.1.1.1
- interpolator ==1.1.0.2
- IntervalMap ==0.6.1.2
- - intervals ==0.9.1
+ - intervals ==0.9.2
- intro ==0.9.0.0
- intset-imperative ==0.1.0.0
- invariant ==0.5.4
@@ -1324,16 +1330,16 @@ default-package-overrides:
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
- iso8601-time ==0.1.5
- - it-has ==0.2.0.0
- iterable ==3.0
- - ix-shapable ==0.1.0
+ - it-has ==0.2.0.0
- ixset-typed ==0.5
- ixset-typed-binary-instance ==0.1.0.2
- ixset-typed-conversions ==0.1.2.0
- ixset-typed-hashable-instance ==0.1.0.2
+ - ix-shapable ==0.1.0
- jack ==0.7.1.4
- jalaali ==1.0.0.0
- - jira-wiki-markup ==1.3.2
+ - jira-wiki-markup ==1.3.3
- jose ==0.8.4
- jose-jwt ==0.9.0
- js-chart ==2.9.4.1
@@ -1341,9 +1347,9 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json-feed ==1.0.12
+ - jsonpath ==0.2.0.0
- json-rpc ==1.0.3
- json-rpc-generic ==0.2.1.5
- - jsonpath ==0.2.0.0
- JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.4.1
@@ -1351,7 +1357,7 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.10.0
- - kan-extensions ==5.2.1
+ - kan-extensions ==5.2.2
- kanji ==3.4.1
- katip ==0.8.5.0
- katip-logstash ==0.1.0.0
@@ -1376,7 +1382,7 @@ default-package-overrides:
- language-bash ==0.9.2
- language-c ==0.8.3
- language-c-quote ==0.12.2.1
- - language-docker ==9.1.2
+ - language-docker ==9.1.3
- language-java ==0.2.9
- language-javascript ==0.7.1.0
- language-protobuf ==1.0.1
@@ -1393,23 +1399,23 @@ default-package-overrides:
- lawful ==0.1.0.0
- lazy-csv ==0.5.1
- lazyio ==0.1.0.4
- - lca ==0.3.1
+ - lca ==0.4
- leancheck ==0.9.3
- leancheck-instances ==0.0.4
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.5
- lens ==4.19.2
- - lens-action ==0.2.4
- - lens-aeson ==1.1
+ - lens-action ==0.2.5
+ - lens-aeson ==1.1.1
- lens-csv ==0.1.1.0
- lens-datetime ==0.3
- lens-family ==2.0.0
- lens-family-core ==2.0.0
- - lens-family-th ==0.5.1.0
+ - lens-family-th ==0.5.2.0
- lens-misc ==0.0.2.0
- lens-process ==0.4.0.0
- lens-properties ==4.11.1
- - lens-regex ==0.1.1
+ - lens-regex ==0.1.3
- lens-regex-pcre ==1.1.0.0
- lenz ==0.4.2.0
- leveldb-haskell ==0.6.5
@@ -1422,22 +1428,22 @@ default-package-overrides:
- libyaml ==0.1.2
- LibZip ==1.0.1
- life-sync ==1.1.1.0
- - lift-generics ==0.2
- - lifted-async ==0.10.1.2
+ - lifted-async ==0.10.1.3
- lifted-base ==0.2.3.12
+ - lift-generics ==0.2
- line ==4.0.1
- - linear ==1.21.4
+ - linear ==1.21.5
- linear-circuit ==0.1.0.2
- linenoise ==0.3.2
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- liquid-fixpoint ==0.8.10.2
- List ==0.6.2
+ - ListLike ==4.7.4
- list-predicate ==0.1.0.1
+ - listsafe ==0.1.0.1
- list-singleton ==1.0.0.5
- list-t ==1.0.4
- - ListLike ==4.7.4
- - listsafe ==0.1.0.1
- ListTree ==0.2.3
- little-logger ==0.3.1
- little-rio ==0.2.2
@@ -1449,7 +1455,7 @@ default-package-overrides:
- locators ==0.3.0.3
- loch-th ==0.2.2
- lockfree-queue ==0.2.3.1
- - log-domain ==0.13
+ - log-domain ==0.13.1
- logfloat ==0.13.3.3
- logging ==3.0.5
- logging-facade ==0.3.0
@@ -1460,18 +1466,18 @@ default-package-overrides:
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lsp-test ==0.11.0.5
- - lucid ==2.9.12
+ - lucid ==2.9.12.1
- lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2
- lukko ==0.1.1.3
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
- lzma-conduit ==1.2.1
- - machines ==0.7.1
+ - machines ==0.7.2
- magic ==1.1
- magico ==0.0.2.1
- - main-tester ==0.2.0.1
- mainland-pretty ==0.7.0.1
+ - main-tester ==0.2.0.1
- makefile ==1.1.0.0
- managed ==1.0.8
- MapWith ==0.2.0.0
@@ -1483,9 +1489,9 @@ default-package-overrides:
- massiv-persist ==0.1.0.0
- massiv-serialise ==0.1.0.0
- massiv-test ==0.1.6.1
+ - mathexpr ==0.3.0.0
- math-extras ==0.1.1.0
- math-functions ==0.3.4.1
- - mathexpr ==0.3.0.0
- matplotlib ==0.7.5
- matrices ==0.5.0
- matrix ==0.3.6.1
@@ -1497,9 +1503,9 @@ default-package-overrides:
- mbox-utility ==0.0.3.1
- mcmc ==0.4.0.0
- mcmc-types ==1.0.3
- - med-module ==0.1.2.1
- medea ==1.2.0
- median-stream ==0.7.0.0
+ - med-module ==0.1.2.1
- megaparsec ==9.0.1
- megaparsec-tests ==9.0.1
- membrain ==0.0.0.2
@@ -1525,15 +1531,15 @@ default-package-overrides:
- midair ==0.2.0.1
- midi ==0.2.2.2
- mighty-metropolis ==2.0.0
- - mime-mail ==0.5.0
+ - mime-mail ==0.5.1
- mime-mail-ses ==0.4.3
- mime-types ==0.1.0.9
- - min-max-pqueue ==0.1.0.2
- mini-egison ==1.0.0
- minimal-configuration ==0.1.4
- minimorph ==0.3.0.0
- minio-hs ==1.5.3
- miniutter ==0.5.1.1
+ - min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.3.0
@@ -1543,20 +1549,22 @@ default-package-overrides:
- mmark ==0.0.7.2
- mmark-cli ==0.0.5.0
- mmark-ext ==0.2.1.2
- - mmorph ==1.1.4
+ - mmorph ==1.1.5
- mnist-idx ==0.1.2.8
- - mock-time ==0.1.0
- mockery ==0.3.5
+ - mock-time ==0.1.0
- mod ==0.1.2.1
- model ==0.5
- - modern-uri ==0.3.3.1
+ - modern-uri ==0.3.4.0
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
- monad-control-aligned ==0.0.1.1
- - monad-coroutine ==0.9.0.4
+ - monad-coroutine ==0.9.1
- monad-extras ==0.6.0
+ - monadic-arrays ==0.2.2
- monad-journal ==0.8.1
+ - monadlist ==0.0.2
- monad-logger ==0.3.36
- monad-logger-json ==0.1.0.0
- monad-logger-logstash ==0.1.0.0
@@ -1565,28 +1573,26 @@ default-package-overrides:
- monad-memo ==0.5.3
- monad-metrics ==0.2.2.0
- monad-par ==0.3.5
+ - monad-parallel ==0.7.2.4
- monad-par-extras ==0.3.3
- - monad-parallel ==0.7.2.3
- monad-peel ==0.2.1.2
- monad-primitive ==0.1
- monad-products ==4.0.1
+ - MonadPrompt ==1.0.0.5
+ - MonadRandom ==0.5.2
- monad-resumption ==0.1.4.0
- monad-skeleton ==0.1.5
- monad-st ==0.2.4.1
+ - monads-tf ==0.1.0.3
- monad-time ==0.3.1.0
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1
- - monadic-arrays ==0.2.2
- - monadlist ==0.0.2
- - MonadPrompt ==1.0.0.5
- - MonadRandom ==0.5.2
- - monads-tf ==0.1.0.3
- mongoDB ==2.7.0.0
+ - monoid-subclasses ==1.0.1
+ - monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0
- - monoid-subclasses ==1.0.1
- - monoid-transformer ==0.0.4
- more-containers ==0.2.2.0
- morpheus-graphql ==0.16.0
- morpheus-graphql-client ==0.16.0
@@ -1599,14 +1605,14 @@ default-package-overrides:
- mpi-hs-cereal ==0.1.0.0
- mtl-compat ==0.2.2
- mtl-prelude ==2.0.3.1
- - multi-containers ==0.1.1
- multiarg ==0.30.0.10
+ - multi-containers ==0.1.1
- multimap ==1.2.1
- multipart ==0.2.1
- multiset ==0.3.4.3
- multistate ==0.8.0.3
- - murmur-hash ==0.1.0.9
- murmur3 ==1.0.4
+ - murmur-hash ==0.1.0.9
- MusicBrainz ==0.4.1
- mustache ==2.3.1
- mutable-containers ==0.3.4
@@ -1631,7 +1637,7 @@ default-package-overrides:
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1
- - netpbm ==1.0.3
+ - netpbm ==1.0.4
- nettle ==0.3.0
- netwire ==5.0.3
- netwire-input ==0.0.7
@@ -1653,21 +1659,22 @@ default-package-overrides:
- newtype-generics ==0.6
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
+ - nix-derivation ==1.1.1
- nix-paths ==1.0.1
- - no-value ==1.0.0.0
- - non-empty ==0.3.2
- - non-empty-sequence ==0.2.0.4
- - non-negative ==0.1.2
- nonce ==1.0.7
- nondeterminism ==1.4
+ - non-empty ==0.3.2
- nonempty-containers ==0.3.4.1
- - nonempty-vector ==0.2.1.0
- nonemptymap ==0.0.6.0
+ - non-empty-sequence ==0.2.0.4
+ - nonempty-vector ==0.2.1.0
+ - non-negative ==0.1.2
- not-gloss ==0.7.7.0
+ - no-value ==1.0.0.0
- nowdoc ==0.1.1.0
- nqe ==0.6.3
- - nri-env-parser ==0.1.0.3
- - nri-prelude ==0.3.0.0
+ - nri-env-parser ==0.1.0.4
+ - nri-prelude ==0.4.0.0
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
@@ -1679,9 +1686,9 @@ default-package-overrides:
- nvim-hs ==2.1.0.4
- nvim-hs-contrib ==2.0.0.0
- nvim-hs-ghcid ==2.0.0.0
- - o-clock ==1.2.0.1
- oauthenticated ==0.2.1.0
- ObjectName ==1.1.0.1
+ - o-clock ==1.2.0.1
- odbc ==0.2.2
- oeis2 ==1.0.4
- ofx ==0.4.4.0
@@ -1694,9 +1701,9 @@ default-package-overrides:
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- - open-browser ==0.2.1.0
- OpenAL ==1.7.0.5
- openapi3 ==3.0.1.0
+ - open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
- OpenGLRaw ==3.3.4.0
@@ -1728,6 +1735,8 @@ default-package-overrides:
- pager ==0.1.1.0
- pagination ==0.2.1
- pagure-cli ==0.2
+ - pandoc ==2.11.4
+ - pandoc-plot ==1.0.2.1
- pandoc-types ==1.22
- pantry ==0.5.1.4
- parallel ==3.2.2.0
@@ -1760,10 +1769,10 @@ default-package-overrides:
- pattern-arrows ==0.0.2
- pava ==0.1.1.0
- pcg-random ==0.1.3.7
+ - pcre2 ==1.1.4
- pcre-heavy ==1.0.0.2
- pcre-light ==0.4.1.0
- pcre-utils ==0.1.8.1.1
- - pcre2 ==1.1.4
- pdfinfo ==1.5.4
- peano ==0.1.0.1
- pem ==0.2.4
@@ -1786,8 +1795,8 @@ default-package-overrides:
- persistent-test ==2.0.3.5
- persistent-typed-db ==0.1.0.2
- pg-harness-client ==0.6.0
- - pg-transact ==0.3.1.1
- pgp-wordlist ==0.1.0.3
+ - pg-transact ==0.3.1.1
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.2.0
@@ -1795,7 +1804,7 @@ default-package-overrides:
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
- - pipes-bytestring ==2.1.6
+ - pipes-bytestring ==2.1.7
- pipes-concurrency ==2.0.12
- pipes-csv ==1.4.3
- pipes-extras ==1.0.15
@@ -1804,10 +1813,10 @@ default-package-overrides:
- pipes-http ==1.0.6
- pipes-network ==0.6.5
- pipes-network-tls ==0.4
- - pipes-ordered-zip ==1.1.0
- - pipes-parse ==3.0.8
+ - pipes-ordered-zip ==1.2.1
+ - pipes-parse ==3.0.9
- pipes-random ==1.0.0.5
- - pipes-safe ==2.3.2
+ - pipes-safe ==2.3.3
- pipes-wai ==3.2.0
- pkcs10 ==0.2.0.0
- pkgtreediff ==0.4
@@ -1826,7 +1835,6 @@ default-package-overrides:
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- possibly ==1.0.0.0
- - post-mess-age ==0.2.1.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.3.3
- postgresql-libpq ==0.9.4.3
@@ -1835,31 +1843,32 @@ default-package-overrides:
- postgresql-simple ==0.6.4
- postgresql-typed ==0.6.1.2
- postgrest ==7.0.1
+ - post-mess-age ==0.2.1.0
- pptable ==0.3.0.0
- pqueue ==1.4.1.3
- prairie ==0.0.1.0
- prefix-units ==0.2.0
- prelude-compat ==0.0.0.2
- prelude-safeenum ==0.1.1.2
- - pretty-class ==1.0.1.1
- - pretty-diff ==0.2.0.3
- - pretty-hex ==1.1
- - pretty-relative-time ==0.2.0.0
- - pretty-show ==1.10
- - pretty-simple ==4.0.0.0
- - pretty-sop ==0.2.0.3
- - pretty-terminal ==0.1.0.0
- prettyclass ==1.0.0.0
+ - pretty-class ==1.0.1.1
+ - pretty-diff ==0.4.0.3
+ - pretty-hex ==1.1
- prettyprinter ==1.7.0
- prettyprinter-ansi-terminal ==1.1.2
- prettyprinter-compat-annotated-wl-pprint ==1.1
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
- prettyprinter-compat-wl-pprint ==1.0.0.1
- prettyprinter-convert-ansi-wl-pprint ==1.1.1
+ - pretty-relative-time ==0.2.0.0
+ - pretty-show ==1.10
+ - pretty-simple ==4.0.0.0
+ - pretty-sop ==0.2.0.3
+ - pretty-terminal ==0.1.0.0
- primes ==0.2.1.0
- primitive ==0.7.1.0
- primitive-addr ==0.1.0.2
- - primitive-extras ==0.8
+ - primitive-extras ==0.10.1
- primitive-unaligned ==0.1.1.1
- primitive-unlifted ==0.1.3.0
- print-console-colors ==0.1.0.0
@@ -1869,20 +1878,14 @@ default-package-overrides:
- product-profunctors ==0.11.0.2
- profiterole ==0.1
- profunctors ==5.5.2
- - project-template ==0.2.1.0
- projectroot ==0.2.0.1
+ - project-template ==0.2.1.0
- prometheus ==2.2.2
- prometheus-client ==1.0.1
- prometheus-wai-middleware ==1.0.1.0
- promises ==0.3
- prompt ==0.1.1.2
- prospect ==0.1.0.0
- - proto-lens ==0.7.0.0
- - proto-lens-optparse ==0.1.1.7
- - proto-lens-protobuf-types ==0.7.0.0
- - proto-lens-protoc ==0.7.0.0
- - proto-lens-runtime ==0.7.0.0
- - proto-lens-setup ==0.4.0.4
- proto3-wire ==1.1.0
- protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0
@@ -1890,6 +1893,12 @@ default-package-overrides:
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
+ - proto-lens ==0.7.0.0
+ - proto-lens-optparse ==0.1.1.7
+ - proto-lens-protobuf-types ==0.7.0.0
+ - proto-lens-protoc ==0.7.0.0
+ - proto-lens-runtime ==0.7.0.0
+ - proto-lens-setup ==0.4.0.4
- protolude ==0.3.0
- proxied ==0.3.1
- psqueues ==0.2.7.2
@@ -1925,49 +1934,48 @@ default-package-overrides:
- radius ==0.7.1.0
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- - ral ==0.1
+ - ral ==0.2
- rampart ==1.1.0.2
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.1
- - random-bytestring ==0.1.3.2
+ - random-bytestring ==0.1.4
- random-fu ==0.2.7.4
- random-shuffle ==0.0.4
- random-source ==0.3.0.8
- random-tree ==0.6.0.5
- range ==0.3.0.2
- - range-set-list ==0.1.3.1
+ - ranged-list ==0.1.0.0
- Ranged-sets ==0.4.0
+ - range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
- - rate-limit ==1.4.2
- ratel ==1.0.13
+ - rate-limit ==1.4.2
- ratel-wai ==1.1.4
- rattle ==0.2
- - raw-strings-qq ==1.1
+ - Rattus ==0.5
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
- - rcu ==0.2.4
+ - raw-strings-qq ==1.1
+ - rcu ==0.2.5
- rdf ==0.1.0.4
- rdtsc ==1.3.0.1
- re2 ==0.3
+ - readable ==0.3.1
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- - readable ==0.3.1
- - reanimate ==1.1.3.2
- - reanimate-svg ==0.13.0.0
- rebase ==1.6.1
- - record-dot-preprocessor ==0.2.7
+ - record-dot-preprocessor ==0.2.9
- record-hasfield ==1.0
- - record-wrangler ==0.1.1.0
- records-sop ==0.1.0.3
- - recursion-schemes ==5.2.1
+ - record-wrangler ==0.1.1.0
+ - recursion-schemes ==5.2.2
- reducers ==3.12.3
- - ref-fd ==0.4.0.2
- - ref-tf ==0.4.0.2
- refact ==0.3.0.2
+ - ref-fd ==0.4.0.2
- refined ==0.6.2
- reflection ==2.1.6
- reform ==0.2.7.4
@@ -1975,11 +1983,12 @@ default-package-overrides:
- reform-hamlet ==0.0.5.3
- reform-happstack ==0.2.5.4
- RefSerialize ==0.4.0
+ - ref-tf ==0.4.0.2
- regex ==1.1.0.0
- regex-applicative ==0.3.4
- regex-applicative-text ==0.1.0.1
- - regex-base ==0.94.0.0
- - regex-compat ==0.95.2.0
+ - regex-base ==0.94.0.1
+ - regex-compat ==0.95.2.1
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.1.3.8.43
@@ -2013,6 +2022,7 @@ default-package-overrides:
- rev-state ==0.1.2
- rfc1751 ==0.1.3
- rfc5051 ==0.2
+ - rhbzquery ==0.4.3
- rhine ==0.7.0
- rhine-gloss ==0.7.0
- rigel-viz ==0.2.0.0
@@ -2032,15 +2042,15 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
- safe ==0.3.19
+ - safecopy ==0.10.4.1
- safe-decimal ==0.2.0.0
- safe-exceptions ==0.1.7.1
- safe-foldable ==0.1.0.0
+ - safeio ==0.0.5.0
- safe-json ==1.1.1.1
- safe-money ==0.9
- - safe-tensor ==0.2.1.0
- - safecopy ==0.10.3.1
- - safeio ==0.0.5.0
- SafeSemaphore ==0.10.1
+ - safe-tensor ==0.2.1.1
- salak ==0.3.6
- salak-yaml ==0.3.5.3
- saltine ==0.1.1.1
@@ -2062,7 +2072,7 @@ default-package-overrides:
- sdl2-gfx ==0.2
- sdl2-image ==2.0.0
- sdl2-mixer ==1.1.0
- - sdl2-ttf ==2.1.1
+ - sdl2-ttf ==2.1.2
- search-algorithms ==0.3.1
- secp256k1-haskell ==0.5.0
- securemem ==0.1.10
@@ -2078,14 +2088,14 @@ default-package-overrides:
- semigroupoid-extras ==5
- semigroupoids ==5.3.5
- semigroups ==0.19.1
- - semiring-simple ==1.0.0.1
- semirings ==0.6
+ - semiring-simple ==1.0.0.1
- semver ==0.4.0.1
- sendfile ==0.7.11.1
- seqalign ==0.2.0.4
- seqid ==0.6.2
- seqid-streams ==0.7.2
- - sequence-formats ==1.5.2
+ - sequence-formats ==1.6.0
- sequenceTools ==1.4.0.5
- serf ==0.1.1.0
- serialise ==0.2.3.0
@@ -2111,7 +2121,7 @@ default-package-overrides:
- servant-swagger-ui ==0.3.4.3.37.2
- servant-swagger-ui-core ==0.3.4
- serverless-haskell ==0.12.5
- - serversession ==1.0.1
+ - serversession ==1.0.2
- serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0
- set-cover ==0.1.1
@@ -2119,15 +2129,16 @@ default-package-overrides:
- setlocale ==1.0.0.9
- sexp-grammar ==2.3.0
- SHA ==1.6.4.4
+ - shake-language-c ==0.12.0
- shake-plus ==0.3.3.1
- shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25
- shared-memory ==0.2.0.0
- shell-conduit ==5.0.0
- shell-escape ==0.2.0
- - shell-utility ==0.1
- shellmet ==0.0.3.1
- shelltestrunner ==1.9
+ - shell-utility ==0.1
- shelly ==1.9.0
- shikensu ==0.3.11
- shortcut-links ==0.5.1.1
@@ -2157,12 +2168,12 @@ default-package-overrides:
- skein ==1.0.9.4
- skews ==0.1.0.3
- skip-var ==0.1.1.0
- - skylighting ==0.10.2
- - skylighting-core ==0.10.2
+ - skylighting ==0.10.4
+ - skylighting-core ==0.10.4
- slack-api ==0.12
- slack-progressbar ==0.1.0.1
- slist ==0.1.1.0
- - slynx ==0.5.0.1
+ - slynx ==0.5.0.2
- smallcheck ==1.2.1
- smash ==0.1.1.0
- smash-aeson ==0.1.0.0
@@ -2186,11 +2197,11 @@ default-package-overrides:
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- sparse-linear-algebra ==0.3.1
- - sparse-tensor ==0.2.1.4
+ - sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- speculate ==0.4.2
- - speedy-slice ==0.3.1
+ - speedy-slice ==0.3.2
- Spintax ==0.3.5
- splice ==0.6.1.1
- splint ==1.0.1.3
@@ -2198,16 +2209,16 @@ default-package-overrides:
- splitmix ==0.1.0.3
- spoon ==0.3.1
- spreadsheet ==0.1.3.8
- - sql-words ==0.1.6.4
- sqlcli ==0.2.2.0
- sqlcli-odbc ==0.2.0.1
- sqlite-simple ==0.4.18.0
+ - sql-words ==0.1.6.4
- squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0
- srcloc ==0.5.1.2
- stache ==2.2.0
- - stack-templatizer ==0.1.0.2
- stackcollapse-ghc ==0.0.1.3
+ - stack-templatizer ==0.1.0.2
- stateref ==0.3
- StateVar ==1.2.1
- static-text ==0.2.0.6
@@ -2220,10 +2231,10 @@ default-package-overrides:
- stm-containers ==1.2
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- - stm-hamt ==1.2.0.4
+ - stm-hamt ==1.2.0.6
- stm-lifted ==2.5.0.0
- - stm-split ==0.0.2.1
- STMonadTrans ==0.4.5
+ - stm-split ==0.0.2.1
- stopwatch ==0.1.0.6
- storable-complex ==0.2.3.0
- storable-endian ==0.2.6
@@ -2244,23 +2255,23 @@ default-package-overrides:
- strict-list ==0.1.5
- strict-tuple ==0.1.4
- strict-tuple-lens ==0.1.0.1
+ - stringbuilder ==0.5.1
- string-class ==0.1.7.0
- string-combinators ==0.6.0.5
- string-conv ==0.1.2
- string-conversions ==0.4.0.1
- - string-interpolate ==0.3.0.2
+ - string-interpolate ==0.3.1.0
- string-qq ==0.0.4
- string-random ==0.1.4.0
- - string-transform ==1.1.1
- - stringbuilder ==0.5.1
- stringsearch ==0.3.6.6
+ - string-transform ==1.1.1
- stripe-concepts ==1.0.2.4
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- strive ==5.0.13
- - structs ==0.1.4
+ - structs ==0.1.5
- structured ==0.1
- structured-cli ==2.6.0.0
- subcategories ==0.1.0.0
@@ -2278,10 +2289,10 @@ default-package-overrides:
- symmetry-operations-symbols ==0.0.2.1
- sysinfo ==0.1.1
- system-argv0 ==0.1.1
+ - systemd ==2.3.0
- system-fileio ==0.3.16.4
- system-filepath ==0.4.14
- system-info ==0.5.1
- - systemd ==2.3.0
- tabular ==0.2.2.8
- taffybar ==3.2.3
- tagchup ==0.4.1.1
@@ -2295,13 +2306,13 @@ default-package-overrides:
- tao-example ==1.0.0
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- - tardis ==0.4.1.0
+ - tardis ==0.4.3.0
- tasty ==1.2.3
- tasty-ant-xml ==1.1.7
- - tasty-bench ==0.2.1
+ - tasty-bench ==0.2.2
- tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2
- - tasty-expected-failure ==0.12.2
+ - tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1
- tasty-golden ==2.3.3.2
- tasty-hedgehog ==1.0.1.0
@@ -2348,6 +2359,7 @@ default-package-overrides:
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.13
+ - textlocal ==0.1.0.5
- text-manipulate ==0.2.0.1
- text-metrics ==0.3.0
- text-postgresql ==0.0.3.1
@@ -2358,9 +2370,8 @@ default-package-overrides:
- text-show ==3.9
- text-show-instances ==3.8.4
- text-zipper ==0.11
- - textlocal ==0.1.0.5
- - tf-random ==0.5
- tfp ==1.0.1.1
+ - tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1.1
@@ -2368,6 +2379,10 @@ default-package-overrides:
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
- th-env ==0.1.0.2
+ - these ==1.1.1.1
+ - these-lens ==1.0.1.2
+ - these-optics ==1.0.1.2
+ - these-skinny ==0.7.4
- th-expand-syns ==0.4.6.0
- th-extras ==0.0.0.4
- th-lift ==0.8.2
@@ -2375,37 +2390,33 @@ default-package-overrides:
- th-nowq ==0.1.0.5
- th-orphans ==0.13.11
- th-printf ==0.7
- - th-reify-compat ==0.0.1.5
- - th-reify-many ==0.1.9
- - th-strict-compat ==0.1.0.1
- - th-test-utils ==1.1.0
- - th-utilities ==0.2.4.1
- - these ==1.1.1.1
- - these-lens ==1.0.1.1
- - these-optics ==1.0.1.1
- - these-skinny ==0.7.4
- thread-hierarchy ==0.3.0.2
- thread-local-storage ==0.2
- - thread-supervisor ==0.2.0.0
- threads ==0.5.1.6
+ - thread-supervisor ==0.2.0.0
- threepenny-gui ==0.9.0.0
+ - th-reify-compat ==0.0.1.5
+ - th-reify-many ==0.1.9
- throttle-io-stream ==0.2.0.1
- through-text ==0.1.0.0
- throwable-exceptions ==0.1.0.9
+ - th-strict-compat ==0.1.0.1
+ - th-test-utils ==1.1.0
+ - th-utilities ==0.2.4.1
- thyme ==0.3.5.5
- - tidal ==1.6.1
+ - tidal ==1.7.2
- tile ==0.3.0.0
- time-compat ==1.9.5
+ - timeit ==2.0
+ - timelens ==0.2.0.2
- time-lens ==0.4.0.2
- time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
- time-manager ==0.0.0
- time-parsers ==0.1.2.1
- - time-units ==1.0.0
- - timeit ==2.0
- - timelens ==0.2.0.2
- - timer-wheel ==0.3.0
- timerep ==2.0.1.0
+ - timer-wheel ==0.3.0
+ - time-units ==1.0.0
- timezone-olson ==0.2.0
- timezone-series ==0.1.9
- tinylog ==0.15.0
@@ -2414,11 +2425,11 @@ default-package-overrides:
- tls ==1.5.5
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
- - tlynx ==0.5.0.1
+ - tlynx ==0.5.0.2
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==1.34.1.0
- - tomland ==1.3.1.0
+ - tomland ==1.3.2.0
- tonalude ==0.1.1.1
- topograph ==1.0.0.1
- torsor ==0.1
@@ -2433,18 +2444,22 @@ default-package-overrides:
- traverse-with-class ==1.0.1.0
- tree-diff ==0.1
- tree-fun ==0.8.1.0
- - tree-view ==0.5
- - trifecta ==2.1
+ - tree-view ==0.5.1
+ - trifecta ==2.1.1
- triplesec ==0.2.2.1
- tsv2csv ==0.1.0.2
- ttc ==0.3.0.0
- ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
+ - tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- - tuples-homogenous-h98 ==0.1.1.0
- turtle ==1.5.20
+ - typecheck-plugin-nat-simple ==0.1.0.2
+ - TypeCompose ==0.9.14
+ - typed-process ==0.2.6.0
+ - typed-uuid ==0.0.0.2
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.1
@@ -2458,14 +2473,10 @@ default-package-overrides:
- type-of-html ==1.6.2.0
- type-of-html-static ==0.1.0.2
- type-operators ==0.2.0.0
- - type-spec ==0.4.0.0
- - typecheck-plugin-nat-simple ==0.1.0.2
- - TypeCompose ==0.9.14
- - typed-process ==0.2.6.0
- - typed-uuid ==0.0.0.2
- typerep-map ==0.3.3.0
+ - type-spec ==0.4.0.0
- tzdata ==0.2.20201021.0
- - ua-parser ==0.7.5.1
+ - ua-parser ==0.7.6.0
- uglymemo ==0.1.0.1
- ulid ==0.3.0.0
- unagi-chan ==0.4.1.3
@@ -2518,8 +2529,8 @@ default-package-overrides:
- utf8-string ==1.0.2
- util ==0.1.17.1
- utility-ht ==0.0.15
- - uuid ==1.3.13
- - uuid-types ==1.0.3
+ - uuid ==1.3.14
+ - uuid-types ==1.0.4
- validation ==1.1
- validation-selective ==0.1.0.0
- validity ==0.11.0.0
@@ -2535,8 +2546,8 @@ default-package-overrides:
- validity-uuid ==0.1.0.3
- validity-vector ==0.2.0.3
- valor ==0.1.0.0
- - vault ==0.3.1.4
- - vec ==0.3
+ - vault ==0.3.1.5
+ - vec ==0.4
- vector ==0.12.2.0
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1
@@ -2550,16 +2561,16 @@ default-package-overrides:
- vector-sized ==1.4.3.1
- vector-space ==0.16
- vector-split ==1.0.0.2
- - vector-th-unbox ==0.2.1.7
+ - vector-th-unbox ==0.2.1.9
- verbosity ==0.4.0.0
- - versions ==4.0.2
+ - versions ==4.0.3
- vformat ==0.14.1.0
- vformat-aeson ==0.1.0.1
- vformat-time ==0.1.0.0
- ViennaRNAParser ==1.3.3
- vinyl ==0.13.0
- void ==0.7.3
- - vty ==5.32
+ - vty ==5.33
- wai ==3.2.3
- wai-app-static ==3.1.7.2
- wai-conduit ==3.0.0.4
@@ -2604,18 +2615,18 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.0.0.5
- - with-location ==0.1.0
- - with-utf8 ==1.0.2.1
- witherable-class ==0
- within ==0.2.0.1
+ - with-location ==0.1.0
+ - with-utf8 ==1.0.2.2
- wizards ==1.0.3
- wl-pprint-annotated ==0.1.0.1
- wl-pprint-console ==0.1.0.2
- wl-pprint-text ==1.2.0.1
- - word-trie ==0.3.0
- - word-wrap ==0.4.1
- word24 ==2.0.1
- word8 ==0.1.3
+ - word-trie ==0.3.0
+ - word-wrap ==0.4.1
- world-peace ==1.0.2.0
- wrap ==0.0.0
- wreq ==0.5.3.3
@@ -2636,12 +2647,13 @@ default-package-overrides:
- xdg-desktop-entry ==0.1.1.1
- xdg-userdirs ==0.1.0.2
- xeno ==0.4.2
- - xlsx ==0.8.2
+ - xlsx ==0.8.3
- xlsx-tabular ==0.2.2.1
- xml ==1.3.14
- xml-basic ==0.1.3.1
- - xml-conduit ==1.9.0.0
+ - xml-conduit ==1.9.1.0
- xml-conduit-writer ==0.1.1.2
+ - xmlgen ==0.6.2.2
- xml-hamlet ==0.5.0.1
- xml-helpers ==1.0.0
- xml-html-qq ==0.1.0.1
@@ -2651,7 +2663,6 @@ default-package-overrides:
- xml-to-json ==2.0.1
- xml-to-json-fast ==2.0.0
- xml-types ==0.3.8
- - xmlgen ==0.6.2.2
- xmonad ==0.15
- xmonad-contrib ==0.16
- xmonad-extras ==0.15.3
@@ -2659,7 +2670,6 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yamlparse-applicative ==0.1.0.2
- - yes-precure5-command ==5.5.3
- yesod ==1.6.1.0
- yesod-auth ==1.6.10.1
- yesod-auth-hashdb ==1.7.1.5
@@ -2670,13 +2680,14 @@ default-package-overrides:
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
- - yesod-page-cursor ==2.0.0.3
+ - yesod-page-cursor ==2.0.0.4
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.12
- yesod-websockets ==0.3.0.2
+ - yes-precure5-command ==5.5.3
- yi-rope ==0.11
- yjsvg ==0.2.0.1
- yjtools ==0.9.18
@@ -2691,10 +2702,10 @@ default-package-overrides:
- zio ==0.1.0.2
- zip ==1.7.0
- zip-archive ==0.4.1
- - zip-stream ==0.2.0.1
- zipper-extra ==0.1.3.2
- - zippers ==0.3
- - zlib ==0.6.2.2
+ - zippers ==0.3.1
+ - zip-stream ==0.2.1.0
+ - zlib ==0.6.2.3
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3
@@ -2790,14 +2801,12 @@ package-maintainers:
- nix-diff
maralorn:
- reflex-dom
- - ghcide
- cabal-fmt
- shh
- - brittany
- - hlint
- neuron
- releaser
- taskwarrior
+ - haskell-language-server
sorki:
- cayene-lpp
- data-stm32
@@ -3099,6 +3108,7 @@ broken-packages:
- aeson-applicative
- aeson-decode
- aeson-diff-generic
+ - aeson-extra
- aeson-filthy
- aeson-flowtyped
- aeson-injector
@@ -3143,6 +3153,7 @@ broken-packages:
- alga
- algebra-checkers
- algebra-dag
+ - algebra-driven-design
- algebra-sql
- algebraic
- algebraic-prelude
@@ -3268,6 +3279,7 @@ broken-packages:
- arbor-monad-metric
- arbor-monad-metric-datadog
- arch-hs
+ - arch-web
- archive-libarchive
- archiver
- archlinux
@@ -3404,6 +3416,7 @@ broken-packages:
- aws-lambda
- aws-lambda-haskell-runtime-wai
- aws-lambda-runtime
+ - aws-larpi
- aws-mfa-credentials
- aws-performance-tests
- aws-route53
@@ -3539,7 +3552,6 @@ broken-packages:
- binary-indexed-tree
- binary-protocol
- binary-protocol-zmq
- - binary-search
- binary-streams
- binary-tagged
- binary-typed
@@ -4387,6 +4399,7 @@ broken-packages:
- crf-chain2-generic
- crf-chain2-tiers
- critbit
+ - criterion-cmp
- criterion-compare
- criterion-plus
- criterion-to-html
@@ -4621,6 +4634,8 @@ broken-packages:
- denominate
- dense
- dense-int-set
+ - dep-t
+ - dep-t-advice
- dependent-hashmap
- dependent-monoidal-map
- dependent-state
@@ -4657,6 +4672,7 @@ broken-packages:
- dhall-fly
- dhall-nix
- dhall-nixpkgs
+ - dhall-recursive-adt
- dhall-text
- dhall-to-cabal
- dhcp-lease-parser
@@ -4788,6 +4804,7 @@ broken-packages:
- docker-build-cacher
- dockercook
- docopt
+ - docrecords
- DocTest
- doctest-discover-configurator
- doctest-driver-gen
@@ -5053,6 +5070,8 @@ broken-packages:
- ethereum-merkle-patricia-db
- euphoria
- eurofxref
+ - evdev
+ - evdev-streamly
- eve-cli
- event
- event-driven
@@ -5078,6 +5097,7 @@ broken-packages:
- execs
- executor
- exference
+ - exh
- exherbo-cabal
- exif
- exigo-schema
@@ -5422,6 +5442,7 @@ broken-packages:
- ftp-conduit
- ftphs
- FTPLine
+ - ftree
- ftshell
- full-sessions
- fullstop
@@ -5437,6 +5458,7 @@ broken-packages:
- functional-arrow
- functor
- functor-combinators
+ - functor-combo
- functor-friends
- functor-infix
- functor-products
@@ -5454,6 +5476,7 @@ broken-packages:
- fused-effects-squeal
- fused-effects-th
- fusion
+ - futhark
- futun
- future
- fuzzy-time-gen
@@ -5496,6 +5519,7 @@ broken-packages:
- gelatin-gl
- gelatin-sdl2
- gelatin-shaders
+ - gemini-textboard
- gemstone
- gen-imports
- gen-passwd
@@ -5513,6 +5537,7 @@ broken-packages:
- generic-church
- generic-enum
- generic-enumeration
+ - generic-labels
- generic-lens-labels
- generic-lucid-scaffold
- generic-maybe
@@ -5813,6 +5838,7 @@ broken-packages:
- gross
- GroteTrap
- groundhog-converters
+ - group-theory
- group-with
- grouped-list
- groups-generic
@@ -6082,6 +6108,7 @@ broken-packages:
- haskell-lsp-client
- haskell-ml
- haskell-mpfr
+ - haskell-mpi
- haskell-neo4j-client
- haskell-openflow
- haskell-overridez
@@ -6315,6 +6342,7 @@ broken-packages:
- heckle
- hedgehog-checkers
- hedgehog-checkers-lens
+ - hedgehog-classes
- hedgehog-fakedata
- hedgehog-gen-json
- hedgehog-generic
@@ -6402,6 +6430,8 @@ broken-packages:
- hGelf
- hgen
- hgeometric
+ - hgeometry
+ - hgeometry-combinatorial
- hgeometry-ipe
- hgeometry-svg
- hgeos
@@ -6915,6 +6945,7 @@ broken-packages:
- huzzy
- hVOIDP
- hw-all
+ - hw-aws-sqs-conduit
- hw-ci-assist
- hw-dsv
- hw-json
@@ -6973,6 +7004,7 @@ broken-packages:
- hyperloglogplus
- hyperpublic
- hypher
+ - hzk
- hzulip
- i18n
- I1M
@@ -6996,7 +7028,6 @@ broken-packages:
- identifiers
- idiii
- idna2008
- - idris
- IDynamic
- ieee-utils
- iexcloud
@@ -7116,6 +7147,7 @@ broken-packages:
- introduction
- introduction-test
- intset
+ - invert
- invertible-hlist
- invertible-syntax
- io-capture
@@ -7259,11 +7291,13 @@ broken-packages:
- json-incremental-decoder
- json-litobj
- json-pointer-hasql
+ - json-pointy
- json-python
- json-rpc-client
- json-schema
- json-sop
- json-syntax
+ - json-to-haskell
- json-togo
- json-tokens
- json-tools
@@ -7375,6 +7409,7 @@ broken-packages:
- koellner-phonetic
- kontra-config
- korfu
+ - kparams
- kqueue
- kraken
- krank
@@ -7544,6 +7579,7 @@ broken-packages:
- lens-filesystem
- lens-labels
- lens-prelude
+ - lens-process
- lens-simple
- lens-text-encoding
- lens-th-rewrite
@@ -7617,6 +7653,7 @@ broken-packages:
- line-bot-sdk
- line-drawing
- linear-algebra-cblas
+ - linear-base
- linear-circuit
- linear-code
- linear-maps
@@ -7646,6 +7683,7 @@ broken-packages:
- linx-gateway
- lio-eci11
- lio-simple
+ - lion
- lipsum-gen
- liquid
- liquid-base
@@ -7765,6 +7803,7 @@ broken-packages:
- LRU
- ls-usb
- lscabal
+ - lsfrom
- LslPlus
- lsystem
- lti13
@@ -7978,6 +8017,7 @@ broken-packages:
- Michelangelo
- miconix-test
- micro-recursion-schemes
+ - microbase
- microformats2-parser
- microformats2-types
- microgroove
@@ -8034,6 +8074,9 @@ broken-packages:
- ml-w
- mlist
- mm2
+ - mmark
+ - mmark-cli
+ - mmark-ext
- mmsyn7h
- mmtf
- mmtl
@@ -8136,6 +8179,7 @@ broken-packages:
- morfeusz
- morley
- morloc
+ - morpheus-graphql-app
- morpheus-graphql-cli
- morphisms-functors
- morphisms-functors-inventory
@@ -8241,6 +8285,7 @@ broken-packages:
- musicbrainz-email
- musicScroll
- musicxml
+ - musicxml2
- mustache-haskell
- mutable-iter
- MutationOrder
@@ -8823,6 +8868,11 @@ broken-packages:
- phoityne
- phone-numbers
- phone-push
+ - phonetic-languages-examples
+ - phonetic-languages-properties
+ - phonetic-languages-simplified-lists-examples
+ - phonetic-languages-simplified-properties-lists
+ - phonetic-languages-simplified-properties-lists-double
- phooey
- photoname
- phraskell
@@ -8843,7 +8893,6 @@ broken-packages:
- piet
- pig
- pinboard
- - pinboard-notes-backup
- pinch
- pinch-gen
- pinchot
@@ -8883,6 +8932,7 @@ broken-packages:
- pit
- pitchtrack
- pivotal-tracker
+ - pixel-printer
- pixelated-avatar-generator
- pkcs10
- pkcs7
@@ -9167,6 +9217,8 @@ broken-packages:
- pure-zlib
- purescheme-wai-routing-core
- purescript
+ - purescript-ast
+ - purescript-cst
- purescript-iso
- purescript-tsd-gen
- push-notifications
@@ -9241,6 +9293,7 @@ broken-packages:
- quickpull
- quickset
- Quickson
+ - quickspec
- quicktest
- quickwebapp
- quipper
@@ -9372,6 +9425,8 @@ broken-packages:
- record-syntax
- records
- records-th
+ - recursion-schemes
+ - recursion-schemes-ext
- recursors
- red-black-record
- reddit
@@ -9428,6 +9483,7 @@ broken-packages:
- regex-tdfa-pipes
- regex-tdfa-quasiquoter
- regex-tdfa-rc
+ - regex-tdfa-text
- regex-tdfa-unittest
- regex-tdfa-utf8
- regex-tre
@@ -9501,6 +9557,7 @@ broken-packages:
- req-url-extra
- reqcatcher
- request-monad
+ - rere
- rescue
- reserve
- reservoir
@@ -9546,6 +9603,7 @@ broken-packages:
- rfc-redis
- rfc-servant
- rg
+ - rhbzquery
- rhythm-game-tutorial
- rib
- ribbit
@@ -9556,6 +9614,7 @@ broken-packages:
- riff
- ring-buffer
- ring-buffers
+ - rio-process-pool
- riot
- risc-v
- risc386
@@ -9587,6 +9646,7 @@ broken-packages:
- roc-cluster-demo
- rock
- rocksdb-haskell
+ - rocksdb-haskell-jprupp
- rocksdb-query
- roku-api
- rollbar
@@ -9888,6 +9948,7 @@ broken-packages:
- servant-server-namedargs
- servant-smsc-ru
- servant-snap
+ - servant-static-th
- servant-streaming
- servant-streaming-client
- servant-streaming-docs
@@ -9901,9 +9962,12 @@ broken-packages:
- servant-zeppelin-server
- servant-zeppelin-swagger
- server-generic
+ - serversession
- serversession-backend-acid-state
- serversession-backend-persistent
- serversession-backend-redis
+ - serversession-frontend-snap
+ - serversession-frontend-wai
- serversession-frontend-yesod
- services
- ses-html-snaplet
@@ -9919,6 +9983,7 @@ broken-packages:
- setoid
- setters
- sexp
+ - sexp-grammar
- sexpr-parser
- sext
- SFML
@@ -9941,6 +10006,7 @@ broken-packages:
- shake-cabal-build
- shake-dhall
- shake-extras
+ - shake-futhark
- shake-minify
- shake-pack
- shake-path
@@ -10079,6 +10145,7 @@ broken-packages:
- slot-lambda
- sloth
- slug
+ - slugify
- slynx
- small-bytearray-builder
- smallarray
@@ -10188,6 +10255,7 @@ broken-packages:
- socketed
- socketio
- sockets
+ - sockets-and-pipes
- socketson
- sodium
- soegtk
@@ -10315,6 +10383,8 @@ broken-packages:
- stackage-types
- stackage-upload
- stackage2nix
+ - stackcollapse-ghc
+ - staged-gg
- standalone-derive-topdown
- standalone-haddock
- starling
@@ -10401,6 +10471,7 @@ broken-packages:
- streaming-utils
- streaming-with
- streamly-archive
+ - streamly-fsnotify
- streamly-lmdb
- streamproc
- strelka
@@ -10591,6 +10662,7 @@ broken-packages:
- tasty-fail-fast
- tasty-groundhog-converters
- tasty-hedgehog-coverage
+ - tasty-html
- tasty-integrate
- tasty-jenkins-xml
- tasty-laws
@@ -10652,6 +10724,7 @@ broken-packages:
- termination-combinators
- termplot
- terntup
+ - terraform-http-backend-pass
- terrahs
- tersmu
- tesla
@@ -10684,6 +10757,7 @@ broken-packages:
- texrunner
- text-all
- text-and-plots
+ - text-ascii
- text-containers
- text-format-heavy
- text-generic-pretty
@@ -10986,6 +11060,7 @@ broken-packages:
- type-structure
- type-sub-th
- type-tree
+ - type-unary
- typeable-th
- TypeClass
- typed-encoding
@@ -11052,6 +11127,8 @@ broken-packages:
- uniprot-kb
- uniqueid
- uniquely-represented-sets
+ - uniqueness-periods-vector-examples
+ - uniqueness-periods-vector-properties
- units-attoparsec
- unittyped
- unitym-yesod
@@ -11065,8 +11142,10 @@ broken-packages:
- unix-fcntl
- unix-handle
- unix-process-conduit
+ - unix-recursive
- unix-simple
- unlifted-list
+ - unliftio-messagebox
- unliftio-streams
- unm-hip
- unordered-containers-rematch
@@ -11184,6 +11263,7 @@ broken-packages:
- vect-floating-accelerate
- vect-opengl
- vector-bytestring
+ - vector-circular
- vector-clock
- vector-conduit
- vector-endian
@@ -11238,6 +11318,10 @@ broken-packages:
- vitrea
- vk-aws-route53
- VKHS
+ - vocoder
+ - vocoder-audio
+ - vocoder-conduit
+ - vocoder-dunai
- voicebase
- vowpal-utils
- voyeur
@@ -11479,11 +11563,11 @@ broken-packages:
- xleb
- xls
- xlsior
- - xlsx
- xlsx-tabular
- xlsx-templater
- xml-catalog
- xml-conduit-decode
+ - xml-conduit-selectors
- xml-conduit-stylist
- xml-enumerator
- xml-enumerator-combinators
@@ -11536,6 +11620,7 @@ broken-packages:
- YACPong
- yahoo-finance-api
- yahoo-finance-conduit
+ - yahoo-prices
- yahoo-web-search
- yajl
- yajl-enumerator
@@ -11567,6 +11652,7 @@ broken-packages:
- yap
- yarr
- yarr-image-io
+ - yasi
- yavie
- yaya-test
- yaya-unsafe-test
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index b4fcf554bb..44f0b4ec51 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1305,6 +1305,35 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "BNFC_2_9_1" = callPackage
+ ({ mkDerivation, alex, array, base, Cabal, cabal-doctest
+ , containers, deepseq, directory, doctest, filepath, happy, hspec
+ , hspec-discover, HUnit, mtl, pretty, process, QuickCheck
+ , string-qq, temporary, time
+ }:
+ mkDerivation {
+ pname = "BNFC";
+ version = "2.9.1";
+ sha256 = "0670in07lr9fgkx0c7zci8rn8c7g8nimkmpzy5w9swfp4rp3gbkk";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ array base containers deepseq directory filepath mtl pretty process
+ string-qq time
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ array base containers deepseq directory doctest filepath hspec
+ HUnit mtl pretty process QuickCheck string-qq temporary time
+ ];
+ testToolDepends = [ alex happy hspec-discover ];
+ description = "A compiler front-end generator";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"BNFC-meta" = callPackage
({ mkDerivation, alex-meta, array, base, fail, happy-meta
, haskell-src-meta, syb, template-haskell
@@ -2993,8 +3022,8 @@ self: {
pname = "Chart";
version = "1.9.3";
sha256 = "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry";
- revision = "1";
- editedCabalFile = "1is2xvhwyf5j4nls6k162glazd28jj84r2h0bf868q93qdppzgxj";
+ revision = "2";
+ editedCabalFile = "04mmsm54mdqcrypvgawhhbwjscmky3j7g5841bc71c0q6d33h2k4";
libraryHaskellDepends = [
array base colour data-default-class lens mtl old-locale
operational time vector
@@ -3011,8 +3040,8 @@ self: {
pname = "Chart-cairo";
version = "1.9.3";
sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f";
- revision = "1";
- editedCabalFile = "1jhw93vmhafnrvim03afc989n6jdiwpnwqma09zxd3m09hcsg17l";
+ revision = "2";
+ editedCabalFile = "0z93znn3dpgj80iiz3a67m90x0j9ljr0jd1ws9jkzj7rk88014gp";
libraryHaskellDepends = [
array base cairo Chart colour data-default-class lens mtl
old-locale operational time
@@ -3031,8 +3060,8 @@ self: {
pname = "Chart-diagrams";
version = "1.9.3";
sha256 = "075yzq50jpakgq6lb3anr660jydm68ry0di33icdacbdymq8avwn";
- revision = "1";
- editedCabalFile = "1hm4z73k60ndb5jvy6wxviiyv9i0qd6diz8kf36yfbayzacqianw";
+ revision = "2";
+ editedCabalFile = "00whqmaqrbidicsz9dqvq88jc88m8cixxkyf70qsdg7ysg8dad8m";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base blaze-markup bytestring Chart colour containers
@@ -9393,8 +9422,8 @@ self: {
}:
mkDerivation {
pname = "HTF";
- version = "0.14.0.5";
- sha256 = "1hgkymgb8v3f5s7i8nn01iml8mqvah4iyqiqcflj3ffbjb93v1zd";
+ version = "0.14.0.6";
+ sha256 = "0lm4va3nnb9yli56vfkj7h816k0cnrdjnd3d9x44m706bh3avksq";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal process ];
@@ -9777,8 +9806,8 @@ self: {
pname = "HaXml";
version = "1.25.5";
sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb";
- revision = "2";
- editedCabalFile = "0vlczcac2is5dbvkcwbsry1i10pbh1r316n1sq2py35alw7kzp1j";
+ revision = "4";
+ editedCabalFile = "029jnlmab1llr55dmlamrn2hxkbqw7ryz1dfg19h1aip6byf4ljh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -15016,6 +15045,8 @@ self: {
pname = "OneTuple";
version = "0.2.2.1";
sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc";
+ revision = "1";
+ editedCabalFile = "03mygfz7lv6h0i30bq2grvmahbg9j7a36mc0wls2nr81dv9p19s7";
libraryHaskellDepends = [ base ];
description = "Singleton Tuple";
license = lib.licenses.bsd3;
@@ -16065,6 +16096,20 @@ self: {
platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs) alsaLib;};
+ "PortMidi-simple" = callPackage
+ ({ mkDerivation, base, PortMidi }:
+ mkDerivation {
+ pname = "PortMidi-simple";
+ version = "0.1.0.0";
+ sha256 = "17bl26jlpd48ag42kbjdirqhpahxaiax5sy7p3j1jylhiargijcd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base PortMidi ];
+ executableHaskellDepends = [ base PortMidi ];
+ description = "Simplified PortMidi wrapper";
+ license = lib.licenses.bsd3;
+ }) {};
+
"PostgreSQL" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -21220,6 +21265,8 @@ self: {
pname = "Win32-errors";
version = "0.2.2.5";
sha256 = "08gbvlsf37nx982qs19pb9qc5sxi6493f02d3afjsyxqvalfbijy";
+ revision = "1";
+ editedCabalFile = "0vk991m2b14sqs74fnbxfymp9hzvmn30xkrngkhl6idyqgc0hsbd";
libraryHaskellDepends = [ base template-haskell text Win32 ];
testHaskellDepends = [ base hspec QuickCheck Win32 ];
description = "Alternative error handling for Win32 foreign calls";
@@ -21961,8 +22008,8 @@ self: {
}:
mkDerivation {
pname = "Z-Data";
- version = "0.6.0.0";
- sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d";
+ version = "0.7.0.0";
+ sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq ghc-prim
@@ -21983,18 +22030,18 @@ self: {
"Z-IO" = callPackage
({ mkDerivation, base, bytestring, containers, exceptions, hashable
- , hspec, hspec-discover, HUnit, microlens, primitive, QuickCheck
+ , hspec, hspec-discover, HUnit, primitive, QuickCheck
, quickcheck-instances, scientific, stm, time, unix-time
, unordered-containers, Z-Data, zlib
}:
mkDerivation {
pname = "Z-IO";
- version = "0.6.2.0";
- sha256 = "0d004yi1i45ccqhl4vqw6h4qxav693vas359gs76bz04wdbqgrah";
+ version = "0.6.4.0";
+ sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers exceptions microlens primitive stm time unix-time
+ base containers exceptions primitive stm time unix-time
unordered-containers Z-Data
];
libraryToolDepends = [ hspec-discover ];
@@ -22017,10 +22064,8 @@ self: {
}:
mkDerivation {
pname = "Z-MessagePack";
- version = "0.1.0.0";
- sha256 = "0ck21z1yqjx4w86h7z4ndj0fkpx7bfxfr9p5ls8687b71wxyzn6z";
- revision = "2";
- editedCabalFile = "14p2w38wrc8m66421wdl7q7fn21vk4b5m2mi2sa79wnaibv43d1n";
+ version = "0.3.0.1";
+ sha256 = "1xn3by0fkn8w9akldfk2rrfk8ns2r64zxqadrcsgga7nv88q49am";
libraryHaskellDepends = [
base containers deepseq hashable integer-gmp primitive QuickCheck
scientific tagged time unordered-containers Z-Data Z-IO
@@ -23963,8 +24008,8 @@ self: {
pname = "acts";
version = "0.3.1.0";
sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37";
- revision = "2";
- editedCabalFile = "1xc061cj6wxqyr79hdakmc3nnzdh46sj2sd7j9gfrvgmbipl895q";
+ revision = "3";
+ editedCabalFile = "01vjb8mp9ifbfknnibzc1yhimn5yli2vafpxs6adk0cdjna99g4w";
libraryHaskellDepends = [
base deepseq finitary finite-typelits groups
];
@@ -24370,38 +24415,6 @@ self: {
}) {};
"aeson" = callPackage
- ({ mkDerivation, attoparsec, base, base-compat
- , base-compat-batteries, base-orphans, base16-bytestring
- , bytestring, containers, data-fix, deepseq, Diff, directory, dlist
- , filepath, generic-deriving, ghc-prim, hashable, hashable-time
- , integer-logarithms, primitive, QuickCheck, quickcheck-instances
- , scientific, strict, tagged, tasty, tasty-golden, tasty-hunit
- , tasty-quickcheck, template-haskell, text, th-abstraction, these
- , time, time-compat, unordered-containers, uuid-types, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "1.5.5.1";
- sha256 = "0iqnzh9xh2vx9viqvs528i24zm9sdpvh8kjbpfxgrca38v6ds5m2";
- libraryHaskellDepends = [
- attoparsec base base-compat-batteries bytestring containers
- data-fix deepseq dlist ghc-prim hashable primitive scientific
- strict tagged template-haskell text th-abstraction these time
- time-compat unordered-containers uuid-types vector
- ];
- testHaskellDepends = [
- attoparsec base base-compat base-orphans base16-bytestring
- bytestring containers data-fix Diff directory dlist filepath
- generic-deriving ghc-prim hashable hashable-time integer-logarithms
- QuickCheck quickcheck-instances scientific strict tagged tasty
- tasty-golden tasty-hunit tasty-quickcheck template-haskell text
- these time time-compat unordered-containers uuid-types vector
- ];
- description = "Fast JSON parsing and encoding";
- license = lib.licenses.bsd3;
- }) {};
-
- "aeson_1_5_6_0" = callPackage
({ mkDerivation, attoparsec, base, base-compat
, base-compat-batteries, base-orphans, base16-bytestring
, bytestring, containers, data-fix, deepseq, Diff, directory, dlist
@@ -24431,7 +24444,6 @@ self: {
];
description = "Fast JSON parsing and encoding";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"aeson-applicative" = callPackage
@@ -24521,26 +24533,6 @@ self: {
}) {};
"aeson-combinators" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, doctest, fail
- , hspec, scientific, text, time, time-compat, unordered-containers
- , utf8-string, uuid-types, vector, void
- }:
- mkDerivation {
- pname = "aeson-combinators";
- version = "0.0.4.0";
- sha256 = "01gsrm6glr2axcls4hxs740z8lxf39cvdhvidf360mnijai4sgl6";
- libraryHaskellDepends = [
- aeson base bytestring containers fail scientific text time
- time-compat unordered-containers uuid-types vector void
- ];
- testHaskellDepends = [
- aeson base bytestring doctest hspec text utf8-string
- ];
- description = "Aeson combinators for dead simple JSON decoding";
- license = lib.licenses.bsd3;
- }) {};
-
- "aeson-combinators_0_0_4_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, deepseq, doctest, fail, hspec, scientific, text, time
, time-compat, unordered-containers, utf8-string, uuid-types
@@ -24562,7 +24554,6 @@ self: {
];
description = "Aeson combinators for dead simple JSON decoding";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"aeson-commit" = callPackage
@@ -24592,8 +24583,8 @@ self: {
pname = "aeson-compat";
version = "0.3.9";
sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0";
- revision = "4";
- editedCabalFile = "0l2ggm3lfnww4sq9frr0cga4ad9vlfhjsh323f9lvx3jk0g9pn7y";
+ revision = "5";
+ editedCabalFile = "11ca16ff12jp0kndhwaq8gm3jc2irs3hbmd1lh2lwrqyq498d8k6";
libraryHaskellDepends = [
aeson attoparsec attoparsec-iso8601 base base-compat bytestring
containers exceptions hashable scientific tagged text time
@@ -24733,6 +24724,8 @@ self: {
];
description = "Extra goodies for aeson";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"aeson-filthy" = callPackage
@@ -24977,8 +24970,8 @@ self: {
pname = "aeson-optics";
version = "1.1.0.1";
sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7";
- revision = "3";
- editedCabalFile = "1hxkahjf6znybqiv622n3syn5pp1a6jdpzq8ryrq9y45yczg82pi";
+ revision = "4";
+ editedCabalFile = "02g4438a6h2l0brvj1izagrsx9mgs1gqfds98vjzdsmamaqsm8fl";
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring optics-core
optics-extra scientific text unordered-containers vector
@@ -25160,8 +25153,8 @@ self: {
}:
mkDerivation {
pname = "aeson-schemas";
- version = "1.3.2";
- sha256 = "1mchqhpnv7rnhi1lbcsg1pwr5ml2444h3l2yak353s8lr204pg1p";
+ version = "1.3.3";
+ sha256 = "1dhi4pf8ariqr5g79cnr52rxfi1ywp2sv9sazw51rgv1k4gb3492";
libraryHaskellDepends = [
aeson base first-class-families hashable megaparsec
template-haskell text unordered-containers
@@ -26349,6 +26342,8 @@ self: {
];
description = "Companion library for the book Algebra-Driven Design by Sandy Maguire";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"algebra-sql" = callPackage
@@ -26521,6 +26516,89 @@ self: {
broken = true;
}) {};
+ "algorithmic-composition-additional" = callPackage
+ ({ mkDerivation, algorithmic-composition-basic, base, bytestring
+ , directory, foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l
+ , mmsyn7ukr-common, phonetic-languages-simplified-base, process
+ , ukrainian-phonetics-basic-array
+ }:
+ mkDerivation {
+ pname = "algorithmic-composition-additional";
+ version = "0.1.0.0";
+ sha256 = "183zjamprssdn3qiiil2ahzhfj6ajg7zs5vdspjfwfq651r8c9gh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ algorithmic-composition-basic base bytestring directory foldable-ix
+ mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common
+ phonetic-languages-simplified-base process
+ ukrainian-phonetics-basic-array
+ ];
+ executableHaskellDepends = [
+ algorithmic-composition-basic base bytestring directory foldable-ix
+ mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common
+ phonetic-languages-simplified-base process
+ ukrainian-phonetics-basic-array
+ ];
+ description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
+ license = lib.licenses.mit;
+ }) {};
+
+ "algorithmic-composition-basic" = callPackage
+ ({ mkDerivation, base, bytestring, directory, foldable-ix
+ , mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common
+ , phonetic-languages-simplified-base, process
+ , ukrainian-phonetics-basic-array
+ }:
+ mkDerivation {
+ pname = "algorithmic-composition-basic";
+ version = "0.2.2.0";
+ sha256 = "0ij3yh29mxkj9zph33g3r46afh3s4vhqxmhkpnm2mgzad7xqca2m";
+ libraryHaskellDepends = [
+ base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l
+ mmsyn7ukr-common phonetic-languages-simplified-base process
+ ukrainian-phonetics-basic-array
+ ];
+ description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
+ license = lib.licenses.mit;
+ }) {};
+
+ "algorithmic-composition-complex" = callPackage
+ ({ mkDerivation, algorithmic-composition-basic, base, bytestring
+ , directory, foldable-ix, mmsyn2-array, mmsyn3, mmsyn7l
+ , mmsyn7ukr-common, phonetic-languages-simplified-base, process
+ , ukrainian-phonetics-basic-array
+ }:
+ mkDerivation {
+ pname = "algorithmic-composition-complex";
+ version = "0.1.0.0";
+ sha256 = "12spldkdcjidaa95w46z5rvy1nsxn9blzhic8klkgx8jwvynixbl";
+ libraryHaskellDepends = [
+ algorithmic-composition-basic base bytestring directory foldable-ix
+ mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common
+ phonetic-languages-simplified-base process
+ ukrainian-phonetics-basic-array
+ ];
+ description = "Helps to create more complex experimental music from a file (especially timbre)";
+ license = lib.licenses.mit;
+ }) {};
+
+ "algorithmic-composition-frequency-shift" = callPackage
+ ({ mkDerivation, algorithmic-composition-basic, base, directory
+ , doublezip, mmsyn3, mmsyn7l, process
+ }:
+ mkDerivation {
+ pname = "algorithmic-composition-frequency-shift";
+ version = "0.1.0.0";
+ sha256 = "0m7pjxczi3w7r3srq76b30xjiqv9w6238xl2hm7s8gwnam8ha7r5";
+ libraryHaskellDepends = [
+ algorithmic-composition-basic base directory doublezip mmsyn3
+ mmsyn7l process
+ ];
+ description = "Helps to create experimental music. Uses SoX inside.";
+ license = lib.licenses.mit;
+ }) {};
+
"align" = callPackage
({ mkDerivation, base, containers, transformers, vector }:
mkDerivation {
@@ -29662,8 +29740,8 @@ self: {
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.4.5.0";
- sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9";
+ version = "0.4.5.1";
+ sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -29675,15 +29753,15 @@ self: {
license = lib.licenses.gpl3;
}) {};
- "amqp-utils_0_4_5_1" = callPackage
+ "amqp-utils_0_5_0_0" = callPackage
({ mkDerivation, amqp, base, bytestring, connection, containers
, data-default-class, directory, hinotify, magic, network, process
, text, time, tls, unix, utf8-string, x509-system
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.4.5.1";
- sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap";
+ version = "0.5.0.0";
+ sha256 = "140awzxj14h9wa13wfl15dqndqvyy046zmyg0q643r40nbyggl8r";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -31865,8 +31943,8 @@ self: {
}:
mkDerivation {
pname = "apply-refact";
- version = "0.9.0.0";
- sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc";
+ version = "0.9.1.0";
+ sha256 = "1b9ib5ix643aagzsw5vk8d789a784pggsm6qv36bxkcsx89s2bjm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -31988,43 +32066,20 @@ self: {
}) {};
"approximate" = callPackage
- ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
- , comonad, deepseq, directory, doctest, filepath, ghc-prim
- , hashable, lens, log-domain, pointed, safecopy, semigroupoids
- , semigroups, simple-reflect, vector
- }:
- mkDerivation {
- pname = "approximate";
- version = "0.3.2";
- sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base binary bytes cereal comonad deepseq ghc-prim hashable lens
- log-domain pointed safecopy semigroupoids semigroups vector
- ];
- testHaskellDepends = [
- base directory doctest filepath semigroups simple-reflect
- ];
- description = "Approximate discrete values and numbers";
- license = lib.licenses.bsd3;
- }) {};
-
- "approximate_0_3_3" = callPackage
({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
, ghc-prim, hashable, lens, log-domain, pointed, safecopy
, semigroupoids, semigroups, vector
}:
mkDerivation {
pname = "approximate";
- version = "0.3.3";
- sha256 = "1hvgx5m83zzpy2l0bbs39yvybhsxlq9919hp7wn27n5j0lk7wplk";
+ version = "0.3.4";
+ sha256 = "06akbrmy66nkgnnk3x87jss9qgv5y9m638rvxy57mfzibf925kbd";
libraryHaskellDepends = [
base binary bytes cereal comonad deepseq ghc-prim hashable lens
log-domain pointed safecopy semigroupoids semigroups vector
];
description = "Approximate discrete values and numbers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"approximate-equality" = callPackage
@@ -32323,8 +32378,8 @@ self: {
}:
mkDerivation {
pname = "arch-hs";
- version = "0.7.0.0";
- sha256 = "0nlsxlqmjg0nw9dgd3l8s1zphzcwrbcvmv30s5y5xbfm06zc5wc7";
+ version = "0.7.1.0";
+ sha256 = "120kxjz27llinggq6qwihqjbs1f4q0wdfb79fmrb80k25pvhkn8v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -32370,6 +32425,8 @@ self: {
];
description = "Arch Linux official and AUR web interface binding";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"archive" = callPackage
@@ -33036,8 +33093,8 @@ self: {
}:
mkDerivation {
pname = "array-chunks";
- version = "0.1.2.0";
- sha256 = "0x2hkc587ki4ncpsdrhby04dr4gxvf0v5qj5kda7kfl2814srixi";
+ version = "0.1.3.0";
+ sha256 = "0alf0d4ifla7i47pl7xqmrhcwsky56rp4b76qgmh19kji8mfcq5z";
libraryHaskellDepends = [ base primitive run-st ];
testHaskellDepends = [
base primitive QuickCheck quickcheck-classes tasty tasty-hunit
@@ -34188,26 +34245,6 @@ self: {
}) {};
"async" = callPackage
- ({ mkDerivation, base, hashable, HUnit, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.2.2";
- sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb";
- revision = "1";
- editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base hashable stm ];
- testHaskellDepends = [
- base HUnit stm test-framework test-framework-hunit
- ];
- description = "Run IO operations asynchronously and wait for their results";
- license = lib.licenses.bsd3;
- }) {};
-
- "async_2_2_3" = callPackage
({ mkDerivation, base, hashable, HUnit, stm, test-framework
, test-framework-hunit
}:
@@ -34223,7 +34260,6 @@ self: {
];
description = "Run IO operations asynchronously and wait for their results";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"async-ajax" = callPackage
@@ -35010,6 +35046,8 @@ self: {
pname = "attoparsec";
version = "0.13.2.5";
sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11";
+ revision = "1";
+ editedCabalFile = "180r53j8z1p6z2l63qmhqyl1h27l5j3vrhanwfmwchrj7xf1k23w";
libraryHaskellDepends = [
array base bytestring containers deepseq ghc-prim scientific text
transformers
@@ -35424,10 +35462,8 @@ self: {
}:
mkDerivation {
pname = "aur";
- version = "7.0.5";
- sha256 = "16c4q0w6qpn4gg6xlggkcs92fcvm58a3qmykfm1dgcfsjhwwhxkx";
- revision = "1";
- editedCabalFile = "10p4qyfv2ha3s8dli6v9yzzx4pj5r1cfxcy0gcf0rgbxsszi2315";
+ version = "7.0.6";
+ sha256 = "0rq2gyhg5c7xwj7w582l99al8jhsacv3vl77p1mfzcc79h424jdy";
libraryHaskellDepends = [
aeson base bytestring hashable http-client http-types text
];
@@ -35468,10 +35504,8 @@ self: {
}:
mkDerivation {
pname = "aura";
- version = "3.2.2";
- sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f";
- revision = "2";
- editedCabalFile = "1m138p8rllm42gpqj10z3jvdlcz9f0v4is4ygdxi7yxn9xmy15x9";
+ version = "3.2.3";
+ sha256 = "1gq4nkwil64h4armg39vbl3wjsbnqsa0vg5b41kq19dp9rmpfsp5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -36541,18 +36575,19 @@ self: {
}) {};
"aws-lambda-haskell-runtime" = callPackage
- ({ mkDerivation, aeson, base, bytestring, case-insensitive, hspec
- , http-client, http-types, path, path-io, safe-exceptions-checked
- , template-haskell, text, unordered-containers
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive
+ , exceptions, hashable, hspec, http-client, http-types, mtl, path
+ , path-io, safe-exceptions-checked, template-haskell, text
+ , unordered-containers
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime";
- version = "3.0.5";
- sha256 = "07p0lz2hj17n97f2ps59axb4c6416g45m6wcd3hk7jybd6ja8qpr";
+ version = "4.1.0";
+ sha256 = "1zb426bj1k3b3sp5hlg0ajx19mf0vwvr39zdg6p9l9i830qfdjfw";
libraryHaskellDepends = [
- aeson base bytestring case-insensitive http-client http-types path
- path-io safe-exceptions-checked template-haskell text
- unordered-containers
+ aeson base bytestring case-insensitive exceptions hashable
+ http-client http-types mtl path path-io safe-exceptions-checked
+ template-haskell text unordered-containers
];
testHaskellDepends = [ base hspec ];
description = "Haskell runtime for AWS Lambda";
@@ -36566,8 +36601,8 @@ self: {
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime-wai";
- version = "1.0.2";
- sha256 = "0bjqrwl2kcnxv8yni2bxaz5x3pgs3j6c4rrgqpv5kfs7yn1ins7w";
+ version = "2.0.0";
+ sha256 = "1m95hcfl72v9rrks0clzrz3md35jsk5jgc5ds81vrknzxr0b0fgj";
libraryHaskellDepends = [
aeson aws-lambda-haskell-runtime base binary bytestring
case-insensitive http-types iproute network text
@@ -36621,6 +36656,8 @@ self: {
];
description = "Package Haskell functions for easy use on AWS Lambda";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"aws-mfa-credentials" = callPackage
@@ -38015,8 +38052,8 @@ self: {
pname = "base16";
version = "0.3.0.1";
sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd";
- revision = "3";
- editedCabalFile = "15r912hb0l92f2cajpq2b6ky4g5qwfmb502nfv1vrg02a1h25xb6";
+ revision = "4";
+ editedCabalFile = "05fpdw8qkdg7cfyfsnk5npcxqgjgasd8hi096nh6czj96xn4s1b6";
libraryHaskellDepends = [
base bytestring deepseq primitive text text-short
];
@@ -38067,18 +38104,15 @@ self: {
}) {};
"base16-lens" = callPackage
- ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest
- , doctest, lens, text, text-short
+ ({ mkDerivation, base, base16, bytestring, lens, text, text-short
}:
mkDerivation {
pname = "base16-lens";
- version = "0.1.3.0";
- sha256 = "1612v5lj99szshz7vm3mr5p4xxcrga1xxcfm9q9zzpnyd5z5vkn2";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "0.1.3.2";
+ sha256 = "04qz8gm969vlaxsk1j3rlpqph74qjkfr3rkpfkkxrfmxih6cm2fj";
libraryHaskellDepends = [
base base16 bytestring lens text text-short
];
- testHaskellDepends = [ base doctest lens ];
description = "Optics for the Base16 library";
license = lib.licenses.bsd3;
}) {};
@@ -38092,8 +38126,8 @@ self: {
pname = "base32";
version = "0.2.0.0";
sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm";
- revision = "1";
- editedCabalFile = "0vsc0fq4rihhx4hicfgy1xpfm1bbq4rnwgfs9qzgmwhslffqy2x5";
+ revision = "2";
+ editedCabalFile = "0chbgkq65mh6nc48a3hywcv7idfqgb3acv4b7gmz8m6szqq4mx95";
libraryHaskellDepends = [
base bytestring deepseq ghc-byteorder text text-short
];
@@ -38126,18 +38160,15 @@ self: {
}) {};
"base32-lens" = callPackage
- ({ mkDerivation, base, base32, bytestring, Cabal, cabal-doctest
- , doctest, lens, text
+ ({ mkDerivation, base, base32, bytestring, lens, text, text-short
}:
mkDerivation {
pname = "base32-lens";
- version = "0.1.0.0";
- sha256 = "0yhaaz5y8cwyjcclmjw0hk31388z233041ycfpwm2a3f0vgpilvn";
- revision = "1";
- editedCabalFile = "1sj9dc2prfhbc3b7bvxmw6wfq0iql6dwvdx928z13rdc4vwj0nv0";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ base base32 bytestring lens text ];
- testHaskellDepends = [ base doctest lens ];
+ version = "0.1.1.1";
+ sha256 = "0wam29m7vz5srrj135wmsbmg9qqhsidnwfhbicy0vmx342ai8bs6";
+ libraryHaskellDepends = [
+ base base32 bytestring lens text text-short
+ ];
description = "Optics for the Base32 library";
license = lib.licenses.bsd3;
}) {};
@@ -38259,6 +38290,8 @@ self: {
pname = "base64";
version = "0.4.2.3";
sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw";
+ revision = "1";
+ editedCabalFile = "10s7nw79q385f74x76rh8cy0dxfj7idzrj77ng9x32bf8h7jpa6q";
libraryHaskellDepends = [
base bytestring deepseq ghc-byteorder text text-short
];
@@ -38350,8 +38383,8 @@ self: {
pname = "base64-bytestring-type";
version = "1.0.1";
sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
- revision = "7";
- editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c";
+ revision = "8";
+ editedCabalFile = "196m1ylkl9d03iymld08fhfnfcdydzd824v7ffl67ijmfxcvzcyn";
libraryHaskellDepends = [
aeson base base-compat base64-bytestring binary bytestring cereal
deepseq hashable http-api-data QuickCheck serialise text
@@ -38386,16 +38419,15 @@ self: {
}) {};
"base64-lens" = callPackage
- ({ mkDerivation, base, base64, bytestring, Cabal, cabal-doctest
- , doctest, lens, text
+ ({ mkDerivation, base, base64, bytestring, lens, text, text-short
}:
mkDerivation {
pname = "base64-lens";
- version = "0.3.0";
- sha256 = "0gs3cxmglz0hshi4m94zrlc6fix90cvbdmcv2v4j01zwsdg8gv81";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ base base64 bytestring lens text ];
- testHaskellDepends = [ base doctest lens ];
+ version = "0.3.1";
+ sha256 = "1iszvlc22h7crwqhcafy974l0l1rgxbcjf6lb5yxsvp6q66gzhrn";
+ libraryHaskellDepends = [
+ base base64 bytestring lens text text-short
+ ];
description = "Optics for the Base64 library";
license = lib.licenses.bsd3;
}) {};
@@ -38901,8 +38933,8 @@ self: {
}:
mkDerivation {
pname = "bcp47";
- version = "0.2.0.1";
- sha256 = "1hrqszdzr15p45wbbnpdkairmqwz8giyb0gn727wgxflh75a84xr";
+ version = "0.2.0.3";
+ sha256 = "07gz8bflc3klw0370albaff8v9vlgyqgrc5lifl35vs2ia891fhn";
libraryHaskellDepends = [
aeson base containers country generic-arbitrary iso639 megaparsec
QuickCheck text
@@ -40272,10 +40304,8 @@ self: {
({ mkDerivation, base, dec, deepseq, fin, hashable, QuickCheck }:
mkDerivation {
pname = "bin";
- version = "0.1";
- sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5";
- revision = "2";
- editedCabalFile = "1zmzi566syvrm9bk0mxj3dycd3i4b33018c644qxdqdb00mlvayh";
+ version = "0.1.1";
+ sha256 = "11awr2zdknjdgy365hh3alq0fjkhhixk6synf65af2brzkl8k5ys";
libraryHaskellDepends = [
base dec deepseq fin hashable QuickCheck
];
@@ -40481,6 +40511,8 @@ self: {
pname = "binary-instances";
version = "1.0.1";
sha256 = "0whqjziwqrqslf6byliry84pg47z7vc6yjligpzb8gb5db2gw1h0";
+ revision = "1";
+ editedCabalFile = "1xw2rl5mk626i54c0azrw5as3avd2cvzxn8l6sg5ymc14c240iwp";
libraryHaskellDepends = [
aeson base binary binary-orphans case-insensitive hashable
scientific tagged text text-binary time-compat unordered-containers
@@ -40645,16 +40677,14 @@ self: {
}:
mkDerivation {
pname = "binary-search";
- version = "1.0.0.3";
- sha256 = "1ypn2i2c3mxd1zhpj515zf15y9sgz10akbyngg2ymp7ddbs2vqxh";
+ version = "2.0.0";
+ sha256 = "13dp9wbf58k4rbr9ychf7p0zkrpzykxhh4fws741sk9mcjmrkgv7";
libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [
base directory doctest filepath hspec QuickCheck
];
description = "Binary and exponential searches";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"binary-serialise-cbor" = callPackage
@@ -42739,23 +42769,6 @@ self: {
}) {};
"bits" = callPackage
- ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl
- , transformers
- }:
- mkDerivation {
- pname = "bits";
- version = "0.5.2";
- sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav";
- revision = "2";
- editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ base bytes mtl transformers ];
- testHaskellDepends = [ base doctest ];
- description = "Various bit twiddling and bitwise serialization primitives";
- license = lib.licenses.bsd3;
- }) {};
-
- "bits_0_5_3" = callPackage
({ mkDerivation, base, bytes, mtl, transformers }:
mkDerivation {
pname = "bits";
@@ -42764,7 +42777,6 @@ self: {
libraryHaskellDepends = [ base bytes mtl transformers ];
description = "Various bit twiddling and bitwise serialization primitives";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"bits-atomic" = callPackage
@@ -43021,30 +43033,6 @@ self: {
}) {};
"bitvec" = callPackage
- ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
- , integer-gmp, primitive, quickcheck-classes, random, tasty
- , tasty-hunit, tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "bitvec";
- version = "1.0.3.0";
- sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd";
- libraryHaskellDepends = [
- base deepseq ghc-prim integer-gmp primitive vector
- ];
- librarySystemDepends = [ gmp ];
- testHaskellDepends = [
- base integer-gmp primitive quickcheck-classes tasty tasty-hunit
- tasty-quickcheck vector
- ];
- benchmarkHaskellDepends = [
- base containers gauge integer-gmp random vector
- ];
- description = "Space-efficient bit vectors";
- license = lib.licenses.bsd3;
- }) {inherit (pkgs) gmp;};
-
- "bitvec_1_1_1_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
, integer-gmp, primitive, quickcheck-classes, random, tasty
, tasty-bench, tasty-hunit, tasty-quickcheck, vector
@@ -43065,7 +43053,6 @@ self: {
];
description = "Space-efficient bit vectors";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"bitwise" = callPackage
@@ -43090,10 +43077,8 @@ self: {
}:
mkDerivation {
pname = "bitwise-enum";
- version = "1.0.0.3";
- sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis";
- revision = "3";
- editedCabalFile = "19d5xwigd482z47s8gpbd2jmm4pmx5bxg2fxkzjl8dias4yb431x";
+ version = "1.0.1.0";
+ sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z";
libraryHaskellDepends = [
aeson array base deepseq mono-traversable vector
];
@@ -43695,6 +43680,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "blaze-markup_0_8_2_8" = callPackage
+ ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "blaze-markup";
+ version = "0.8.2.8";
+ sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23";
+ libraryHaskellDepends = [ base blaze-builder bytestring text ];
+ testHaskellDepends = [
+ base blaze-builder bytestring containers HUnit QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
+ ];
+ description = "A blazingly fast markup combinator library for Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"blaze-shields" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }:
mkDerivation {
@@ -45025,8 +45028,8 @@ self: {
pname = "boring";
version = "0.1.3";
sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d";
- revision = "1";
- editedCabalFile = "1gn2f035fmn2l56a507x080cl1apddszhlsf6lriwyass4v58mfl";
+ revision = "2";
+ editedCabalFile = "031vricyy2m7hg2hk3bj64lsz55k9qh36s2yfh09pgsfykr883ag";
libraryHaskellDepends = [
adjunctions base base-compat bin constraints dec fin generics-sop
ral singleton-bool streams tagged transformers transformers-compat
@@ -45794,7 +45797,6 @@ self: {
];
description = "Haskell source code formatter";
license = lib.licenses.agpl3;
- maintainers = with lib.maintainers; [ maralorn ];
}) {};
"broadcast-chan" = callPackage
@@ -47276,29 +47278,6 @@ self: {
}) {};
"bytes" = callPackage
- ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal
- , cabal-doctest, cereal, containers, directory, doctest, filepath
- , hashable, mtl, scientific, text, time, transformers
- , transformers-compat, unordered-containers, void
- }:
- mkDerivation {
- pname = "bytes";
- version = "0.17";
- sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3";
- revision = "5";
- editedCabalFile = "0a089bz9sjnmv3f5w9jsm1b7g60qx8qxqj76lwjj0mslzi9iajk2";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base binary binary-orphans bytestring cereal containers hashable
- mtl scientific text time transformers transformers-compat
- unordered-containers void
- ];
- testHaskellDepends = [ base directory doctest filepath ];
- description = "Sharing code for serialization between binary and cereal";
- license = lib.licenses.bsd3;
- }) {};
-
- "bytes_0_17_1" = callPackage
({ mkDerivation, base, binary, binary-orphans, bytestring, cereal
, containers, hashable, mtl, scientific, text, time, transformers
, transformers-compat, unordered-containers, void
@@ -47314,7 +47293,6 @@ self: {
];
description = "Sharing code for serialization between binary and cereal";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"byteset" = callPackage
@@ -47337,8 +47315,8 @@ self: {
}:
mkDerivation {
pname = "byteslice";
- version = "0.2.5.0";
- sha256 = "0sl5jbfni6sx6srlfdpj0cb0pjw38cf3fyxsnaldbap2wfd3ncyr";
+ version = "0.2.5.2";
+ sha256 = "0nva9w086g6d7g6bjwk4ad14jz8z17m0m9fvzfxv90cx6wkmvph3";
libraryHaskellDepends = [
base bytestring primitive primitive-addr primitive-unlifted run-st
tuples vector
@@ -48757,23 +48735,22 @@ self: {
({ mkDerivation, array, async, base, base16-bytestring, binary
, bytestring, Cabal, containers, cryptohash-sha256, deepseq
, directory, echo, edit-distance, filepath, hackage-security
- , hashable, HTTP, lukko, mtl, network, network-uri, parsec, pretty
- , process, random, resolv, stm, tar, text, time, transformers, unix
- , zlib
+ , hashable, HTTP, lukko, mtl, network-uri, parsec, pretty, process
+ , random, regex-base, regex-posix, resolv, stm, tar, text, time
+ , transformers, unix, zlib
}:
mkDerivation {
pname = "cabal-install";
- version = "3.2.0.0";
- sha256 = "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0";
+ version = "3.4.0.0";
+ sha256 = "15rylx5pa03jdiwcg1x7zvs6aq3g6phwmi1hz26cl080nczyz00r";
isLibrary = false;
isExecutable = true;
- setupHaskellDepends = [ base Cabal filepath process ];
executableHaskellDepends = [
array async base base16-bytestring binary bytestring Cabal
containers cryptohash-sha256 deepseq directory echo edit-distance
- filepath hackage-security hashable HTTP lukko mtl network
- network-uri parsec pretty process random resolv stm tar text time
- transformers unix zlib
+ filepath hackage-security hashable HTTP lukko mtl network-uri
+ parsec pretty process random regex-base regex-posix resolv stm tar
+ text time transformers unix zlib
];
doCheck = false;
postInstall = ''
@@ -51579,8 +51556,8 @@ self: {
pname = "cassava";
version = "0.5.2.0";
sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk";
- revision = "2";
- editedCabalFile = "1y08lhkh6c6421g3nwwkrrv3r36l75x9j2hnm5khagjpm5njjzma";
+ revision = "3";
+ editedCabalFile = "0hq9s6662ykk2ldv222xgifwzwvmhmrs56b1llqpdzp7vf7p8b3p";
configureFlags = [ "-f-bytestring--lt-0_10_4" ];
libraryHaskellDepends = [
array attoparsec base bytestring containers deepseq hashable Only
@@ -53156,23 +53133,6 @@ self: {
}) {};
"charset" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, semigroups
- , unordered-containers
- }:
- mkDerivation {
- pname = "charset";
- version = "0.3.7.1";
- sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
- revision = "2";
- editedCabalFile = "002x3yan7632nqgwk0a7f3wvchgm95pdwqh225va8dnn1lr9pi1z";
- libraryHaskellDepends = [
- array base bytestring containers semigroups unordered-containers
- ];
- description = "Fast unicode character sets based on complemented PATRICIA tries";
- license = lib.licenses.bsd3;
- }) {};
-
- "charset_0_3_8" = callPackage
({ mkDerivation, array, base, bytestring, containers
, unordered-containers
}:
@@ -53185,7 +53145,6 @@ self: {
];
description = "Fast unicode character sets based on complemented PATRICIA tries";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"charsetdetect" = callPackage
@@ -54927,6 +54886,33 @@ self: {
license = lib.licenses.bsd2;
}) {};
+ "citeproc_0_3_0_8" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring
+ , case-insensitive, containers, data-default, Diff, directory
+ , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe
+ , scientific, text, timeit, transformers, uniplate, vector
+ , xml-conduit
+ }:
+ mkDerivation {
+ pname = "citeproc";
+ version = "0.3.0.8";
+ sha256 = "0njlb37cxnpikwz9k92d689j477fz9x7chl58s3ljsw9drcgpcvh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring case-insensitive containers
+ data-default file-embed filepath pandoc-types rfc5051 safe
+ scientific text transformers uniplate vector xml-conduit
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers Diff directory filepath mtl pretty
+ text timeit transformers
+ ];
+ description = "Generates citations and bibliography from CSL styles";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"citeproc-hs" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri
@@ -57117,23 +57103,6 @@ self: {
}) {};
"cmdargs" = callPackage
- ({ mkDerivation, base, filepath, process, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "cmdargs";
- version = "0.10.20";
- sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base filepath process template-haskell transformers
- ];
- description = "Command line argument processing";
- license = lib.licenses.bsd3;
- }) {};
-
- "cmdargs_0_10_21" = callPackage
({ mkDerivation, base, filepath, process, template-haskell
, transformers
}:
@@ -57148,7 +57117,6 @@ self: {
];
description = "Command line argument processing";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"cmdargs-browser" = callPackage
@@ -59567,37 +59535,14 @@ self: {
}) {};
"compensated" = callPackage
- ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
- , cabal-doctest, cereal, comonad, criterion, deepseq, distributive
- , doctest, generic-deriving, hashable, lens, log-domain, safecopy
- , semigroupoids, semigroups, simple-reflect, vector
- }:
- mkDerivation {
- pname = "compensated";
- version = "0.8.1";
- sha256 = "1qr5nsg6fb6ib2wp29c1y05zdbydsng0sfg2k75qsh0avb2cgw7z";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base bifunctors binary bytes cereal comonad deepseq distributive
- hashable lens log-domain safecopy semigroupoids semigroups vector
- ];
- testHaskellDepends = [
- base doctest generic-deriving semigroups simple-reflect
- ];
- benchmarkHaskellDepends = [ base criterion ];
- description = "Compensated floating-point arithmetic";
- license = lib.licenses.bsd3;
- }) {};
-
- "compensated_0_8_2" = callPackage
({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad
, criterion, deepseq, distributive, hashable, lens, log-domain
, safecopy, semigroupoids, semigroups, vector
}:
mkDerivation {
pname = "compensated";
- version = "0.8.2";
- sha256 = "0mqy5c5wh4m3l78fbd20vnllpsn383q07kxl6j62iakcyhr1264p";
+ version = "0.8.3";
+ sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a";
libraryHaskellDepends = [
base bifunctors binary bytes cereal comonad deepseq distributive
hashable lens log-domain safecopy semigroupoids semigroups vector
@@ -59605,7 +59550,6 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Compensated floating-point arithmetic";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"competition" = callPackage
@@ -60952,6 +60896,35 @@ self: {
license = lib.licenses.mit;
}) {};
+ "conduit_1_3_4_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , exceptions, filepath, gauge, hspec, kan-extensions
+ , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+ , resourcet, safe, silently, split, text, transformers, unix
+ , unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "conduit";
+ version = "1.3.4.1";
+ sha256 = "1w96q9nqxvl1s9js1rrzy9x711jpkj8mm6s5nz67jmrdby6knx45";
+ libraryHaskellDepends = [
+ base bytestring directory exceptions filepath mono-traversable mtl
+ primitive resourcet text transformers unix unliftio-core vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory exceptions filepath hspec
+ mono-traversable mtl QuickCheck resourcet safe silently split text
+ transformers unliftio vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers deepseq gauge hspec kan-extensions mwc-random
+ transformers vector
+ ];
+ description = "Streaming data processing library";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"conduit-algorithms" = callPackage
({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
, conduit-combinators, conduit-extra, conduit-zstd, containers
@@ -61468,6 +61441,26 @@ self: {
license = lib.licenses.mpl20;
}) {};
+ "conferer_1_1_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , filepath, hspec, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "conferer";
+ version = "1.1.0.0";
+ sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09";
+ libraryHaskellDepends = [
+ base bytestring containers directory filepath text
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq directory filepath hspec
+ QuickCheck text
+ ];
+ description = "Configuration management library";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"conferer-aeson" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
, directory, hspec, text, unordered-containers, vector
@@ -61488,14 +61481,35 @@ self: {
license = lib.licenses.mpl20;
}) {};
+ "conferer-aeson_1_1_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
+ , directory, hspec, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "conferer-aeson";
+ version = "1.1.0.0";
+ sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96";
+ libraryHaskellDepends = [
+ aeson base bytestring conferer directory text unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-qq base bytestring conferer directory hspec text
+ unordered-containers vector
+ ];
+ description = "conferer's source for reading json files";
+ license = lib.licenses.mpl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"conferer-dhall" = callPackage
({ mkDerivation, base, bytestring, conferer, conferer-aeson, dhall
, dhall-json, directory, hspec, text
}:
mkDerivation {
pname = "conferer-dhall";
- version = "1.0.0.0";
- sha256 = "0xw2c1cmjw93x4ala85bxs0lfwlqwdl26lj1n7yc9lk67ln54912";
+ version = "1.1.0.0";
+ sha256 = "0whxxjz5askw1qxcxdn5094bqm2hy3zp49567v57gqikgv6rcnp1";
libraryHaskellDepends = [
base bytestring conferer conferer-aeson dhall dhall-json directory
text
@@ -61698,8 +61712,8 @@ self: {
({ mkDerivation, base, conferer, conferer-aeson, hspec, yaml }:
mkDerivation {
pname = "conferer-yaml";
- version = "1.0.0.0";
- sha256 = "091pkbkjpppkc2ygm8jq22xslr4afbp3kk5377gpx3vh4a0lvswg";
+ version = "1.1.0.0";
+ sha256 = "0pqxwwaskj96virs65p7cb6shkjbczmnqwla7rbfga2l0rw9ww0r";
libraryHaskellDepends = [ base conferer conferer-aeson yaml ];
testHaskellDepends = [ base conferer conferer-aeson hspec yaml ];
description = "Configuration for reading yaml files";
@@ -62202,16 +62216,15 @@ self: {
}) {};
"connections" = callPackage
- ({ mkDerivation, base, containers, finite-typelits, hedgehog
- , transformers, universe-base
- }:
+ ({ mkDerivation, base, containers, doctest, hedgehog }:
mkDerivation {
pname = "connections";
- version = "0.1.0";
- sha256 = "0lnskpdfgxjbkqlg82i1gxz8dsns36szyw1mv45nlq7jqspfspgp";
- libraryHaskellDepends = [
- base containers finite-typelits transformers universe-base
- ];
+ version = "0.2.0";
+ sha256 = "1hvfqdjcj4mp2iyx0596710z4f8fm0jlgp819xf2s90rz1b360ya";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers ];
+ executableHaskellDepends = [ base doctest ];
testHaskellDepends = [ base hedgehog ];
description = "Orders, Galois connections, and lattices";
license = lib.licenses.bsd3;
@@ -64656,8 +64669,8 @@ self: {
}:
mkDerivation {
pname = "cql";
- version = "4.0.2";
- sha256 = "0b6806ahmg4yacx5wc4v53gihhkwywajhqm13kb11nxabww3lapl";
+ version = "4.0.3";
+ sha256 = "1b6bqhg3rf2kk7i81l4vsgyp7zxiycifdrsj8qa4sqx78m72dmxh";
libraryHaskellDepends = [
base bytestring cereal containers Decimal iproute network
template-haskell text time transformers uuid vector
@@ -65420,6 +65433,8 @@ self: {
];
description = "A simple tool for comparing in Criterion benchmark results";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"criterion-compare" = callPackage
@@ -67339,6 +67354,18 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "curly-expander" = callPackage
+ ({ mkDerivation, base, parsec, text }:
+ mkDerivation {
+ pname = "curly-expander";
+ version = "0.2.0.3";
+ sha256 = "0sfd3vmkx74fp1yvbwwbx4rw3i1g70hcvcp205mz709r8yyhr9sb";
+ libraryHaskellDepends = [ base parsec text ];
+ testHaskellDepends = [ base parsec text ];
+ description = "Curly braces (brackets) expanding";
+ license = lib.licenses.lgpl3Only;
+ }) {};
+
"currencies" = callPackage
({ mkDerivation, base, hspec, text }:
mkDerivation {
@@ -70970,7 +70997,7 @@ self: {
license = lib.licenses.asl20;
}) {};
- "dbus_1_2_18" = callPackage
+ "dbus_1_2_21" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, containers
, criterion, deepseq, directory, exceptions, extra, filepath, lens
, network, parsec, process, QuickCheck, random, resourcet, split
@@ -70979,8 +71006,8 @@ self: {
}:
mkDerivation {
pname = "dbus";
- version = "1.2.18";
- sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73";
+ version = "1.2.21";
+ sha256 = "023lfywmxc5qqb31jaxpcf319az8ma9k9b0lkgriklskacq9sadi";
libraryHaskellDepends = [
base bytestring cereal conduit containers deepseq exceptions
filepath lens network parsec random split template-haskell text
@@ -71768,10 +71795,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "dec";
- version = "0.0.3";
- sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r";
- revision = "2";
- editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs";
+ version = "0.0.4";
+ sha256 = "0yslffafmqfkvhcw2arpc53hfmn1788z85ss9lxnbclr29lbvzgc";
libraryHaskellDepends = [ base ];
description = "Decidable propositions";
license = lib.licenses.bsd3;
@@ -71846,8 +71871,8 @@ self: {
}:
mkDerivation {
pname = "declarative";
- version = "0.5.3";
- sha256 = "021rhdhj2sji316mkm1fw679w7xb9n51x9pslmj21427q127ycw3";
+ version = "0.5.4";
+ sha256 = "10dwdzl4gbxwvb068kz8kiprk18bwl79pkyhyyrmfzawf8zp3pha";
libraryHaskellDepends = [
base hasty-hamiltonian kan-extensions lens mcmc-types
mighty-metropolis mwc-probability pipes primitive speedy-slice
@@ -72110,8 +72135,8 @@ self: {
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.9.15";
- sha256 = "0jijnjy6x6f86dmlhiaj9gl13zbwzaz4gpb8svzdwwws48bwwyqr";
+ version = "0.9.16";
+ sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1";
libraryHaskellDepends = [
base bytestring containers foldl hashable primitive text
transformers unordered-containers vector
@@ -72124,7 +72149,7 @@ self: {
license = lib.licenses.mit;
}) {};
- "deferred-folds_0_9_16" = callPackage
+ "deferred-folds_0_9_17" = callPackage
({ mkDerivation, base, bytestring, containers, foldl, hashable
, primitive, QuickCheck, quickcheck-instances, rerebase, tasty
, tasty-hunit, tasty-quickcheck, text, transformers
@@ -72132,8 +72157,8 @@ self: {
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.9.16";
- sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1";
+ version = "0.9.17";
+ sha256 = "1dn7ylqsqrc5s734xc4bsif6f53hg84i8w7zi929pikjl7xkbrch";
libraryHaskellDepends = [
base bytestring containers foldl hashable primitive text
transformers unordered-containers vector
@@ -72586,6 +72611,8 @@ self: {
];
description = "Reader-like monad transformer for dependency injection";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"dep-t-advice" = callPackage
@@ -72608,6 +72635,8 @@ self: {
];
description = "Giving good advice to functions in a DepT environment";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"dependency" = callPackage
@@ -73113,8 +73142,8 @@ self: {
({ mkDerivation, aeson, base, bytestring }:
mkDerivation {
pname = "deriving-aeson";
- version = "0.2.6";
- sha256 = "0x9sv8r0ziy14zk6lcgzgxbmx9mrlngc0r1bqg6gkgxhswmjc2jq";
+ version = "0.2.6.1";
+ sha256 = "014f3jsaiwqkz2l0jap8shwq3rdn1hq14ahmq0hm3l4c98vznjra";
libraryHaskellDepends = [ aeson base ];
testHaskellDepends = [ aeson base bytestring ];
description = "Type driven generic aeson instance customisation";
@@ -74019,6 +74048,8 @@ self: {
];
description = "Convert recursive ADTs from and to Dhall";
license = lib.licenses.cc0;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"dhall-text" = callPackage
@@ -74771,22 +74802,6 @@ self: {
}) {};
"diagrams-solve" = callPackage
- ({ mkDerivation, base, deepseq, tasty, tasty-hunit
- , tasty-quickcheck
- }:
- mkDerivation {
- pname = "diagrams-solve";
- version = "0.1.2";
- sha256 = "1qzycw3aj4107dqpgir3ak7pnja3a6i4ax15gd2q2fjzmp4p3z24";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [
- base deepseq tasty tasty-hunit tasty-quickcheck
- ];
- description = "Pure Haskell solver routines used by diagrams";
- license = lib.licenses.bsd3;
- }) {};
-
- "diagrams-solve_0_1_3" = callPackage
({ mkDerivation, base, deepseq, tasty, tasty-hunit
, tasty-quickcheck
}:
@@ -74800,7 +74815,6 @@ self: {
];
description = "Pure Haskell solver routines used by diagrams";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"diagrams-svg" = callPackage
@@ -75991,6 +76005,8 @@ self: {
pname = "directory";
version = "1.3.6.1";
sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi";
+ revision = "1";
+ editedCabalFile = "1rf2w9gx0vy74mgsf5q1y82bhm5ngb9mi0i2v2h6ss9gscyvgb7j";
libraryHaskellDepends = [ base filepath time unix ];
testHaskellDepends = [ base filepath time unix ];
description = "Platform-agnostic library for filesystem operations";
@@ -77532,8 +77548,8 @@ self: {
pname = "dlist-nonempty";
version = "0.1.1";
sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
- revision = "9";
- editedCabalFile = "09qgsqzjnkr5d2lwdz86q3zrikd5hacd62hvvfdqy39kh5wrqn4y";
+ revision = "10";
+ editedCabalFile = "0k9h3d93ivjykdpblkdcxyv1aybbjq6m5laqjh7bdv6nrdr5va2c";
libraryHaskellDepends = [
base base-compat deepseq dlist semigroupoids
];
@@ -78178,6 +78194,8 @@ self: {
];
description = "Vinyl-based records with hierarchical field names, default values and documentation";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"docstrings" = callPackage
@@ -78248,30 +78266,30 @@ self: {
license = lib.licenses.mit;
}) {};
- "doctest_0_18" = callPackage
+ "doctest_0_18_1" = callPackage
({ mkDerivation, base, base-compat, code-page, deepseq, directory
- , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery
- , process, QuickCheck, setenv, silently, stringbuilder, syb
- , transformers
+ , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core, HUnit
+ , mockery, process, QuickCheck, setenv, silently, stringbuilder
+ , syb, transformers
}:
mkDerivation {
pname = "doctest";
- version = "0.18";
- sha256 = "1yqrmjg3rn1vy0p6a6j78gnnl8lx4hzi0rwhpl5ljb4q6kzyc3x4";
+ version = "0.18.1";
+ sha256 = "07w77cik8p3kpcl5vx4l3cr93r1dhk3wc98k1g50l9pby5argrzb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
+ base base-compat code-page deepseq directory exceptions filepath
+ ghc ghc-paths process syb transformers
];
executableHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- process syb transformers
+ base base-compat code-page deepseq directory exceptions filepath
+ ghc ghc-paths process syb transformers
];
testHaskellDepends = [
- base base-compat code-page deepseq directory filepath ghc ghc-paths
- hspec hspec-core HUnit mockery process QuickCheck setenv silently
- stringbuilder syb transformers
+ base base-compat code-page deepseq directory exceptions filepath
+ ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck
+ setenv silently stringbuilder syb transformers
];
description = "Test interactive Haskell examples";
license = lib.licenses.mit;
@@ -78330,8 +78348,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "doctest-driver-gen";
- version = "0.3.0.2";
- sha256 = "1xkq9fpdm8ayjwf2lypkfnh1w08zimvhf27ffn71hfckd5nw4h2q";
+ version = "0.3.0.3";
+ sha256 = "0vb062mznjpksrbsf2v599slgnm5jr6dq1frbxii19mcqxjbnzrj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -78740,8 +78758,8 @@ self: {
}:
mkDerivation {
pname = "dormouse-client";
- version = "0.1.0.1";
- sha256 = "033299c0rc6hsg51pg7igb5fnf8w200ckazmyjk23d1h48mz7gcg";
+ version = "0.2.0.0";
+ sha256 = "1l5vhlvl5kl4m5shl2rysj16r7wqkqwy1i1yb3r96zx8rbwhi2j8";
libraryHaskellDepends = [
aeson attoparsec base bytestring case-insensitive containers
dormouse-uri http-api-data http-client http-client-tls http-types
@@ -78768,8 +78786,8 @@ self: {
}:
mkDerivation {
pname = "dormouse-uri";
- version = "0.1.0.1";
- sha256 = "04ps9k4dhg9xk7al12y757lxl45dfa0aczirdkyks28cavlpr07b";
+ version = "0.2.0.0";
+ sha256 = "1b19167xprw9f4ivpfl0sdk2gs2ai6jxk25wyy7xlvzq2fn5q6sd";
libraryHaskellDepends = [
attoparsec base bytestring case-insensitive containers http-types
safe-exceptions template-haskell text
@@ -78967,6 +78985,17 @@ self: {
license = "GPL";
}) {};
+ "doublezip" = callPackage
+ ({ mkDerivation, base, foldable-ix }:
+ mkDerivation {
+ pname = "doublezip";
+ version = "0.1.0.0";
+ sha256 = "0bf9jb688kj5f0cjb2ma6744aj2hkslkpc96frljm73h6pyqvwz6";
+ libraryHaskellDepends = [ base foldable-ix ];
+ description = "Some special functions to work with lists (with zip)";
+ license = lib.licenses.mit;
+ }) {};
+
"doublify-toolkit" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -79390,14 +79419,16 @@ self: {
}) {};
"drama" = callPackage
- ({ mkDerivation, base, criterion, ki, transformers, unagi-chan }:
+ ({ mkDerivation, base, ki, transformers, unagi-chan }:
mkDerivation {
pname = "drama";
- version = "0.1.0.1";
- sha256 = "0ssmw1yci4369hvpdc5f4ng6s4m7m2lgn9sp6jbgj90izwg0px8w";
+ version = "0.3.0.0";
+ sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ base ki transformers unagi-chan ];
- benchmarkHaskellDepends = [ base criterion ];
- description = "Simple actor library for Haskell";
+ executableHaskellDepends = [ base ];
+ description = "Actor library for Haskell";
license = lib.licenses.bsd3;
}) {};
@@ -79840,8 +79871,8 @@ self: {
}:
mkDerivation {
pname = "dtab";
- version = "1.1.1.1";
- sha256 = "1pxhvnm5vvgfxwm42s3w3i5nk0lx75xgsr1c487hkswip48fiyd6";
+ version = "1.2";
+ sha256 = "1mkk1jdw04294hljz3jxiz8403jq7srx6nalyjn1kj09yvws3d05";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81254,21 +81285,6 @@ self: {
}) {};
"echo" = callPackage
- ({ mkDerivation, base, process }:
- mkDerivation {
- pname = "echo";
- version = "0.1.3";
- sha256 = "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh";
- revision = "1";
- editedCabalFile = "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base process ];
- description = "A cross-platform, cross-console way to handle echoing terminal input";
- license = lib.licenses.bsd3;
- }) {};
-
- "echo_0_1_4" = callPackage
({ mkDerivation, base, process }:
mkDerivation {
pname = "echo";
@@ -81279,7 +81295,6 @@ self: {
libraryHaskellDepends = [ base process ];
description = "A cross-platform, cross-console way to handle echoing terminal input";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"ecma262" = callPackage
@@ -83134,25 +83149,6 @@ self: {
}) {};
"elynx" = callPackage
- ({ mkDerivation, aeson, base, bytestring, elynx-tools
- , optparse-applicative, slynx, tlynx
- }:
- mkDerivation {
- pname = "elynx";
- version = "0.5.0.1";
- sha256 = "1rglf080hx4c8nai07ghh2wf6j79x9hfx2mjzbqc588y0rpj7kmj";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- aeson base bytestring elynx-tools optparse-applicative slynx tlynx
- ];
- description = "Validate and (optionally) redo ELynx analyses";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "elynx_0_5_0_2" = callPackage
({ mkDerivation, aeson, base, bytestring, elynx-tools
, optparse-applicative, slynx, tlynx
}:
@@ -83172,28 +83168,6 @@ self: {
}) {};
"elynx-markov" = callPackage
- ({ mkDerivation, async, attoparsec, base, bytestring, containers
- , elynx-seq, elynx-tools, hmatrix, hspec, integration
- , math-functions, mwc-random, parallel, primitive, statistics
- , vector
- }:
- mkDerivation {
- pname = "elynx-markov";
- version = "0.5.0.1";
- sha256 = "0m24kzayvhc2mhhk2glpw82kmdbgk38vl2d0xdkkdnnbqag8mbqa";
- libraryHaskellDepends = [
- async attoparsec base bytestring containers elynx-seq hmatrix
- integration math-functions mwc-random parallel primitive statistics
- vector
- ];
- testHaskellDepends = [
- base containers elynx-tools hmatrix hspec mwc-random vector
- ];
- description = "Simulate molecular sequences along trees";
- license = lib.licenses.gpl3Plus;
- }) {};
-
- "elynx-markov_0_5_0_2" = callPackage
({ mkDerivation, async, attoparsec, base, bytestring, containers
, elynx-seq, elynx-tools, hmatrix, hspec, integration
, math-functions, mwc-random, primitive, statistics, vector
@@ -83212,22 +83186,9 @@ self: {
benchmarkHaskellDepends = [ base ];
description = "Simulate molecular sequences along trees";
license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
}) {};
"elynx-nexus" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, hspec }:
- mkDerivation {
- pname = "elynx-nexus";
- version = "0.5.0.1";
- sha256 = "0jh5j4f8awallrjbgrgdjl6jdzk2lswr28xjryqdapwf4licfkk2";
- libraryHaskellDepends = [ attoparsec base bytestring ];
- testHaskellDepends = [ base hspec ];
- description = "Import and export Nexus files";
- license = lib.licenses.gpl3Plus;
- }) {};
-
- "elynx-nexus_0_5_0_2" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hspec }:
mkDerivation {
pname = "elynx-nexus";
@@ -83237,30 +83198,9 @@ self: {
testHaskellDepends = [ base hspec ];
description = "Import and export Nexus files";
license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
}) {};
"elynx-seq" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
- , elynx-tools, hspec, matrices, mwc-random, parallel, primitive
- , vector, vector-th-unbox, word8
- }:
- mkDerivation {
- pname = "elynx-seq";
- version = "0.5.0.1";
- sha256 = "0b5jih0jgcf0rbcbwj18l269wbgf31i9125gx3rz6w7ydapmr7wr";
- libraryHaskellDepends = [
- aeson attoparsec base bytestring containers matrices mwc-random
- parallel primitive vector vector-th-unbox word8
- ];
- testHaskellDepends = [
- base bytestring elynx-tools hspec matrices vector
- ];
- description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
- }) {};
-
- "elynx-seq_0_5_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
, elynx-tools, hspec, matrices, mwc-random, parallel, primitive
, vector, vector-th-unbox, word8
@@ -83278,32 +83218,9 @@ self: {
];
description = "Handle molecular sequences";
license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
}) {};
"elynx-tools" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
- , bytestring, cryptohash-sha256, deepseq, directory, fast-logger
- , hmatrix, monad-control, monad-logger, mwc-random
- , optparse-applicative, primitive, template-haskell, text, time
- , transformers, transformers-base, vector, zlib
- }:
- mkDerivation {
- pname = "elynx-tools";
- version = "0.5.0.1";
- sha256 = "0lq5jv9dwyi0plkx1n270dan8nfxac9q7rhcdq95mzhgar8daink";
- libraryHaskellDepends = [
- aeson attoparsec base base16-bytestring bytestring
- cryptohash-sha256 deepseq directory fast-logger hmatrix
- monad-control monad-logger mwc-random optparse-applicative
- primitive template-haskell text time transformers transformers-base
- vector zlib
- ];
- description = "Tools for ELynx";
- license = lib.licenses.gpl3Plus;
- }) {};
-
- "elynx-tools_0_5_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, base16-bytestring
, bytestring, cryptohash-sha256, deepseq, directory, fast-logger
, hmatrix, monad-control, monad-logger, mwc-random
@@ -83323,37 +83240,9 @@ self: {
];
description = "Tools for ELynx";
license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
}) {};
"elynx-tree" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
- , containers, criterion, deepseq, double-conversion, elynx-nexus
- , elynx-tools, hspec, math-functions, microlens, mwc-random
- , parallel, primitive, QuickCheck, statistics
- }:
- mkDerivation {
- pname = "elynx-tree";
- version = "0.5.0.1";
- sha256 = "1pzam7qg7qihim50iyxw2fsy58xakzjvzskaa4vhzg9cghmjjva8";
- libraryHaskellDepends = [
- aeson attoparsec base bytestring comonad containers deepseq
- double-conversion elynx-nexus math-functions mwc-random parallel
- primitive statistics
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers elynx-tools hspec QuickCheck
- ];
- benchmarkHaskellDepends = [
- base criterion elynx-tools microlens mwc-random parallel
- ];
- description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "elynx-tree_0_5_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
, containers, criterion, deepseq, double-conversion, elynx-nexus
, elynx-tools, hspec, math-functions, microlens, mwc-random
@@ -85159,34 +85048,6 @@ self: {
}) {};
"ersatz" = callPackage
- ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
- , cabal-doctest, containers, data-default, directory, doctest, fail
- , filepath, lens, mtl, parsec, process, semigroups, temporary
- , transformers, unordered-containers
- }:
- mkDerivation {
- pname = "ersatz";
- version = "0.4.8";
- sha256 = "1gddf8zhavxri80f3nnd29ff6k7n03ggcah4qglknci7h94z7v8c";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- array attoparsec base bytestring containers data-default lens mtl
- process semigroups temporary transformers unordered-containers
- ];
- executableHaskellDepends = [
- array base containers fail lens mtl parsec semigroups
- ];
- testHaskellDepends = [ array base directory doctest filepath ];
- description = "A monad for expressing SAT or QSAT problems using observable sharing";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "ersatz_0_4_9" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, containers
, data-default, fail, lens, mtl, parsec, process, semigroups
, temporary, transformers, unordered-containers
@@ -85423,8 +85284,8 @@ self: {
}:
mkDerivation {
pname = "esqueleto";
- version = "3.4.0.1";
- sha256 = "1vq8yfrixgqps8g6wvfgr9n42zmwj1jybiq3sbrgfj318n6dm5mc";
+ version = "3.4.1.0";
+ sha256 = "1nm2xdl6an140gl5cw6ij7s6i6v2xfp98m8dwbwzns75nrgmsb73";
libraryHaskellDepends = [
aeson attoparsec base blaze-html bytestring conduit containers
monad-logger persistent resourcet tagged text time transformers
@@ -86067,6 +85928,8 @@ self: {
];
description = "Bindings to libevdev";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) libevdev;};
"evdev-streamly" = callPackage
@@ -86085,6 +85948,8 @@ self: {
];
description = "Bridge for working with evdev and streamly";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"eve" = callPackage
@@ -87061,6 +86926,8 @@ self: {
];
description = "A library for crawling exhentai";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"exhaustive" = callPackage
@@ -87949,8 +87816,8 @@ self: {
}:
mkDerivation {
pname = "extensible";
- version = "0.8.1";
- sha256 = "189svxwh54zzczrrirlnfyqmv2f12h8qxw9rqq47mn55ch40xnw3";
+ version = "0.8.2";
+ sha256 = "133yid7snb48n4rn15p6nsk2h1shbiw647d5fvapn3lnsb4ymqgv";
libraryHaskellDepends = [
aeson base bytestring cassava comonad constraints deepseq ghc-prim
hashable incremental membership monad-skeleton prettyprinter
@@ -88691,22 +88558,26 @@ self: {
}) {};
"faktory" = callPackage
- ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
- , cryptonite, hspec, markdown-unlit, megaparsec, memory, network
- , random, safe-exceptions, scanner, text, time, unix
+ ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+ , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory
+ , mtl, network, random, safe-exceptions, scanner, semigroups, text
+ , time, unix, unordered-containers
}:
mkDerivation {
pname = "faktory";
- version = "1.0.1.6";
- sha256 = "1yqld2b6lbxl9sw9yp3dy184189nhfs7q4shnyrzc0m000hxgwkj";
+ version = "1.0.2.0";
+ sha256 = "1i16g4sj5qrbyldyylggcammr2fs0dvi9hc986ijpv3iy0ryqkmw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-casing base bytestring connection cryptonite megaparsec
- memory network random safe-exceptions scanner text time unix
+ memory mtl network random safe-exceptions scanner semigroups text
+ time unix unordered-containers
];
executableHaskellDepends = [ aeson base safe-exceptions ];
- testHaskellDepends = [ aeson base hspec markdown-unlit ];
+ testHaskellDepends = [
+ aeson async base hspec markdown-unlit time
+ ];
testToolDepends = [ markdown-unlit ];
description = "Faktory Worker for Haskell";
license = lib.licenses.mit;
@@ -88904,28 +88775,6 @@ self: {
}) {};
"fast-logger" = callPackage
- ({ mkDerivation, array, auto-update, base, bytestring, directory
- , easy-file, filepath, hspec, hspec-discover, text, unix-compat
- , unix-time
- }:
- mkDerivation {
- pname = "fast-logger";
- version = "3.0.2";
- sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z";
- revision = "1";
- editedCabalFile = "1w8nsnjnpaxz8hm66gmh18msmc9hsafpladwy4ihvydb421fqpq2";
- libraryHaskellDepends = [
- array auto-update base bytestring directory easy-file filepath text
- unix-compat unix-time
- ];
- testHaskellDepends = [ base bytestring directory hspec ];
- testToolDepends = [ hspec-discover ];
- description = "A fast logging system";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ sternenseemann ];
- }) {};
-
- "fast-logger_3_0_3" = callPackage
({ mkDerivation, array, auto-update, base, bytestring, directory
, easy-file, filepath, hspec, hspec-discover, text, unix-compat
, unix-time
@@ -88942,7 +88791,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A fast logging system";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ sternenseemann ];
}) {};
@@ -89503,8 +89351,8 @@ self: {
}:
mkDerivation {
pname = "fbrnch";
- version = "0.7.1";
- sha256 = "05gs3r9c67xvpkpg968aj0ym39qakazbycjlb8wnys5ijc0iwa7w";
+ version = "0.7.2";
+ sha256 = "1xly3vjd8ylxwnc16y6hcrbg1chr4cxx60f3i3r9cyv1vrvf7l1k";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
@@ -91307,15 +91155,15 @@ self: {
"fin" = callPackage
({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
- , QuickCheck, tagged
+ , QuickCheck, tagged, universe-base
}:
mkDerivation {
pname = "fin";
- version = "0.1.1";
- sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri";
- revision = "2";
- editedCabalFile = "1x446k44pci81dakzd98vrj6amj10xkb05k7g2qwk0ir1hdj5sfz";
- libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ];
+ version = "0.2";
+ sha256 = "1xy3dgvl6s4cyb0l2hkyl06nbhc4dpc3sy2kjd8w7av9921k96i3";
+ libraryHaskellDepends = [
+ base dec deepseq hashable QuickCheck universe-base
+ ];
testHaskellDepends = [ base inspection-testing tagged ];
description = "Nat and Fin: peano naturals and finite numbers";
license = lib.licenses.bsd3;
@@ -93650,13 +93498,13 @@ self: {
}) {};
"fold-debounce-conduit" = callPackage
- ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
- , stm, transformers, transformers-base
+ ({ mkDerivation, base, conduit, fold-debounce, hspec
+ , hspec-discover, resourcet, stm, transformers, transformers-base
}:
mkDerivation {
pname = "fold-debounce-conduit";
- version = "0.2.0.5";
- sha256 = "1qvr3wqqv2lvs22ddmalavggp8a4a50d056a50dsz6lcml1k6hdg";
+ version = "0.2.0.6";
+ sha256 = "0xy6vr2hbw41fcs3rlk7wyxqrkqd3nfw5rcr1aiij86zaaifpry5";
libraryHaskellDepends = [
base conduit fold-debounce resourcet stm transformers
transformers-base
@@ -93664,6 +93512,7 @@ self: {
testHaskellDepends = [
base conduit hspec resourcet stm transformers
];
+ testToolDepends = [ hspec-discover ];
description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
license = lib.licenses.bsd3;
}) {};
@@ -93698,10 +93547,8 @@ self: {
}:
mkDerivation {
pname = "foldl";
- version = "1.4.10";
- sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq";
- revision = "1";
- editedCabalFile = "0rd3w7m8a8pxb8jpmi9nky4hf1jl35cm8vp1qq8mfzgpx5bbqd2w";
+ version = "1.4.11";
+ sha256 = "05i87pqldk1xfpx66nh1lhn75x3g7s8kvhf9k9yll33a6ggawwxl";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids text transformers
@@ -93828,31 +93675,6 @@ self: {
}) {};
"folds" = callPackage
- ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal
- , cabal-doctest, comonad, constraints, contravariant, data-reify
- , deepseq, directory, distributive, doctest, filepath, lens, mtl
- , pointed, profunctors, reflection, semigroupoids, semigroups
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "folds";
- version = "0.7.5";
- sha256 = "17a8xggx17m59hiwd2lxd2379sw4xblgyv1pk9g5h93w3m8wgq1r";
- configureFlags = [ "-f-test-hlint" ];
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- adjunctions base bifunctors comonad constraints contravariant
- data-reify distributive lens mtl pointed profunctors reflection
- semigroupoids transformers unordered-containers vector
- ];
- testHaskellDepends = [
- base bytestring deepseq directory doctest filepath mtl semigroups
- ];
- description = "Beautiful Folding";
- license = lib.licenses.bsd3;
- }) {};
-
- "folds_0_7_6" = callPackage
({ mkDerivation, adjunctions, base, bifunctors, comonad
, constraints, contravariant, data-reify, distributive, lens, mtl
, pointed, profunctors, reflection, semigroupoids, transformers
@@ -93870,7 +93692,6 @@ self: {
];
description = "Beautiful Folding";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"folds-common" = callPackage
@@ -94556,28 +94377,29 @@ self: {
"fortran-src" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, fgl, filepath, GenericPretty, happy, hspec
- , mtl, pretty, text, uniplate
+ , hspec-discover, mtl, pretty, temporary, text, uniplate
}:
mkDerivation {
pname = "fortran-src";
- version = "0.4.0";
- sha256 = "1l66f9wcn5dp7i63wapzkx8bgiy22xrlxbfh3jbnhy7glhvk80ja";
+ version = "0.4.2";
+ sha256 = "03x1pxkpl41r4cf034qj5ls946azbzwdyxkp2nxxymjx0nm2lsv6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory fgl
- filepath GenericPretty mtl pretty text uniplate
+ filepath GenericPretty mtl pretty temporary text uniplate
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
array base binary bytestring containers deepseq directory fgl
- filepath GenericPretty mtl pretty text uniplate
+ filepath GenericPretty mtl pretty temporary text uniplate
];
testHaskellDepends = [
array base binary bytestring containers deepseq directory fgl
- filepath GenericPretty hspec mtl pretty text uniplate
+ filepath GenericPretty hspec mtl pretty temporary text uniplate
];
- description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
+ testToolDepends = [ hspec-discover ];
+ description = "Parsers and analyses for Fortran standards 66, 77, 90 and 95";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
broken = true;
@@ -94727,6 +94549,8 @@ self: {
pname = "fourmolu";
version = "0.3.0.0";
sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms";
+ revision = "1";
+ editedCabalFile = "1n3avdmjqkd2910lhb5spxvjgzb7icln82pcrz3cmkfmjwxnirsc";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -96453,6 +96277,8 @@ self: {
libraryHaskellDepends = [ base ShowF type-unary ];
description = "Depth-typed functor-based trees, both top-down and bottom-up";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"ftshell" = callPackage
@@ -96825,23 +96651,6 @@ self: {
}) {};
"functor-classes-compat" = callPackage
- ({ mkDerivation, base, containers, hashable, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "functor-classes-compat";
- version = "1";
- sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
- revision = "7";
- editedCabalFile = "0dagdnlb3wfrli6adpy4fjlgdc982pjgwcnq2sb7p3zm86ngi07v";
- libraryHaskellDepends = [
- base containers hashable unordered-containers vector
- ];
- description = "Data.Functor.Classes instances for core packages";
- license = lib.licenses.bsd3;
- }) {};
-
- "functor-classes-compat_1_0_1" = callPackage
({ mkDerivation, base, containers, hashable, unordered-containers
, vector
}:
@@ -96854,7 +96663,6 @@ self: {
];
description = "Data.Functor.Classes instances for core packages";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"functor-combinators" = callPackage
@@ -96900,6 +96708,8 @@ self: {
];
description = "Functor combinators with tries & zippers";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"functor-friends" = callPackage
@@ -97360,7 +97170,7 @@ self: {
"futhark" = callPackage
({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
- , blaze-html, bytestring, bytestring-to-vector, cmark-gfm
+ , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm
, containers, directory, directory-tree, dlist, file-embed
, filepath, free, gitrev, happy, haskeline, language-c-quote
, mainland-pretty, megaparsec, mtl, neat-interpolation, parallel
@@ -97372,12 +97182,12 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.18.6";
- sha256 = "0bp837b6myis5kvyy0rg3py01fcyyj7qws7kqvci3mjyi9x57k7w";
+ version = "0.19.1";
+ sha256 = "1nhy1pjqy7na7brpkh72yzcglfrwaz7l325fivfq5niaq85832dd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-terminal array base binary blaze-html bytestring
+ aeson ansi-terminal array base binary blaze-html bmp bytestring
bytestring-to-vector cmark-gfm containers directory directory-tree
dlist file-embed filepath free gitrev haskeline language-c-quote
mainland-pretty megaparsec mtl neat-interpolation parallel
@@ -97394,6 +97204,8 @@ self: {
];
description = "An optimising compiler for a functional, array-oriented language";
license = lib.licenses.isc;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"futhask" = callPackage
@@ -98620,33 +98432,33 @@ self: {
}) {};
"gemini-router" = callPackage
- ({ mkDerivation, base, gemini-server, network-uri, transformers }:
+ ({ mkDerivation, base, gemini-server, HsOpenSSL, network-uri
+ , transformers
+ }:
mkDerivation {
pname = "gemini-router";
- version = "0.1.0.0";
- sha256 = "1k1fa4vi93ijj8yf1sfjgmy5kibs0z77z994pvzs1bm8sx73h8kr";
- revision = "1";
- editedCabalFile = "1pb52h8md6g422y5rj7nyy1mkgxccggfal27i42c3qsn8x9frrpz";
+ version = "0.1.1.0";
+ sha256 = "19aq9ri0ixkg0d5g4ickda75dvpq340lwkdxn0ndcbkis9xrvkv9";
libraryHaskellDepends = [
- base gemini-server network-uri transformers
+ base gemini-server HsOpenSSL network-uri transformers
];
description = "A simple Happstack-style Gemini router";
license = lib.licenses.bsd3;
}) {};
"gemini-server" = callPackage
- ({ mkDerivation, base, bytestring, hslogger, network, network-run
- , network-uri, text, utf8-string
+ ({ mkDerivation, base, bytestring, hslogger, HsOpenSSL, network
+ , network-run, network-uri, text, utf8-string
}:
mkDerivation {
pname = "gemini-server";
- version = "0.1.0.0";
- sha256 = "0m98dc66469gbnsra8sp0clrlbyzn817vnd7aini576g5gv4sxr5";
+ version = "0.2.0.0";
+ sha256 = "06sqy3c04s3cjx6p9rzfi23cq34bjs1wbigczcc66i6ahf4x1hz2";
revision = "1";
- editedCabalFile = "091wv6ar78dhhz1y6rknslxc2wh020b50n38928abl0a939gwvh9";
+ editedCabalFile = "0zw9svhk5wmi56vqmw7630nqhp816xph9ldgc8l3jzspziz350fx";
libraryHaskellDepends = [
- base bytestring hslogger network network-run network-uri text
- utf8-string
+ base bytestring hslogger HsOpenSSL network network-run network-uri
+ text utf8-string
];
description = "A lightweight server for the Gemini protocol";
license = lib.licenses.bsd3;
@@ -98671,6 +98483,8 @@ self: {
];
description = "A barebones textboard for the Gemini protocol";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"gemstone" = callPackage
@@ -99098,6 +98912,8 @@ self: {
testHaskellDepends = [ base Cabal inspection-testing ];
description = "Generically extract and replace collections of record fields";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"generic-lens" = callPackage
@@ -99179,8 +98995,8 @@ self: {
pname = "generic-lens-lite";
version = "0.1";
sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6";
- revision = "1";
- editedCabalFile = "1gbl0kmc77yjvn63cgdsifhzyd54g1v1qq1pjsrhhn0hb4c8jszz";
+ revision = "2";
+ editedCabalFile = "0516sqr5xplh57kdzcxx1fpsxwhmxc1bl9hxlcdif9hrjjb61rwg";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Monomorphic field lens like with generic-lens";
@@ -99288,8 +99104,8 @@ self: {
pname = "generic-optics-lite";
version = "0.1";
sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi";
- revision = "1";
- editedCabalFile = "1z6bglkw2lvwlxjs0dlmr9wa4rh73pkzhqlg5dq88q5p9d51cy09";
+ revision = "2";
+ editedCabalFile = "1ib6klb9ff27qw8y6icywldnq1p5z8fbkwkibsjyimbvvdk4lqki";
libraryHaskellDepends = [ base generic-lens-lite optics-core ];
testHaskellDepends = [ base optics-core ];
description = "Monomorphic field opics like with generic-lens";
@@ -99506,10 +99322,8 @@ self: {
}:
mkDerivation {
pname = "generics-sop";
- version = "0.5.1.0";
- sha256 = "0g0z0k5bnw3whfj3qswzhadrhg85jfn491s30cgai0ijfjm5gipa";
- revision = "1";
- editedCabalFile = "1m61bb6k96ybsrc3hpxn0fdspq9mbkyfklx7vfnd55mava4ahzp2";
+ version = "0.5.1.1";
+ sha256 = "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1";
libraryHaskellDepends = [
base ghc-prim sop-core template-haskell th-abstraction
];
@@ -99527,6 +99341,8 @@ self: {
pname = "generics-sop-lens";
version = "0.2.0.1";
sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks";
+ revision = "1";
+ editedCabalFile = "1y9v2imcrm8wyagv2d91x7zvdf358iz7460gqakhg9bgifjaylh1";
libraryHaskellDepends = [ base generics-sop lens ];
description = "Lenses for types in generics-sop";
license = lib.licenses.bsd3;
@@ -100700,6 +100516,8 @@ self: {
pname = "ghc-byteorder";
version = "4.11.0.0.10";
sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6";
+ revision = "1";
+ editedCabalFile = "1qwx6569079a8viq2plkpc1wlqdz8syys6hvx68m051a7zvdwzyl";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
doHaddock = false;
@@ -100988,8 +100806,8 @@ self: {
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.6.3.4";
- sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98";
+ version = "0.6.4";
+ sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -101417,8 +101235,8 @@ self: {
pname = "ghc-paths";
version = "0.1.0.12";
sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf";
- revision = "1";
- editedCabalFile = "1gb4hn87a78j1c2y1adi81y03irzkaxywscjkphfajsxc7f0ydw5";
+ revision = "2";
+ editedCabalFile = "07f81larq1ddxq2m2vyq05sdhfmz0whf2c3i5cdq57pkhijxppxg";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
description = "Knowledge of GHC's installation directories";
@@ -101495,8 +101313,8 @@ self: {
}:
mkDerivation {
pname = "ghc-prof";
- version = "1.4.1.7";
- sha256 = "0js799sf957xlki8f7jgwj803iygi35j4bp4p4hh8gzj4icvcqfz";
+ version = "1.4.1.8";
+ sha256 = "02k6il0a6cdr5dvf5x6gpjyn9vzn43kahqdsq5lzjvw5c6l0462p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -101799,13 +101617,13 @@ self: {
}) {};
"ghc-trace-events" = callPackage
- ({ mkDerivation, base, bytestring, criterion, text }:
+ ({ mkDerivation, base, bytestring, tasty-bench, text }:
mkDerivation {
pname = "ghc-trace-events";
- version = "0.1.2.1";
- sha256 = "0isxvysjk8z9ya8kbjkbp95wf7b4ixk0bjjy831aqyl6kbrnps84";
+ version = "0.1.2.2";
+ sha256 = "18vhv99lrfjx6bxww77qxg7gwqmvpylvlrq1bji0hd6mcxxdjn69";
libraryHaskellDepends = [ base bytestring text ];
- benchmarkHaskellDepends = [ base bytestring criterion ];
+ benchmarkHaskellDepends = [ base bytestring tasty-bench ];
description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
license = lib.licenses.bsd3;
}) {};
@@ -101854,22 +101672,6 @@ self: {
}) {};
"ghc-typelits-natnormalise" = callPackage
- ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
- , integer-gmp, tasty, tasty-hunit, template-haskell, transformers
- }:
- mkDerivation {
- pname = "ghc-typelits-natnormalise";
- version = "0.7.3";
- sha256 = "14lynjsmiml19wma9fk2bbhfz43wzbbyvrxp8xpch2lkh5zkfkny";
- libraryHaskellDepends = [
- base containers ghc ghc-tcplugins-extra integer-gmp transformers
- ];
- testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
- description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
- license = lib.licenses.bsd2;
- }) {};
-
- "ghc-typelits-natnormalise_0_7_4" = callPackage
({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
, integer-gmp, tasty, tasty-hunit, template-haskell, transformers
}:
@@ -101883,7 +101685,6 @@ self: {
testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
}) {};
"ghc-typelits-presburger" = callPackage
@@ -102214,11 +102015,10 @@ self: {
description = "The core of an IDE";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
- maintainers = with lib.maintainers; [ maralorn ];
broken = true;
}) {shake-bench = null;};
- "ghcide_0_7_5_0" = callPackage
+ "ghcide_1_0_0_0" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
, binary, bytestring, bytestring-encoding, case-insensitive
, containers, cryptohash-sha1, data-default, deepseq, dependent-map
@@ -102239,8 +102039,8 @@ self: {
}:
mkDerivation {
pname = "ghcide";
- version = "0.7.5.0";
- sha256 = "157h7jliwf25yjip9hfc5lghifqgqz3ckj894fnmx7pw4jfwyc2s";
+ version = "1.0.0.0";
+ sha256 = "15hz49d68229bnp8g7q1ac60ryd4zbyc1rbxsfaq5lb586ps82k8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102280,7 +102080,6 @@ self: {
description = "The core of an IDE";
license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
- maintainers = with lib.maintainers; [ maralorn ];
broken = true;
}) {shake-bench = null;};
@@ -103220,8 +103019,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-declarative";
- version = "0.6.3";
- sha256 = "1cxh1r7ylj6d13nyjxdkvgp7h6fqzbi4zndl95lykki129jhfwkk";
+ version = "0.7.0";
+ sha256 = "0j6yk2qr88yrxs8vdwcqv6jzisjl0x1j932ssim8ay98z4r6y8gg";
libraryHaskellDepends = [
base containers data-default-class gi-glib gi-gobject gi-gtk
haskell-gi haskell-gi-base haskell-gi-overloading mtl text
@@ -103241,17 +103040,20 @@ self: {
"gi-gtk-declarative-app-simple" = callPackage
({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk
, gi-gtk-declarative, haskell-gi, haskell-gi-base
- , haskell-gi-overloading, pipes, pipes-concurrency, text
+ , haskell-gi-overloading, hspec, pipes, pipes-concurrency, text
}:
mkDerivation {
pname = "gi-gtk-declarative-app-simple";
- version = "0.6.3";
- sha256 = "1dyz6sfj352lacs3bk4lxbv9dmlpqp27kzl9vz8bq4321d5nfav9";
+ version = "0.7.0";
+ sha256 = "0ygp70yfj530czfw6an3yp9y883q4lwky45rxdslyf1ifk8dn6rf";
libraryHaskellDepends = [
async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
haskell-gi haskell-gi-base haskell-gi-overloading pipes
pipes-concurrency text
];
+ testHaskellDepends = [
+ async base gi-gtk gi-gtk-declarative hspec pipes
+ ];
description = "Declarative GTK+ programming in Haskell in the style of Pux";
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
@@ -104002,8 +103804,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "8.20210127";
- sha256 = "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3";
+ version = "8.20210223";
+ sha256 = "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -111243,18 +111045,16 @@ self: {
}) {};
"group-theory" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
- , groups
- }:
+ ({ mkDerivation, base, containers, groups }:
mkDerivation {
pname = "group-theory";
- version = "0.2.0.0";
- sha256 = "0giwyvki83ndxn9vyfzi5fkz23c95zv5x09ya1in4i8318f8d7az";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "0.2.1.0";
+ sha256 = "11cm59l3g831pz0h5qr94rf1g7km4bn0gqrb8ikssf4xwnjxib46";
libraryHaskellDepends = [ base containers groups ];
- testHaskellDepends = [ base doctest ];
description = "The theory of groups";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"group-with" = callPackage
@@ -113982,8 +113782,8 @@ self: {
({ mkDerivation, base, filepath, haddock-api }:
mkDerivation {
pname = "haddock";
- version = "2.24.0";
- sha256 = "08hbn6i6rac8c1l80dfnv9161gh8rs7npdxyk87wqz910h6f4iip";
+ version = "2.25.0";
+ sha256 = "0wjp13f7206g3j2g3lr4msf1anbhjqy9wbgfx382dnanxy80yr74";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base haddock-api ];
@@ -114024,22 +113824,24 @@ self: {
"haddock-api" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
- , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library
- , hspec, hspec-discover, QuickCheck, transformers, xhtml
+ , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths
+ , haddock-library, hspec, hspec-discover, mtl, QuickCheck
+ , transformers, xhtml
}:
mkDerivation {
pname = "haddock-api";
- version = "2.24.0";
- sha256 = "0bbyhwyshafzcfbzjyv1b09lb8bxcimpj3b605pw5gssxgjh1s8i";
+ version = "2.25.0";
+ sha256 = "1f0gbdlr2kvwagni3416q8jhhjh1b3h1cda5znlmgwdcg9bmcr17";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath ghc
- ghc-boot ghc-paths haddock-library transformers xhtml
+ array base bytestring containers deepseq directory exceptions
+ filepath ghc ghc-boot ghc-paths haddock-library mtl transformers
+ xhtml
];
testHaskellDepends = [
- array base bytestring containers deepseq directory filepath ghc
- ghc-boot ghc-paths haddock-library hspec QuickCheck transformers
- xhtml
+ array base bytestring containers deepseq directory exceptions
+ filepath ghc ghc-boot ghc-paths haddock-library hspec mtl
+ QuickCheck transformers xhtml
];
testToolDepends = [ hspec-discover ];
description = "A documentation-generation tool for Haskell libraries";
@@ -114124,6 +113926,29 @@ self: {
license = lib.licenses.bsd2;
}) {};
+ "haddock-library_1_10_0" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+ , directory, filepath, hspec, hspec-discover, optparse-applicative
+ , parsec, QuickCheck, text, transformers, tree-diff
+ }:
+ mkDerivation {
+ pname = "haddock-library";
+ version = "1.10.0";
+ sha256 = "15ak06q8yp11xz1hwr0sg2jqi3r78p1n89ik05hicqvxl3awf1pq";
+ libraryHaskellDepends = [
+ base bytestring containers parsec text transformers
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring containers deepseq directory filepath
+ hspec optparse-applicative parsec QuickCheck text transformers
+ tree-diff
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Library exposing some functionality of Haddock";
+ license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"haddock-test" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
, process, syb, xhtml, xml
@@ -114193,6 +114018,36 @@ self: {
license = lib.licenses.gpl3;
}) {};
+ "hadolint_1_23_0" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, colourista
+ , containers, cryptonite, deepseq, directory, filepath, gitrev
+ , hspec, HsYAML, HUnit, ilist, language-docker, megaparsec, mtl
+ , optparse-applicative, parallel, ShellCheck, split, text, void
+ }:
+ mkDerivation {
+ pname = "hadolint";
+ version = "1.23.0";
+ sha256 = "09aaxdi1g199cgaxvv5v2cynvd8rm91mnpaw2a5ppbzc7cgh6rca";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base bytestring colourista containers cryptonite
+ deepseq directory filepath HsYAML ilist language-docker megaparsec
+ mtl parallel ShellCheck split text void
+ ];
+ executableHaskellDepends = [
+ base containers gitrev language-docker megaparsec
+ optparse-applicative text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
+ ShellCheck split text
+ ];
+ description = "Dockerfile Linter JavaScript API";
+ license = lib.licenses.gpl3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hadoop-formats" = callPackage
({ mkDerivation, attoparsec, base, bytestring, filepath, snappy
, text, vector
@@ -115871,8 +115726,8 @@ self: {
}:
mkDerivation {
pname = "hanspell";
- version = "0.2.2.0";
- sha256 = "06351wg5y9840nj1ysraa78bixk25vjn64g6fnj3d0zs2qyxd6ca";
+ version = "0.2.3.0";
+ sha256 = "1n692i4d92g25j31v7iyp7w3135hxcdm5p18zki8mmx6x1pg244a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116917,20 +116772,17 @@ self: {
"harg" = callPackage
({ mkDerivation, aeson, barbies, base, bytestring, directory
- , higgledy, markdown-unlit, optparse-applicative, split, text, yaml
+ , higgledy, optparse-applicative, split, text, yaml
}:
mkDerivation {
pname = "harg";
- version = "0.4.2.1";
- sha256 = "0fbbf9zxfbyc6mnsybrd81sd87ps6qwks5zv5kmjygc6w8ngh6vh";
+ version = "0.5.0.0";
+ sha256 = "1panniqhyg8my7nac569fl6rgdg4bch8x469lsp2r00wwp0sivcs";
libraryHaskellDepends = [
aeson barbies base bytestring directory higgledy
optparse-applicative split text yaml
];
- testHaskellDepends = [
- aeson barbies base higgledy optparse-applicative
- ];
- testToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [ base ];
description = "Haskell program configuration using higher kinded data";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
@@ -117202,8 +117054,8 @@ self: {
}:
mkDerivation {
pname = "hascard";
- version = "0.5.0.0";
- sha256 = "1lic3s5z3rq2m3hpf9626k8k3a8vrx267afavzvzcngkfdl3bfap";
+ version = "0.5.0.1";
+ sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -117500,19 +117352,6 @@ self: {
}) {};
"hashable-time" = callPackage
- ({ mkDerivation, base, hashable, time }:
- mkDerivation {
- pname = "hashable-time";
- version = "0.2.0.2";
- sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
- revision = "3";
- editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk";
- libraryHaskellDepends = [ base hashable time ];
- description = "Hashable instances for Data.Time";
- license = lib.licenses.bsd3;
- }) {};
-
- "hashable-time_0_2_1" = callPackage
({ mkDerivation, base, hashable, time, time-compat }:
mkDerivation {
pname = "hashable-time";
@@ -117521,7 +117360,6 @@ self: {
libraryHaskellDepends = [ base hashable time time-compat ];
description = "Hashable instances for Data.Time";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hashabler" = callPackage
@@ -118752,6 +118590,7 @@ self: {
testToolDepends = [ ghcide ];
description = "LSP server for GHC";
license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ maralorn ];
}) {};
"haskell-lexer" = callPackage
@@ -119003,6 +118842,8 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Distributed parallel programming in Haskell using MPI";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {open-pal = null; open-rte = null; openmpi = null;};
"haskell-names" = callPackage
@@ -119533,10 +119374,8 @@ self: {
}:
mkDerivation {
pname = "haskell-src-meta";
- version = "0.8.5";
- sha256 = "1csqp3n7330rhia9msyw34z7qwwj64gdy5qlv8w4jbm49dap24ik";
- revision = "1";
- editedCabalFile = "00znr8mrlbyn0n1bw4c82rv82pq5ngkk7kw9cgk13pghf93hwwv7";
+ version = "0.8.7";
+ sha256 = "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in";
libraryHaskellDepends = [
base haskell-src-exts pretty syb template-haskell th-orphans
];
@@ -120901,26 +120740,26 @@ self: {
}) {};
"haskoin-core" = callPackage
- ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
- , cereal, conduit, containers, cryptonite, deepseq, entropy
- , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory
- , mtl, murmur3, network, QuickCheck, safe, scientific
+ ({ mkDerivation, aeson, array, base, base16, binary, bytes
+ , bytestring, cereal, conduit, containers, cryptonite, deepseq
+ , entropy, hashable, hspec, hspec-discover, HUnit, lens, lens-aeson
+ , memory, mtl, murmur3, network, QuickCheck, safe, scientific
, secp256k1-haskell, split, string-conversions, text, time
, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.19.0";
- sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c";
+ version = "0.20.0";
+ sha256 = "10pdpg75r2gch32p3mkiz82qip9rwkc5lrq0zxy13pqrmxdy162k";
libraryHaskellDepends = [
- aeson array base base16-bytestring bytestring cereal conduit
+ aeson array base base16 binary bytes bytestring cereal conduit
containers cryptonite deepseq entropy hashable hspec memory mtl
murmur3 network QuickCheck safe scientific secp256k1-haskell split
string-conversions text time transformers unordered-containers
vector
];
testHaskellDepends = [
- aeson array base base16-bytestring bytestring cereal conduit
+ aeson array base base16 binary bytes bytestring cereal conduit
containers cryptonite deepseq entropy hashable hspec HUnit lens
lens-aeson memory mtl murmur3 network QuickCheck safe scientific
secp256k1-haskell split string-conversions text time transformers
@@ -121041,45 +120880,46 @@ self: {
}) {};
"haskoin-store" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring
- , cereal, conduit, containers, data-default, deepseq, ekg-core
- , ekg-statsd, filepath, foldl, hashable, haskoin-core, haskoin-node
- , haskoin-store-data, hedis, hspec, hspec-discover, http-types
- , lens, monad-control, monad-logger, mtl, network, nqe
+ ({ mkDerivation, aeson, aeson-pretty, base, base16, base64, bytes
+ , bytestring, cereal, conduit, containers, data-default, deepseq
+ , ekg-core, ekg-statsd, filepath, foldl, hashable, haskoin-core
+ , haskoin-node, haskoin-store-data, hedis, hspec, hspec-discover
+ , http-types, lens, monad-control, monad-logger, mtl, network, nqe
, optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp
, rocksdb-query, scotty, stm, string-conversions, text, time
, transformers, unliftio, unordered-containers, wai, warp, wreq
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.46.6";
- sha256 = "13qqq08bh1a07zvd5rkfgyvh2ln0261q2hybjkjigw05mhrblf5c";
+ version = "0.47.3";
+ sha256 = "0z3rhxfnk1985lmfzajipkzajya2vrfh0p5c66kk03vysvssjzpi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring cereal conduit containers
- data-default deepseq ekg-core ekg-statsd foldl hashable
+ aeson aeson-pretty base base16 bytes bytestring cereal conduit
+ containers data-default deepseq ekg-core ekg-statsd foldl hashable
haskoin-core haskoin-node haskoin-store-data hedis http-types lens
monad-control monad-logger mtl network nqe random
rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions
text time transformers unliftio unordered-containers wai warp wreq
];
executableHaskellDepends = [
- aeson aeson-pretty base bytestring cereal conduit containers
- data-default deepseq ekg-core ekg-statsd filepath foldl hashable
- haskoin-core haskoin-node haskoin-store-data hedis http-types lens
- monad-control monad-logger mtl network nqe optparse-applicative
- random rocksdb-haskell-jprupp rocksdb-query scotty stm
- string-conversions text time transformers unliftio
+ aeson aeson-pretty base base16 bytes bytestring cereal conduit
+ containers data-default deepseq ekg-core ekg-statsd filepath foldl
+ hashable haskoin-core haskoin-node haskoin-store-data hedis
+ http-types lens monad-control monad-logger mtl network nqe
+ optparse-applicative random rocksdb-haskell-jprupp rocksdb-query
+ scotty stm string-conversions text time transformers unliftio
unordered-containers wai warp wreq
];
testHaskellDepends = [
- aeson aeson-pretty base base64 bytestring cereal conduit containers
- data-default deepseq ekg-core ekg-statsd foldl hashable
- haskoin-core haskoin-node haskoin-store-data hedis hspec http-types
- lens monad-control monad-logger mtl network nqe QuickCheck random
- rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions
- text time transformers unliftio unordered-containers wai warp wreq
+ aeson aeson-pretty base base16 base64 bytes bytestring cereal
+ conduit containers data-default deepseq ekg-core ekg-statsd foldl
+ hashable haskoin-core haskoin-node haskoin-store-data hedis hspec
+ http-types lens monad-control monad-logger mtl network nqe
+ QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty stm
+ string-conversions text time transformers unliftio
+ unordered-containers wai warp wreq
];
testToolDepends = [ hspec-discover ];
description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -121089,25 +120929,26 @@ self: {
}) {};
"haskoin-store-data" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cereal, containers
- , data-default, deepseq, hashable, haskoin-core, hspec
+ ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal
+ , containers, data-default, deepseq, hashable, haskoin-core, hspec
, hspec-discover, http-client, http-types, lens, mtl, network
, QuickCheck, scotty, string-conversions, text
, unordered-containers, wreq
}:
mkDerivation {
pname = "haskoin-store-data";
- version = "0.46.6";
- sha256 = "0a71gg790ix0z1q99m7cri4bpql222yprmj0vnvmacprnbihw77n";
+ version = "0.47.3";
+ sha256 = "0i7jf832q2lv8h82sf4y3a81j8y4ipw653q32jfnxhjjbnfxccly";
libraryHaskellDepends = [
- aeson base bytestring cereal containers data-default deepseq
- hashable haskoin-core http-client http-types lens mtl network
- scotty string-conversions text unordered-containers wreq
+ aeson base binary bytes bytestring cereal containers data-default
+ deepseq hashable haskoin-core http-client http-types lens mtl
+ network scotty string-conversions text unordered-containers wreq
];
testHaskellDepends = [
- aeson base bytestring cereal containers data-default deepseq
- hashable haskoin-core hspec http-client http-types lens mtl network
- QuickCheck scotty string-conversions text unordered-containers wreq
+ aeson base binary bytes bytestring cereal containers data-default
+ deepseq hashable haskoin-core hspec http-client http-types lens mtl
+ network QuickCheck scotty string-conversions text
+ unordered-containers wreq
];
testToolDepends = [ hspec-discover ];
description = "Data for Haskoin Store";
@@ -121763,8 +121604,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-data";
- version = "1.3";
- sha256 = "0373bb3aqbrw6prn323vy47qq9mfnvmm1lbd9ql1dxgb9px338qn";
+ version = "1.4";
+ sha256 = "18k8kbfy60l60pzc3c3kwny87avwp6sn766cg4b0z47hx8d70i5k";
libraryHaskellDepends = [
base containers ghc-prim haskus-utils-types mtl recursion-schemes
transformers
@@ -121797,8 +121638,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-variant";
- version = "3.0";
- sha256 = "128i47aqp1h8j4yganj7l8svdb1ax5vx9h4j55k56wh5yxrg5aan";
+ version = "3.1";
+ sha256 = "0iqlc6lrgrwjqvgpbvvvna8v5daxgf84vnqlgbchy87p67lkv6ni";
libraryHaskellDepends = [
base deepseq exceptions haskus-utils-data haskus-utils-types
template-haskell transformers
@@ -122609,8 +122450,8 @@ self: {
}:
mkDerivation {
pname = "hasty-hamiltonian";
- version = "1.3.3";
- sha256 = "11x0daijylcxg0zf55bcwac6dy6lmmz9f4zf7a44qp9dsgfv753a";
+ version = "1.3.4";
+ sha256 = "0qvqh5d213lq02qq25s1a6z783836h5gi5zra99pprblpdffaazq";
libraryHaskellDepends = [
base kan-extensions lens mcmc-types mwc-probability pipes primitive
transformers
@@ -124204,6 +124045,34 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "headroom_0_4_0_0" = callPackage
+ ({ mkDerivation, aeson, base, doctest, either, file-embed
+ , generic-data, hspec, hspec-discover, microlens, microlens-th, mtl
+ , mustache, optparse-applicative, pcre-heavy, pcre-light
+ , QuickCheck, rio, string-interpolate, template-haskell, time, yaml
+ }:
+ mkDerivation {
+ pname = "headroom";
+ version = "0.4.0.0";
+ sha256 = "1xjm84k6wpi7b5w9pjf1siwy4c59rfsgmrg5cbjhznrv8mzvpygw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base either file-embed generic-data microlens microlens-th
+ mtl mustache optparse-applicative pcre-heavy pcre-light rio
+ string-interpolate template-haskell time yaml
+ ];
+ executableHaskellDepends = [ base optparse-applicative rio ];
+ testHaskellDepends = [
+ aeson base doctest hspec mtl optparse-applicative pcre-light
+ QuickCheck rio string-interpolate time
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "License Header Manager";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"heap" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
@@ -124629,6 +124498,8 @@ self: {
];
description = "Hedgehog will eat your typeclass bugs";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hedgehog-corpus" = callPackage
@@ -125643,6 +125514,24 @@ self: {
maintainers = with lib.maintainers; [ roberth ];
}) {};
+ "hercules-ci-cnix-store" = callPackage
+ ({ mkDerivation, base, boost, bytestring, conduit, containers
+ , inline-c, inline-c-cpp, nix, protolude, unliftio-core
+ }:
+ mkDerivation {
+ pname = "hercules-ci-cnix-store";
+ version = "0.1.0.0";
+ sha256 = "1ni83x2453ii2xgq4ihhr41jbjhgga5dq5q8560f555fwrw10brz";
+ libraryHaskellDepends = [
+ base bytestring conduit containers inline-c inline-c-cpp protolude
+ unliftio-core
+ ];
+ librarySystemDepends = [ boost ];
+ libraryPkgconfigDepends = [ nix ];
+ description = "Haskell bindings for Nix's libstore";
+ license = lib.licenses.asl20;
+ }) {inherit (pkgs) boost; inherit (pkgs) nix;};
+
"here" = callPackage
({ mkDerivation, base, haskell-src-meta, mtl, parsec
, template-haskell
@@ -126130,14 +126019,13 @@ self: {
}) {};
"hex-text" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, doctest, text
- }:
+ ({ mkDerivation, base, base16-bytestring, bytestring, text }:
mkDerivation {
pname = "hex-text";
- version = "0.1.0.2";
- sha256 = "0wgqm1ziblgljrh679i44gvdq7bqym37y1lnnpb1mk7qlv664c9h";
+ version = "0.1.0.4";
+ sha256 = "03nlm2axcb29jlx797krfac65fb2f3xbcw7lp3klrnznkagb8884";
libraryHaskellDepends = [ base base16-bytestring bytestring text ];
- testHaskellDepends = [ base doctest ];
+ testHaskellDepends = [ base bytestring text ];
description = "ByteString-Text hexidecimal conversions";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -126454,8 +126342,8 @@ self: {
}:
mkDerivation {
pname = "hextream";
- version = "0.2.0.0";
- sha256 = "045q4glzqdl79w4baq4yvqjiqaih48p2iixkb3dv96nwmgr8xl8r";
+ version = "0.3.0.0";
+ sha256 = "05i479zv5j0fyd9nr4c0pgrfkvyngvvw54lqipvzwdkccljs17i8";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-compat containers parsers text
@@ -126840,59 +126728,77 @@ self: {
"hgeometry" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, containers
- , data-clist, deepseq, dlist, doctest, doctest-discover, fingertree
- , fixed-vector, hashable, hgeometry-combinatorial, hspec, lens
- , linear, MonadRandom, mtl, primitive, QuickCheck
+ , data-clist, deepseq, deepseq-generics, dlist, doctest
+ , doctest-discover, fingertree, fixed-vector, hashable
+ , hgeometry-combinatorial, hspec, lens, linear, MonadRandom, mtl
+ , nonempty-vector, optparse-applicative, primitive, QuickCheck
, quickcheck-instances, random, reflection, semigroupoids
- , semigroups, template-haskell, text, vector, vector-builder, vinyl
- , yaml
+ , semigroups, tasty-bench, template-haskell, text, vector
+ , vector-algorithms, vector-builder, vector-circular, vinyl, yaml
}:
mkDerivation {
pname = "hgeometry";
- version = "0.11.0.0";
- sha256 = "1vbj26j06byz9x0c03q5k7fijl31hsi7x9f5wfr2w9g96d7zl3ls";
- enableSeparateDataOutput = true;
+ version = "0.12.0.1";
+ sha256 = "12qd960njarmsy1a9b6w6jkjqb05xvmg5261n1xhx3lf70xvffj2";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
aeson base bifunctors bytestring containers data-clist deepseq
dlist fingertree fixed-vector hashable hgeometry-combinatorial
- hspec lens linear MonadRandom mtl primitive QuickCheck
- quickcheck-instances random reflection semigroupoids semigroups
- template-haskell text vector vector-builder vinyl yaml
+ hspec lens linear MonadRandom mtl nonempty-vector primitive
+ QuickCheck quickcheck-instances random reflection semigroupoids
+ semigroups template-haskell text vector vector-algorithms
+ vector-builder vector-circular vinyl yaml
+ ];
+ testHaskellDepends = [
+ base doctest doctest-discover QuickCheck quickcheck-instances
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers deepseq deepseq-generics dlist
+ fixed-vector hashable hgeometry-combinatorial lens linear
+ MonadRandom mtl optparse-applicative QuickCheck semigroupoids
+ semigroups tasty-bench vector vector-circular vinyl
];
- testHaskellDepends = [ base doctest doctest-discover QuickCheck ];
description = "Geometric Algorithms, Data structures, and Data types";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hgeometry-combinatorial" = callPackage
- ({ mkDerivation, aeson, approximate-equality, base, bifunctors
- , bytestring, containers, contravariant, data-clist, deepseq
- , directory, dlist, doctest, filepath, fingertree, hashable, hspec
- , hspec-discover, lens, linear, MonadRandom, mtl, primitive
- , QuickCheck, quickcheck-instances, random, reflection
- , semigroupoids, semigroups, singletons, template-haskell, text
- , vector, vector-builder, vinyl, yaml
+ ({ mkDerivation, aeson, approximate-equality, array, base
+ , bifunctors, bytestring, containers, contravariant, data-clist
+ , deepseq, directory, dlist, doctest, filepath, fingertree
+ , hashable, hspec, hspec-discover, lens, linear, math-functions
+ , MonadRandom, mtl, nonempty-vector, primitive, QuickCheck
+ , quickcheck-instances, random, reflection, semigroupoids
+ , semigroups, singletons, template-haskell, text
+ , unordered-containers, vector, vector-builder, vector-circular
+ , vinyl, yaml
}:
mkDerivation {
pname = "hgeometry-combinatorial";
- version = "0.11.0.0";
- sha256 = "0qhb4aflqcjjm1qnhq7xsd086pk09gnq7q503ys4kzr8j0knc2j5";
+ version = "0.12.0.1";
+ sha256 = "0767c7ljw674zbj57nw3dsq2h56x6gw1r6ihyd2jg7djbf5k13ar";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base bifunctors bytestring containers contravariant
+ aeson array base bifunctors bytestring containers contravariant
data-clist deepseq dlist fingertree hashable lens linear
- MonadRandom mtl primitive QuickCheck quickcheck-instances random
- reflection semigroupoids semigroups template-haskell text vector
- vector-builder vinyl yaml
+ math-functions MonadRandom mtl nonempty-vector primitive QuickCheck
+ quickcheck-instances random reflection semigroupoids semigroups
+ template-haskell text unordered-containers vector vector-builder
+ vector-circular vinyl yaml
];
testHaskellDepends = [
- approximate-equality base bytestring containers data-clist
+ approximate-equality base bytestring containers data-clist deepseq
directory doctest filepath hspec lens linear MonadRandom QuickCheck
quickcheck-instances random semigroups singletons vector vinyl yaml
];
testToolDepends = [ hspec-discover ];
description = "Data structures, and Data types";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"hgeometry-ipe" = callPackage
@@ -127402,36 +127308,6 @@ self: {
}) {};
"hie-bios" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, bytestring
- , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
- , directory, extra, file-embed, filepath, ghc, hslogger
- , hspec-expectations, process, tasty, tasty-expected-failure
- , tasty-hunit, temporary, text, time, transformers, unix-compat
- , unordered-containers, vector, yaml
- }:
- mkDerivation {
- pname = "hie-bios";
- version = "0.7.2";
- sha256 = "0cff9kf4qnfkfzvxhxi0hh54x013g5sg0xcw0vpsarc3a91p7da8";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base base16-bytestring bytestring conduit conduit-extra
- containers cryptohash-sha1 deepseq directory extra file-embed
- filepath ghc hslogger process temporary text time transformers
- unix-compat unordered-containers vector yaml
- ];
- executableHaskellDepends = [ base directory filepath ghc ];
- testHaskellDepends = [
- base directory extra filepath ghc hspec-expectations tasty
- tasty-expected-failure tasty-hunit temporary text
- unordered-containers yaml
- ];
- description = "Set up a GHC API session";
- license = lib.licenses.bsd3;
- }) {};
-
- "hie-bios_0_7_3" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, conduit, conduit-extra, containers, cryptohash-sha1, deepseq
, directory, extra, file-embed, filepath, ghc, hslogger
@@ -127441,8 +127317,8 @@ self: {
}:
mkDerivation {
pname = "hie-bios";
- version = "0.7.3";
- sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi";
+ version = "0.7.4";
+ sha256 = "05ad47ll6vxi7say4f7zf13npcjpqbwb42pqs2bmxslif6rl9sdh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127461,7 +127337,6 @@ self: {
];
description = "Set up a GHC API session";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hie-compat" = callPackage
@@ -129050,8 +128925,8 @@ self: {
pname = "hkd";
version = "0.1";
sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa";
- revision = "1";
- editedCabalFile = "09inakgqdwqifha2whvjfx6imx642zfinw8faxgjiv55ncm04zhr";
+ revision = "2";
+ editedCabalFile = "19z00b29z095fp9jxp0n7k1dgm980j9i94aysqd0mm1yjvxvn1k5";
libraryHaskellDepends = [ base some ];
testHaskellDepends = [ base some ];
description = "\"higher-kinded data\"";
@@ -129109,19 +128984,19 @@ self: {
}) {};
"hkgr" = callPackage
- ({ mkDerivation, base, directory, extra, filepath, simple-cabal
- , simple-cmd, simple-cmd-args, xdg-basedir
+ ({ mkDerivation, base, bytestring, directory, extra, filepath
+ , simple-cabal, simple-cmd-args, typed-process, xdg-basedir
}:
mkDerivation {
pname = "hkgr";
- version = "0.2.6.1";
- sha256 = "0hq059l3byw3vcxw56z341q56xnb86kdqj5vnn16v29ql677xm26";
+ version = "0.2.7";
+ sha256 = "1p03qigrfkjj0q8ps9gx50pnz6s2rdmn2lqnybhfz8pifsqj0z7k";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- base directory extra filepath simple-cabal simple-cmd
- simple-cmd-args xdg-basedir
+ base bytestring directory extra filepath simple-cabal
+ simple-cmd-args typed-process xdg-basedir
];
description = "Simple Hackage release workflow for package maintainers";
license = lib.licenses.gpl3;
@@ -129700,7 +129575,6 @@ self: {
executableHaskellDepends = [ base ];
description = "Source code suggestions";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ maralorn ];
}) {};
"hlint-test" = callPackage
@@ -129852,6 +129726,24 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "hls-class-plugin_1_0_0_0" = callPackage
+ ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
+ , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-class-plugin";
+ version = "1.0.0.0";
+ sha256 = "103rswyrbs35q6mmv19bnj4cp4r1n5mx6aazcabfakh1cix0fn60";
+ libraryHaskellDepends = [
+ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens
+ lsp shake text transformers unordered-containers
+ ];
+ description = "Class/instance management plugin for Haskell Language Server";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hls-eval-plugin" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
@@ -129944,6 +129836,23 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "hls-haddock-comments-plugin_1_0_0_0" = callPackage
+ ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
+ , hls-plugin-api, lsp-types, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hls-haddock-comments-plugin";
+ version = "1.0.0.0";
+ sha256 = "1azy3rrbdi465c65f603ycj14mz1cvc9h92rrf0b0frs90hs66r3";
+ libraryHaskellDepends = [
+ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types
+ text unordered-containers
+ ];
+ description = "Haddock comments plugin for Haskell Language Server";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hls-hlint-plugin" = callPackage
({ mkDerivation, aeson, apply-refact, base, binary, bytestring
, containers, data-default, deepseq, Diff, directory, extra
@@ -129983,7 +129892,7 @@ self: {
license = lib.licenses.asl20;
}) {};
- "hls-plugin-api_0_7_1_0" = callPackage
+ "hls-plugin-api_1_0_0_0" = callPackage
({ mkDerivation, aeson, base, containers, data-default
, dependent-map, dependent-sum, Diff, dlist, hashable, hslogger
, lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix
@@ -129991,8 +129900,8 @@ self: {
}:
mkDerivation {
pname = "hls-plugin-api";
- version = "0.7.1.0";
- sha256 = "036lrij56fzd3rbrxrxpvmq2ng0yp4qrnrl8k6g60p5sf9abqzc2";
+ version = "1.0.0.0";
+ sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal";
libraryHaskellDepends = [
aeson base containers data-default dependent-map dependent-sum Diff
dlist hashable hslogger lens lsp opentelemetry process regex-tdfa
@@ -130087,6 +129996,44 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "hls-tactics-plugin_1_0_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, checkers, containers
+ , data-default, deepseq, directory, extra, filepath, fingertree
+ , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen
+ , ghcide, hie-bios, hls-plugin-api, hspec, hspec-discover
+ , hspec-expectations, lens, lsp, lsp-test, lsp-types, megaparsec
+ , mtl, QuickCheck, refinery, retrie, shake, syb, tasty
+ , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
+ , tasty-rerun, text, transformers
+ }:
+ mkDerivation {
+ pname = "hls-tactics-plugin";
+ version = "1.0.0.0";
+ sha256 = "0cd6d3m3w1n7x22k5xndjl9r440s5nx6q2fg3wcmdsbd3s3pg1qa";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers deepseq directory extra filepath fingertree
+ generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
+ hls-plugin-api lens lsp mtl refinery retrie shake syb text
+ transformers
+ ];
+ executableHaskellDepends = [
+ base data-default ghcide hls-plugin-api shake
+ ];
+ testHaskellDepends = [
+ aeson base bytestring checkers containers data-default deepseq
+ directory filepath ghc ghcide hie-bios hls-plugin-api hspec
+ hspec-expectations lens lsp-test lsp-types megaparsec mtl
+ QuickCheck tasty tasty-ant-xml tasty-expected-failure tasty-golden
+ tasty-hunit tasty-rerun text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Wingman plugin for Haskell Language Server";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hlwm" = callPackage
({ mkDerivation, base, stm, transformers, unix, X11 }:
mkDerivation {
@@ -130836,6 +130783,8 @@ self: {
pname = "hnix";
version = "0.12.0.1";
sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc";
+ revision = "1";
+ editedCabalFile = "136lwfb5hjwdbfik5c5dw1nhsmy8v410czmjn4i242s8jv5wm9yb";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -130874,34 +130823,6 @@ self: {
}) {};
"hnix-store-core" = callPackage
- ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary
- , bytestring, containers, cryptohash-md5, cryptohash-sha1
- , cryptohash-sha256, directory, filepath, hashable, mtl, process
- , regex-base, regex-tdfa, saltine, tasty, tasty-discover
- , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
- , unix, unordered-containers, vector
- }:
- mkDerivation {
- pname = "hnix-store-core";
- version = "0.2.0.0";
- sha256 = "1gy808dzaq2jjy1xdhf3vjxzprlzn9mmbxc554sa03v8f9hc0r7h";
- libraryHaskellDepends = [
- base base16-bytestring binary bytestring containers cryptohash-md5
- cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl
- regex-base regex-tdfa saltine text time unix unordered-containers
- vector
- ];
- testHaskellDepends = [
- base base64-bytestring binary bytestring containers directory
- process tasty tasty-discover tasty-hspec tasty-hunit
- tasty-quickcheck temporary text
- ];
- testToolDepends = [ tasty-discover ];
- description = "Core effects for interacting with the Nix store";
- license = lib.licenses.asl20;
- }) {};
-
- "hnix-store-core_0_4_1_0" = callPackage
({ mkDerivation, algebraic-graphs, attoparsec, base
, base16-bytestring, base64-bytestring, binary, bytestring, cereal
, containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
@@ -130928,7 +130849,6 @@ self: {
];
description = "Core effects for interacting with the Nix store";
license = lib.licenses.asl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"hnix-store-remote" = callPackage
@@ -132759,24 +132679,6 @@ self: {
}) {};
"hp2pretty" = callPackage
- ({ mkDerivation, array, attoparsec, base, containers, filepath
- , floatshow, mtl, optparse-applicative, semigroups, text
- }:
- mkDerivation {
- pname = "hp2pretty";
- version = "0.9";
- sha256 = "0libwl8kl6yhingvbrmw1b8l5yiq6wn07asvkwbnh9l6mnh8pz2n";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- array attoparsec base containers filepath floatshow mtl
- optparse-applicative semigroups text
- ];
- description = "generate pretty graphs from heap profiles";
- license = lib.licenses.bsd3;
- }) {};
-
- "hp2pretty_0_10" = callPackage
({ mkDerivation, array, attoparsec, base, containers, filepath
, floatshow, mtl, optparse-applicative, semigroups, text
}:
@@ -132792,7 +132694,6 @@ self: {
];
description = "generate pretty graphs from heap profiles";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hpack" = callPackage
@@ -136628,6 +136529,28 @@ self: {
license = lib.licenses.mit;
}) {};
+ "hslua-core" = callPackage
+ ({ mkDerivation, base, bytestring, exceptions, lua, lua-arbitrary
+ , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "hslua-core";
+ version = "1.0.0";
+ sha256 = "1dkm0w0cpdkakx2ka8csjpg2dlzv49xxij884g1kzwg2k85l4xyy";
+ libraryHaskellDepends = [
+ base bytestring exceptions lua mtl text
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions lua lua-arbitrary mtl QuickCheck
+ quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+ ];
+ description = "Bindings to Lua, an embeddable scripting language";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {lua-arbitrary = null;};
+
"hslua-module-doclayout" = callPackage
({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
, tasty-lua, text
@@ -137152,8 +137075,8 @@ self: {
}:
mkDerivation {
pname = "hspec-dirstream";
- version = "1.0.0.2";
- sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr";
+ version = "1.0.0.3";
+ sha256 = "1wzz718rw3nfzjgkigy5si7n6igjs5h8z8xsj1vhcivly4adzrrw";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -139293,10 +139216,8 @@ self: {
}:
mkDerivation {
pname = "htoml-megaparsec";
- version = "2.1.0.3";
- sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x";
- revision = "3";
- editedCabalFile = "074r8wr9xar40ybm6wqg2s0k32kiapbjm8k3djp4lz6gjxyw7nc8";
+ version = "2.1.0.4";
+ sha256 = "08pka0z97b461bf45nvh9gymbvbwhn2dh70dy7x22xmzrigxnxw1";
libraryHaskellDepends = [
base composition-prelude containers deepseq megaparsec mtl text
time unordered-containers vector
@@ -139467,6 +139388,8 @@ self: {
pname = "http-api-data";
version = "0.4.3";
sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz";
+ revision = "1";
+ editedCabalFile = "0vy4glhjc036m2lmkc1ls0s48pcxga2qqc1jbpj4139v9j8h158m";
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base base-compat bytestring
containers cookie hashable http-types tagged text time-compat
@@ -139523,7 +139446,7 @@ self: {
license = lib.licenses.mit;
}) {};
- "http-client_0_7_5" = callPackage
+ "http-client_0_7_6" = callPackage
({ mkDerivation, array, async, base, base64-bytestring
, blaze-builder, bytestring, case-insensitive, containers, cookie
, deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -139532,8 +139455,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.7.5";
- sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k";
+ version = "0.7.6";
+ sha256 = "1458mq5kh5fjlkhk9cgaz6sc6533l2nm4r2jz80diy8qc6bpiwrk";
libraryHaskellDepends = [
array base base64-bytestring blaze-builder bytestring
case-insensitive containers cookie deepseq exceptions filepath
@@ -139834,8 +139757,8 @@ self: {
}:
mkDerivation {
pname = "http-conduit";
- version = "2.3.7.4";
- sha256 = "1mbaasmxx90gzfirwn8lmjpwj34gf1dk9y3m9mm88rzmy3s6czbb";
+ version = "2.3.8";
+ sha256 = "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng";
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit conduit-extra http-client
http-client-tls http-types mtl resourcet transformers unliftio-core
@@ -139905,8 +139828,8 @@ self: {
}:
mkDerivation {
pname = "http-date";
- version = "0.0.10";
- sha256 = "1g3b895894mrscnm32x3a2nax3xvsp8aji11f0qd44xh7kz249zs";
+ version = "0.0.11";
+ sha256 = "1lzlrj2flcnz3k5kfhf11nk5n8m6kcya0lkwrsnzxgfr3an27y9j";
libraryHaskellDepends = [ array attoparsec base bytestring time ];
testHaskellDepends = [
base bytestring doctest hspec old-locale time
@@ -140341,8 +140264,8 @@ self: {
}:
mkDerivation {
pname = "http-query";
- version = "0.1.0";
- sha256 = "1j2ad7ym5mkpavlw1fp07n4qlggms04i93l5rv6vg07ljf4imjvs";
+ version = "0.1.0.1";
+ sha256 = "11l3bxbaxkd0mrarp5l3s3c4xhvdiq8lj739hxspi6cgk0ywjwxw";
libraryHaskellDepends = [
aeson base bytestring http-conduit network-uri text
];
@@ -141051,8 +140974,8 @@ self: {
pname = "hum";
version = "0.2.0.0";
sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b";
- revision = "2";
- editedCabalFile = "03hh7nyqchskkp4iqcq335mnpdsvgdw8d1pf3dp7p4wmsk20kwmk";
+ revision = "3";
+ editedCabalFile = "1wj4rf5gn2zqlym2hrl5iiakyvh1h8n2z788wzzjvfx4xwsb5gp3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141643,6 +141566,24 @@ self: {
broken = true;
}) {};
+ "hw-aws-sqs-conduit" = callPackage
+ ({ mkDerivation, amazonka, amazonka-sqs, base, conduit, lens, mtl
+ , text
+ }:
+ mkDerivation {
+ pname = "hw-aws-sqs-conduit";
+ version = "0.1.0.0";
+ sha256 = "112nf8yqpb0cl4vb7h21r0nf13hz5419vkk2z5235db75ap6bbcc";
+ libraryHaskellDepends = [
+ amazonka amazonka-sqs base conduit lens mtl text
+ ];
+ testHaskellDepends = [ base ];
+ description = "AWS SQS conduit";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-balancedparens" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, directory
, doctest, doctest-discover, generic-lens, hedgehog, hspec
@@ -142379,6 +142320,21 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hw-playground-linear" = callPackage
+ ({ mkDerivation, base, hedgehog, hmatrix, hmatrix-csv, hspec
+ , hspec-discover, hw-hspec-hedgehog, text
+ }:
+ mkDerivation {
+ pname = "hw-playground-linear";
+ version = "0.1.0.0";
+ sha256 = "039bkjgwa14v9qjmblipv4qd19lg3y2qn78khv0rbqka1haxnhn9";
+ libraryHaskellDepends = [ base hmatrix hmatrix-csv text ];
+ testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
+ testToolDepends = [ hspec-discover ];
+ description = "Primitive functions and data types";
+ license = lib.licenses.bsd3;
+ }) {};
+
"hw-prim" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, directory
, doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec
@@ -143761,31 +143717,6 @@ self: {
}) {};
"hyperloglog" = callPackage
- ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
- , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
- , distributive, doctest, filepath, generic-deriving, hashable, lens
- , reflection, semigroupoids, semigroups, simple-reflect, siphash
- , tagged, vector
- }:
- mkDerivation {
- pname = "hyperloglog";
- version = "0.4.3";
- sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- approximate base binary bits bytes cereal cereal-vector comonad
- deepseq distributive hashable lens reflection semigroupoids
- semigroups siphash tagged vector
- ];
- testHaskellDepends = [
- base directory doctest filepath generic-deriving semigroups
- simple-reflect
- ];
- description = "An approximate streaming (constant space) unique object counter";
- license = lib.licenses.bsd3;
- }) {};
-
- "hyperloglog_0_4_4" = callPackage
({ mkDerivation, approximate, base, binary, bits, bytes, cereal
, cereal-vector, comonad, deepseq, distributive, hashable, lens
, reflection, semigroupoids, semigroups, siphash, tagged, vector
@@ -143801,7 +143732,6 @@ self: {
];
description = "An approximate streaming (constant space) unique object counter";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"hyperloglogplus" = callPackage
@@ -143851,28 +143781,6 @@ self: {
}) {};
"hyphenation" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers
- , doctest, text, unordered-containers, zlib
- }:
- mkDerivation {
- pname = "hyphenation";
- version = "0.8";
- sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii";
- revision = "3";
- editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki";
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base bytestring containers text unordered-containers zlib
- ];
- testHaskellDepends = [
- base containers doctest unordered-containers
- ];
- description = "Configurable Knuth-Liang hyphenation";
- license = lib.licenses.bsd2;
- }) {};
-
- "hyphenation_0_8_1" = callPackage
({ mkDerivation, base, bytestring, containers, text
, unordered-containers, zlib
}:
@@ -143886,7 +143794,6 @@ self: {
];
description = "Configurable Knuth-Liang hyphenation";
license = lib.licenses.bsd2;
- hydraPlatforms = lib.platforms.none;
}) {};
"hypher" = callPackage
@@ -144024,6 +143931,8 @@ self: {
testSystemDepends = [ zookeeper_mt ];
description = "Haskell client library for Apache Zookeeper";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) zookeeper_mt;};
"hzulip" = callPackage
@@ -144240,8 +144149,8 @@ self: {
}:
mkDerivation {
pname = "ice40-prim";
- version = "0.1.0.0";
- sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99";
+ version = "0.2.0.0";
+ sha256 = "02dm3zqq24phhxis471gp91figkazpwpz0ndhazp14jajxvka0cd";
libraryHaskellDepends = [
base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat
ghc-typelits-natnormalise interpolate
@@ -144726,8 +144635,6 @@ self: {
];
description = "Functional Programming Language with Dependent Types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {inherit (pkgs) gmp;};
"ieee" = callPackage
@@ -146871,8 +146778,8 @@ self: {
}:
mkDerivation {
pname = "influxdb";
- version = "1.9.0";
- sha256 = "1d580f2j71x0iww0q2mg47jbhjsd83yarrnnmcp9f2bx7cix174v";
+ version = "1.9.1";
+ sha256 = "1g8lj56xi61g0vfindiz4lmnypjh2bzp2nm92dmh2d4mlfhrh78y";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -146885,7 +146792,7 @@ self: {
base containers doctest lens raw-strings-qq tasty tasty-hunit
template-haskell time vector
];
- description = "Haskell client library for InfluxDB";
+ description = "InfluxDB client library for Haskell";
license = lib.licenses.bsd3;
}) {};
@@ -147241,19 +147148,19 @@ self: {
}) {aether = null;};
"insert-ordered-containers" = callPackage
- ({ mkDerivation, aeson, base, base-compat, hashable, lens
- , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups
- , tasty, tasty-quickcheck, text, transformers, unordered-containers
+ ({ mkDerivation, aeson, base, base-compat, hashable
+ , indexed-traversable, lens, optics-core, optics-extra, QuickCheck
+ , semigroupoids, semigroups, tasty, tasty-quickcheck, text
+ , transformers, unordered-containers
}:
mkDerivation {
pname = "insert-ordered-containers";
- version = "0.2.3.1";
- sha256 = "020a56280mxjk9k97q2m1424m73m1sf1ccl0wm0ci9msyw2g51za";
- revision = "1";
- editedCabalFile = "1s90flzj3039s50r6hx7mqihf8lvarcqb6zps7m12x543gahfcq0";
+ version = "0.2.4";
+ sha256 = "174maygil2mffjz2ssqawlmv36413m65zp3ng67hzij4dh8piz7x";
libraryHaskellDepends = [
- aeson base base-compat hashable lens optics-core optics-extra
- semigroupoids semigroups text transformers unordered-containers
+ aeson base base-compat hashable indexed-traversable lens
+ optics-core optics-extra semigroupoids semigroups text transformers
+ unordered-containers
];
testHaskellDepends = [
aeson base base-compat hashable lens QuickCheck semigroupoids
@@ -147295,22 +147202,6 @@ self: {
}) {};
"inspection-testing" = callPackage
- ({ mkDerivation, base, containers, ghc, mtl, template-haskell
- , transformers
- }:
- mkDerivation {
- pname = "inspection-testing";
- version = "0.4.2.4";
- sha256 = "11nz8j56l3h7sn927mcsms9af9rpqkmxc0c0vf9mln567wpb75h3";
- libraryHaskellDepends = [
- base containers ghc mtl template-haskell transformers
- ];
- testHaskellDepends = [ base ];
- description = "GHC plugin to do inspection testing";
- license = lib.licenses.mit;
- }) {};
-
- "inspection-testing_0_4_3_0" = callPackage
({ mkDerivation, base, containers, ghc, mtl, template-haskell
, transformers
}:
@@ -147324,7 +147215,6 @@ self: {
testHaskellDepends = [ base ];
description = "GHC plugin to do inspection testing";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"inspector-wrecker" = callPackage
@@ -147878,23 +147768,6 @@ self: {
}) {};
"intern" = callPackage
- ({ mkDerivation, array, base, bytestring, hashable, text
- , unordered-containers
- }:
- mkDerivation {
- pname = "intern";
- version = "0.9.3";
- sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k";
- revision = "1";
- editedCabalFile = "1cjlmvg55nn9fd1f0jfmgy1rjys7gna3x3qknnpcmndq6vzg1mrl";
- libraryHaskellDepends = [
- array base bytestring hashable text unordered-containers
- ];
- description = "Efficient hash-consing for arbitrary data types";
- license = lib.licenses.bsd3;
- }) {};
-
- "intern_0_9_4" = callPackage
({ mkDerivation, array, base, bytestring, hashable, text
, unordered-containers
}:
@@ -147907,7 +147780,6 @@ self: {
];
description = "Efficient hash-consing for arbitrary data types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"internetmarke" = callPackage
@@ -148225,26 +148097,6 @@ self: {
}) {};
"intervals" = callPackage
- ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
- , distributive, doctest, filepath, ghc-prim, QuickCheck
- , template-haskell
- }:
- mkDerivation {
- pname = "intervals";
- version = "0.9.1";
- sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z";
- revision = "2";
- editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ array base distributive ghc-prim ];
- testHaskellDepends = [
- base directory doctest filepath QuickCheck template-haskell
- ];
- description = "Interval Arithmetic";
- license = lib.licenses.bsd3;
- }) {};
-
- "intervals_0_9_2" = callPackage
({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }:
mkDerivation {
pname = "intervals";
@@ -148254,7 +148106,6 @@ self: {
testHaskellDepends = [ base QuickCheck ];
description = "Interval Arithmetic";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"intmap-graph" = callPackage
@@ -148442,6 +148293,32 @@ self: {
license = lib.licenses.bsd2;
}) {};
+ "inventory" = callPackage
+ ({ mkDerivation, appendmap, base, bytestring, containers, directory
+ , filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit
+ }:
+ mkDerivation {
+ pname = "inventory";
+ version = "0.1.0.2";
+ sha256 = "1ykfxlsgnim45b4birflpwj0p3grjw8y4p9vwqnmhss6krl2qk3x";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ appendmap base bytestring containers directory filepath ghc
+ ghc-paths mtl
+ ];
+ executableHaskellDepends = [
+ appendmap base bytestring containers directory filepath ghc
+ ghc-paths mtl
+ ];
+ testHaskellDepends = [
+ appendmap base bytestring containers directory filepath ghc
+ ghc-paths mtl tasty tasty-hunit
+ ];
+ description = "Project statistics and definition analysis";
+ license = lib.licenses.bsd3;
+ }) {};
+
"invert" = callPackage
({ mkDerivation, base, containers, criterion, generic-deriving
, hashable, unordered-containers, vector
@@ -148460,6 +148337,8 @@ self: {
benchmarkHaskellDepends = [ base criterion ];
description = "Automatically generate a function's inverse";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"invertible" = callPackage
@@ -148995,8 +148874,8 @@ self: {
}:
mkDerivation {
pname = "ipfs";
- version = "1.1.5.1";
- sha256 = "0c93s1s3l72yw2lb28v37bnhmvcn5s2w1620fsx0z4ij1z8dnk19";
+ version = "1.2.0.0";
+ sha256 = "12aibxpdkgwym8k8hibb8a77bbf7wd6z5czwpakg48x9gxmvhygn";
libraryHaskellDepends = [
aeson base bytestring envy flow Glob http-media ip lens
monad-logger regex-compat rio servant servant-client servant-server
@@ -151314,21 +151193,6 @@ self: {
}) {};
"jira-wiki-markup" = callPackage
- ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
- mkDerivation {
- pname = "jira-wiki-markup";
- version = "1.3.2";
- sha256 = "16vcy9gn6qrzvr99l26az4yi2dy9xngcb1wmj86yl7bmk1hcq3wc";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base mtl parsec text ];
- executableHaskellDepends = [ base text ];
- testHaskellDepends = [ base parsec tasty tasty-hunit text ];
- description = "Handle Jira wiki markup";
- license = lib.licenses.mit;
- }) {};
-
- "jira-wiki-markup_1_3_3" = callPackage
({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
mkDerivation {
pname = "jira-wiki-markup";
@@ -151341,7 +151205,6 @@ self: {
testHaskellDepends = [ base parsec tasty tasty-hunit text ];
description = "Handle Jira wiki markup";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"jmacro" = callPackage
@@ -152448,6 +152311,8 @@ self: {
testToolDepends = [ tasty-discover ];
description = "JSON Pointer (RFC 6901) parsing, access, and modification";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"json-python" = callPackage
@@ -152728,6 +152593,8 @@ self: {
recursion-schemes text unordered-containers vector
];
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"json-togo" = callPackage
@@ -153778,24 +153645,6 @@ self: {
}) {};
"kan-extensions" = callPackage
- ({ mkDerivation, adjunctions, array, base, comonad, containers
- , contravariant, distributive, free, invariant, mtl, profunctors
- , semigroupoids, tagged, transformers, transformers-compat
- }:
- mkDerivation {
- pname = "kan-extensions";
- version = "5.2.1";
- sha256 = "114zs8j81ich4178qvvlnpch09dvbv1mm1g7xf2g78f77gh9ia7a";
- libraryHaskellDepends = [
- adjunctions array base comonad containers contravariant
- distributive free invariant mtl profunctors semigroupoids tagged
- transformers transformers-compat
- ];
- description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
- license = lib.licenses.bsd3;
- }) {};
-
- "kan-extensions_5_2_2" = callPackage
({ mkDerivation, adjunctions, array, base, comonad, containers
, contravariant, distributive, free, invariant, mtl, profunctors
, semigroupoids, tagged, transformers, transformers-compat
@@ -153811,7 +153660,6 @@ self: {
];
description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"kangaroo" = callPackage
@@ -154954,8 +154802,8 @@ self: {
}:
mkDerivation {
pname = "kempe";
- version = "0.1.1.2";
- sha256 = "1nmmka06zin3i4y30510c56yk3vjxvnndfb38w4v557xr94rirkd";
+ version = "0.1.1.3";
+ sha256 = "0p0zm3dxjcmckwif966cnsn8qb667mxd8yh7wx56nl7jsxz90cw1";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -155885,6 +155733,8 @@ self: {
doHaddock = false;
description = "Extracts values from /proc/cmdline";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"kqueue" = callPackage
@@ -157730,27 +157580,6 @@ self: {
}) {};
"language-docker" = callPackage
- ({ mkDerivation, base, bytestring, containers, data-default-class
- , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
- , time
- }:
- mkDerivation {
- pname = "language-docker";
- version = "9.1.2";
- sha256 = "014rb5jf650fhsmc02v4xc60w7v1261ri1w9ig6dw0xjdgxalvbs";
- libraryHaskellDepends = [
- base bytestring containers data-default-class megaparsec
- prettyprinter split text time
- ];
- testHaskellDepends = [
- base bytestring containers data-default-class hspec HUnit
- megaparsec prettyprinter QuickCheck split text time
- ];
- description = "Dockerfile parser, pretty-printer and embedded DSL";
- license = lib.licenses.gpl3;
- }) {};
-
- "language-docker_9_1_3" = callPackage
({ mkDerivation, base, bytestring, containers, data-default-class
, hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text
, time
@@ -157769,7 +157598,6 @@ self: {
];
description = "Dockerfile parser, pretty-printer and embedded DSL";
license = lib.licenses.gpl3;
- hydraPlatforms = lib.platforms.none;
}) {};
"language-dockerfile" = callPackage
@@ -159125,8 +158953,8 @@ self: {
pname = "lattices";
version = "2.0.2";
sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix";
- revision = "2";
- editedCabalFile = "122mrj3b15jv1bjmzc8k37dkc2gy05hg550gia09n7j7n76v0h7i";
+ revision = "3";
+ editedCabalFile = "1n1sv7477v88ibcwb5rh4p1r9r4hj0jj7s0vh6r0y2w4hbhpslvr";
libraryHaskellDepends = [
base base-compat containers deepseq hashable integer-logarithms
QuickCheck semigroupoids tagged transformers universe-base
@@ -159153,8 +158981,8 @@ self: {
}:
mkDerivation {
pname = "launchdarkly-server-sdk";
- version = "2.1.0";
- sha256 = "1nj6jcmara4x8y292q5qacli6hmfhahw856a0nyngca2c8m5mwr1";
+ version = "2.1.1";
+ sha256 = "1gjiwj8x57z9qs9gxdgqyih38i8rkkvjak4va5cg44qp3rflmby1";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring
bytestring-conversion clock containers cryptohash exceptions extra
@@ -159591,19 +159419,6 @@ self: {
}) {};
"lca" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, doctest }:
- mkDerivation {
- pname = "lca";
- version = "0.3.1";
- sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base doctest ];
- description = "O(log n) persistent online lowest common ancestor search without preprocessing";
- license = lib.licenses.bsd3;
- }) {};
-
- "lca_0_4" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "lca";
@@ -159612,7 +159427,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "O(log n) persistent online lowest common ancestor search without preprocessing";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"lcs" = callPackage
@@ -159852,8 +159666,8 @@ self: {
({ mkDerivation, base, bytestring, text }:
mkDerivation {
pname = "leanpub-concepts";
- version = "1.0.0.1";
- sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c";
+ version = "1.1";
+ sha256 = "0zy26sccxyqhmlk6dfbd7jghwmfi9zkcljb9rcl82ysw7cwyl3qw";
libraryHaskellDepends = [ base bytestring text ];
description = "Types for the Leanpub API";
license = lib.licenses.mit;
@@ -159866,8 +159680,8 @@ self: {
}:
mkDerivation {
pname = "leanpub-wreq";
- version = "1.0.0.0";
- sha256 = "060ilipz2aj7rci6yiy2r6j8c10hlv8q8qv5wm7ic9rjl2gvx4ra";
+ version = "1.1";
+ sha256 = "1mk188r1bxg3qhv24nxkqw5vk5jyifxvg171h8bx93s9mmrikzdv";
libraryHaskellDepends = [
aeson base bytestring exceptions leanpub-concepts lens rando text
time transformers unordered-containers wreq
@@ -160268,7 +160082,7 @@ self: {
license = lib.licenses.bsd2;
}) {};
- "lens_5" = callPackage
+ "lens_5_0_1" = callPackage
({ mkDerivation, array, assoc, base, base-compat, base-orphans
, bifunctors, bytestring, call-stack, comonad, containers
, contravariant, criterion, deepseq, distributive, exceptions
@@ -160282,8 +160096,8 @@ self: {
}:
mkDerivation {
pname = "lens";
- version = "5";
- sha256 = "06nvmg9aan4s4ldq3c2a4z15r29hsxyvbjid2yvskmlw5pvwpncy";
+ version = "5.0.1";
+ sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c";
libraryHaskellDepends = [
array assoc base base-orphans bifunctors bytestring call-stack
comonad containers contravariant distributive exceptions filepath
@@ -160319,25 +160133,6 @@ self: {
}) {};
"lens-action" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant
- , directory, doctest, filepath, lens, mtl, profunctors
- , semigroupoids, semigroups, transformers
- }:
- mkDerivation {
- pname = "lens-action";
- version = "0.2.4";
- sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base comonad contravariant lens mtl profunctors semigroupoids
- semigroups transformers
- ];
- testHaskellDepends = [ base directory doctest filepath ];
- description = "Monadic Getters and Folds";
- license = lib.licenses.bsd3;
- }) {};
-
- "lens-action_0_2_5" = callPackage
({ mkDerivation, base, comonad, contravariant, lens, mtl
, profunctors, semigroupoids, transformers
}:
@@ -160351,33 +160146,9 @@ self: {
];
description = "Monadic Getters and Folds";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"lens-aeson" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
- , cabal-doctest, doctest, generic-deriving, lens, scientific
- , semigroups, simple-reflect, text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "lens-aeson";
- version = "1.1";
- sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p";
- revision = "4";
- editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- aeson attoparsec base bytestring lens scientific text
- unordered-containers vector
- ];
- testHaskellDepends = [
- base doctest generic-deriving semigroups simple-reflect
- ];
- description = "Law-abiding lenses for aeson";
- license = lib.licenses.mit;
- }) {};
-
- "lens-aeson_1_1_1" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, lens
, scientific, text, unordered-containers, vector
}:
@@ -160391,7 +160162,6 @@ self: {
];
description = "Law-abiding lenses for aeson";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"lens-core" = callPackage
@@ -160497,8 +160267,8 @@ self: {
({ mkDerivation, base, hspec, template-haskell, transformers }:
mkDerivation {
pname = "lens-family-th";
- version = "0.5.1.0";
- sha256 = "1gpjfig8a2dh4v4660rg659hpvrf2vv85v7cwn64xg3043i954qi";
+ version = "0.5.2.0";
+ sha256 = "00glipk0mzq6mjvdi2lqys1d9gsncvphcccigw2ry8k9zc8l85zb";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base hspec template-haskell transformers ];
description = "Generate lens-family style lenses";
@@ -160586,12 +160356,16 @@ self: {
pname = "lens-process";
version = "0.4.0.0";
sha256 = "1gms2bxa1sygpid09cg3nk1kyhkg4s38dqs0gd77ia2aln6zd7qg";
+ revision = "1";
+ editedCabalFile = "0y1ran4pjqr2226rkmiqij0pf980npr7iv88y5bgcg7hs22f3b57";
libraryHaskellDepends = [ base filepath lens process ];
testHaskellDepends = [
base filepath lens process tasty tasty-hunit
];
description = "Optics for system processes";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"lens-properties" = callPackage
@@ -160613,8 +160387,8 @@ self: {
}:
mkDerivation {
pname = "lens-regex";
- version = "0.1.1";
- sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d";
+ version = "0.1.3";
+ sha256 = "11zgdk46skj3g0436vilcgg4wvclixh07xjwqfcsfhffn0vn3mz4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -160833,8 +160607,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.5.0.0";
- sha256 = "1fkgaf4vgn2b8pkvcc9x3dmigqrq4qp31xvjmp3h0g9s1bm9ay5z";
+ version = "1.5.1.0";
+ sha256 = "03h7fk37rrxpnxfpckpfi5k3v7ch4v5vn601m9lj9shbs26h1cdx";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -162403,14 +162177,14 @@ self: {
}) {};
"lifted-async" = callPackage
- ({ mkDerivation, async, base, constraints, criterion, deepseq
- , HUnit, lifted-base, monad-control, mtl, tasty
+ ({ mkDerivation, async, base, constraints, deepseq, HUnit
+ , lifted-base, monad-control, mtl, tasty, tasty-bench
, tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.1.2";
- sha256 = "04spjv6l7bpdl3wla78yqg8misq5ym6vi4q8d03iaw2kg4cwn95x";
+ version = "0.10.1.3";
+ sha256 = "1hml672j8sqxhklxif3nwr8v59a596wwwbllq0zvvmlxcjdzlh7k";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -162418,7 +162192,7 @@ self: {
async base HUnit lifted-base monad-control mtl tasty
tasty-expected-failure tasty-hunit tasty-th
];
- benchmarkHaskellDepends = [ async base criterion deepseq ];
+ benchmarkHaskellDepends = [ async base deepseq tasty-bench ];
description = "Run lifted IO operations asynchronously and wait for their results";
license = lib.licenses.bsd3;
}) {};
@@ -162902,32 +162676,6 @@ self: {
}) {};
"linear" = callPackage
- ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
- , bytestring, cereal, containers, deepseq, distributive, ghc-prim
- , hashable, HUnit, lens, random, reflection, semigroupoids
- , semigroups, simple-reflect, tagged, template-haskell
- , test-framework, test-framework-hunit, transformers
- , transformers-compat, unordered-containers, vector, void
- }:
- mkDerivation {
- pname = "linear";
- version = "1.21.4";
- sha256 = "019dsw4xqcmz8g0hanc3xsl0k1pqzxkhp9jz1sf12mqsgs6jj0zr";
- libraryHaskellDepends = [
- adjunctions base base-orphans binary bytes cereal containers
- deepseq distributive ghc-prim hashable lens random reflection
- semigroupoids semigroups tagged template-haskell transformers
- transformers-compat unordered-containers vector void
- ];
- testHaskellDepends = [
- base binary bytestring deepseq HUnit reflection simple-reflect
- test-framework test-framework-hunit vector
- ];
- description = "Linear Algebra";
- license = lib.licenses.bsd3;
- }) {};
-
- "linear_1_21_5" = callPackage
({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
, bytestring, cereal, containers, deepseq, distributive, ghc-prim
, hashable, HUnit, indexed-traversable, lens, random, reflection
@@ -162952,7 +162700,6 @@ self: {
];
description = "Linear Algebra";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"linear-accelerate" = callPackage
@@ -163018,6 +162765,8 @@ self: {
];
description = "Standard library for linear types";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"linear-circuit" = callPackage
@@ -163543,6 +163292,17 @@ self: {
broken = true;
}) {blkid = null;};
+ "linux-capabilities" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "linux-capabilities";
+ version = "0.1.0.0";
+ sha256 = "033mnbxg9bzi3cc4js22gpi96g5yslv6sksxdsgab5k075gad85k";
+ libraryHaskellDepends = [ base ];
+ description = "Linux capabilities Haskell data type";
+ license = lib.licenses.asl20;
+ }) {};
+
"linux-cgroup" = callPackage
({ mkDerivation, base, filepath }:
mkDerivation {
@@ -163788,6 +163548,25 @@ self: {
broken = true;
}) {};
+ "lion" = callPackage
+ ({ mkDerivation, base, Cabal, clash-prelude, generic-monoid
+ , ghc-typelits-extra, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, ice40-prim, lens, mtl
+ }:
+ mkDerivation {
+ pname = "lion";
+ version = "0.1.0.0";
+ sha256 = "0sxj7rjx9xzrmzy0q415b7vhxvj5fp38av1qs3sx54frmzbm0x20";
+ libraryHaskellDepends = [
+ base Cabal clash-prelude generic-monoid ghc-typelits-extra
+ ghc-typelits-knownnat ghc-typelits-natnormalise ice40-prim lens mtl
+ ];
+ description = "RISC-V Core";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"lipsum-gen" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
@@ -165638,8 +165417,8 @@ self: {
}:
mkDerivation {
pname = "log-base";
- version = "0.9.0.0";
- sha256 = "0rlwr80636b4rrjgqg7ri5cfz95v9h47r9k413r9wvldfvz2abyg";
+ version = "0.9.1.0";
+ sha256 = "0p0zb805a8zlxdnii6r0gmf0zic4g4zxkvcq84j6g8973qx1fch9";
libraryHaskellDepends = [
aeson aeson-pretty base bytestring deepseq exceptions mmorph
monad-control monad-time mtl semigroups stm text time
@@ -165650,29 +165429,6 @@ self: {
}) {};
"log-domain" = callPackage
- ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
- , comonad, deepseq, distributive, doctest, generic-deriving
- , hashable, semigroupoids, semigroups, simple-reflect, vector
- }:
- mkDerivation {
- pname = "log-domain";
- version = "0.13";
- sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv";
- revision = "3";
- editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base binary bytes cereal comonad deepseq distributive hashable
- semigroupoids semigroups vector
- ];
- testHaskellDepends = [
- base doctest generic-deriving semigroups simple-reflect
- ];
- description = "Log-domain arithmetic";
- license = lib.licenses.bsd3;
- }) {};
-
- "log-domain_0_13_1" = callPackage
({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
, distributive, hashable, semigroupoids, semigroups, vector
}:
@@ -165686,7 +165442,6 @@ self: {
];
description = "Log-domain arithmetic";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"log-effect" = callPackage
@@ -166760,18 +166515,18 @@ self: {
}) {};
"lorentz" = callPackage
- ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints
- , containers, data-default, first-class-families, fmt, interpolate
- , lens, morley, morley-prelude, mtl, named, optparse-applicative
- , singletons, template-haskell, text, text-manipulate
- , unordered-containers, vinyl, with-utf8
+ ({ mkDerivation, aeson-pretty, base-noprelude, bimap, bytestring
+ , constraints, containers, data-default, first-class-families, fmt
+ , interpolate, lens, morley, morley-prelude, mtl, named
+ , optparse-applicative, singletons, template-haskell, text
+ , text-manipulate, unordered-containers, vinyl, with-utf8
}:
mkDerivation {
pname = "lorentz";
- version = "0.9.1";
- sha256 = "1f4rf4q6gfiz55qlfpkzk19nq6fw92ri3a1smyv4r55i50jr07rm";
+ version = "0.10.0";
+ sha256 = "15kgnw8f52i30xxw1q6mxlyhkpfpq5hyjsvfklg334iqr5w0nby2";
libraryHaskellDepends = [
- aeson-pretty base bimap bytestring constraints containers
+ aeson-pretty base-noprelude bimap bytestring constraints containers
data-default first-class-families fmt interpolate lens morley
morley-prelude mtl named optparse-applicative singletons
template-haskell text text-manipulate unordered-containers vinyl
@@ -167033,6 +166788,8 @@ self: {
testHaskellDepends = [ base directory filepath simple-cmd ];
description = "List dir files starting from a specific name";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"lsp" = callPackage
@@ -167159,6 +166916,8 @@ self: {
pname = "lsp-types";
version = "1.1.0.0";
sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54";
+ revision = "1";
+ editedCabalFile = "0iifws4r1h9v1mbsrmbvssvm0gmvzm9yh9h85izly0s51869bbq4";
libraryHaskellDepends = [
aeson base binary bytestring containers data-default deepseq
dependent-sum dependent-sum-template directory filepath hashable
@@ -167246,8 +167005,8 @@ self: {
}:
mkDerivation {
pname = "lti13";
- version = "0.2.0.0";
- sha256 = "004zic7k2a4cii4ny3vbnwn7vwrzbfvi971xz8wgsnvnjmjnpfsq";
+ version = "0.2.0.1";
+ sha256 = "1fcjypadap94f238vnhbchq9dy61mhgwlqpy4v22m34881dvx8gf";
libraryHaskellDepends = [
aeson base bytestring containers http-client http-types jose-jwt
oidc-client safe-exceptions text
@@ -167420,10 +167179,8 @@ self: {
}:
mkDerivation {
pname = "lucid";
- version = "2.9.12";
- sha256 = "156wniydd1hlb7rygbm95zln8ky8lai8rn2apkkv0rax9cdw6jrh";
- revision = "1";
- editedCabalFile = "1f0whk5ncanxfjjanrf6rqyncig2xgc5mh2j0sqy3nrlyjr9aqq9";
+ version = "2.9.12.1";
+ sha256 = "0nky4pqxd6828kg3js90ks6r3hxs5x48ibfz37pw2dr7y1nygq21";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -167599,6 +167356,8 @@ self: {
pname = "lukko";
version = "0.1.1.3";
sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8";
+ revision = "1";
+ editedCabalFile = "0mmq1q82mrbayiij0p8wdnkf0j8drmq1iibg8kn4cak3nrn9pd1d";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
async base bytestring filepath singleton-bool tasty
@@ -168242,32 +168001,6 @@ self: {
}) {};
"machines" = callPackage
- ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
- , conduit, containers, criterion, distributive, doctest, mtl, pipes
- , pointed, profunctors, semigroupoids, semigroups, streaming
- , transformers, transformers-compat, void
- }:
- mkDerivation {
- pname = "machines";
- version = "0.7.1";
- sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1";
- revision = "1";
- editedCabalFile = "1cp850vwzn213n0k9s5i62889a1wvmyi05jw6kmazaczcbcs7jsq";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- adjunctions base comonad containers distributive mtl pointed
- profunctors semigroupoids semigroups transformers
- transformers-compat void
- ];
- testHaskellDepends = [ base doctest ];
- benchmarkHaskellDepends = [
- base conduit criterion mtl pipes streaming
- ];
- description = "Networked stream transducers";
- license = lib.licenses.bsd3;
- }) {};
-
- "machines_0_7_2" = callPackage
({ mkDerivation, adjunctions, base, comonad, conduit, containers
, criterion, distributive, mtl, pipes, pointed, profunctors
, semigroupoids, semigroups, streaming, transformers
@@ -168287,7 +168020,6 @@ self: {
];
description = "Networked stream transducers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"machines-amazonka" = callPackage
@@ -168672,8 +168404,8 @@ self: {
}:
mkDerivation {
pname = "magic-wormhole";
- version = "0.3.3";
- sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn";
+ version = "0.3.4";
+ sha256 = "1i9010zp1w34kfgx5xgd23hjmb0v8h3y3riiw2ripvjxqgikbky4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -171006,8 +170738,8 @@ self: {
({ mkDerivation, base, containers, hspec, QuickCheck }:
mkDerivation {
pname = "matroid";
- version = "0.0.0";
- sha256 = "0k7x9m8zn45s9r9frpqagrjkwbmfd9hfx2v1kwx7h5gfdkmkpb5z";
+ version = "0.0.0.1.1";
+ sha256 = "1lkahlkfm6vrss0wpfg943q0m9dqqkl7cy3f37p4h185375qyj42";
libraryHaskellDepends = [ base containers hspec QuickCheck ];
testHaskellDepends = [ base containers hspec QuickCheck ];
description = "matroid (combinatorial pre-geometries) library";
@@ -172146,8 +171878,8 @@ self: {
}:
mkDerivation {
pname = "membership";
- version = "0";
- sha256 = "0hdy0yv64gcwja2kr6akfms21jgq6lqhzbxap603nhiwvf7n8ayv";
+ version = "0.0.1";
+ sha256 = "07b40i1fvkix9x60nqp6nmlchjkcj3jhp7xpq583fpssqm79x14m";
libraryHaskellDepends = [
base constraints deepseq hashable prettyprinter template-haskell
th-lift
@@ -172961,8 +172693,8 @@ self: {
({ mkDerivation, base, hspec, hspec-discover, rio, transformers }:
mkDerivation {
pname = "method";
- version = "0.2.0.0";
- sha256 = "0vgh0ri5r1jsfax5qafvkqqnkywk4qayaw54dwhh5i3p1n5cqkqa";
+ version = "0.3.0.0";
+ sha256 = "1a5i9sd5zz5kjpjpar3r5ak61x8fz5rrbb1iak1r2dcwlyk6rq25";
libraryHaskellDepends = [ base rio transformers ];
testHaskellDepends = [ base hspec rio transformers ];
testToolDepends = [ hspec-discover ];
@@ -173308,6 +173040,8 @@ self: {
doHaddock = false;
description = "A minimal base to work around GHC bugs";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"microbench" = callPackage
@@ -174135,8 +173869,8 @@ self: {
}:
mkDerivation {
pname = "mime-mail";
- version = "0.5.0";
- sha256 = "0vs302vbdf8y58nxky0m2w7cbqs4laljk969sfnbxl8zq7k3ic0h";
+ version = "0.5.1";
+ sha256 = "1s1wp8v1xlvw3r4qk1lv9zpm99ihka7a785zjl6i3fq1maqq955g";
libraryHaskellDepends = [
base base64-bytestring blaze-builder bytestring filepath process
random text
@@ -174574,8 +174308,8 @@ self: {
({ mkDerivation, async, base }:
mkDerivation {
pname = "minisat";
- version = "0.1.2";
- sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
+ version = "0.1.3";
+ sha256 = "172l1zn3ls0s55llnp4z1kgf388bs5vq4a8qys2x7dqk9zmgpbqb";
libraryHaskellDepends = [ async base ];
description = "A Haskell bundle of the Minisat SAT solver";
license = lib.licenses.bsd3;
@@ -175261,6 +174995,8 @@ self: {
benchmarkHaskellDepends = [ base criterion text weigh ];
description = "Strict markdown processor for writers";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"mmark-cli" = callPackage
@@ -175284,6 +175020,8 @@ self: {
];
description = "Command line interface to the MMark markdown processor";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"mmark-ext" = callPackage
@@ -175306,6 +175044,8 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Commonly useful extensions for the MMark markdown processor";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"mmorph_1_1_3" = callPackage
@@ -175323,32 +175063,18 @@ self: {
}) {};
"mmorph" = callPackage
- ({ mkDerivation, base, mtl, transformers, transformers-compat }:
- mkDerivation {
- pname = "mmorph";
- version = "1.1.4";
- sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz";
- revision = "1";
- editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl";
- libraryHaskellDepends = [
- base mtl transformers transformers-compat
- ];
- description = "Monad morphisms";
- license = lib.licenses.bsd3;
- }) {};
-
- "mmorph_1_1_5" = callPackage
({ mkDerivation, base, mtl, transformers, transformers-compat }:
mkDerivation {
pname = "mmorph";
version = "1.1.5";
sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6";
+ revision = "1";
+ editedCabalFile = "087v8ajcfpx4f0v4jxvv16h6jswgnkfnyfn28k406d5w3ihcx1wl";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
description = "Monad morphisms";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"mmsyn2" = callPackage
@@ -175713,6 +175439,8 @@ self: {
pname = "mod";
version = "0.1.2.1";
sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1";
+ revision = "1";
+ editedCabalFile = "012slncmwh9i4fh31mdxn5xnpl9l309swrm5vlnibrxj3pxhmrxv";
libraryHaskellDepends = [
base deepseq integer-gmp primitive semirings vector
];
@@ -175783,8 +175511,8 @@ self: {
}:
mkDerivation {
pname = "modern-uri";
- version = "0.3.3.1";
- sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3";
+ version = "0.3.4.0";
+ sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
@@ -175801,7 +175529,7 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "modern-uri_0_3_4_0" = callPackage
+ "modern-uri_0_3_4_1" = callPackage
({ mkDerivation, base, bytestring, containers, contravariant
, criterion, deepseq, exceptions, hspec, hspec-discover
, hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
@@ -175809,8 +175537,8 @@ self: {
}:
mkDerivation {
pname = "modern-uri";
- version = "0.3.4.0";
- sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk";
+ version = "0.3.4.1";
+ sha256 = "09yzn5lim3wv0120lfdwlc8ynx15z3p6p0js2r6ij3rzx26nchqd";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
@@ -176277,6 +176005,8 @@ self: {
pname = "monad-chronicle";
version = "1.0.0.1";
sha256 = "1p9w9f5sw4adxxrgfba0vxs5kdhl82ibnwfqal7nrrhp3v86imbg";
+ revision = "1";
+ editedCabalFile = "097f5wvzx10i9zgx4gn7wm81z7dfyhj9lx8jyy4n90j0adpbjryq";
libraryHaskellDepends = [
base data-default-class mtl semigroupoids these transformers
transformers-compat
@@ -176403,8 +176133,8 @@ self: {
}:
mkDerivation {
pname = "monad-coroutine";
- version = "0.9.0.4";
- sha256 = "1rsxzry8qk5229vx4iw4jrzbbc82m80m1nlxlq73k5k20h9gzq0k";
+ version = "0.9.1";
+ sha256 = "1d85jyfwf4h60cfp3dyrkmf7kw7ya37z2vqmv6rdbpqc1pslmb1i";
libraryHaskellDepends = [
base monad-parallel transformers transformers-compat
];
@@ -176987,8 +176717,8 @@ self: {
}:
mkDerivation {
pname = "monad-parallel";
- version = "0.7.2.3";
- sha256 = "12ahni860pfkdj70f9d0dg2h93gl0d9qav8llcmgh5z7dg1vi3qj";
+ version = "0.7.2.4";
+ sha256 = "1h36hwbk800v0cq2x8kxf7v3gkr8maws7ijxckvsqp480xr4r5xx";
libraryHaskellDepends = [
base parallel transformers transformers-compat
];
@@ -178005,8 +177735,8 @@ self: {
pname = "monoid-extras";
version = "0.5.1";
sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37";
- revision = "1";
- editedCabalFile = "0b8x5d6vh7mpigvjvcd8f38a1nyzn1vfdqypslw7z9fgsr742913";
+ revision = "2";
+ editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3";
libraryHaskellDepends = [ base groups semigroupoids semigroups ];
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
@@ -178405,37 +178135,45 @@ self: {
}) {morfeusz = null;};
"morley" = callPackage
- ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base
- , base58-bytestring, binary, bytestring, constraints, containers
- , cryptonite, data-default, first-class-families, fmt
- , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens
- , megaparsec, memory, morley-prelude, mtl, named
- , optparse-applicative, parser-combinators, scientific, semigroups
- , show-type, singletons, syb, template-haskell, text
- , text-manipulate, th-lift, th-lift-instances, time, timerep
+ ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude
+ , base58-bytestring, binary, bytestring, Cabal, constraints
+ , containers, cryptonite, data-default, doctest, elliptic-curve
+ , first-class-families, fmt, galois-field, generic-deriving, gitrev
+ , haskeline, hex-text, interpolate, lens, megaparsec, memory
+ , MonadRandom, morley-prelude, mtl, named, optparse-applicative
+ , pairing, parser-combinators, process, scientific, semigroups
+ , show-type, singletons, syb, tasty-discover, template-haskell
+ , text, text-manipulate, th-lift, th-lift-instances, time, timerep
, uncaught-exception, unordered-containers, vector, vinyl
, with-utf8, wl-pprint-text
}:
mkDerivation {
pname = "morley";
- version = "1.12.0";
- sha256 = "0cfmcrasf2cfirsa6xb1aznj75bwnzmiy9irirk1i9p2bx4aqy5m";
+ version = "1.13.0";
+ sha256 = "1jbjmri2k7z5fh96i0yx28wpcp0l3fchkk3iwvq0vdwcrb78bndb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-casing aeson-pretty base base58-bytestring binary
- bytestring constraints containers cryptonite data-default
- first-class-families fmt generic-deriving gitrev hex-text
- interpolate lens megaparsec memory morley-prelude mtl named
- optparse-applicative parser-combinators scientific semigroups
- show-type singletons syb template-haskell text text-manipulate
- th-lift th-lift-instances time timerep uncaught-exception
- unordered-containers vector vinyl with-utf8 wl-pprint-text
+ aeson aeson-casing aeson-pretty base-noprelude base58-bytestring
+ binary bytestring constraints containers cryptonite data-default
+ elliptic-curve first-class-families fmt galois-field
+ generic-deriving gitrev hex-text interpolate lens megaparsec memory
+ MonadRandom morley-prelude mtl named optparse-applicative pairing
+ parser-combinators scientific semigroups show-type singletons syb
+ template-haskell text text-manipulate th-lift th-lift-instances
+ time timerep uncaught-exception unordered-containers vector vinyl
+ with-utf8 wl-pprint-text
];
executableHaskellDepends = [
- aeson base bytestring data-default fmt haskeline megaparsec
- morley-prelude named optparse-applicative text vinyl with-utf8
+ aeson base-noprelude bytestring data-default fmt haskeline
+ megaparsec morley-prelude named optparse-applicative text vinyl
+ with-utf8
];
+ testHaskellDepends = [
+ base-noprelude bytestring Cabal doctest morley-prelude
+ optparse-applicative process
+ ];
+ testToolDepends = [ tasty-discover ];
description = "Developer tools for the Michelson Language";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -178536,6 +178274,62 @@ self: {
license = lib.licenses.mit;
}) {};
+ "morpheus-graphql_0_17_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers
+ , morpheus-graphql-app, morpheus-graphql-core
+ , morpheus-graphql-subscriptions, mtl, relude, tasty, tasty-hunit
+ , template-haskell, text, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "morpheus-graphql";
+ version = "0.17.0";
+ sha256 = "0k9nlik5qi1ff4m731da5wlaadx024irgn2v1hyz2bv9n1q28cqs";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers morpheus-graphql-app
+ morpheus-graphql-core mtl relude template-haskell text transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers morpheus-graphql-app
+ morpheus-graphql-core morpheus-graphql-subscriptions mtl relude
+ tasty tasty-hunit template-haskell text transformers
+ unordered-containers vector
+ ];
+ description = "Morpheus GraphQL";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "morpheus-graphql-app" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , hashable, megaparsec, morpheus-graphql-core, mtl, relude
+ , scientific, tasty, tasty-hunit, template-haskell, text
+ , th-lift-instances, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "morpheus-graphql-app";
+ version = "0.17.0";
+ sha256 = "0l3brvcv7ang83yiv1bdg4v8hvajq4cbq2dr28q1j39a4r85f9xz";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers hashable megaparsec
+ morpheus-graphql-core mtl relude scientific template-haskell text
+ th-lift-instances transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory hashable megaparsec
+ morpheus-graphql-core mtl relude scientific tasty tasty-hunit
+ template-haskell text th-lift-instances transformers
+ unordered-containers vector
+ ];
+ description = "Morpheus GraphQL Core";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"morpheus-graphql-cli" = callPackage
({ mkDerivation, base, bytestring, filepath, morpheus-graphql
, optparse-applicative
@@ -178581,6 +178375,30 @@ self: {
license = lib.licenses.mit;
}) {};
+ "morpheus-graphql-client_0_17_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory
+ , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit
+ , template-haskell, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "morpheus-graphql-client";
+ version = "0.17.0";
+ sha256 = "1djgxy59s98na1s182p5a06qjhw8n862zka96wwp8ckyx2jpjkq3";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring morpheus-graphql-core mtl relude
+ template-haskell text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory morpheus-graphql-core mtl relude
+ tasty tasty-hunit template-haskell text transformers
+ unordered-containers
+ ];
+ description = "Morpheus GraphQL Client";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"morpheus-graphql-core" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, hashable
, megaparsec, mtl, relude, scientific, tasty, tasty-hunit
@@ -178606,6 +178424,32 @@ self: {
license = lib.licenses.mit;
}) {};
+ "morpheus-graphql-core_0_17_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , hashable, megaparsec, mtl, relude, scientific, tasty, tasty-hunit
+ , template-haskell, text, th-lift-instances, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "morpheus-graphql-core";
+ version = "0.17.0";
+ sha256 = "0rj4g05365hp5c9b5y0v0v7s73jw3gkq3g0z3m6xrpxi3j2gp0p8";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers hashable megaparsec mtl relude
+ scientific template-haskell text th-lift-instances transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory hashable megaparsec mtl
+ relude scientific tasty tasty-hunit template-haskell text
+ th-lift-instances transformers unordered-containers vector
+ ];
+ description = "Morpheus GraphQL Core";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"morpheus-graphql-subscriptions" = callPackage
({ mkDerivation, aeson, base, bytestring, directory
, morpheus-graphql-core, mtl, relude, tasty, tasty-hunit, text
@@ -178629,6 +178473,31 @@ self: {
license = lib.licenses.mit;
}) {};
+ "morpheus-graphql-subscriptions_0_17_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory
+ , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty
+ , tasty-hunit, text, transformers, unliftio-core
+ , unordered-containers, uuid, websockets
+ }:
+ mkDerivation {
+ pname = "morpheus-graphql-subscriptions";
+ version = "0.17.0";
+ sha256 = "14bpnzxxiid5582z5fi8nwb8rrhm7lgxscgkjxw34ng41wyv6686";
+ libraryHaskellDepends = [
+ aeson base bytestring morpheus-graphql-app morpheus-graphql-core
+ mtl relude text transformers unliftio-core unordered-containers
+ uuid websockets
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory morpheus-graphql-app
+ morpheus-graphql-core mtl relude tasty tasty-hunit text
+ transformers unliftio-core unordered-containers uuid websockets
+ ];
+ description = "Morpheus GraphQL Subscriptions";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"morphisms" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -181403,8 +181272,8 @@ self: {
}:
mkDerivation {
pname = "musicw";
- version = "0.3.6";
- sha256 = "0bi57x087r22547z90n58faz78ha6z6pfmf2chwrfdys48lr8wfq";
+ version = "0.3.7";
+ sha256 = "0b5wn084ka4xnvimzxd47y4m0ldmfqr7sa30a5bm08g62333h3yr";
libraryHaskellDepends = [
array base bytestring containers data-default file-embed ghcjs-base
ghcjs-dom ghcjs-prim json monad-loops mtl safe text time
@@ -181448,6 +181317,8 @@ self: {
];
description = "A representation of the MusicXML format";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"mustache" = callPackage
@@ -182089,6 +181960,22 @@ self: {
license = lib.licenses.bsd3;
}) {inherit (pkgs) mysql;};
+ "mysql_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+ }:
+ mkDerivation {
+ pname = "mysql";
+ version = "0.2";
+ sha256 = "09b1rhv16g8npjblq9jfi29bffsplvq4hnksdhknd39anr5gpqzc";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring containers ];
+ librarySystemDepends = [ mysql ];
+ testHaskellDepends = [ base bytestring hspec ];
+ description = "A low-level MySQL client library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {inherit (pkgs) mysql;};
+
"mysql-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects, mysql
, mysql-simple
@@ -184124,8 +184011,8 @@ self: {
}:
mkDerivation {
pname = "netpbm";
- version = "1.0.3";
- sha256 = "17cxh15wf7m9ljg0scd5i71ki95fiz8qhrfk4w1zvk4pf2gb7z38";
+ version = "1.0.4";
+ sha256 = "0728k34q14f3rv6rfln7lh8clb1r7nigxri6fkl4q7dbf6i8n86p";
libraryHaskellDepends = [
attoparsec attoparsec-binary base bytestring storable-record
unordered-containers vector vector-th-unbox
@@ -185413,8 +185300,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "network-types-icmp";
- version = "1.0.0.2";
- sha256 = "1s449djcr78k8ywzypmc62d7lysm245ih60z4wi6p0kmyv1qcj75";
+ version = "1.0.1";
+ sha256 = "0wf2rg4alw4alalvjdcd85k6sjhcpdqacblbn76r5kmy2pqfrqfs";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Types for representing ICMP and ICMPv6 messages";
@@ -186035,8 +185922,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export";
- version = "1.7.1";
- sha256 = "0dylj1i6370r1yz2rgjpjs5ynsvaqshgvz71200r0q2hqqznax6d";
+ version = "1.7.3";
+ sha256 = "18pdvmyhqil98d5mzh8a4r5i3pc4vyj13jcrjjw4q73prcj4mg6p";
libraryHaskellDepends = [
async base binary bytestring deepseq monad-loops template-haskell
unix
@@ -186069,8 +185956,10 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools-extra";
- version = "0.6.1.1";
- sha256 = "1gqns0ifrmjd1013jfa9c03xwdmqicdvazjc9kkxyzw4mpjgjils";
+ version = "0.6.2.0";
+ sha256 = "01r6b7xsgn2dd42jh3xnvds21sccq5lchyiikk5v1vr055dddmpm";
+ revision = "1";
+ editedCabalFile = "0sab8vs3zycm4ykcayrynvd0rmyar9bmvd8b60dq1fzmnbmzzgg9";
libraryHaskellDepends = [
aeson array base base64 binary bytestring case-insensitive
containers ede enclosed-exceptions http-client http-types network
@@ -186399,18 +186288,19 @@ self: {
}) {};
"nix-diff" = callPackage
- ({ mkDerivation, attoparsec, base, containers, Diff, directory, mtl
- , nix-derivation, optparse-applicative, text, unix, vector
+ ({ mkDerivation, attoparsec, base, containers, directory, mtl
+ , nix-derivation, optparse-applicative, patience, text, unix
+ , vector
}:
mkDerivation {
pname = "nix-diff";
- version = "1.0.11";
- sha256 = "0pi0nqhv48f90ls40whifw1lcld5sw3hcrz7kzy14s4sc6ln9543";
+ version = "1.0.12";
+ sha256 = "1w994nxgmg9cyrvqz13d5qjp3dqprdh16w2adcc5mbs3nqm9nmrc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- attoparsec base containers Diff directory mtl nix-derivation
- optparse-applicative text unix vector
+ attoparsec base containers directory mtl nix-derivation
+ optparse-applicative patience text unix vector
];
description = "Explain why two Nix derivations differ";
license = lib.licenses.bsd3;
@@ -186560,20 +186450,25 @@ self: {
}) {};
"nix-tree" = callPackage
- ({ mkDerivation, aeson, async, base, brick, bytestring, containers
- , deepseq, directory, filepath, hashable, hrfsize, lens, parallel
+ ({ mkDerivation, aeson, base, brick, bytestring, clock, containers
+ , deepseq, directory, filepath, hashable, hedgehog, hrfsize
, protolude, text, transformers, typed-process
, unordered-containers, vty
}:
mkDerivation {
pname = "nix-tree";
- version = "0.1.3.1";
- sha256 = "1rihvfvfsrkgvq87bli9gzpbv1ny93n21cf31bid1b3g3cwadffp";
+ version = "0.1.5";
+ sha256 = "1iymfgffafqh57m0b8mrsrcd8m6x3wycwm2lly0bz1q4z784k66v";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson async base brick bytestring containers deepseq directory
- filepath hashable hrfsize lens parallel protolude text transformers
+ aeson base brick bytestring clock containers deepseq directory
+ filepath hashable hrfsize protolude text transformers typed-process
+ unordered-containers vty
+ ];
+ testHaskellDepends = [
+ aeson base brick bytestring clock containers deepseq directory
+ filepath hashable hedgehog hrfsize protolude text transformers
typed-process unordered-containers vty
];
description = "Interactively browse a Nix store paths dependencies";
@@ -187527,6 +187422,8 @@ self: {
pname = "nothunks";
version = "0.1.2";
sha256 = "0z9calmdw4bk4cdwrfq5nkxxks2f82q59i7kv6lnsgwyl4nqvg2y";
+ revision = "1";
+ editedCabalFile = "18q60yrm0fwb7zs4saxv4f3gk2av4dmbjag04kxzrllfy34h3y6z";
libraryHaskellDepends = [
base bytestring containers ghc-heap stm text time vector
];
@@ -187788,8 +187685,8 @@ self: {
}:
mkDerivation {
pname = "nri-env-parser";
- version = "0.1.0.3";
- sha256 = "0335bpjqvkazfjx2k0dm460hzdwcwz1rn82x0nvf441njjqz6846";
+ version = "0.1.0.4";
+ sha256 = "01s2346rdccnqrymxb947kx68jqdyh29v3s2mq3c707pvmxlhw4y";
libraryHaskellDepends = [
base modern-uri network-uri nri-prelude text
];
@@ -187797,49 +187694,90 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "nri-prelude" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, async, auto-update, base
- , bytestring, containers, directory, exceptions, filepath, hedgehog
- , junit-xml, pretty-diff, pretty-show, safe-exceptions
- , terminal-size, text, time, vector
+ "nri-env-parser_0_1_0_5" = callPackage
+ ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text
}:
mkDerivation {
- pname = "nri-prelude";
- version = "0.3.0.0";
- sha256 = "1dijid038rvviz063ncviq1mw20hsk02gidcf68vzy99d16kn5c9";
+ pname = "nri-env-parser";
+ version = "0.1.0.5";
+ sha256 = "18xxgr82fqnl1s24gcwn7sdq50nsjk4zjl52h14f8zgw4cvkql1h";
libraryHaskellDepends = [
- aeson ansi-terminal async auto-update base bytestring containers
- directory exceptions filepath hedgehog junit-xml pretty-diff
- pretty-show safe-exceptions terminal-size text time vector
+ base modern-uri network-uri nri-prelude text
+ ];
+ description = "Read environment variables as settings to build 12-factor apps";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
+ "nri-observability" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs
+ , bytestring, directory, hostname, http-client, http-client-tls
+ , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text
+ , time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "nri-observability";
+ version = "0.1.0.0";
+ sha256 = "121ajy98n0qwn38ia4x1gcy0nz2zygjwyi1lxywwijqdzcnl1yal";
+ libraryHaskellDepends = [
+ aeson aeson-pretty async base bugsnag-hs bytestring directory
+ hostname http-client http-client-tls nri-env-parser nri-prelude
+ random safe-exceptions stm text time unordered-containers
];
testHaskellDepends = [
- aeson ansi-terminal async auto-update base bytestring containers
- directory exceptions filepath hedgehog junit-xml pretty-diff
- pretty-show safe-exceptions terminal-size text time vector
+ aeson aeson-pretty async base bugsnag-hs bytestring directory
+ hostname http-client http-client-tls nri-env-parser nri-prelude
+ random safe-exceptions stm text time unordered-containers
];
- description = "A Prelude inspired by the Elm programming language";
+ description = "Report log spans collected by nri-prelude";
license = lib.licenses.bsd3;
}) {};
- "nri-prelude_0_3_1_0" = callPackage
+ "nri-prelude" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async
, auto-update, base, bytestring, containers, directory, exceptions
- , filepath, hedgehog, junit-xml, pretty-diff, pretty-show
+ , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show
, safe-exceptions, terminal-size, text, time, vector
}:
mkDerivation {
pname = "nri-prelude";
- version = "0.3.1.0";
- sha256 = "0dg94blhrrnzh00kgjz5bclcwzx87ky2210nxx8902xx54x928vc";
+ version = "0.4.0.0";
+ sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async auto-update base bytestring
- containers directory exceptions filepath hedgehog junit-xml
+ containers directory exceptions filepath ghc hedgehog junit-xml
pretty-diff pretty-show safe-exceptions terminal-size text time
vector
];
testHaskellDepends = [
aeson aeson-pretty ansi-terminal async auto-update base bytestring
- containers directory exceptions filepath hedgehog junit-xml
+ containers directory exceptions filepath ghc hedgehog junit-xml
+ pretty-diff pretty-show safe-exceptions terminal-size text time
+ vector
+ ];
+ description = "A Prelude inspired by the Elm programming language";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "nri-prelude_0_5_0_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async
+ , auto-update, base, bytestring, containers, directory, exceptions
+ , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show
+ , safe-exceptions, terminal-size, text, time, vector
+ }:
+ mkDerivation {
+ pname = "nri-prelude";
+ version = "0.5.0.0";
+ sha256 = "1avpj21scw9c45208wf8q86n0fs73k3lgm54mgqdwln1m1ajfnvg";
+ libraryHaskellDepends = [
+ aeson aeson-pretty ansi-terminal async auto-update base bytestring
+ containers directory exceptions filepath ghc hedgehog junit-xml
+ pretty-diff pretty-show safe-exceptions terminal-size text time
+ vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty ansi-terminal async auto-update base bytestring
+ containers directory exceptions filepath ghc hedgehog junit-xml
pretty-diff pretty-show safe-exceptions terminal-size text time
vector
];
@@ -189916,6 +189854,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "one-liner_2_0" = callPackage
+ ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
+ , linear-base, profunctors, tagged, transformers
+ }:
+ mkDerivation {
+ pname = "one-liner";
+ version = "2.0";
+ sha256 = "0al9wavxx23xbalqw0cdlhq01kx8kyhg33fipwmn5617z3ddir6v";
+ libraryHaskellDepends = [
+ base bifunctors contravariant ghc-prim linear-base profunctors
+ tagged transformers
+ ];
+ testHaskellDepends = [ base contravariant HUnit ];
+ description = "Constraint-based generics";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"one-liner-instances" = callPackage
({ mkDerivation, base, one-liner, random }:
mkDerivation {
@@ -190442,6 +190398,45 @@ self: {
pname = "openapi3";
version = "3.0.1.0";
sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc";
+ revision = "1";
+ editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat-batteries bytestring containers
+ cookie generics-sop hashable http-media insert-ordered-containers
+ lens mtl network optics-core optics-th QuickCheck scientific
+ template-haskell text time transformers unordered-containers
+ uuid-types vector
+ ];
+ executableHaskellDepends = [ aeson base lens text ];
+ testHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers doctest Glob
+ hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+ quickcheck-instances template-haskell text time
+ unordered-containers utf8-string vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "OpenAPI 3.0 data model";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "openapi3_3_0_2_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
+ , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
+ , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
+ , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
+ , optics-th, QuickCheck, quickcheck-instances, scientific
+ , template-haskell, text, time, transformers, unordered-containers
+ , utf8-string, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "openapi3";
+ version = "3.0.2.0";
+ sha256 = "00qpbj2lvaysbwgbax7z1vyixzd0x7yzbz26aw5zxd4asddypbfg";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -191527,6 +191522,35 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "optics_0_4" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, criterion
+ , indexed-profunctors, inspection-testing, lens, mtl, optics-core
+ , optics-extra, optics-th, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "optics";
+ version = "0.4";
+ sha256 = "18hdfmay7v2qsbq0ylzrfk3hrgax8bzs65bdmjrmck4is8vbs6h5";
+ libraryHaskellDepends = [
+ array base containers mtl optics-core optics-extra optics-th
+ transformers
+ ];
+ testHaskellDepends = [
+ base containers indexed-profunctors inspection-testing mtl
+ optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck
+ template-haskell
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion lens transformers
+ unordered-containers vector
+ ];
+ description = "Optics as an abstract interface";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"optics-core" = callPackage
({ mkDerivation, array, base, containers, indexed-profunctors
, transformers
@@ -191542,6 +191566,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "optics-core_0_4" = callPackage
+ ({ mkDerivation, array, base, containers, indexed-profunctors
+ , indexed-traversable, transformers
+ }:
+ mkDerivation {
+ pname = "optics-core";
+ version = "0.4";
+ sha256 = "1kyxdfzha4xjym96yahrwhpbzqracks2di2lx1x34sjcn165rxry";
+ libraryHaskellDepends = [
+ array base containers indexed-profunctors indexed-traversable
+ transformers
+ ];
+ description = "Optics as an abstract interface: core definitions";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"optics-extra" = callPackage
({ mkDerivation, array, base, bytestring, containers, hashable
, indexed-profunctors, mtl, optics-core, text, transformers
@@ -191551,8 +191592,8 @@ self: {
pname = "optics-extra";
version = "0.3";
sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4";
- revision = "1";
- editedCabalFile = "0bizzsgmq7b337wpraavgss7r0c5vp2n2gwl8h4xa0qxx0d1wm1p";
+ revision = "2";
+ editedCabalFile = "13x3mavf2bi25ns03b93b5ghhkyivwxf6idn0wqs9fdiih1xvhv8";
libraryHaskellDepends = [
array base bytestring containers hashable indexed-profunctors mtl
optics-core text transformers unordered-containers vector
@@ -191561,6 +191602,25 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "optics-extra_0_4" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, hashable
+ , indexed-profunctors, indexed-traversable-instances, mtl
+ , optics-core, text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "optics-extra";
+ version = "0.4";
+ sha256 = "1ynhyw22rwvvh5yglybmb6skhpgqk4gh9w2w4dh8kb7myzcwfj1s";
+ libraryHaskellDepends = [
+ array base bytestring containers hashable indexed-profunctors
+ indexed-traversable-instances mtl optics-core text transformers
+ unordered-containers vector
+ ];
+ description = "Extra utilities and instances for optics-core";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"optics-th" = callPackage
({ mkDerivation, base, containers, mtl, optics-core, tagged
, template-haskell, th-abstraction, transformers
@@ -191580,6 +191640,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "optics-th_0_4" = callPackage
+ ({ mkDerivation, base, containers, mtl, optics-core, tagged
+ , template-haskell, th-abstraction, transformers
+ }:
+ mkDerivation {
+ pname = "optics-th";
+ version = "0.4";
+ sha256 = "1qddzwhzlhhp1902irswjj18aa5ziavn4klhy7najxjwndilb55y";
+ libraryHaskellDepends = [
+ base containers mtl optics-core template-haskell th-abstraction
+ transformers
+ ];
+ testHaskellDepends = [ base optics-core tagged ];
+ description = "Optics construction using TemplateHaskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"optics-vl" = callPackage
({ mkDerivation, base, indexed-profunctors, optics-core
, profunctors
@@ -191588,6 +191666,8 @@ self: {
pname = "optics-vl";
version = "0.2.1";
sha256 = "1xrkak0cn2imgqr641wzysgynykyj438m3ywgdm9h14k17inv55v";
+ revision = "1";
+ editedCabalFile = "0ba6fk4djs3gm305km8c870h76mg8q1dyy899cll0scc6l9jgbyc";
libraryHaskellDepends = [
base indexed-profunctors optics-core profunctors
];
@@ -192459,6 +192539,33 @@ self: {
license = lib.licenses.asl20;
}) {};
+ "ory-hydra-client" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, containers, deepseq, exceptions, hspec
+ , http-api-data, http-client, http-client-tls, http-media
+ , http-types, iso8601-time, katip, microlens, mtl, network
+ , QuickCheck, random, safe-exceptions, semigroups, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "ory-hydra-client";
+ version = "1.9.2";
+ sha256 = "0z1897xl10465mzhriis9bmxk0hnswl5ap2m6x8ks5m120irh894";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring case-insensitive containers
+ deepseq exceptions http-api-data http-client http-client-tls
+ http-media http-types iso8601-time katip microlens mtl network
+ random safe-exceptions text time transformers unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+ semigroups text time transformers unordered-containers vector
+ ];
+ description = "Auto-generated ory-hydra API Client";
+ license = lib.licenses.mit;
+ }) {};
+
"os-release" = callPackage
({ mkDerivation, aeson, base, bytestring, filepath, hspec
, hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions
@@ -192466,8 +192573,8 @@ self: {
}:
mkDerivation {
pname = "os-release";
- version = "1.0.1";
- sha256 = "05ajgnihm82ikxgvfnam0msn7id2apiyin9757jrc8wfsh3xvkmx";
+ version = "1.0.2";
+ sha256 = "0wjf1z76pqfv091b88zc3w0hmqv8i2i6qsx21cfcgaym4r3zqpjf";
libraryHaskellDepends = [
aeson base megaparsec safe-exceptions text unordered-containers
];
@@ -193870,6 +193977,41 @@ self: {
license = lib.licenses.gpl2Plus;
}) {};
+ "pandoc-plot_1_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, criterion
+ , data-default, directory, filepath, githash, hashable, hspec
+ , hspec-expectations, lifted-async, lifted-base, mtl
+ , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup
+ , tasty, tasty-hspec, tasty-hunit, template-haskell, text
+ , typed-process, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-plot";
+ version = "1.1.0";
+ sha256 = "1dk9s37z3hah1kiha3q9d1yzl0vfgivdazhdcraivaspzi78iry8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers data-default directory filepath hashable
+ lifted-async lifted-base mtl pandoc pandoc-types shakespeare
+ tagsoup template-haskell text typed-process yaml
+ ];
+ executableHaskellDepends = [
+ base containers directory filepath githash optparse-applicative
+ pandoc pandoc-types template-haskell text typed-process
+ ];
+ testHaskellDepends = [
+ base containers directory filepath hspec hspec-expectations
+ pandoc-types tasty tasty-hspec tasty-hunit text
+ ];
+ benchmarkHaskellDepends = [
+ base criterion pandoc-types template-haskell text
+ ];
+ description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
+ license = lib.licenses.gpl2Plus;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"pandoc-pyplot" = callPackage
({ mkDerivation, base, containers, data-default-class, deepseq
, directory, filepath, hashable, hspec, hspec-expectations, mtl
@@ -194025,8 +194167,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.3.6";
- sha256 = "12slj2jy688k4ndngwmjjkdvl2ryljv3siwal874pdficx0dffxg";
+ version = "0.3.7";
+ sha256 = "0laqf7mfzdpdbg583l3mr25qxdqryq1cd1141gl713d5m9s1b4fs";
description = "A box of patterns and paradigms";
license = lib.licenses.mit;
}) {};
@@ -199542,6 +199684,8 @@ self: {
];
description = "A generalization of the uniqueness-periods-vector-examples functionality";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"phonetic-languages-filters-array" = callPackage
@@ -199627,6 +199771,8 @@ self: {
];
description = "A generalization of the uniqueness-periods-vector-properties package";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"phonetic-languages-rhythmicity" = callPackage
@@ -199764,6 +199910,8 @@ self: {
];
description = "Simplified and somewhat optimized version of the phonetic-languages-examples";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"phonetic-languages-simplified-properties-array" = callPackage
@@ -199799,6 +199947,8 @@ self: {
];
description = "A generalization of the uniqueness-periods-vector-properties package";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"phonetic-languages-simplified-properties-lists-double" = callPackage
@@ -199817,6 +199967,8 @@ self: {
];
description = "A generalization of the uniqueness-periods-vector-properties package";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"phonetic-languages-ukrainian" = callPackage
@@ -200357,8 +200509,8 @@ self: {
}:
mkDerivation {
pname = "pinboard-notes-backup";
- version = "1.0.5";
- sha256 = "042zph3nisrmhkfk2h3fwh91dz1fp0wgff0hlnpd962i67fgpixx";
+ version = "1.0.5.2";
+ sha256 = "0lhccldfya4pj5446kh23ahyb7vrd33jxrf1xgk4i3xiwv9bvpyy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -200368,8 +200520,6 @@ self: {
];
description = "Back up the notes you've saved to Pinboard";
license = lib.licenses.gpl3;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"pinch" = callPackage
@@ -200798,22 +200948,6 @@ self: {
}) {};
"pipes-bytestring" = callPackage
- ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
- , stringsearch, transformers
- }:
- mkDerivation {
- pname = "pipes-bytestring";
- version = "2.1.6";
- sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i";
- libraryHaskellDepends = [
- base bytestring pipes pipes-group pipes-parse stringsearch
- transformers
- ];
- description = "ByteString support for pipes";
- license = lib.licenses.bsd3;
- }) {};
-
- "pipes-bytestring_2_1_7" = callPackage
({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
, stringsearch, transformers
}:
@@ -200827,7 +200961,6 @@ self: {
];
description = "ByteString support for pipes";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"pipes-bzip" = callPackage
@@ -201432,8 +201565,8 @@ self: {
({ mkDerivation, base, foldl, hspec, pipes, pipes-safe }:
mkDerivation {
pname = "pipes-ordered-zip";
- version = "1.1.0";
- sha256 = "1fs0qyhc4a7xnglxl7b1d615s9ajml6pvch337ivny31cxrngcsa";
+ version = "1.2.1";
+ sha256 = "0jgqnx5jdra5v0r7v564zzd96jfv42lbkdxgk1k7ip8gcikb1zdm";
libraryHaskellDepends = [ base pipes pipes-safe ];
testHaskellDepends = [ base foldl hspec pipes pipes-safe ];
description = "merge two ordered Producers into a new Producer";
@@ -201480,17 +201613,6 @@ self: {
}) {};
"pipes-parse" = callPackage
- ({ mkDerivation, base, pipes, transformers }:
- mkDerivation {
- pname = "pipes-parse";
- version = "3.0.8";
- sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj";
- libraryHaskellDepends = [ base pipes transformers ];
- description = "Parsing infrastructure for the pipes ecosystem";
- license = lib.licenses.bsd3;
- }) {};
-
- "pipes-parse_3_0_9" = callPackage
({ mkDerivation, base, pipes, transformers }:
mkDerivation {
pname = "pipes-parse";
@@ -201499,7 +201621,6 @@ self: {
libraryHaskellDepends = [ base pipes transformers ];
description = "Parsing infrastructure for the pipes ecosystem";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"pipes-postgresql-simple" = callPackage
@@ -201595,22 +201716,6 @@ self: {
}) {};
"pipes-safe" = callPackage
- ({ mkDerivation, base, containers, exceptions, monad-control, mtl
- , pipes, primitive, transformers, transformers-base
- }:
- mkDerivation {
- pname = "pipes-safe";
- version = "2.3.2";
- sha256 = "10m6f52nahxwnl2zvgnbilllcvd3lpi0dxl3j6fk20lryjzmhyqc";
- libraryHaskellDepends = [
- base containers exceptions monad-control mtl pipes primitive
- transformers transformers-base
- ];
- description = "Safety for the pipes ecosystem";
- license = lib.licenses.bsd3;
- }) {};
-
- "pipes-safe_2_3_3" = callPackage
({ mkDerivation, base, containers, exceptions, monad-control, mtl
, pipes, primitive, transformers, transformers-base
}:
@@ -201624,7 +201729,6 @@ self: {
];
description = "Safety for the pipes ecosystem";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"pipes-shell" = callPackage
@@ -201888,18 +201992,22 @@ self: {
}) {};
"pixel-printer" = callPackage
- ({ mkDerivation, base, JuicyPixels, lens }:
+ ({ mkDerivation, base, JuicyPixels, lens, optparse-applicative }:
mkDerivation {
pname = "pixel-printer";
- version = "0.1.0";
- sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy";
+ version = "0.1.1";
+ sha256 = "179r8715rmd7njan4jl0g3jy0w0xq420nmkw9arvp50my8ag610f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base JuicyPixels lens ];
- executableHaskellDepends = [ base JuicyPixels ];
+ executableHaskellDepends = [
+ base JuicyPixels optparse-applicative
+ ];
testHaskellDepends = [ base ];
description = "A program for turning pixel art into 3D prints";
license = lib.licenses.gpl3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"pixela" = callPackage
@@ -203529,8 +203637,8 @@ self: {
pname = "polyparse";
version = "1.13";
sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w";
- revision = "1";
- editedCabalFile = "09jcn26py3lkjn3lvxgry86bad8xb8cwl3avxymqmf7b181krfb8";
+ revision = "2";
+ editedCabalFile = "1n5q6w7x46cvcq7j1pg9jx9h72vcsc5di35rbkmwgjw6pq4w4gfl";
libraryHaskellDepends = [ base bytestring text ];
description = "A variety of alternative parser combinator libraries";
license = "LGPL";
@@ -203751,8 +203859,8 @@ self: {
}:
mkDerivation {
pname = "polysemy-mocks";
- version = "0.1.0.0";
- sha256 = "04cgajjrlbiqij54k6agm1p6h4hv5lldb9f9yrzbwm0v69d02bs7";
+ version = "0.1.0.1";
+ sha256 = "0jd8x47mdx9fyn65ra0y1m05myf2m2bhz3ykg1i3818ixwd93xvl";
libraryHaskellDepends = [ base polysemy template-haskell ];
testHaskellDepends = [ base hspec polysemy ];
testToolDepends = [ hspec-discover ];
@@ -205138,6 +205246,8 @@ self: {
pname = "postgresql-libpq";
version = "0.9.4.3";
sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3";
+ revision = "1";
+ editedCabalFile = "1clivf13z15w954a0kcfkv8yc0d8kx61b68x2hk7a9236ck7l2m2";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring unix ];
librarySystemDepends = [ postgresql ];
@@ -205359,6 +205469,8 @@ self: {
pname = "postgresql-simple";
version = "0.6.4";
sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d";
+ revision = "1";
+ editedCabalFile = "017qfhml58psv72qnyb2hg6r8jl1mj8jmr2q5p3hgd0lcsxiq0qi";
libraryHaskellDepends = [
aeson attoparsec base bytestring bytestring-builder
case-insensitive containers hashable Only postgresql-libpq
@@ -205753,8 +205865,8 @@ self: {
pname = "postgrest";
version = "7.0.1";
sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf";
- revision = "5";
- editedCabalFile = "0cfw145pna4k1jjcmkffwaw2h8ls9crngmzcsi2jhc85s90gq2fv";
+ revision = "6";
+ editedCabalFile = "0kkhkz1bmgc1p0yry24fhc4a3s9w28wg6gxai0cggvalbz8c4pc4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206994,8 +207106,8 @@ self: {
}:
mkDerivation {
pname = "pretty-diff";
- version = "0.2.0.3";
- sha256 = "1pnq05zw7zyfikga8y27pkya4wrf0m3mrksmzi8l7jp9qdhkyia1";
+ version = "0.4.0.3";
+ sha256 = "0qzsq9dm95f6yjryl2675rbyx178zxl562x0y9i1py2rx4k8z7gl";
libraryHaskellDepends = [ base data-default Diff text ];
testHaskellDepends = [
base data-default Diff tasty tasty-hunit tasty-test-reporter text
@@ -207004,23 +207116,6 @@ self: {
license = lib.licenses.bsd3;
}) {};
- "pretty-diff_0_4_0_0" = callPackage
- ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit
- , tasty-test-reporter, text
- }:
- mkDerivation {
- pname = "pretty-diff";
- version = "0.4.0.0";
- sha256 = "10fsa49pd0d5rvl0093x2hrcbv44hq7xc9d2x369ygd6q7pxkbnz";
- libraryHaskellDepends = [ base data-default Diff text ];
- testHaskellDepends = [
- base data-default Diff tasty tasty-hunit tasty-test-reporter text
- ];
- description = "Pretty printing a diff of two values";
- license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
- }) {};
-
"pretty-display" = callPackage
({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }:
mkDerivation {
@@ -207706,32 +207801,8 @@ self: {
}:
mkDerivation {
pname = "primitive-extras";
- version = "0.8";
- sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r";
- libraryHaskellDepends = [
- base bytestring cereal deferred-folds focus foldl list-t primitive
- primitive-unlifted profunctors vector
- ];
- testHaskellDepends = [
- cereal deferred-folds focus primitive QuickCheck
- quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
- ];
- description = "Extras for the \"primitive\" library";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "primitive-extras_0_9" = callPackage
- ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
- , foldl, list-t, primitive, primitive-unlifted, profunctors
- , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
- , tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "primitive-extras";
- version = "0.9";
- sha256 = "04sb2q5r5z1sdj976p8p6hgx360agwxjqmcrgr8vcgyfgzphizfr";
+ version = "0.10.1";
+ sha256 = "0ddnn94qqkx021marpi2j03sil15422scq0df6dmlc6q0qyyivyc";
libraryHaskellDepends = [
base bytestring cereal deferred-folds focus foldl list-t primitive
primitive-unlifted profunctors vector
@@ -208368,6 +208439,17 @@ self: {
broken = true;
}) {};
+ "process-sequential" = callPackage
+ ({ mkDerivation, base, directory, mmsyn3, process, sublists }:
+ mkDerivation {
+ pname = "process-sequential";
+ version = "0.1.0.0";
+ sha256 = "11s6ki1cgqav8i06np63cj2l6z1wdszjrq2rslx1pk7af5dxz9r0";
+ libraryHaskellDepends = [ base directory mmsyn3 process sublists ];
+ description = "A test suite for the complex multi files multi level processment";
+ license = lib.licenses.mit;
+ }) {};
+
"process-streaming" = callPackage
({ mkDerivation, attoparsec, base, bifunctors, bytestring, conceit
, containers, directory, doctest, exceptions, filepath, foldl, free
@@ -211031,50 +211113,48 @@ self: {
, ansi-terminal, ansi-wl-pprint, array, base, base-compat
, blaze-html, bower-json, boxes, bytestring, Cabal, cborg
, cheapskate, clock, containers, cryptonite, data-ordlist, deepseq
- , directory, dlist, edit-distance, file-embed, filepath, fsnotify
- , gitrev, Glob, happy, haskeline, hspec, hspec-discover, http-types
- , HUnit, language-javascript, lifted-async, lifted-base, memory
+ , directory, edit-distance, file-embed, filepath, fsnotify, gitrev
+ , Glob, happy, haskeline, hspec, hspec-discover, http-types, HUnit
+ , language-javascript, lifted-async, lifted-base, memory
, microlens-platform, monad-control, monad-logger, mtl, network
, optparse-applicative, parallel, parsec, pattern-arrows, process
- , protolude, regex-tdfa, safe, scientific, semialign, semigroups
- , serialise, sourcemap, split, stm, stringsearch, syb, tasty
- , tasty-golden, tasty-hspec, tasty-quickcheck, text, these, time
- , transformers, transformers-base, transformers-compat
- , unordered-containers, utf8-string, vector, wai, wai-websockets
- , warp, websockets
+ , protolude, purescript-ast, purescript-cst, regex-base, regex-tdfa
+ , safe, semialign, semigroups, serialise, sourcemap, split, stm
+ , stringsearch, syb, tasty, tasty-golden, tasty-hspec
+ , tasty-quickcheck, text, these, time, transformers
+ , transformers-base, transformers-compat, unordered-containers
+ , utf8-string, vector, wai, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.13.8";
- sha256 = "0sh9z3ir3jiwmi5h95v9p7j746xxidg1hrxha89c0zl6vr4sq7vh";
- revision = "1";
- editedCabalFile = "1ilnqfxscwkr0jl09y1dwi2aabwnghd0l22lm32jgfyq04njpc2a";
+ version = "0.14.0";
+ sha256 = "1bv68y91l6fyjidfp71djiv2lijn5d55j4szlg77yvsw164s6vk0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-better-errors aeson-pretty ansi-terminal array base
base-compat blaze-html bower-json boxes bytestring Cabal cborg
cheapskate clock containers cryptonite data-ordlist deepseq
- directory dlist edit-distance file-embed filepath fsnotify Glob
- haskeline language-javascript lifted-async lifted-base memory
+ directory edit-distance file-embed filepath fsnotify Glob haskeline
+ language-javascript lifted-async lifted-base memory
microlens-platform monad-control monad-logger mtl parallel parsec
- pattern-arrows process protolude regex-tdfa safe scientific
- semialign semigroups serialise sourcemap split stm stringsearch syb
- text these time transformers transformers-base transformers-compat
- unordered-containers utf8-string vector
+ pattern-arrows process protolude purescript-ast purescript-cst
+ regex-tdfa safe semialign semigroups serialise sourcemap split stm
+ stringsearch syb text these time transformers transformers-base
+ transformers-compat unordered-containers utf8-string vector
];
libraryToolDepends = [ happy ];
executableHaskellDepends = [
aeson aeson-better-errors aeson-pretty ansi-terminal ansi-wl-pprint
array base base-compat blaze-html bower-json boxes bytestring Cabal
cborg cheapskate clock containers cryptonite data-ordlist deepseq
- directory dlist edit-distance file-embed filepath fsnotify gitrev
- Glob haskeline http-types language-javascript lifted-async
- lifted-base memory microlens-platform monad-control monad-logger
- mtl network optparse-applicative parallel parsec pattern-arrows
- process protolude regex-tdfa safe scientific semialign semigroups
- serialise sourcemap split stm stringsearch syb text these time
- transformers transformers-base transformers-compat
+ directory edit-distance file-embed filepath fsnotify gitrev Glob
+ haskeline http-types language-javascript lifted-async lifted-base
+ memory microlens-platform monad-control monad-logger mtl network
+ optparse-applicative parallel parsec pattern-arrows process
+ protolude purescript-ast purescript-cst regex-tdfa safe semialign
+ semigroups serialise sourcemap split stm stringsearch syb text
+ these time transformers transformers-base transformers-compat
unordered-containers utf8-string vector wai wai-websockets warp
websockets
];
@@ -211083,14 +211163,15 @@ self: {
aeson aeson-better-errors aeson-pretty ansi-terminal array base
base-compat blaze-html bower-json boxes bytestring Cabal cborg
cheapskate clock containers cryptonite data-ordlist deepseq
- directory dlist edit-distance file-embed filepath fsnotify Glob
- haskeline hspec hspec-discover HUnit language-javascript
- lifted-async lifted-base memory microlens-platform monad-control
- monad-logger mtl parallel parsec pattern-arrows process protolude
- regex-tdfa safe scientific semialign semigroups serialise sourcemap
- split stm stringsearch syb tasty tasty-golden tasty-hspec
- tasty-quickcheck text these time transformers transformers-base
- transformers-compat unordered-containers utf8-string vector
+ directory edit-distance file-embed filepath fsnotify Glob haskeline
+ hspec hspec-discover HUnit language-javascript lifted-async
+ lifted-base memory microlens-platform monad-control monad-logger
+ mtl parallel parsec pattern-arrows process protolude purescript-ast
+ purescript-cst regex-base regex-tdfa safe semialign semigroups
+ serialise sourcemap split stm stringsearch syb tasty tasty-golden
+ tasty-hspec tasty-quickcheck text these time transformers
+ transformers-base transformers-compat unordered-containers
+ utf8-string vector
];
testToolDepends = [ happy hspec-discover ];
doCheck = false;
@@ -211100,6 +211181,25 @@ self: {
broken = true;
}) {};
+ "purescript-ast" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+ , deepseq, filepath, microlens, mtl, protolude, scientific
+ , serialise, text, vector
+ }:
+ mkDerivation {
+ pname = "purescript-ast";
+ version = "0.1.0.0";
+ sha256 = "1zwwbdkc5mb3ckc2g15b18j9vp9bksyc1nrlg73w7w0fzqwnqb4g";
+ libraryHaskellDepends = [
+ aeson base base-compat bytestring containers deepseq filepath
+ microlens mtl protolude scientific serialise text vector
+ ];
+ description = "PureScript Programming Language Abstract Syntax Tree";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"purescript-bridge" = callPackage
({ mkDerivation, base, containers, directory, filepath
, generic-deriving, hspec, hspec-expectations-pretty-diff, lens
@@ -211137,6 +211237,32 @@ self: {
license = lib.licenses.mit;
}) {};
+ "purescript-cst" = callPackage
+ ({ mkDerivation, array, base, base-compat, bytestring, containers
+ , dlist, filepath, happy, purescript-ast, scientific, semigroups
+ , tasty, tasty-golden, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "purescript-cst";
+ version = "0.1.0.0";
+ sha256 = "1h4na5k0lz91i1f49axsgs7zqz6dqdxds5dg0g00wd4wmyd619cc";
+ libraryHaskellDepends = [
+ array base containers dlist purescript-ast scientific semigroups
+ text
+ ];
+ libraryToolDepends = [ happy ];
+ testHaskellDepends = [
+ array base base-compat bytestring containers dlist filepath
+ purescript-ast scientific semigroups tasty tasty-golden
+ tasty-quickcheck text
+ ];
+ testToolDepends = [ happy ];
+ description = "PureScript Programming Language Concrete Syntax Tree";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"purescript-iso" = callPackage
({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async
, attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
@@ -211393,6 +211519,28 @@ self: {
license = lib.licenses.mit;
}) {};
+ "pusher-http-haskell_2_1_0_0" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+ , cryptonite, hashable, hspec, http-client, http-client-tls
+ , http-types, memory, QuickCheck, text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "pusher-http-haskell";
+ version = "2.1.0.0";
+ sha256 = "1zmcpbd20m7pc1bc0dwkhy33vbakdwc478dmzpr4l80kck0mpmy6";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring cryptonite hashable
+ http-client http-client-tls http-types memory text time
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec QuickCheck text unordered-containers
+ ];
+ description = "Haskell client library for the Pusher Channels HTTP API";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"pusher-ws" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, deepseq
, hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -212238,10 +212386,8 @@ self: {
}:
mkDerivation {
pname = "quantification";
- version = "0.5.1";
- sha256 = "1abr0rb3q13klrz6199gpl4d07s5y8j56i8gvpy8nqgyi7awznx9";
- revision = "1";
- editedCabalFile = "1q18l6wv57d0386p75ykkcpc18cdnzpbxdxbr5bdx02wj5v4vq8f";
+ version = "0.5.2";
+ sha256 = "0ngy44xlbxhq8gzvp9fs71pchzqgy2bpqqfm3wna666c1034srxf";
libraryHaskellDepends = [
aeson base binary containers ghc-prim hashable path-pieces text
unordered-containers vector
@@ -213180,6 +213326,8 @@ self: {
];
description = "Equational laws for free!";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"quickterm" = callPackage
@@ -214192,17 +214340,16 @@ self: {
"ral" = callPackage
({ mkDerivation, adjunctions, base, bin, criterion, deepseq
- , distributive, fin, hashable, QuickCheck, semigroupoids, vector
+ , distributive, fin, hashable, indexed-traversable, QuickCheck
+ , semigroupoids, vector
}:
mkDerivation {
pname = "ral";
- version = "0.1";
- sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304";
- revision = "2";
- editedCabalFile = "0a3ryzcmjgyp64f8s2pl95pkz8zddq9qsn76dlimg23gczf1cql4";
+ version = "0.2";
+ sha256 = "0xwr2wr44zzl2bvkii2nq06djd6rrf891zxlb4daxzf3m93xvf3v";
libraryHaskellDepends = [
- adjunctions base bin deepseq distributive fin hashable QuickCheck
- semigroupoids
+ adjunctions base bin deepseq distributive fin hashable
+ indexed-traversable QuickCheck semigroupoids
];
benchmarkHaskellDepends = [ base criterion vector ];
description = "Random access lists";
@@ -214213,10 +214360,8 @@ self: {
({ mkDerivation, base, bin, fin, lens, ral }:
mkDerivation {
pname = "ral-lens";
- version = "0.1";
- sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv";
- revision = "1";
- editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv";
+ version = "0.2";
+ sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67";
libraryHaskellDepends = [ base bin fin lens ral ];
description = "Length-indexed random access lists: lens utilities";
license = lib.licenses.gpl2Plus;
@@ -214226,10 +214371,8 @@ self: {
({ mkDerivation, base, bin, fin, optics-core, ral }:
mkDerivation {
pname = "ral-optics";
- version = "0.1";
- sha256 = "0sky2zbh6wn4xlfc6sbrx7lvvy01qv69j80k0n4w9fyrq9ammb3r";
- revision = "1";
- editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv";
+ version = "0.2";
+ sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1";
libraryHaskellDepends = [ base bin fin optics-core ral ];
description = "Length-indexed random access lists: optics utilities";
license = lib.licenses.gpl2Plus;
@@ -214437,23 +214580,6 @@ self: {
}) {};
"random-bytestring" = callPackage
- ({ mkDerivation, async, base, bytestring, criterion, cryptonite
- , entropy, ghc-prim, mwc-random, pcg-random, primitive, random
- }:
- mkDerivation {
- pname = "random-bytestring";
- version = "0.1.3.2";
- sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw";
- libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
- benchmarkHaskellDepends = [
- async base bytestring criterion cryptonite entropy ghc-prim
- mwc-random pcg-random primitive random
- ];
- description = "Efficient generation of random bytestrings";
- license = lib.licenses.mit;
- }) {};
-
- "random-bytestring_0_1_4" = callPackage
({ mkDerivation, async, base, bytestring, criterion, cryptonite
, entropy, ghc-prim, mwc-random, pcg-random, primitive, random
}:
@@ -214468,7 +214594,6 @@ self: {
];
description = "Efficient generation of random bytestrings";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"random-class" = callPackage
@@ -214839,6 +214964,19 @@ self: {
broken = true;
}) {};
+ "ranged-list" = callPackage
+ ({ mkDerivation, base, doctest, typecheck-plugin-nat-simple }:
+ mkDerivation {
+ pname = "ranged-list";
+ version = "0.1.0.0";
+ sha256 = "0v0a80g17r8dap28gm83wnk32m3snlmw1r51vvwfb74a4q3613w8";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base typecheck-plugin-nat-simple ];
+ testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ];
+ description = "The list like structure whose length or range of length can be specified";
+ license = lib.licenses.bsd3;
+ }) {};
+
"rangemin" = callPackage
({ mkDerivation, base, containers, primitive, vector }:
mkDerivation {
@@ -215386,24 +215524,22 @@ self: {
}) {};
"rattletrap" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
- , caerbannog, containers, filepath, http-client, http-client-tls
- , HUnit, scientific, template-haskell, temporary, text
- , transformers
+ ({ mkDerivation, aeson, aeson-pretty, array, base, binary
+ , bytestring, caerbannog, containers, filepath, http-client
+ , http-client-tls, HUnit, text, transformers
}:
mkDerivation {
pname = "rattletrap";
- version = "9.4.1";
- sha256 = "1m8bqjqp413sm86v0i2083hnsq7h11hlmmqch1pxbgpv5678jq0q";
+ version = "10.0.7";
+ sha256 = "1wpxysd23gz2lga6bzg3cx21yxjvcprqgk9xqlg3b5gmj22h2mdg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base binary bytestring caerbannog containers
- filepath http-client http-client-tls scientific template-haskell
- text transformers
+ aeson aeson-pretty array base binary bytestring caerbannog
+ containers filepath http-client http-client-tls text transformers
];
executableHaskellDepends = [ base ];
- testHaskellDepends = [ base bytestring filepath HUnit temporary ];
+ testHaskellDepends = [ base bytestring filepath HUnit ];
description = "Parse and generate Rocket League replays";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -215669,34 +215805,6 @@ self: {
}) {};
"rcu" = callPackage
- ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
- , containers, criterion, deepseq, doctest, fail, ghc-prim
- , optparse-applicative, parallel, primitive, rdtsc, time
- , transformers
- }:
- mkDerivation {
- pname = "rcu";
- version = "0.2.4";
- sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr";
- revision = "2";
- editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz";
- isLibrary = true;
- isExecutable = true;
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- atomic-primops base fail ghc-prim parallel primitive transformers
- ];
- executableHaskellDepends = [ base transformers ];
- testHaskellDepends = [ base doctest parallel ];
- benchmarkHaskellDepends = [
- base containers criterion deepseq ghc-prim optparse-applicative
- primitive rdtsc time transformers
- ];
- description = "Read-Copy-Update for Haskell";
- license = lib.licenses.bsd3;
- }) {};
-
- "rcu_0_2_5" = callPackage
({ mkDerivation, atomic-primops, base, containers, criterion
, deepseq, fail, ghc-prim, optparse-applicative, parallel
, primitive, rdtsc, time, transformers
@@ -215717,7 +215825,6 @@ self: {
];
description = "Read-Copy-Update for Haskell";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"rdf" = callPackage
@@ -216530,8 +216637,8 @@ self: {
}:
mkDerivation {
pname = "reanimate";
- version = "1.1.3.2";
- sha256 = "006fj47pm7lqs4haq0i0nmz6syqx3v07qgnh4vjqlyqixk22cyy5";
+ version = "1.1.3.3";
+ sha256 = "1d348fpfzfqi3vm8qzdxbbdrx62awxx0hrnj3vw1szp41an6ya30";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal array attoparsec base base64-bytestring
@@ -216564,8 +216671,8 @@ self: {
}:
mkDerivation {
pname = "reanimate-svg";
- version = "0.13.0.0";
- sha256 = "0fl3rb993zihwm9vyg615x4k17rrqimjfpc7k06mb5dlgkd39f7v";
+ version = "0.13.0.1";
+ sha256 = "1h31r0lrslxqfayh06955p1kv35g42g3drmqp4miydk6zibyn091";
libraryHaskellDepends = [
attoparsec base bytestring containers double-conversion hashable
JuicyPixels lens linear mtl scientific text transformers vector xml
@@ -216749,8 +216856,8 @@ self: {
}:
mkDerivation {
pname = "record-dot-preprocessor";
- version = "0.2.7";
- sha256 = "1ma1rc962z2qr7xwxh03bkbcmn9dsqizrjv699wbc82fzfzn5hrr";
+ version = "0.2.9";
+ sha256 = "02g36p14waf66lwwy2s4jy19pmkxv46kqfkkipy7qix3vaffbzir";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base extra ghc uniplate ];
@@ -216760,6 +216867,24 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "record-dot-preprocessor_0_2_10" = callPackage
+ ({ mkDerivation, base, extra, filepath, ghc, record-hasfield
+ , uniplate
+ }:
+ mkDerivation {
+ pname = "record-dot-preprocessor";
+ version = "0.2.10";
+ sha256 = "1zwkc5mqcxlv4cm7qd75sdmvjckvpchcrqphsq82val41mp27nk5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base extra ghc uniplate ];
+ executableHaskellDepends = [ base extra ];
+ testHaskellDepends = [ base extra filepath record-hasfield ];
+ description = "Preprocessor to allow record.field syntax";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"record-encode" = callPackage
({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck
, vector
@@ -216941,8 +217066,8 @@ self: {
}:
mkDerivation {
pname = "recursion-schemes";
- version = "5.2.1";
- sha256 = "0yx7pj25p6h8qjsgxbjsxaz23ar21wyxr8wqpmsn61pk8mahwggl";
+ version = "5.2.2";
+ sha256 = "02p1blgxd0nyzrgqw8ghm2a680f2a05rn1nrqqcjyh1whksl2g3x";
libraryHaskellDepends = [
base base-orphans comonad containers data-fix free template-haskell
th-abstraction transformers
@@ -216950,6 +217075,8 @@ self: {
testHaskellDepends = [ base HUnit template-haskell transformers ];
description = "Representing common recursion patterns as higher-order functions";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"recursion-schemes-ext" = callPackage
@@ -216969,6 +217096,8 @@ self: {
];
description = "Amateur addenda to recursion-schemes";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"recursion-schemes-ix" = callPackage
@@ -218580,10 +218709,8 @@ self: {
({ mkDerivation, array, base, bytestring, containers, mtl, text }:
mkDerivation {
pname = "regex-base";
- version = "0.94.0.0";
- sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4";
- revision = "1";
- editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4";
+ version = "0.94.0.1";
+ sha256 = "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi";
libraryHaskellDepends = [
array base bytestring containers mtl text
];
@@ -218595,12 +218722,10 @@ self: {
({ mkDerivation, array, base, regex-base, regex-posix }:
mkDerivation {
pname = "regex-compat";
- version = "0.95.2.0";
- sha256 = "01l44zrfpqb4k1rrzd1j18hn6922xhrl9h7s0hjfs363dx3hxj8z";
- revision = "1";
- editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif";
+ version = "0.95.2.1";
+ sha256 = "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg";
libraryHaskellDepends = [ array base regex-base regex-posix ];
- description = "Replaces/Enhances \"Text.Regex\"";
+ description = "Replaces/enhances \"Text.Regex\"";
license = lib.licenses.bsd3;
}) {};
@@ -218781,8 +218906,8 @@ self: {
pname = "regex-pcre";
version = "0.95.0.0";
sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n";
- revision = "1";
- editedCabalFile = "1s5jdwvymc9hxdfa23x5amnv2kkcsm2p119f38df2vjdxfvjfiq4";
+ revision = "2";
+ editedCabalFile = "0bvpy3rswyawv23s14nbxvgz5761s61g0shcj7p032i95iq7dj6d";
libraryHaskellDepends = [
array base bytestring containers regex-base
];
@@ -218848,8 +218973,8 @@ self: {
pname = "regex-posix";
version = "0.96.0.0";
sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5";
- revision = "1";
- editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9";
+ revision = "2";
+ editedCabalFile = "10al5qljh6pc46581nkhrs0rjn8w05pp6jb4v55lgfr17ac0z1xx";
libraryHaskellDepends = [
array base bytestring containers regex-base
];
@@ -218896,8 +219021,8 @@ self: {
pname = "regex-tdfa";
version = "1.3.1.0";
sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm";
- revision = "1";
- editedCabalFile = "1fhi4g2p29qnnfyb211n62g97qrw3gz1kahca7rlz43all93ihdy";
+ revision = "2";
+ editedCabalFile = "1hvcqdywwlcpia7qss7ikr9bq0lvkk8z0mjgaylaqpzlgh00z3gb";
libraryHaskellDepends = [
array base bytestring containers mtl parsec regex-base text
];
@@ -218967,6 +219092,8 @@ self: {
libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
description = "Text interface for regex-tdfa";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"regex-tdfa-unittest" = callPackage
@@ -220878,10 +221005,8 @@ self: {
}:
mkDerivation {
pname = "rere";
- version = "0.1";
- sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac";
- revision = "1";
- editedCabalFile = "0k2fcc94dlcf33by0zcqk01i9k2g8x4j8rnlpfmabld9dvf5cjwg";
+ version = "0.2";
+ sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr";
libraryHaskellDepends = [
base containers fin parsec QuickCheck transformers vec
];
@@ -220895,6 +221020,8 @@ self: {
];
description = "Regular-expressions extended with fixpoints for context-free powers";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"rerebase" = callPackage
@@ -222180,6 +222307,8 @@ self: {
testHaskellDepends = [ base simple-cmd ];
description = "Bugzilla query tool";
license = lib.licenses.gpl2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"rhine" = callPackage
@@ -222730,6 +222859,8 @@ self: {
];
description = "A library for process pools coupled with asynchronous message queues";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"riot" = callPackage
@@ -223270,8 +223401,8 @@ self: {
}:
mkDerivation {
pname = "rock";
- version = "0.3.0.0";
- sha256 = "1hssz23kifpmcv0vjnrymr4cj1f3m8z7kvvkyzsfh3ysc493514i";
+ version = "0.3.1.0";
+ sha256 = "0rv689w41dbspn40nblkjg81csp5jvk069c92c6dkvfx1biblhwn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223331,6 +223462,8 @@ self: {
];
description = "Haskell bindings for RocksDB";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) rocksdb;};
"rocksdb-query" = callPackage
@@ -225463,8 +225596,8 @@ self: {
}:
mkDerivation {
pname = "safe-tensor";
- version = "0.2.1.0";
- sha256 = "00s8p7bp72wjpz4mbxn79xg6cllyl2c6fn952w2nykyrapzpxhxm";
+ version = "0.2.1.1";
+ sha256 = "1ms8mrlvvivk474qpa9sqprpr7b8p3l5iq1z58yd81djdkrpqar3";
libraryHaskellDepends = [
base constraints containers deepseq hmatrix mtl singletons
];
@@ -225480,8 +225613,8 @@ self: {
}:
mkDerivation {
pname = "safecopy";
- version = "0.10.3.1";
- sha256 = "0y2jpykad7inzndw4azb2wdp4zp3smjax95sdcxycw5x88rxdra1";
+ version = "0.10.4.1";
+ sha256 = "1p8kbf9js67zl2wr6y0605acy54xlpsih1zqkdy21cywz1kannbp";
libraryHaskellDepends = [
array base bytestring cereal containers generic-data old-time
template-haskell text time transformers vector
@@ -225754,8 +225887,8 @@ self: {
pname = "salak";
version = "0.3.6";
sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3";
- revision = "3";
- editedCabalFile = "0cdp6gy3r92vhpmq2i7yg4xxmnj95dyfvaf8gm05v6wl8l6rihfy";
+ revision = "4";
+ editedCabalFile = "07q9a24ry6h6r3m1av0dxz39dzmyjhlcrw1ww5jprqcf3xxjxhdz";
libraryHaskellDepends = [
base bytestring containers data-default directory dlist exceptions
filepath hashable heaps megaparsec mtl scientific text time
@@ -226882,8 +227015,8 @@ self: {
}:
mkDerivation {
pname = "scc";
- version = "0.8.2.4";
- sha256 = "1f0sayjihh6h7vb4r13j7ly5p0c10biidfmbs9nyybd70ai6dy1f";
+ version = "0.8.3.1";
+ sha256 = "1l89lq20khi3fysbvfxjzchbdw9civz1kj85fyjf8wcm3s3cq34l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -227346,8 +227479,8 @@ self: {
}:
mkDerivation {
pname = "scientific-notation";
- version = "0.1.2.0";
- sha256 = "19yfg032ppiy70y28fbildxp4h6y4krs9ayh7a8sdbxibpqb82cx";
+ version = "0.1.3.0";
+ sha256 = "1sdqyf3538n2yz29p2b4jvafa9vlgmr3aqn2x4hifmjx0176xm03";
libraryHaskellDepends = [
base bytebuild bytesmith natural-arithmetic
];
@@ -228342,16 +228475,17 @@ self: {
"sdl2-ttf" = callPackage
({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
- , template-haskell, text, transformers
+ , template-haskell, text, th-abstraction, transformers
}:
mkDerivation {
pname = "sdl2-ttf";
- version = "2.1.1";
- sha256 = "1iyqm1i5k8j4948gvr59rgalqwsdkishs52kp85ncvb6cpylw3qn";
+ version = "2.1.2";
+ sha256 = "0jg3dg4g876shbcxlgcjwfd0g76ih3xh8f1hc79qxg6j48khxbpd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring sdl2 template-haskell text transformers
+ base bytestring sdl2 template-haskell text th-abstraction
+ transformers
];
libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
description = "Bindings to SDL2_ttf";
@@ -228381,6 +228515,17 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "sdp-binary" = callPackage
+ ({ mkDerivation, base, binary, sdp }:
+ mkDerivation {
+ pname = "sdp-binary";
+ version = "0.2";
+ sha256 = "09wripyza10b7cy1w00j2vna1hmld1ijrd081faz88brkahzhdgq";
+ libraryHaskellDepends = [ base binary sdp ];
+ description = "Binary instances for SDP";
+ license = lib.licenses.bsd3;
+ }) {};
+
"sdp-deepseq" = callPackage
({ mkDerivation, base, deepseq, sdp }:
mkDerivation {
@@ -228403,6 +228548,17 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "sdp-io" = callPackage
+ ({ mkDerivation, base, fmr, sdp }:
+ mkDerivation {
+ pname = "sdp-io";
+ version = "0.2";
+ sha256 = "06rrfsxzfi3vbjsm1d4cm2f4x7035y0zhp869f3bjasf2r4mzsp4";
+ libraryHaskellDepends = [ base fmr sdp ];
+ description = "SDP IO extension";
+ license = lib.licenses.bsd3;
+ }) {};
+
"sdp-quickcheck" = callPackage
({ mkDerivation, base, criterion, ghc-prim, QuickCheck, sdp
, sdp-deepseq, test-framework, test-framework-quickcheck2
@@ -228422,6 +228578,57 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "sdp4bytestring" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances
+ , sdp, sdp-io, sdp-quickcheck, test-framework
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "sdp4bytestring";
+ version = "0.2";
+ sha256 = "119r7rhrsbv3c5dlwq5lf6lpjdybr5vl9lnvffcl6dvh8bym4g86";
+ revision = "1";
+ editedCabalFile = "1kwi2y9l7mnq5m9kr8731fjy50mz32qp1i966m9wg5bd9kximaga";
+ libraryHaskellDepends = [ base bytestring sdp sdp-io ];
+ testHaskellDepends = [
+ base bytestring QuickCheck quickcheck-instances sdp sdp-io
+ sdp-quickcheck test-framework test-framework-quickcheck2
+ ];
+ description = "SDP wrapper for ByteString";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "sdp4text" = callPackage
+ ({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp
+ , sdp-io, sdp-quickcheck, test-framework
+ , test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "sdp4text";
+ version = "0.2";
+ sha256 = "12gq2rjddl2q4y045jixcar6v6s73qmqy4j30d22nvdyyqdjrxc8";
+ libraryHaskellDepends = [ base sdp sdp-io text ];
+ testHaskellDepends = [
+ base QuickCheck quickcheck-instances sdp sdp-io sdp-quickcheck
+ test-framework test-framework-quickcheck2 text
+ ];
+ description = "SDP wrapper for Text";
+ license = lib.licenses.bsd3;
+ }) {};
+
+ "sdp4unordered" = callPackage
+ ({ mkDerivation, base, sdp, sdp-hashable, unordered-containers }:
+ mkDerivation {
+ pname = "sdp4unordered";
+ version = "0.2";
+ sha256 = "0y24ia2p2wsrdk05nikip369fzjh6b3jk59nss4xn4823p15vwsv";
+ libraryHaskellDepends = [
+ base sdp sdp-hashable unordered-containers
+ ];
+ description = "SDP classes for unordered containers";
+ license = lib.licenses.bsd3;
+ }) {};
+
"sdp4vector" = callPackage
({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp
, sdp-quickcheck, test-framework, test-framework-quickcheck2
@@ -229189,6 +229396,25 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "semialign_1_2" = callPackage
+ ({ mkDerivation, base, containers, hashable, indexed-traversable
+ , indexed-traversable-instances, semigroupoids, tagged, these
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "semialign";
+ version = "1.2";
+ sha256 = "04dcyj69g7bm1sydxk89vin9mh2pmm0pqf0cm9v981i98xp6xxdj";
+ libraryHaskellDepends = [
+ base containers hashable indexed-traversable
+ indexed-traversable-instances semigroupoids tagged these
+ transformers unordered-containers vector
+ ];
+ description = "Align and Zip type-classes from the common Semialign ancestor";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"semialign-extras" = callPackage
({ mkDerivation, base, doctest, lens, QuickCheck, semialign
, semialign-indexed, these, witherable
@@ -229227,6 +229453,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "semialign-indexed_1_2" = callPackage
+ ({ mkDerivation, base, lens, semialign }:
+ mkDerivation {
+ pname = "semialign-indexed";
+ version = "1.2";
+ sha256 = "16f0y3j85zlq2f8z45z085dizvbx4ihppp1ww3swh5daj0zf3kzy";
+ libraryHaskellDepends = [ base lens semialign ];
+ doHaddock = false;
+ description = "SemialignWithIndex, i.e. izipWith and ialignWith";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"semialign-optics" = callPackage
({ mkDerivation, base, containers, hashable, optics-extra
, semialign, these, unordered-containers, vector
@@ -229245,6 +229484,19 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "semialign-optics_1_2" = callPackage
+ ({ mkDerivation, base, optics-core, semialign }:
+ mkDerivation {
+ pname = "semialign-optics";
+ version = "1.2";
+ sha256 = "04vh689mmnb5q77v6ifhg7xf7m2qh5x4i4804rm4biw78130xqr1";
+ libraryHaskellDepends = [ base optics-core semialign ];
+ doHaddock = false;
+ description = "SemialignWithIndex, i.e. izipWith and ialignWith";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"semibounded-lattices" = callPackage
({ mkDerivation, base, containers, lattices }:
mkDerivation {
@@ -229836,8 +230088,8 @@ self: {
}:
mkDerivation {
pname = "sequence-formats";
- version = "1.5.2";
- sha256 = "0n09mw9z8bjqr8dc32l7swp25vgci7m2hb1w6masgv2cw8irh7as";
+ version = "1.6.0";
+ sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq";
libraryHaskellDepends = [
attoparsec base bytestring containers errors exceptions foldl
lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
@@ -231673,6 +231925,8 @@ self: {
pname = "servant-openapi3";
version = "2.0.1.1";
sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf";
+ revision = "1";
+ editedCabalFile = "0j2b3zv5qk5xfi17jwwn456pqpf27aqgy6fmbyqvn8df83rcij5j";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -231768,14 +232022,14 @@ self: {
"servant-polysemy" = callPackage
({ mkDerivation, base, deepseq, http-client, http-client-tls, lens
- , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant-client
- , servant-server, servant-swagger, servant-swagger-ui, swagger2
- , text, wai, warp
+ , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant
+ , servant-client, servant-server, servant-swagger
+ , servant-swagger-ui, swagger2, text, wai, warp
}:
mkDerivation {
pname = "servant-polysemy";
- version = "0.1.1";
- sha256 = "074c1x51am3ffl9lzhq090h8a6xd9gjf154mhp51glb4m4f6kr15";
+ version = "0.1.2";
+ sha256 = "05qk2kl90lqszwhi1yqnj63zkx3qvd6jbaxsxjw68k7ppsjvnyks";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -231784,7 +232038,7 @@ self: {
];
executableHaskellDepends = [
base deepseq http-client http-client-tls lens mtl polysemy
- polysemy-plugin polysemy-zoo servant-client servant-server
+ polysemy-plugin polysemy-zoo servant servant-client servant-server
servant-swagger servant-swagger-ui swagger2 text wai warp
];
description = "Utilities for using servant in a polysemy stack";
@@ -232328,6 +232582,8 @@ self: {
];
description = "Embed a directory of static files in your Servant server";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"servant-streaming" = callPackage
@@ -232867,30 +233123,6 @@ self: {
}) {};
"serversession" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, bytestring
- , containers, data-default, hashable, hspec, nonce, path-pieces
- , QuickCheck, text, time, transformers, unordered-containers
- }:
- mkDerivation {
- pname = "serversession";
- version = "1.0.1";
- sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
- revision = "2";
- editedCabalFile = "0i5faxzxgvpfylmrr175f8l4asyh4phncc90jkfag53gnspcv028";
- libraryHaskellDepends = [
- aeson base base64-bytestring bytestring data-default hashable nonce
- path-pieces text time transformers unordered-containers
- ];
- testHaskellDepends = [
- aeson base base64-bytestring bytestring containers data-default
- hspec nonce path-pieces QuickCheck text time transformers
- unordered-containers
- ];
- description = "Secure, modular server-side sessions";
- license = lib.licenses.mit;
- }) {};
-
- "serversession_1_0_2" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, containers, data-default, hashable, hspec, nonce, path-pieces
, persistent-test, QuickCheck, text, time, transformers
@@ -232913,6 +233145,7 @@ self: {
description = "Secure, modular server-side sessions";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"serversession-backend-acid-state" = callPackage
@@ -233003,6 +233236,8 @@ self: {
];
description = "Snap bindings for serversession";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"serversession-frontend-wai" = callPackage
@@ -233020,6 +233255,8 @@ self: {
];
description = "wai-session bindings for serversession";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"serversession-frontend-yesod" = callPackage
@@ -233501,6 +233738,8 @@ self: {
];
description = "Invertible grammar combinators for S-expressions";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"sexp-show" = callPackage
@@ -234058,6 +234297,8 @@ self: {
];
description = "Dependency tracking for Futhark";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"shake-google-closure-compiler" = callPackage
@@ -236570,12 +236811,13 @@ self: {
}) {};
"simple-units" = callPackage
- ({ mkDerivation, base, first-class-families }:
+ ({ mkDerivation, base, doctest, first-class-families }:
mkDerivation {
pname = "simple-units";
- version = "1.0.1.1";
- sha256 = "1dzsr15lq32dqsbhb639vzlx2d6m2kx0qax75ik2z765r5h9f9sa";
+ version = "1.0.2";
+ sha256 = "1caijdnah0lr5c48zmx93b06yvw9fbpakw0y0nz0k4icv935xdam";
libraryHaskellDepends = [ base first-class-families ];
+ testHaskellDepends = [ base doctest ];
description = "Simple arithmetic with SI units using type-checked dimensional analysis";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
@@ -236935,8 +237177,8 @@ self: {
pname = "singleton-bool";
version = "0.1.5";
sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0";
- revision = "2";
- editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an";
+ revision = "3";
+ editedCabalFile = "11rhzpy4xiry39bbxzwrqff75f0f4g7z0vkr3v9l8rv3w40jlf7x";
libraryHaskellDepends = [ base dec ];
description = "Type level booleans";
license = lib.licenses.bsd3;
@@ -237615,8 +237857,8 @@ self: {
}:
mkDerivation {
pname = "skylighting";
- version = "0.10.2";
- sha256 = "1f60fnr8d8a28fr785hjzaaakss1ncn0998sz740xb76wp6q7pqd";
+ version = "0.10.4";
+ sha256 = "057nrlm714r78rfdrqyy4zjl50npvz5qaprrb9nfwdiyb50nyz2j";
configureFlags = [ "-fexecutable" ];
isLibrary = true;
isExecutable = true;
@@ -237635,20 +237877,20 @@ self: {
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
, case-insensitive, colour, containers, criterion, Diff, directory
- , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe
+ , filepath, HUnit, mtl, pretty-show, QuickCheck, random, safe
, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
- , transformers, utf8-string
+ , transformers, utf8-string, xml-conduit
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.10.2";
- sha256 = "1igqskmcbhk7b3fv1a1fxvfc4s3mc2sf96q90bf5iipy0h3f2zbg";
+ version = "0.10.4";
+ sha256 = "0b5cbwsr5mnl4wppxw8rwy4a14pk6s804c4qwf1cd2vzz9j64dag";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal attoparsec base base64-bytestring binary
blaze-html bytestring case-insensitive colour containers directory
- filepath hxt mtl safe text transformers utf8-string
+ filepath mtl safe text transformers utf8-string xml-conduit
];
testHaskellDepends = [
aeson base bytestring containers Diff directory filepath HUnit
@@ -237857,8 +238099,8 @@ self: {
}:
mkDerivation {
pname = "slack-web";
- version = "0.2.1.0";
- sha256 = "01bwiq3b97bznn3sc51vi7q8xkjdslvqqh250fk7arcaq6hkkiw1";
+ version = "0.3.0.0";
+ sha256 = "1z223dhv0qb7labrxppjq65lp2jyscxgxk4rjdvfd2xsglj36dbf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -238190,33 +238432,11 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Convert text into slugs";
license = lib.licenses.bsd3;
- }) {};
-
- "slynx" = callPackage
- ({ mkDerivation, async, attoparsec, base, bytestring, containers
- , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix
- , monad-logger, mwc-random, optparse-applicative, statistics, text
- , transformers, vector
- }:
- mkDerivation {
- pname = "slynx";
- version = "0.5.0.1";
- sha256 = "013ck07xgna42a5vlk6a323z3x1jrggbjw7jr2ww8mpgvpw2wp8r";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- async attoparsec base bytestring containers elynx-markov elynx-seq
- elynx-tools elynx-tree hmatrix monad-logger mwc-random
- optparse-applicative statistics text transformers vector
- ];
- executableHaskellDepends = [ base ];
- description = "Handle molecular sequences";
- license = lib.licenses.gpl3Plus;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
- "slynx_0_5_0_2" = callPackage
+ "slynx" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix
, monad-logger, mwc-random, optparse-applicative, statistics, text
@@ -240967,6 +241187,26 @@ self: {
broken = true;
}) {};
+ "sockets-and-pipes" = callPackage
+ ({ mkDerivation, aeson, ascii, async, base, blaze-html, bytestring
+ , containers, network, safe-exceptions, stm, text, time
+ }:
+ mkDerivation {
+ pname = "sockets-and-pipes";
+ version = "0.1";
+ sha256 = "02xc2kddcz93d9yqdchml0yh9gypcx64315baj766adgf8np42nv";
+ revision = "4";
+ editedCabalFile = "1lv2zpyblqryr59ii3zvwi5f06vxsgnla1xa14rardhncs36fa8r";
+ libraryHaskellDepends = [
+ aeson ascii async base blaze-html bytestring containers network
+ safe-exceptions stm text time
+ ];
+ description = "Support for the Sockets and Pipes book";
+ license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"socketson" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
, crypto-api, data-default, DRBG, either, errors, http-types
@@ -241825,8 +242065,8 @@ self: {
}:
mkDerivation {
pname = "sparse-tensor";
- version = "0.2.1.4";
- sha256 = "10caf86g33hcccmpicxfjh0jq3z9d7vs4jafl0f8zhy09dirq8bn";
+ version = "0.2.1.5";
+ sha256 = "0549hw502hka1fyvv00nvd5aif5knvq7b9fk62f3fyjlfmqcnwx4";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
ad base bytestring cereal containers deepseq ghc-typelits-knownnat
@@ -242187,8 +242427,8 @@ self: {
}:
mkDerivation {
pname = "speedy-slice";
- version = "0.3.1";
- sha256 = "0i139wp2c75q8a5q018z7ps1ghbqjkkd8nh6z6xfp0rqywq2bsnr";
+ version = "0.3.2";
+ sha256 = "1bmy0hrrqgwbqsk1ckbmzy1hhcwlcjsclcskrdmzfq5afvq9kq3z";
libraryHaskellDepends = [
base kan-extensions lens mcmc-types mwc-probability pipes primitive
transformers
@@ -242501,6 +242741,8 @@ self: {
pname = "split";
version = "0.2.3.4";
sha256 = "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7";
+ revision = "1";
+ editedCabalFile = "06pmlvyrz4rr7rsrghpyrdypprphm9522rvnz4l3i8333n4pb304";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Combinator library for splitting lists";
@@ -243673,6 +243915,41 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "stache_2_2_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , deepseq, directory, file-embed, filepath, gitrev, hspec
+ , hspec-discover, hspec-megaparsec, megaparsec, mtl
+ , optparse-applicative, template-haskell, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "stache";
+ version = "2.2.1";
+ sha256 = "1vkvi9rrf15a8lbihvcmrslykby4qc4jmc5zaqm1ikxsid9x5704";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath
+ megaparsec mtl template-haskell text unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ aeson base filepath gitrev optparse-applicative text
+ unordered-containers yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers file-embed hspec hspec-megaparsec
+ megaparsec template-haskell text yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ aeson base criterion deepseq megaparsec text
+ ];
+ description = "Mustache templates for Haskell";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"stack" = callPackage
({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
, async, attoparsec, base, base64-bytestring, bytestring, Cabal
@@ -244535,6 +244812,8 @@ self: {
];
description = "Program to fold GHC prof files into flamegraph input";
license = lib.licenses.gpl3Only;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"stacked-dag" = callPackage
@@ -244568,6 +244847,24 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "staged-gg" = callPackage
+ ({ mkDerivation, base, containers, generic-deriving
+ , template-haskell, th-abstraction, th-lift
+ }:
+ mkDerivation {
+ pname = "staged-gg";
+ version = "0.1";
+ sha256 = "1apajw5ig7sax31i2zf842isnhk74x65hv9k8k3f6dhdxxg2dha4";
+ libraryHaskellDepends = [
+ base containers generic-deriving template-haskell th-abstraction
+ th-lift
+ ];
+ description = "GHC.Generics style staged generics";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"stagen" = callPackage
({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
, data-default, directory, feed, filemanip, json-feed, lucid
@@ -245592,8 +245889,8 @@ self: {
pname = "step-function";
version = "0.2";
sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
- revision = "4";
- editedCabalFile = "0zxjrsa54g65p7kf5mfpjb897d1add2dfp5dm4xfs5321rs31knv";
+ revision = "5";
+ editedCabalFile = "03xg6n7dyz73y3llbbahnlh46xfy2iq29s1jwjp22qxd4z6xndsa";
libraryHaskellDepends = [
base base-compat-batteries containers deepseq QuickCheck
];
@@ -245858,36 +246155,8 @@ self: {
}:
mkDerivation {
pname = "stm-hamt";
- version = "1.2.0.4";
- sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj";
- libraryHaskellDepends = [
- base deferred-folds focus hashable list-t primitive
- primitive-extras transformers
- ];
- testHaskellDepends = [
- deferred-folds focus QuickCheck quickcheck-instances rerebase tasty
- tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- async criterion focus free list-t mwc-random mwc-random-monad
- rebase
- ];
- description = "STM-specialised Hash Array Mapped Trie";
- license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "stm-hamt_1_2_0_5" = callPackage
- ({ mkDerivation, async, base, criterion, deferred-folds, focus
- , free, hashable, list-t, mwc-random, mwc-random-monad, primitive
- , primitive-extras, QuickCheck, quickcheck-instances, rebase
- , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers
- }:
- mkDerivation {
- pname = "stm-hamt";
- version = "1.2.0.5";
- sha256 = "09hz5v2ldinyl6brrl87f46wg16y9d1fnwb5v8s17ph00sb95lgg";
+ version = "1.2.0.6";
+ sha256 = "15jqj31h9ff4g2k3sq35nm122sy0hqapxf4fm5vlkfh33zdn28di";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t primitive
primitive-extras transformers
@@ -246840,8 +247109,8 @@ self: {
}:
mkDerivation {
pname = "streaming-cassava";
- version = "0.1.0.1";
- sha256 = "0dr58azgyw7ihxrabva7fh0yafq2kx12yvap4jl6ljnlwvcapa5i";
+ version = "0.2.0.0";
+ sha256 = "07mlhnn2k8zdgc5lrv0icyr4nn83dc0grywr5q284y64irix6grl";
libraryHaskellDepends = [
base bytestring cassava mtl streaming streaming-bytestring
transformers
@@ -247216,10 +247485,8 @@ self: {
}:
mkDerivation {
pname = "streamly";
- version = "0.7.2";
- sha256 = "007i3rfza0v8zy34lq9ipq2biarg82prmd1vxr5f2zz5xln37wrm";
- revision = "1";
- editedCabalFile = "15fyfvf0g2l678426fz91fqf3qgi44dagqdxh6i6am3vh0nvvg1d";
+ version = "0.7.3";
+ sha256 = "11bjyyqc745igw7122284fjph0922l56jddnhfy5h7w84nj35ck3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -247335,6 +247602,8 @@ self: {
];
description = "Folder watching as a Streamly stream";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"streamly-lmdb" = callPackage
@@ -247588,8 +247857,8 @@ self: {
({ mkDerivation, base, lens, strict }:
mkDerivation {
pname = "strict-lens";
- version = "0.4.0.1";
- sha256 = "0hwrbrjhgkh83474mci3ipg8nqims7b18w7i6xajz3xxq3cik5vn";
+ version = "0.4.0.2";
+ sha256 = "1dsgr53q0sdivrxc7jmbqjd65hav9zwjqc8zfbyybkr1ww17bhf5";
libraryHaskellDepends = [ base lens strict ];
description = "Lenses for types in strict package";
license = lib.licenses.bsd3;
@@ -247618,6 +247887,8 @@ self: {
pname = "strict-optics";
version = "0.4.0.1";
sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a";
+ revision = "1";
+ editedCabalFile = "1rlkslqkicw7zzmy88kvbnlcyyx2afm3vs8y51gazz1bs0b73p0f";
libraryHaskellDepends = [ base optics-core strict ];
description = "Optics for types in strict package";
license = lib.licenses.bsd3;
@@ -247650,6 +247921,19 @@ self: {
broken = true;
}) {};
+ "strict-tuple-lens_0_2" = callPackage
+ ({ mkDerivation, base, lens, strict-tuple }:
+ mkDerivation {
+ pname = "strict-tuple-lens";
+ version = "0.2";
+ sha256 = "02pagvg6rz0bdkxvikv7ac7766b329j84jbd42cjqr193wjphqd4";
+ libraryHaskellDepends = [ base lens strict-tuple ];
+ description = "Optics for the `strict-tuple` library";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"strict-types" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, hashable, text, unordered-containers, vector
@@ -247795,36 +248079,6 @@ self: {
}) {};
"string-interpolate" = callPackage
- ({ mkDerivation, base, bytestring, criterion, deepseq, formatting
- , haskell-src-exts, haskell-src-meta, hspec, hspec-core
- , interpolate, neat-interpolation, QuickCheck, quickcheck-instances
- , quickcheck-text, quickcheck-unicode, split, template-haskell
- , text, text-conversions, unordered-containers, utf8-string
- }:
- mkDerivation {
- pname = "string-interpolate";
- version = "0.3.0.2";
- sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl";
- revision = "1";
- editedCabalFile = "1rwylfxa821260mxfsr6l6grcyz7gxk18mvjijfhg5sm53v4c1ka";
- libraryHaskellDepends = [
- base bytestring haskell-src-exts haskell-src-meta split
- template-haskell text text-conversions utf8-string
- ];
- testHaskellDepends = [
- base bytestring hspec hspec-core QuickCheck quickcheck-instances
- quickcheck-text quickcheck-unicode template-haskell text
- unordered-containers
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion deepseq formatting interpolate
- neat-interpolation QuickCheck text
- ];
- description = "Haskell string/text/bytestring interpolation that just works";
- license = lib.licenses.bsd3;
- }) {};
-
- "string-interpolate_0_3_1_0" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, formatting
, haskell-src-exts, haskell-src-meta, hspec, hspec-core
, interpolate, neat-interpolation, QuickCheck, quickcheck-instances
@@ -247850,7 +248104,6 @@ self: {
];
description = "Haskell string/text/bytestring interpolation that just works";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"string-isos" = callPackage
@@ -248408,28 +248661,6 @@ self: {
}) {};
"structs" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
- , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck
- , tasty, tasty-hunit, tasty-quickcheck, template-haskell
- , th-abstraction
- }:
- mkDerivation {
- pname = "structs";
- version = "0.1.4";
- sha256 = "0sjrih706bpibd1ygfjz76gabampffwqvn0hnvmxa9b9vzwdgqzr";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base deepseq ghc-prim primitive template-haskell th-abstraction
- ];
- testHaskellDepends = [
- base directory doctest filepath parallel primitive QuickCheck tasty
- tasty-hunit tasty-quickcheck
- ];
- description = "Strict GC'd imperative object-oriented programming with cheap pointers";
- license = lib.licenses.bsd3;
- }) {};
-
- "structs_0_1_5" = callPackage
({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
, tasty, tasty-hunit, tasty-quickcheck, template-haskell
, th-abstraction
@@ -248446,7 +248677,6 @@ self: {
];
description = "Strict GC'd imperative object-oriented programming with cheap pointers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"structural-induction" = callPackage
@@ -248970,6 +249200,17 @@ self: {
broken = true;
}) {};
+ "sublists" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "sublists";
+ version = "0.1.1.0";
+ sha256 = "1k08cpidl5r4sj64vc1a9fcln78k31z7v8gnh579fxa5lrp4ylnr";
+ libraryHaskellDepends = [ base ];
+ description = "Allows to split lists into sublists with some patterns by quantity";
+ license = lib.licenses.mit;
+ }) {};
+
"submark" = callPackage
({ mkDerivation, base, cmark, hlint, hspec, optparse-applicative
, template-haskell, text
@@ -249113,8 +249354,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "successors";
- version = "0.1.0.1";
- sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg";
+ version = "0.1.0.2";
+ sha256 = "0q6sfxxzc0ws1iky79iyx7sf7l3jqdwxz9ngsi11km1bp7rd8ycw";
libraryHaskellDepends = [ base ];
description = "An applicative functor to manage successors";
license = lib.licenses.mit;
@@ -249838,8 +250079,8 @@ self: {
pname = "svg-builder";
version = "0.1.1";
sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
- revision = "2";
- editedCabalFile = "100nmkgcm1ncv4mkr1xcsa7bb3z6zx0lfayk8innd4hm62xsvhj3";
+ revision = "3";
+ editedCabalFile = "1zc7shja5i63rn7kd9mnq2m052qhp7nh44qy8qp93dm64v9m9pi2";
libraryHaskellDepends = [
base blaze-builder bytestring hashable text unordered-containers
];
@@ -249875,6 +250116,8 @@ self: {
pname = "svg-tree";
version = "0.6.2.4";
sha256 = "1hhs2w6fmd1m6768p1bfhj6vi4br4ray0g9f1hv8g19pqgip3r2c";
+ revision = "1";
+ editedCabalFile = "12askkxmrzjkssnfa8m6xmdwdxk6v3z26jc63jcgb3q8snxb0hg1";
libraryHaskellDepends = [
attoparsec base bytestring containers JuicyPixels lens linear mtl
scientific text transformers vector xml
@@ -250274,11 +250517,12 @@ self: {
"swisstable" = callPackage
({ mkDerivation, base, criterion, deepseq, hashable, hashtables
, primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector
+ , weigh
}:
mkDerivation {
pname = "swisstable";
- version = "0.1.0.2";
- sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1";
+ version = "0.1.0.3";
+ sha256 = "1d1vk1j8r2lwxkx2l4l1fmm8z9ascp7hq52al7qjn4bir177b92q";
libraryHaskellDepends = [ base hashable primitive vector ];
testHaskellDepends = [
base hashable primitive QuickCheck tasty tasty-discover tasty-hunit
@@ -250287,7 +250531,7 @@ self: {
testToolDepends = [ tasty-discover ];
benchmarkHaskellDepends = [
base criterion deepseq hashable hashtables primitive QuickCheck
- vector
+ vector weigh
];
description = "SwissTable hash map";
license = lib.licenses.bsd3;
@@ -252952,8 +253196,8 @@ self: {
pname = "tar";
version = "0.5.1.1";
sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k";
- revision = "2";
- editedCabalFile = "131f369a2vjzr26r7f2c2p534xvyw0s7cvgvih2ck56lqha58wbs";
+ revision = "3";
+ editedCabalFile = "0qjhii1lhvqav3pnm6z5ly40d9gwp7p3y4g7k26bhxgy31bx1pll";
libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath time
];
@@ -253027,11 +253271,10 @@ self: {
({ mkDerivation, base, mmorph, mtl }:
mkDerivation {
pname = "tardis";
- version = "0.4.1.0";
- sha256 = "1nd54pff1n6ds5jqa98qrby06d3ziw2rhb3j5lvw4mahsynsnwp6";
- revision = "1";
- editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv";
+ version = "0.4.3.0";
+ sha256 = "1ffmpdvnmr1s3rh3kpqqscsbz2rq4s7k8nfc93zw9m4mchg37waw";
libraryHaskellDepends = [ base mmorph mtl ];
+ testHaskellDepends = [ base ];
description = "Bidirectional state monad transformer";
license = lib.licenses.bsd3;
}) {};
@@ -253354,8 +253597,8 @@ self: {
({ mkDerivation, base, containers, deepseq, tasty }:
mkDerivation {
pname = "tasty-bench";
- version = "0.2.1";
- sha256 = "0gw0hlpkpwn7hpvwn9i8zqghrzjvhdrhr2q9y4r4ykhqv7y95zy3";
+ version = "0.2.2";
+ sha256 = "0x6kg8n778nysv3b7j31bnh62h5srid35nhmvr76bzba4qdgx258";
libraryHaskellDepends = [ base containers deepseq tasty ];
description = "Featherlight benchmark framework";
license = lib.licenses.mit;
@@ -253399,22 +253642,6 @@ self: {
}) {};
"tasty-expected-failure" = callPackage
- ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden
- , tasty-hedgehog, tasty-hunit, unbounded-delays
- }:
- mkDerivation {
- pname = "tasty-expected-failure";
- version = "0.12.2";
- sha256 = "0i97y723vi2f5z94ripli8jfzqk540w80cfab3prylbm9j3s7rb7";
- libraryHaskellDepends = [ base tagged tasty unbounded-delays ];
- testHaskellDepends = [
- base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
- ];
- description = "Mark tasty tests as failure expected";
- license = lib.licenses.mit;
- }) {};
-
- "tasty-expected-failure_0_12_3" = callPackage
({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden
, tasty-hedgehog, tasty-hunit, unbounded-delays
}:
@@ -253428,7 +253655,6 @@ self: {
];
description = "Mark tasty tests as failure expected";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
}) {};
"tasty-fail-fast" = callPackage
@@ -253603,6 +253829,8 @@ self: {
];
description = "Render tasty output to HTML";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"tasty-hunit" = callPackage
@@ -255814,6 +256042,28 @@ self: {
broken = true;
}) {};
+ "terraform-http-backend-pass" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, mtl
+ , optparse-applicative, optparse-generic, servant, servant-server
+ , shelly, text, warp
+ }:
+ mkDerivation {
+ pname = "terraform-http-backend-pass";
+ version = "0.1.0.0";
+ sha256 = "0cw9vzj5kigz84r2nwxmvva5fmn9r6y78g40icwi1yaby9g9s809";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring directory mtl optparse-applicative
+ optparse-generic servant servant-server shelly text warp
+ ];
+ executableHaskellDepends = [ base ];
+ description = "HTTP backend to store terraform state using pass and git";
+ license = "AGPL";
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"terrahs" = callPackage
({ mkDerivation, base, haskell98, old-time, terralib4c, translib }:
mkDerivation {
@@ -256728,19 +256978,24 @@ self: {
}) {};
"text-ascii" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, hashable, optics-core
- , parsec, template-haskell, text
+ ({ mkDerivation, base, bytestring, case-insensitive, deepseq
+ , hashable, megaparsec, optics-core, optics-extra, template-haskell
+ , text
}:
mkDerivation {
pname = "text-ascii";
- version = "1.0.0";
- sha256 = "1mwm3ss54c927rdj8dlfw7v2l0maz12mkxb5ss3g1ngdkiwd0bsx";
+ version = "1.0.1";
+ sha256 = "0clibcn3g72hxjhcsnb7ziw35ald5zqkql5b8mf9lpjpx94hii65";
+ revision = "1";
+ editedCabalFile = "0qc1in7i9i22hyd440g3bra74ryz26z8c2bcxdbr91hfjzj4n3g3";
libraryHaskellDepends = [
- base bytestring deepseq hashable optics-core parsec
- template-haskell text
+ base bytestring case-insensitive deepseq hashable megaparsec
+ optics-core optics-extra template-haskell text
];
description = "ASCII string and character processing";
license = lib.licenses.asl20;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"text-binary" = callPackage
@@ -258535,8 +258790,8 @@ self: {
({ mkDerivation, base, lens, these }:
mkDerivation {
pname = "these-lens";
- version = "1.0.1.1";
- sha256 = "1nwknm17x7vkx9936z7xa6hqw69pgig185if1dninrvyxvv59kps";
+ version = "1.0.1.2";
+ sha256 = "1v3kj7j4bkywbmdbblwqs5gsj5s23d59sb3s27jf3bwdzf9d21p6";
libraryHaskellDepends = [ base lens these ];
description = "Lenses for These";
license = lib.licenses.bsd3;
@@ -258546,8 +258801,8 @@ self: {
({ mkDerivation, base, optics-core, these }:
mkDerivation {
pname = "these-optics";
- version = "1.0.1.1";
- sha256 = "1xwf2m03cbb2z40mdab70d042nmvcxpgdq94rmajbqqpb072yivq";
+ version = "1.0.1.2";
+ sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd";
libraryHaskellDepends = [ base optics-core these ];
description = "Optics for These";
license = lib.licenses.bsd3;
@@ -259275,28 +259530,8 @@ self: {
}:
mkDerivation {
pname = "tidal";
- version = "1.6.1";
- sha256 = "13n9s0s04bddl16xq86anz7a9fqcm7j3xfqn5y1mni5j1h7hn2k2";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base bifunctors bytestring clock colour containers deepseq hosc
- network parsec primitive random text transformers vector
- ];
- testHaskellDepends = [ base containers deepseq microspec parsec ];
- benchmarkHaskellDepends = [ base criterion weigh ];
- description = "Pattern language for improvised music";
- license = lib.licenses.gpl3;
- }) {};
-
- "tidal_1_7_1" = callPackage
- ({ mkDerivation, base, bifunctors, bytestring, clock, colour
- , containers, criterion, deepseq, hosc, microspec, network, parsec
- , primitive, random, text, transformers, vector, weigh
- }:
- mkDerivation {
- pname = "tidal";
- version = "1.7.1";
- sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4";
+ version = "1.7.2";
+ sha256 = "15shxaazxik1bawgak16xhlvk708kv9al6i3518b3m3iap9sbw9p";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers deepseq hosc
@@ -259308,7 +259543,6 @@ self: {
benchmarkHaskellDepends = [ base criterion weigh ];
description = "Pattern language for improvised music";
license = lib.licenses.gpl3;
- hydraPlatforms = lib.platforms.none;
}) {};
"tidal-midi" = callPackage
@@ -259725,8 +259959,8 @@ self: {
pname = "time-parsers";
version = "0.1.2.1";
sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv";
- revision = "2";
- editedCabalFile = "10bawg6cwfwm31fcs63z8imd1cdl1wq8syn669yfkycrk77wfkli";
+ revision = "3";
+ editedCabalFile = "1cv9fpn8bixicwcacyv0hx81q1xw06pig07zrpnf354bqzrsf3jw";
libraryHaskellDepends = [ base parsers template-haskell time ];
testHaskellDepends = [
attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -260942,30 +261176,6 @@ self: {
}) {};
"tlynx" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
- , containers, elynx-tools, elynx-tree, gnuplot, lifted-async
- , monad-logger, mwc-random, optparse-applicative, parallel
- , statistics, text, transformers, vector
- }:
- mkDerivation {
- pname = "tlynx";
- version = "0.5.0.1";
- sha256 = "0prqnbq75jrixx845z3hbqajfc63vgsdfdgrsxw0g29rx0x4hw2i";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring comonad containers elynx-tools
- elynx-tree gnuplot lifted-async monad-logger mwc-random
- optparse-applicative parallel statistics text transformers vector
- ];
- executableHaskellDepends = [ base ];
- description = "Handle phylogenetic trees";
- license = lib.licenses.gpl3Plus;
- hydraPlatforms = lib.platforms.none;
- broken = true;
- }) {};
-
- "tlynx_0_5_0_2" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, comonad
, containers, elynx-tools, elynx-tree, gnuplot, lifted-async
, monad-logger, mwc-random, optparse-applicative, parallel
@@ -261520,37 +261730,6 @@ self: {
}) {};
"tomland" = callPackage
- ({ mkDerivation, base, bytestring, containers, deepseq, directory
- , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog
- , hspec-megaparsec, markdown-unlit, megaparsec, mtl
- , parser-combinators, text, time, transformers
- , unordered-containers, validation-selective
- }:
- mkDerivation {
- pname = "tomland";
- version = "1.3.1.0";
- sha256 = "17909a8aapbrsa0yb642ij80k64dg2dam1v3rsvc3rm07ik61x42";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring containers deepseq hashable megaparsec mtl
- parser-combinators text time transformers unordered-containers
- validation-selective
- ];
- executableHaskellDepends = [
- base bytestring containers hashable text time unordered-containers
- ];
- executableToolDepends = [ markdown-unlit ];
- testHaskellDepends = [
- base bytestring containers directory hashable hedgehog hspec
- hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time
- unordered-containers
- ];
- description = "Bidirectional TOML serialization";
- license = lib.licenses.mpl20;
- }) {};
-
- "tomland_1_3_2_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog
, hspec-megaparsec, markdown-unlit, megaparsec, mtl
@@ -261579,7 +261758,6 @@ self: {
];
description = "Bidirectional TOML serialization";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"tomlcheck" = callPackage
@@ -261743,45 +261921,44 @@ self: {
}) {};
"too-many-cells" = callPackage
- ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava
- , colour, containers, deepseq, diagrams, diagrams-cairo
- , diagrams-graphviz, diagrams-lib, differential, directory
- , diversity, fgl, filepath, find-clumpiness, foldl, graphviz
+ ({ mkDerivation, aeson, async, async-pool, attoparsec, base
+ , birch-beer, bytestring, cassava, colour, containers, deepseq
+ , diagrams, diagrams-cairo, diagrams-graphviz, diagrams-lib
+ , differential, directory, diversity, fgl, filepath
+ , find-clumpiness, foldl, graphviz, hashable
, hierarchical-clustering, hierarchical-spectral-clustering
- , hmatrix, inline-r, lens, managed, matrix-market-attoparsec
- , modularity, mtl, optparse-generic, palette, parallel, plots, safe
- , scientific, sparse-linear-algebra, spectral-clustering, split
- , statistics, streaming, streaming-bytestring, streaming-cassava
- , streaming-utils, streaming-with, SVGFonts, temporary
- , terminal-progress-bar, text, text-show, transformers, vector
- , vector-algorithms, zlib
+ , hmatrix, hmatrix-svdlibc, inline-r, IntervalMap, lens, managed
+ , matrix-market-attoparsec, modularity, mtl, mwc-random
+ , optparse-generic, palette, parallel, plots, process, resourcet
+ , safe, scientific, sparse-linear-algebra, spectral-clustering
+ , split, statistics, stm, streaming, streaming-bytestring
+ , streaming-cassava, streaming-commons, streaming-utils
+ , streaming-with, SVGFonts, system-filepath, temporary
+ , terminal-progress-bar, text, text-show, transformers, turtle
+ , unordered-containers, vector, vector-algorithms, zlib
}:
mkDerivation {
pname = "too-many-cells";
- version = "0.2.2.2";
- sha256 = "091hqg4wxki8v7xkrzmnh1hpm81pif936pbmrzvr5p84sbbyyj91";
+ version = "2.1.1.0";
+ sha256 = "0ysixw2ab0m2gmh7aqn2qhrc5gb6habjdif7f2bf7a1n29rih8x6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base birch-beer bytestring cassava colour containers deepseq
- diagrams diagrams-cairo diagrams-graphviz diagrams-lib differential
- directory diversity fgl filepath find-clumpiness foldl graphviz
+ aeson async async-pool attoparsec base birch-beer bytestring
+ cassava colour containers deepseq diagrams diagrams-cairo
+ diagrams-graphviz diagrams-lib differential directory diversity fgl
+ filepath find-clumpiness foldl graphviz hashable
hierarchical-clustering hierarchical-spectral-clustering hmatrix
- inline-r lens managed matrix-market-attoparsec modularity mtl
- palette parallel plots safe scientific sparse-linear-algebra split
- statistics streaming streaming-bytestring streaming-cassava
- streaming-with SVGFonts temporary text text-show vector
- vector-algorithms zlib
- ];
- executableHaskellDepends = [
- aeson base birch-beer bytestring cassava colour containers
- diagrams-cairo diagrams-lib directory fgl filepath find-clumpiness
- graphviz hierarchical-spectral-clustering inline-r lens
- matrix-market-attoparsec modularity mtl optparse-generic palette
- plots spectral-clustering streaming streaming-bytestring
- streaming-utils terminal-progress-bar text text-show transformers
- vector
+ hmatrix-svdlibc inline-r IntervalMap lens managed
+ matrix-market-attoparsec modularity mtl mwc-random optparse-generic
+ palette parallel plots process resourcet safe scientific
+ sparse-linear-algebra spectral-clustering split statistics stm
+ streaming streaming-bytestring streaming-cassava streaming-commons
+ streaming-utils streaming-with SVGFonts system-filepath temporary
+ terminal-progress-bar text text-show transformers turtle
+ unordered-containers vector vector-algorithms zlib
];
+ executableHaskellDepends = [ base optparse-generic ];
description = "Cluster single cells and analyze cell clade relationships";
license = lib.licenses.gpl3;
hydraPlatforms = lib.platforms.none;
@@ -261896,6 +262073,8 @@ self: {
pname = "topograph";
version = "1.0.0.1";
sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv";
+ revision = "1";
+ editedCabalFile = "1cbpm16jk8x8xy0r3v8zdmwrdgxlp6zww03rmzbz0031hddpywrk";
libraryHaskellDepends = [
base base-compat base-orphans containers vector
];
@@ -263345,8 +263524,8 @@ self: {
pname = "tree-diff";
version = "0.1";
sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3";
- revision = "5";
- editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h";
+ revision = "6";
+ editedCabalFile = "1wqfac660m9ggv6r85a7y29mk947hki9iydy124vdwcqzichja0d";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
bytestring-builder containers hashable parsec parsers pretty
@@ -263564,10 +263743,8 @@ self: {
({ mkDerivation, base, containers, mtl }:
mkDerivation {
pname = "tree-view";
- version = "0.5";
- sha256 = "1aywcaq9b48ap04g8i5rirz447kfmwxnswqigmycbgvqdbglc01d";
- revision = "1";
- editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5";
+ version = "0.5.1";
+ sha256 = "1ya3m1qi83pn74wzffvbzj7wn6n5zny4yzzzf7wlfqszl96jhn2g";
libraryHaskellDepends = [ base containers mtl ];
description = "Render trees as foldable HTML and Unicode art";
license = lib.licenses.bsd3;
@@ -263901,33 +264078,6 @@ self: {
}) {};
"trifecta" = callPackage
- ({ mkDerivation, ansi-terminal, array, base, blaze-builder
- , blaze-html, blaze-markup, bytestring, Cabal, cabal-doctest
- , charset, comonad, containers, deepseq, doctest, fingertree
- , ghc-prim, hashable, lens, mtl, parsers, prettyprinter
- , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers
- , semigroups, transformers, unordered-containers, utf8-string
- }:
- mkDerivation {
- pname = "trifecta";
- version = "2.1";
- sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs";
- revision = "4";
- editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- ansi-terminal array base blaze-builder blaze-html blaze-markup
- bytestring charset comonad containers deepseq fingertree ghc-prim
- hashable lens mtl parsers prettyprinter prettyprinter-ansi-terminal
- profunctors reducers semigroups transformers unordered-containers
- utf8-string
- ];
- testHaskellDepends = [ base doctest parsers QuickCheck ];
- description = "A modern parser combinator library with convenient diagnostics";
- license = lib.licenses.bsd3;
- }) {};
-
- "trifecta_2_1_1" = callPackage
({ mkDerivation, ansi-terminal, array, base, blaze-builder
, blaze-html, blaze-markup, bytestring, charset, comonad
, containers, deepseq, fingertree, ghc-prim, hashable
@@ -263949,7 +264099,6 @@ self: {
testHaskellDepends = [ base parsers QuickCheck ];
description = "A modern parser combinator library with convenient diagnostics";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"trigger" = callPackage
@@ -264971,16 +265120,17 @@ self: {
}) {};
"twee" = callPackage
- ({ mkDerivation, base, containers, jukebox, pretty, split, twee-lib
+ ({ mkDerivation, ansi-terminal, base, containers, jukebox, pretty
+ , split, symbol, twee-lib
}:
mkDerivation {
pname = "twee";
- version = "2.2";
- sha256 = "0wmjmgkf5piwqzrk08ij7mc3s82gpg7j5x4bk96njj06gm4lc38v";
+ version = "2.3";
+ sha256 = "1fg8khaa5zkfyh2jawh2m7jyy3a4kbd755qa09gwg9b7y9wijamr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base containers jukebox pretty split twee-lib
+ ansi-terminal base containers jukebox pretty split symbol twee-lib
];
description = "An equational theorem prover";
license = lib.licenses.bsd3;
@@ -264990,14 +265140,15 @@ self: {
"twee-lib" = callPackage
({ mkDerivation, base, containers, dlist, ghc-prim, pretty
- , primitive, transformers, vector
+ , primitive, random, transformers, uglymemo, vector
}:
mkDerivation {
pname = "twee-lib";
- version = "2.2";
- sha256 = "0v99hhnxpzi5581s4bfxhbpnmvlbqnrrr3pdkfvicz2b146mhhgr";
+ version = "2.3";
+ sha256 = "1ba98apscp1f4k9917an27aqymnr8gj8pkwj7g2ci02fh7dan9b9";
libraryHaskellDepends = [
- base containers dlist ghc-prim pretty primitive transformers vector
+ base containers dlist ghc-prim pretty primitive random transformers
+ uglymemo vector
];
description = "An equational theorem prover";
license = lib.licenses.bsd3;
@@ -265535,8 +265686,8 @@ self: {
}:
mkDerivation {
pname = "twitter-types-lens";
- version = "0.10.0";
- sha256 = "1x9w68mr6r6354in9l4vmawk5symvfh2qlhjn2gd30m8b1mzbrjg";
+ version = "0.10.1";
+ sha256 = "07znqqb4lhhzlzvi1nl3m13cnskfakq4pnn52wpn554igxymgvsd";
libraryHaskellDepends = [
base lens template-haskell text time twitter-types
];
@@ -266393,6 +266544,8 @@ self: {
];
description = "Type-level and typed unary natural numbers, inequality proofs, vectors";
license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"typeable-th" = callPackage
@@ -266728,17 +266881,15 @@ self: {
}) {};
"typelevel-rewrite-rules" = callPackage
- ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
- , term-rewriting, transformers, vinyl
+ ({ mkDerivation, base, containers, ghc, ghc-prim, term-rewriting
+ , transformers, vinyl
}:
mkDerivation {
pname = "typelevel-rewrite-rules";
- version = "0.1";
- sha256 = "1gm3xbsi90dgppwhhhlmq1rwwnx9bxhm7zv9x4yr0952fwxrm8x8";
- revision = "1";
- editedCabalFile = "0wgryhys24671j46s58prbh7agrlxdcbains6qv37kp6xly726nj";
+ version = "1.0";
+ sha256 = "0by8zl16dzq0srdmr7p3hwdp1966gbdmzqp9h2548sj767r0ncmy";
libraryHaskellDepends = [
- base ghc ghc-prim ghc-tcplugins-extra term-rewriting transformers
+ base containers ghc ghc-prim term-rewriting transformers
];
testHaskellDepends = [ base ghc-prim vinyl ];
description = "Solve type equalities using custom type-level rewrite rules";
@@ -267179,31 +267330,6 @@ self: {
}) {};
"ua-parser" = callPackage
- ({ mkDerivation, aeson, base, bytestring, criterion, data-default
- , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
- , tasty-hunit, tasty-quickcheck, text, yaml
- }:
- mkDerivation {
- pname = "ua-parser";
- version = "0.7.5.1";
- sha256 = "091lks0jpp0m4wg56i03ih3n0n7kvs2fm511vcnypmwskflkkk0z";
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring data-default file-embed pcre-light text yaml
- ];
- testHaskellDepends = [
- aeson base bytestring data-default file-embed filepath HUnit
- pcre-light tasty tasty-hunit tasty-quickcheck text yaml
- ];
- benchmarkHaskellDepends = [
- aeson base bytestring criterion data-default deepseq file-embed
- filepath pcre-light text yaml
- ];
- description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
- license = lib.licenses.bsd3;
- }) {};
-
- "ua-parser_0_7_6_0" = callPackage
({ mkDerivation, aeson, base, bytestring, criterion, data-default
, deepseq, file-embed, filepath, HUnit, pcre-light, tasty
, tasty-hunit, tasty-quickcheck, text, yaml
@@ -267226,7 +267352,6 @@ self: {
];
description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"uacpid" = callPackage
@@ -268047,10 +268172,8 @@ self: {
}:
mkDerivation {
pname = "unfoldable";
- version = "1.0";
- sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a";
- revision = "2";
- editedCabalFile = "0lnqjgh8nyq6w94swn0m7syl0bx6a2ml7s9sqp449inpdb8f8jaj";
+ version = "1.0.1";
+ sha256 = "1h1zps55adzhfsfq1bgwc235qywpad9z7rfqid81l4405pi5zw83";
libraryHaskellDepends = [
base containers ghc-prim one-liner QuickCheck random transformers
];
@@ -268371,8 +268494,8 @@ self: {
({ mkDerivation, base, containers, logict, mtl }:
mkDerivation {
pname = "unification-fd";
- version = "0.10.0.1";
- sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
+ version = "0.11.1";
+ sha256 = "0xvc3xa0yhxjxd1nf6d1cnixlbjaz2ww08hg1vldsf6c1h4lvs05";
libraryHaskellDepends = [ base containers logict mtl ];
description = "Simple generic unification algorithms";
license = lib.licenses.bsd3;
@@ -268686,6 +268809,8 @@ self: {
];
description = "Usage examples for the uniqueness-periods-vector series of packages";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"uniqueness-periods-vector-filters" = callPackage
@@ -268731,6 +268856,8 @@ self: {
];
description = "Metrices for the maximum element for the uniqueness-periods-vector packages family";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"uniqueness-periods-vector-stats" = callPackage
@@ -269007,6 +269134,8 @@ self: {
pname = "universe-instances-extended";
version = "1.1.2";
sha256 = "1yg3cacr56kk0r8vnqxa9cm1awb727qkysnhc7rn4h9pfb10a7sn";
+ revision = "1";
+ editedCabalFile = "017adjf6wbw56a81l69vd0gzhlvi6n1wplh85smq7l9m98wsh4wy";
libraryHaskellDepends = [
adjunctions base comonad containers universe-base
];
@@ -269236,6 +269365,25 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "unix-recursive" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, dir-traverse, hspec
+ , unix
+ }:
+ mkDerivation {
+ pname = "unix-recursive";
+ version = "0.1.0.0";
+ sha256 = "151ap7b3nzlaz2pfl144z4azfvxdw6l8zrn500nzl58hqr9n7awl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring unix ];
+ testHaskellDepends = [ base bytestring hspec unix ];
+ benchmarkHaskellDepends = [ base criterion dir-traverse ];
+ description = "Fast and flexible primitives for recursive file system IO on Posix systems";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"unix-simple" = callPackage
({ mkDerivation, base, bytestring, zenhack-prelude }:
mkDerivation {
@@ -269387,6 +269535,8 @@ self: {
];
description = "Fast and robust message queues for concurrent processes";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"unliftio-path" = callPackage
@@ -271213,33 +271363,6 @@ self: {
}) {};
"uuid" = callPackage
- ({ mkDerivation, base, binary, bytestring, criterion
- , cryptohash-md5, cryptohash-sha1, entropy, HUnit
- , mersenne-random-pure64, network-info, QuickCheck, random, tasty
- , tasty-hunit, tasty-quickcheck, text, time, uuid-types
- }:
- mkDerivation {
- pname = "uuid";
- version = "1.3.13";
- sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
- revision = "6";
- editedCabalFile = "06w8i9hi9ha84nmj6fcj44apzv61m3ryc0a1yxxqq5n8vznk2iya";
- libraryHaskellDepends = [
- base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
- network-info random text time uuid-types
- ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck random tasty tasty-hunit
- tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base criterion mersenne-random-pure64 random
- ];
- description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
- license = lib.licenses.bsd3;
- }) {};
-
- "uuid_1_3_14" = callPackage
({ mkDerivation, base, binary, bytestring, cryptohash-md5
, cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty
, tasty-hunit, tasty-quickcheck, text, time, uuid-types
@@ -271258,7 +271381,6 @@ self: {
];
description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"uuid-aeson" = callPackage
@@ -271356,30 +271478,6 @@ self: {
}) {};
"uuid-types" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit
- , tasty-quickcheck, text
- }:
- mkDerivation {
- pname = "uuid-types";
- version = "1.0.3";
- sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj";
- revision = "4";
- editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn";
- libraryHaskellDepends = [
- base binary bytestring deepseq hashable random text
- ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq random
- ];
- description = "Type definitions for Universally Unique Identifiers";
- license = lib.licenses.bsd3;
- }) {};
-
- "uuid-types_1_0_4" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder
, hashable, QuickCheck, random, tasty, tasty-hunit
, tasty-quickcheck, text
@@ -271397,7 +271495,6 @@ self: {
];
description = "Type definitions for Universally Unique Identifiers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"uulib" = callPackage
@@ -271417,8 +271514,8 @@ self: {
}:
mkDerivation {
pname = "uusi";
- version = "0.3.1.0";
- sha256 = "14n2n62lcaxfljxxdk6pw14liksfa77jj8zby5magdnsx2jzkb5i";
+ version = "0.4.0.0";
+ sha256 = "03spazp0lpd2impvg9i6fdd32v3fzycgqr95ry2jwvaxijqhfic9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal microlens microlens-th text ];
@@ -271428,7 +271525,7 @@ self: {
testHaskellDepends = [
base Cabal HUnit microlens microlens-th text
];
- description = "Tweak dependencies in .cabal files";
+ description = "Tweak .cabal files";
license = lib.licenses.mit;
}) {};
@@ -271765,6 +271862,23 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "validation_1_1_1" = callPackage
+ ({ mkDerivation, assoc, base, bifunctors, deepseq, hedgehog, HUnit
+ , lens, semigroupoids, semigroups
+ }:
+ mkDerivation {
+ pname = "validation";
+ version = "1.1.1";
+ sha256 = "1dv7azpljdcf7irbnznnz31hq611bn1aj2m6ywghz3hgv835qqak";
+ libraryHaskellDepends = [
+ assoc base bifunctors deepseq lens semigroupoids semigroups
+ ];
+ testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
+ description = "A data-type like Either but with an accumulating Applicative";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"validation-selective" = callPackage
({ mkDerivation, base, deepseq, doctest, hedgehog, hspec
, hspec-hedgehog, selective, text
@@ -272154,21 +272268,6 @@ self: {
}) {};
"vault" = callPackage
- ({ mkDerivation, base, containers, hashable, semigroups
- , unordered-containers
- }:
- mkDerivation {
- pname = "vault";
- version = "0.3.1.4";
- sha256 = "0na31n56p6713az0vfhdrv53n03bb3yrnyszf3vxsjlgvrax472v";
- libraryHaskellDepends = [
- base containers hashable semigroups unordered-containers
- ];
- description = "a persistent store for values of arbitrary types";
- license = lib.licenses.bsd3;
- }) {};
-
- "vault_0_3_1_5" = callPackage
({ mkDerivation, base, containers, hashable, unordered-containers
}:
mkDerivation {
@@ -272180,7 +272279,6 @@ self: {
];
description = "a persistent store for values of arbitrary types";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"vault-tool" = callPackage
@@ -272432,18 +272530,17 @@ self: {
"vec" = callPackage
({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
- , distributive, fin, hashable, inspection-testing, QuickCheck
- , semigroupoids, tagged, transformers, vector
+ , distributive, fin, hashable, indexed-traversable
+ , inspection-testing, QuickCheck, semigroupoids, tagged
+ , transformers, vector
}:
mkDerivation {
pname = "vec";
- version = "0.3";
- sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr";
- revision = "2";
- editedCabalFile = "0v9m2x1p1395dqf0g2agfgmlx6w1dak2fr50hh6aahjk4y0jp30j";
+ version = "0.4";
+ sha256 = "0z7icj5g59ml8cmcawa6ncayrzdi63s9ssllvnw2dfcd3ys5cjj0";
libraryHaskellDepends = [
- adjunctions base deepseq distributive fin hashable QuickCheck
- semigroupoids transformers
+ adjunctions base deepseq distributive fin hashable
+ indexed-traversable QuickCheck semigroupoids transformers
];
testHaskellDepends = [
base base-compat fin inspection-testing tagged
@@ -272457,10 +272554,8 @@ self: {
({ mkDerivation, base, fin, lens, vec }:
mkDerivation {
pname = "vec-lens";
- version = "0.3";
- sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q";
- revision = "1";
- editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph";
+ version = "0.4";
+ sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h";
libraryHaskellDepends = [ base fin lens vec ];
description = "Vec: length-indexed (sized) list: lens support";
license = lib.licenses.bsd3;
@@ -272470,10 +272565,8 @@ self: {
({ mkDerivation, base, fin, optics-core, vec }:
mkDerivation {
pname = "vec-optics";
- version = "0.3";
- sha256 = "13g0j9hn27jfjlrm7c6bdsb2lhwrg016cal7hdic8azdxgdp8n0a";
- revision = "1";
- editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0";
+ version = "0.4";
+ sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg";
libraryHaskellDepends = [ base fin optics-core vec ];
description = "Vec: length-indexed (sized) list: optics support";
license = lib.licenses.bsd3;
@@ -272675,6 +272768,8 @@ self: {
testHaskellDepends = [ base doctest hedgehog hedgehog-classes ];
description = "circular vectors";
license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"vector-clock" = callPackage
@@ -273051,10 +273146,8 @@ self: {
({ mkDerivation, base, data-default, template-haskell, vector }:
mkDerivation {
pname = "vector-th-unbox";
- version = "0.2.1.7";
- sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi";
- revision = "1";
- editedCabalFile = "11qhhir9cdy3x7pd0z0xk8vi4nzr9fn9q3ggwbhhc43jglngw1x7";
+ version = "0.2.1.9";
+ sha256 = "0jbzm31d91kxn8m0h6iplj54h756q6f4zzdrnb2w7rzz5zskgqyl";
libraryHaskellDepends = [ base template-haskell vector ];
testHaskellDepends = [ base data-default vector ];
description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -273212,8 +273305,8 @@ self: {
}:
mkDerivation {
pname = "verifiable-expressions";
- version = "0.6.0";
- sha256 = "1drb5zkpm5zn765fkp2p7jq69q50f9577rz9bs76cp0gvccan8my";
+ version = "0.6.1";
+ sha256 = "0s3615m849xj0df6ia18kg4i54z87x3c6yxgv594dwf9mf9dw4x8";
libraryHaskellDepends = [
base containers lens mtl sbv transformers union vinyl
];
@@ -273342,8 +273435,8 @@ self: {
}:
mkDerivation {
pname = "versions";
- version = "4.0.2";
- sha256 = "1m7nyjqd0cyxnli5f7rbk1wrh6h7dk65i67k6xp787npf7hi6gdf";
+ version = "4.0.3";
+ sha256 = "0rp62aih4blpahymqlkrfzywdqb1mkhy6f021vp74ljknpch4scf";
libraryHaskellDepends = [
base deepseq hashable megaparsec parser-combinators text
];
@@ -274120,6 +274213,8 @@ self: {
libraryHaskellDepends = [ base random vector vector-fftw ];
description = "Phase vocoder";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"vocoder-audio" = callPackage
@@ -274138,6 +274233,8 @@ self: {
];
description = "Phase vocoder for conduit-audio";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"vocoder-conduit" = callPackage
@@ -274159,6 +274256,8 @@ self: {
];
description = "Phase vocoder for Conduit";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"vocoder-dunai" = callPackage
@@ -274180,6 +274279,8 @@ self: {
];
description = "Phase vocoder for Dunai and Rhine";
license = lib.licenses.bsd2;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"voicebase" = callPackage
@@ -274366,8 +274467,10 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.32";
- sha256 = "0ydbifik7xilb33phglpjkgf6r8vifipyyq0wb6111azzj7dmszs";
+ version = "5.33";
+ sha256 = "0qsx4lwlkp6mwyr7rm1r9dg5ic1lc1awqgyag0nj1qgj2gnv6nc9";
+ revision = "1";
+ editedCabalFile = "1in66nd2xkb6mxxzazny900pz1xj83iqsql42c0rwk72chnnb8cd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -274497,8 +274600,8 @@ self: {
}:
mkDerivation {
pname = "vulkan-utils";
- version = "0.4.2";
- sha256 = "0mf1jf5xv31818c7rarvz0aqc1qxgh7fqfp893pryhwwcr8r2qqa";
+ version = "0.5.0";
+ sha256 = "11pcxa7pjhdrfcxl058dn909ar6sv9kn34g73w8jqa60d2savj6q";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring containers dependent-map dependent-sum extra
@@ -276170,18 +276273,17 @@ self: {
"wai-secure-cookies" = callPackage
({ mkDerivation, base, bytestring, cryptonite, hspec
- , hspec-expectations, hspec-wai, http-types, memory, protolude
- , random, split, wai, wai-extra
+ , hspec-expectations, hspec-wai, http-types, memory, random, split
+ , wai, wai-extra
}:
mkDerivation {
pname = "wai-secure-cookies";
- version = "0.1.0.5";
- sha256 = "0v3gz70z968yk563g9n72v8l7mhqhkbjb9gy15s5zpf3apv1cf00";
+ version = "0.1.0.6";
+ sha256 = "02y2vw3mw3k6il7x6dfcs1fhzzbaslxk374nj4yqwzr6ax4nvrgb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring cryptonite http-types memory protolude random split
- wai
+ base bytestring cryptonite http-types memory random split wai
];
executableHaskellDepends = [ base bytestring cryptonite memory ];
testHaskellDepends = [
@@ -278842,8 +278944,8 @@ self: {
pname = "windns";
version = "0.1.0.1";
sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";
- revision = "1";
- editedCabalFile = "17d44pzi4q5yvrygimdrwdrabz62s1ylw918w28sxgcvj64ir22g";
+ revision = "2";
+ editedCabalFile = "129amxjf05b6vi9ln8ijxry062av8bmv3wnng0jis71fyw8ldr0p";
libraryHaskellDepends = [ base bytestring deepseq ];
librarySystemDepends = [ dnsapi ];
description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library";
@@ -279057,30 +279159,6 @@ self: {
}) {};
"with-utf8" = callPackage
- ({ mkDerivation, base, deepseq, directory, filepath, hedgehog
- , HUnit, process, safe-exceptions, tasty, tasty-discover
- , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix
- }:
- mkDerivation {
- pname = "with-utf8";
- version = "1.0.2.1";
- sha256 = "13zifhmhpdfwifw9bwyn9w5a29iph7h59jx13r0wiw5ry0g7qbif";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base safe-exceptions text ];
- executableHaskellDepends = [
- base directory filepath process safe-exceptions text th-env
- ];
- testHaskellDepends = [
- base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog
- tasty-hunit temporary text unix
- ];
- testToolDepends = [ tasty-discover ];
- description = "Get your IO right on the first try";
- license = lib.licenses.mpl20;
- }) {};
-
- "with-utf8_1_0_2_2" = callPackage
({ mkDerivation, base, deepseq, directory, filepath, hedgehog
, HUnit, process, safe-exceptions, tasty, tasty-discover
, tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix
@@ -279102,7 +279180,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Get your IO right on the first try";
license = lib.licenses.mpl20;
- hydraPlatforms = lib.platforms.none;
}) {};
"withdependencies" = callPackage
@@ -281738,8 +281815,8 @@ self: {
}:
mkDerivation {
pname = "xlsx";
- version = "0.8.2";
- sha256 = "0kjfnp24nc97qqla1z65wzy59cch336pjncz1kdfakmgv27mv38a";
+ version = "0.8.3";
+ sha256 = "11g6bfir21wgafnkzzx26r6mz8m39isaz2yqw92k5ymdb1qhs95q";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary-search bytestring conduit
containers data-default deepseq errors extra filepath lens mtl
@@ -281754,8 +281831,6 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Simple and incomplete Excel file parser/writer";
license = lib.licenses.mit;
- hydraPlatforms = lib.platforms.none;
- broken = true;
}) {};
"xlsx-tabular" = callPackage
@@ -281845,14 +281920,15 @@ self: {
"xml-conduit" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
- , bytestring, conduit, conduit-extra, containers
- , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
- , text, transformers, xml-types
+ , bytestring, Cabal, cabal-doctest, conduit, conduit-extra
+ , containers, data-default-class, deepseq, doctest, hspec, HUnit
+ , resourcet, text, transformers, xml-types
}:
mkDerivation {
pname = "xml-conduit";
- version = "1.9.0.0";
- sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w";
+ version = "1.9.1.0";
+ sha256 = "0ag0g9x5qnw1nfgc31h6bj2qv0h1c2y7n1l0g99l4dkn428dk9ca";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec base blaze-html blaze-markup bytestring conduit
conduit-extra containers data-default-class deepseq resourcet text
@@ -281911,6 +281987,27 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
+ "xml-conduit-selectors" = callPackage
+ ({ mkDerivation, base, containers, data-default, megaparsec, tasty
+ , tasty-hunit, tasty-quickcheck, text, xml-conduit
+ }:
+ mkDerivation {
+ pname = "xml-conduit-selectors";
+ version = "0.2.0.0";
+ sha256 = "1h1gfnsrypy9w559rgbgabidzpaw580xy0m6l12bbcjc92kr3mf0";
+ libraryHaskellDepends = [
+ base containers megaparsec text xml-conduit
+ ];
+ testHaskellDepends = [
+ base containers data-default tasty tasty-hunit tasty-quickcheck
+ text xml-conduit
+ ];
+ description = "jQuery-style CSS selectors for xml-conduit";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"xml-conduit-stylist" = callPackage
({ mkDerivation, base, containers, css-syntax, network-uri, stylist
, text, unordered-containers, xml-conduit
@@ -283459,6 +283556,25 @@ self: {
broken = true;
}) {};
+ "yahoo-prices" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, hspec, lens, QuickCheck
+ , time, vector, wreq
+ }:
+ mkDerivation {
+ pname = "yahoo-prices";
+ version = "0.1.0.2";
+ sha256 = "1zyrj6rq75blzh1v9ja2bbyfaf3c2a6648lcmflmxmd45350ah9f";
+ libraryHaskellDepends = [
+ base bytestring cassava lens time vector wreq
+ ];
+ testHaskellDepends = [ base bytestring hspec QuickCheck time ];
+ doHaddock = false;
+ description = "A wrapper around Yahoo API for downloading market data";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
+ }) {};
+
"yahoo-web-search" = callPackage
({ mkDerivation, base, HTTP, network, xml }:
mkDerivation {
@@ -284363,6 +284479,8 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Yet another string interpolator";
license = lib.licenses.cc0;
+ hydraPlatforms = lib.platforms.none;
+ broken = true;
}) {};
"yate" = callPackage
@@ -285078,8 +285196,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-lti13";
- version = "0.2.0.0";
- sha256 = "0g48g1ajzwp7k7q3vi1z4nvmmvcfiyziizfydnd3i26xf7nvzqnx";
+ version = "0.2.0.1";
+ sha256 = "1ylwg85q6j04rmq0lclyiv7by3dgwmpya5hv1dqhaw62nlfh05r6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -285152,7 +285270,7 @@ self: {
broken = true;
}) {};
- "yesod-auth-oauth2_0_6_2_2" = callPackage
+ "yesod-auth-oauth2_0_6_2_3" = callPackage
({ mkDerivation, aeson, base, bytestring, cryptonite, errors
, hoauth2, hspec, http-client, http-conduit, http-types, memory
, microlens, safe-exceptions, text, uri-bytestring, yesod-auth
@@ -285160,8 +285278,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.6.2.2";
- sha256 = "176iz5mg9jhrp8kp61f12j1jw3icnqp10dxln7046p1nqam0nv3d";
+ version = "0.6.2.3";
+ sha256 = "1vf4cfbqg4zx3rdihj1iajk6kmj9c8xk4s4n2n40yvz2rmbjy0yb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -285945,8 +286063,8 @@ self: {
}:
mkDerivation {
pname = "yesod-markdown";
- version = "0.12.6.3";
- sha256 = "1q2zbb49248ppda5k5lxqnq8s5yf1mym05jwna59m0kfxp63xbj5";
+ version = "0.12.6.5";
+ sha256 = "1bs0npryigf7k8gj48i8r8snylc49qdca96610msi6df843c6s6g";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare text xss-sanitize yesod-core yesod-form
@@ -286001,8 +286119,8 @@ self: {
}:
mkDerivation {
pname = "yesod-page-cursor";
- version = "2.0.0.3";
- sha256 = "1qj3qsrzjh0w0hc9ngbxd82pkwb8jylhf0nihhnk4dvrdqm2yvyb";
+ version = "2.0.0.4";
+ sha256 = "1zckyjg3k8xi6lx1xgyh50d6v7hydv12c1j36w48xy296nsjwvv9";
libraryHaskellDepends = [
aeson base bytestring containers http-link-header network-uri text
unliftio yesod-core
@@ -288536,8 +288654,8 @@ self: {
pname = "zinza";
version = "0.2";
sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8";
- revision = "1";
- editedCabalFile = "0pgrfx4vnc3m6rlmg5qj4skarq5y0ijz3swf3fyy57310lvifr0q";
+ revision = "2";
+ editedCabalFile = "17q1as97cazj2nkwdi31kkgaa3wrxpc8phdj6f9wr4jibbm3jyp6";
libraryHaskellDepends = [
base containers parsec text transformers
];
@@ -288660,8 +288778,8 @@ self: {
}:
mkDerivation {
pname = "zip-stream";
- version = "0.2.0.1";
- sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p";
+ version = "0.2.1.0";
+ sha256 = "0fx8kj0ijm3555grhdns7agmi084584fh1v0mvkm4x696h1zzvli";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -288735,26 +288853,6 @@ self: {
}) {};
"zippers" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest
- , fail, lens, profunctors, semigroupoids, semigroups
- }:
- mkDerivation {
- pname = "zippers";
- version = "0.3";
- sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm";
- revision = "2";
- editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
- libraryHaskellDepends = [
- base fail lens profunctors semigroupoids semigroups
- ];
- testHaskellDepends = [ base doctest ];
- benchmarkHaskellDepends = [ base criterion lens ];
- description = "Traversal based zippers";
- license = lib.licenses.bsd3;
- }) {};
-
- "zippers_0_3_1" = callPackage
({ mkDerivation, base, criterion, fail, indexed-traversable, lens
, profunctors, semigroupoids, semigroups
}:
@@ -288769,7 +288867,6 @@ self: {
benchmarkHaskellDepends = [ base criterion lens ];
description = "Traversal based zippers";
license = lib.licenses.bsd3;
- hydraPlatforms = lib.platforms.none;
}) {};
"zippo" = callPackage
@@ -288835,8 +288932,8 @@ self: {
}:
mkDerivation {
pname = "zlib";
- version = "0.6.2.2";
- sha256 = "1fii0qfc60lfp93vwb78p2fv3jjyklgdhw4ms262z6cysq6qkd84";
+ version = "0.6.2.3";
+ sha256 = "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ zlib ];
testHaskellDepends = [
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
index 96c884ab60..92531eacd2 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
make install PREFIX="$out"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix
index d38fb8279f..64fd89008e 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clips/default.nix
@@ -1,18 +1,28 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
- version = "6.30";
+stdenv.mkDerivation rec {
+ version = "6.31";
pname = "clips";
+
src = fetchurl {
- url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
- sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
+ url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
+ builtins.replaceStrings [ "." ] [ "" ] version
+ }.tar.gz";
+ sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";
};
- buildPhase = ''
- make -C core -f ../makefiles/makefile.gcc
+
+ postPatch = ''
+ substituteInPlace core/makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
+
+ makeFlags = [ "-C" "core" ];
+
installPhase = ''
+ runHook preInstall
install -D -t $out/bin core/clips
+ runHook postInstall
'';
+
meta = with lib; {
description = "A Tool for Building Expert Systems";
homepage = "http://www.clipsrules.net/";
@@ -23,7 +33,7 @@ stdenv.mkDerivation {
easier to implement and maintain than an algorithmic solution.
'';
license = licenses.publicDomain;
- maintainers = [maintainers.league];
- platforms = platforms.linux;
+ maintainers = [ maintainers.league ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
index 774e83311b..43b8fb4c6c 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix
@@ -17,36 +17,71 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ graalvm11-ce glibcLocales ];
+ LC_ALL = "en_US.UTF-8";
+ BABASHKA_JAR = src;
+ BABASHKA_BINARY = "bb";
+ BABASHKA_XMX = "-J-Xmx4500m";
+
buildPhase = ''
- native-image \
- -jar ${src} \
- -H:Name=bb \
- ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \
- -H:+ReportExceptionStackTraces \
- -J-Dclojure.spec.skip-macros=true \
- -J-Dclojure.compiler.direct-linking=true \
- "-H:IncludeResources=BABASHKA_VERSION" \
- "-H:IncludeResources=SCI_VERSION" \
- -H:ReflectionConfigurationFiles=${reflectionJson} \
- --initialize-at-build-time \
- -H:Log=registerResource: \
- -H:EnableURLProtocols=http,https \
- --enable-all-security-services \
- -H:+JNI \
- --verbose \
- --no-fallback \
- --no-server \
- --report-unsupported-elements-at-runtime \
- "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \
- "-J-Xmx4500m"
+ runHook preBuild
+
+ # https://github.com/babashka/babashka/blob/77daea7362d8e2562c89c315b1fbcefde6fa56a5/script/compile
+ args=("-jar" "$BABASHKA_JAR"
+ "-H:Name=$BABASHKA_BINARY"
+ "${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''}"
+ "-H:+ReportExceptionStackTraces"
+ "-J-Dclojure.spec.skip-macros=true"
+ "-J-Dclojure.compiler.direct-linking=true"
+ "-H:IncludeResources=BABASHKA_VERSION"
+ "-H:IncludeResources=SCI_VERSION"
+ "-H:ReflectionConfigurationFiles=${reflectionJson}"
+ "--initialize-at-build-time"
+ # "-H:+PrintAnalysisCallTree"
+ # "-H:+DashboardAll"
+ # "-H:DashboardDump=reports/dump"
+ # "-H:+DashboardPretty"
+ # "-H:+DashboardJson"
+ "-H:Log=registerResource:"
+ "-H:EnableURLProtocols=http,https,jar"
+ "--enable-all-security-services"
+ "-H:+JNI"
+ "--verbose"
+ "--no-fallback"
+ "--no-server"
+ "--report-unsupported-elements-at-runtime"
+ "--initialize-at-run-time=org.postgresql.sspi.SSPIClient"
+ "--native-image-info"
+ "--verbose"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileReader"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.MixerProvider"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.FormatConversionProvider"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileWriter"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiDeviceProvider"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.SoundbankReader"
+ "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileWriter"
+ "$BABASHKA_XMX")
+
+ native-image ''${args[@]}
+
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/bin
cp bb $out/bin/bb
+
+ runHook postInstall
+ '';
+
+ installCheckPhase = ''
+ $out/bin/bb --version | grep '${version}'
+ $out/bin/bb '(+ 1 2)' | grep '3'
+ $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
index 57da5e862e..baf83c6477 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
phases = "installPhase";
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
index aaf368017f..0e4beaa850 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -20,7 +20,8 @@ in
inherit src version;
- buildInputs = [ erlang makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ erlang ];
LANG = "C.UTF-8";
LC_TYPE = "C.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
index fdd034fc60..e1145090c8 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
@@ -1,10 +1,6 @@
{ mkDerivation }:
mkDerivation {
- version = "21.3.8.3";
- sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
-
- prePatch = ''
- substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
- '';
+ version = "21.3.8.21";
+ sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4=";
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R22.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R22.nix
index 7596ad9e2f..8bfe111f06 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R22.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R22.nix
@@ -3,11 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "22.3";
- sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27";
-
- prePatch = ''
- substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
- substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
- '';
+ version = "22.3.4.16";
+ sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck=";
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix
index 53d1b49c37..8c07c09f22 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R23.nix
@@ -3,11 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "23.1.4";
- sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z";
-
- prePatch = ''
- substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
- substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
- '';
+ version = "23.2.6";
+ sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU=";
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
index 110a93a3ba..325d8e87e4 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -57,20 +57,13 @@ in stdenv.mkDerivation ({
++ optionals odbcSupport odbcPackages
++ optionals javacSupport javacPackages
++ optional withSystemd systemd
- ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]);
+ ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]);
debugInfo = enableDebugInfo;
# On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step
enableParallelBuilding = parallelBuild;
- # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
- prePatch = ''
- substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
-
- ${prePatch}
- '';
-
postPatch = ''
patchShebangs make
@@ -132,6 +125,7 @@ in stdenv.mkDerivation ({
// optionalAttrs (preUnpack != "") { inherit preUnpack; }
// optionalAttrs (postUnpack != "") { inherit postUnpack; }
// optionalAttrs (patches != []) { inherit patches; }
+// optionalAttrs (prePatch != "") { inherit prePatch; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (configurePhase != "") { inherit configurePhase; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; }
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
index 0e3a0a46af..114bc13f5d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/groovy/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr";
};
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/io/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/io/default.nix
index d0a3b20e50..48462a333b 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/io/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/io/default.nix
@@ -1,18 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
}:
stdenv.mkDerivation {
- name = "io-2015.11.11";
+ pname = "io";
+ version = "2017.09.06";
src = fetchFromGitHub {
owner = "stevedekorte";
repo = "io";
- rev = "1fc725e0a8635e2679cbb20521f4334c25273caa";
- sha256 = "0ll2kd72zy8vf29sy0nnx3awk7nywpwpv21rvninjjaqkygrc0qw";
+ rev = "b8a18fc199758ed09cd2f199a9bc821f6821072a";
+ sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
};
+ patches = [
+ (fetchpatch {
+ name = "check-for-sysctl-h.patch";
+ url = "https://github.com/IoLanguage/io/pull/446/commits/9f3e4d87b6d4c1bf583134d55d1cf92d3464c49f.patch";
+ sha256 = "9f06073ac17f26c2ef6298143bdd1babe7783c228f9667622aa6c91bb7ec7fa0";
+ })
+ ];
+
nativeBuildInputs = [
cmake
];
@@ -32,6 +41,17 @@ stdenv.mkDerivation {
sed -ie \
"s/add_subdirectory(addons)/#add_subdirectory(addons)/g" \
CMakeLists.txt
+ # Bind Libs STATIC to avoid a segfault when relinking
+ sed -i 's/basekit SHARED/basekit STATIC/' libs/basekit/CMakeLists.txt
+ sed -i 's/garbagecollector SHARED/garbagecollector STATIC/' libs/garbagecollector/CMakeLists.txt
+ sed -i 's/coroutine SHARED/coroutine STATIC/' libs/coroutine/CMakeLists.txt
+ '';
+
+ doInstallCheck = true;
+
+ installCheckPhase = ''
+ $out/bin/io
+ $out/bin/io_static
'';
# for gcc5; c11 inline semantics breaks the build
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
index 8cce2b66cb..0ab90c1e06 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "1.15.2";
+ version = "1.15.3";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xIvcHMDBPdmNSp0/aaVDXxCmCpQOtSFG99lyHAWmbY0=";
+ sha256 = "sha256-GWSPNz4IxEYxSRpDPbgCXmc7WYZNi8IGVqNhSEgUaeg=";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
index f792471c06..7fe50a124e 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix
@@ -6,14 +6,14 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
- version = "9.2.14.0";
+ version = "9.2.16.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj";
+ sha256 = "sha256-WuJ/FJ9z8/6k80NZy7dzwl2dmH5yte3snouTlXmX6zA=";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -pv $out/docs
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix
index 61cc8f9cd0..38b599d339 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/jython/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
deleted file mode 100644
index d4e68b5cb7..0000000000
--- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/filesystem.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, lua5 }:
-
-stdenv.mkDerivation {
- version = "1.6.2";
- pname = "lua-filesystem";
- isLibrary = true;
- src = fetchurl {
- url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
- sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
- };
-
- buildInputs = [ lua5 ];
-
- preBuild = ''
- makeFlagsArray=(
- PREFIX=$out
- LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}"
- LUA_INC="-I${lua5}/include");
- '';
-
- meta = {
- homepage = "https://github.com/keplerproject/luafilesystem";
- hydraPlatforms = lib.platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
deleted file mode 100644
index d16f068883..0000000000
--- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/sockets.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, lua5 }:
-
-stdenv.mkDerivation rec {
- pname = "lua-sockets";
- version = "2.0.2";
- src = fetchurl {
- url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
- sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
- };
-
- luaver = lua5.luaversion;
- patchPhase = ''
- sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
- -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
- -i config
- '';
-
- buildInputs = [ lua5 ];
-
- meta = {
- homepage = "http://w3.impa.br/~diego/software/luasocket/";
- hydraPlatforms = lib.platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix
new file mode 100644
index 0000000000..fee53b716d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-env.nix
@@ -0,0 +1,83 @@
+{ lib, stdenv, octave, buildEnv
+, makeWrapper, texinfo
+, octavePackages
+, wrapOctave
+, computeRequiredOctavePackages
+, extraLibs ? []
+, extraOutputsToInstall ? []
+, postBuild ? ""
+, ignoreCollisions ? false
+}:
+
+# Create an octave executable that knows about additional packages
+let
+ packages = computeRequiredOctavePackages extraLibs;
+
+in buildEnv {
+ name = "${octave.name}-env";
+ paths = extraLibs ++ [ octave ];
+
+ inherit ignoreCollisions;
+ extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
+
+ buildInputs = [ makeWrapper texinfo wrapOctave ];
+
+ # During "build" we must first unlink the /share symlink to octave's /share
+ # Then, we can re-symlink the all of octave/share, except for /share/octave
+ # in env/share/octave, re-symlink everything from octave/share/octave and then
+ # perform the pkg install.
+ postBuild = ''
+ . "${makeWrapper}/nix-support/setup-hook"
+ # The `makeWrapper` used here is the one defined in
+ # ${makeWrapper}/nix-support/setup-hook
+
+ if [ -L "$out/bin" ]; then
+ unlink $out/bin
+ mkdir -p "$out/bin"
+ cd "${octave}/bin"
+ for prg in *; do
+ if [ -x $prg ]; then
+ makeWrapper "${octave}/bin/$prg" "$out/bin/$prg" --set OCTAVE_SITE_INITFILE "$out/share/octave/site/m/startup/octaverc"
+ fi
+ done
+ cd $out
+ fi
+
+ # Remove symlinks to the input tarballs, they aren't needed.
+ rm $out/*.tar.gz
+
+ createOctavePackagesPath $out ${octave}
+
+ for path in ${lib.concatStringsSep " " packages}; do
+ if [ -e $path/*.tar.gz ]; then
+ $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \
+ pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \
+ pfx = pkg (\"prefix\"); \
+ pkg install -nodeps -local $path/*.tar.gz"
+ fi
+ done
+
+ # Re-write the octave-wide startup file (share/octave/site/m/startup/octaverc)
+ # To point to the new local_list in $out
+ addPkgLocalList $out ${octave}
+
+ wrapOctavePrograms "${lib.concatStringsSep " " packages}"
+ '' + postBuild;
+
+ inherit (octave) meta;
+
+ passthru = octave.passthru // {
+ interpreter = "$out/bin/octave";
+ inherit octave;
+ env = stdenv.mkDerivation {
+ name = "interactive-${octave.name}-environment";
+
+ buildCommand = ''
+ echo >&2 ""
+ echo >&2 "*** octave 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+ echo >&2 ""
+ exit 1
+ '';
+ };
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/build-octave-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-octave-package.nix
new file mode 100644
index 0000000000..73a67769d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/build-octave-package.nix
@@ -0,0 +1,113 @@
+# Generic builder for GNU Octave libraries.
+# This is a file that contains nested functions. The first, outer, function
+# is the library- and package-wide details, such as the nixpkgs library, any
+# additional configuration provided, and the namePrefix to use (based on the
+# pname and version of Octave), the octave package, etc.
+
+{ lib
+, stdenv
+, config
+, octave
+, texinfo
+, computeRequiredOctavePackages
+, writeRequiredOctavePackagesHook
+}:
+
+# The inner function contains information required to build the individual
+# libraries.
+{ fullLibName ? "${attrs.pname}-${attrs.version}"
+
+, src
+
+, dontPatch ? false
+, patches ? []
+, patchPhase ? ""
+
+, enableParallelBuilding ? true
+# Build-time dependencies for the package, which were compiled for the system compiling this.
+, nativeBuildInputs ? []
+
+# Build-time dependencies for the package, which may not have been compiled for the system compiling this.
+, buildInputs ? []
+
+# Propagate build dependencies so in case we have A -> B -> C,
+# C can import package A propagated by B
+# Run-time dependencies for the package.
+, propagatedBuildInputs ? []
+
+# Octave packages that are required at runtime for this one.
+# These behave similarly to propagatedBuildInputs, where if
+# package A is needed by B, and C needs B, then C also requires A.
+# The main difference between these and propagatedBuildInputs is
+# during the package's installation into octave, where all
+# requiredOctavePackages are ALSO installed into octave.
+, requiredOctavePackages ? []
+
+, preBuild ? ""
+
+, meta ? {}
+
+, passthru ? {}
+
+, ... } @ attrs:
+
+let
+ requiredOctavePackages' = computeRequiredOctavePackages requiredOctavePackages;
+
+in stdenv.mkDerivation {
+ packageName = "${fullLibName}";
+ # The name of the octave package ends up being
+ # "octave-version-package-version"
+ name = "${octave.pname}-${octave.version}-${fullLibName}";
+
+ # This states that any package built with the function that this returns
+ # will be an octave package. This is used for ensuring other octave
+ # packages are installed into octave during the environment building phase.
+ isOctavePackage = true;
+
+ OCTAVE_HISTFILE = "/dev/null";
+
+ inherit src;
+
+ inherit dontPatch patches patchPhase;
+
+ dontConfigure = true;
+
+ enableParallelBuilding = enableParallelBuilding;
+
+ requiredOctavePackages = requiredOctavePackages';
+
+ nativeBuildInputs = [
+ octave
+ writeRequiredOctavePackagesHook
+ ]
+ ++ nativeBuildInputs;
+
+ buildInputs = buildInputs ++ requiredOctavePackages';
+
+ propagatedBuildInputs = propagatedBuildInputs ++ [ texinfo ];
+
+ preBuild = if preBuild == "" then
+ ''
+ # This trickery is needed because Octave expects a single directory inside
+ # at the top-most level of the tarball.
+ tar --transform 's,^,${fullLibName}/,' -cz * -f ${fullLibName}.tar.gz
+ ''
+ else
+ preBuild;
+
+ buildPhase = ''
+ runHook preBuild
+
+ mkdir -p $out
+ octave-cli --eval "pkg build $out ${fullLibName}.tar.gz"
+
+ runHook postBuild
+ '';
+
+ # We don't install here, because that's handled when we build the environment
+ # together with Octave.
+ dontInstall = true;
+
+ inherit meta;
+}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
index 72f3dd552d..0a87c1ddcf 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, pkgs
, lib
# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation
# with wrapQtAppsHook (comes from libsForQt5.callPackage)
@@ -45,6 +46,11 @@
, python ? null
, overridePlatforms ? null
, sundials ? null
+# - Packages required for building extra packages.
+, newScope
+, callPackage
+, makeSetupHook
+, makeWrapper
# - Build Octave Qt GUI:
, enableQt ? false
, qtbase ? null
@@ -60,6 +66,7 @@
}:
let
+
# Not always evaluated
blas' = if use64BitIdx then
blas.override {
@@ -94,118 +101,144 @@ let
else
null
;
-in mkDerivation rec {
- version = "6.2.0";
- pname = "octave";
- src = fetchurl {
- url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
- sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw=";
+ octavePackages = import ../../../top-level/octave-packages.nix {
+ inherit pkgs;
+ inherit lib stdenv fetchurl newScope;
+ octave = self;
};
- buildInputs = [
- readline
- ncurses
- perl
- flex
- qhull
- graphicsmagick
- pcre
- fltk
- zlib
- curl
- blas'
- lapack'
- libsndfile
- fftw
- fftwSinglePrec
- portaudio
- qrupdate'
- arpack'
- libwebp
- gl2ps
- ]
- ++ lib.optionals enableQt [
- qtbase
- qtsvg
- qscintilla
- ]
- ++ lib.optionals (ghostscript != null) [ ghostscript ]
- ++ lib.optionals (hdf5 != null) [ hdf5 ]
- ++ lib.optionals (glpk != null) [ glpk ]
- ++ lib.optionals (suitesparse != null) [ suitesparse' ]
- ++ lib.optionals (enableJava) [ jdk ]
- ++ lib.optionals (sundials != null) [ sundials ]
- ++ lib.optionals (gnuplot != null) [ gnuplot ]
- ++ lib.optionals (python != null) [ python ]
- ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
- ++ lib.optionals stdenv.isDarwin [
- libiconv
- darwin.apple_sdk.frameworks.Accelerate
- darwin.apple_sdk.frameworks.Cocoa
- ]
- ;
- nativeBuildInputs = [
- pkg-config
- gfortran
- # Listed here as well because it's outputs are split
- fftw
- fftwSinglePrec
- texinfo
- ]
- ++ lib.optionals (sundials != null) [ sundials ]
- ++ lib.optionals enableJIT [ llvm ]
- ++ lib.optionals enableQt [
- qtscript
- qttools
- ]
- ;
+ wrapOctave = callPackage ./wrap-octave.nix {
+ octave = self;
+ inherit (pkgs) makeSetupHook makeWrapper;
+ };
- doCheck = !stdenv.isDarwin;
+ self = mkDerivation rec {
+ version = "6.2.0";
+ pname = "octave";
- enableParallelBuilding = true;
+ src = fetchurl {
+ url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
+ sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw=";
+ };
- # See https://savannah.gnu.org/bugs/?50339
- F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
+ buildInputs = [
+ readline
+ ncurses
+ perl
+ flex
+ qhull
+ graphicsmagick
+ pcre
+ fltk
+ zlib
+ curl
+ blas'
+ lapack'
+ libsndfile
+ fftw
+ fftwSinglePrec
+ portaudio
+ qrupdate'
+ arpack'
+ libwebp
+ gl2ps
+ ]
+ ++ lib.optionals enableQt [
+ qtbase
+ qtsvg
+ qscintilla
+ ]
+ ++ lib.optionals (ghostscript != null) [ ghostscript ]
+ ++ lib.optionals (hdf5 != null) [ hdf5 ]
+ ++ lib.optionals (glpk != null) [ glpk ]
+ ++ lib.optionals (suitesparse != null) [ suitesparse' ]
+ ++ lib.optionals (enableJava) [ jdk ]
+ ++ lib.optionals (sundials != null) [ sundials ]
+ ++ lib.optionals (gnuplot != null) [ gnuplot ]
+ ++ lib.optionals (python != null) [ python ]
+ ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
+ ++ lib.optionals stdenv.isDarwin [
+ libiconv
+ darwin.apple_sdk.frameworks.Accelerate
+ darwin.apple_sdk.frameworks.Cocoa
+ ]
+ ;
+ nativeBuildInputs = [
+ pkg-config
+ gfortran
+ # Listed here as well because it's outputs are split
+ fftw
+ fftwSinglePrec
+ texinfo
+ ]
+ ++ lib.optionals (sundials != null) [ sundials ]
+ ++ lib.optionals enableJIT [ llvm ]
+ ++ lib.optionals enableQt [
+ qtscript
+ qttools
+ ]
+ ;
- configureFlags = [
- "--with-blas=blas"
- "--with-lapack=lapack"
- (if use64BitIdx then "--enable-64" else "--disable-64")
- ]
+ doCheck = !stdenv.isDarwin;
+
+ enableParallelBuilding = true;
+
+ # See https://savannah.gnu.org/bugs/?50339
+ F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
+
+ configureFlags = [
+ "--with-blas=blas"
+ "--with-lapack=lapack"
+ (if use64BitIdx then "--enable-64" else "--disable-64")
+ ]
++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
++ lib.optionals enableReadline [ "--enable-readline" ]
++ lib.optionals stdenv.isDarwin [ "--with-x=no" ]
++ lib.optionals enableQt [ "--with-qt=5" ]
++ lib.optionals enableJIT [ "--enable-jit" ]
- ;
+ ;
- # Keep a copy of the octave tests detailed results in the output
- # derivation, because someone may care
- postInstall = ''
- cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true
- '';
+ # Keep a copy of the octave tests detailed results in the output
+ # derivation, because someone may care
+ postInstall = ''
+ cp test/fntests.log $out/share/octave/${pname}-${version}-fntests.log || true
+ '';
- passthru = {
- sitePath = "share/octave/${version}/site";
- blas = blas';
- lapack = lapack';
- qrupdate = qrupdate';
- arpack = arpack';
- suitesparse = suitesparse';
- inherit python;
- inherit enableQt enableJIT enableReadline enableJava;
+ passthru = rec {
+ sitePath = "share/octave/${version}/site";
+ octPkgsPath = "share/octave/octave_packages";
+ blas = blas';
+ lapack = lapack';
+ qrupdate = qrupdate';
+ arpack = arpack';
+ suitesparse = suitesparse';
+ inherit fftw fftwSinglePrec;
+ inherit portaudio;
+ inherit jdk;
+ inherit python;
+ inherit enableQt enableJIT enableReadline enableJava;
+ buildEnv = callPackage ./build-env.nix {
+ octave = self;
+ inherit octavePackages wrapOctave;
+ inherit (octavePackages) computeRequiredOctavePackages;
+ };
+ withPackages = import ./with-packages.nix { inherit buildEnv octavePackages; };
+ pkgs = octavePackages;
+ interpreter = "${self}/bin/octave";
+ };
+
+ meta = {
+ homepage = "https://www.gnu.org/software/octave/";
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ raskin doronbehar ];
+ description = "Scientific Pragramming Language";
+ # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
+ broken = enableJIT;
+ platforms = if overridePlatforms == null then
+ (lib.platforms.linux ++ lib.platforms.darwin)
+ else overridePlatforms;
+ };
};
- meta = {
- homepage = "https://www.gnu.org/software/octave/";
- license = lib.licenses.gpl3Plus;
- maintainers = with lib.maintainers; [ raskin doronbehar ];
- description = "Scientific Pragramming Language";
- # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
- broken = enableJIT;
- platforms = if overridePlatforms == null then
- (lib.platforms.linux ++ lib.platforms.darwin)
- else overridePlatforms;
- };
-}
+in self
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/default.nix
new file mode 100644
index 0000000000..f47560921a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/default.nix
@@ -0,0 +1,13 @@
+# Hooks for building Octave packages.
+{ octave
+, lib
+, callPackage
+, makeSetupHook
+}:
+
+rec {
+ writeRequiredOctavePackagesHook = callPackage ({ }:
+ makeSetupHook {
+ name = "write-required-octave-packages-hook";
+ } ./write-required-octave-packages-hook.sh) {};
+}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh
new file mode 100644
index 0000000000..64e87d6824
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh
@@ -0,0 +1,17 @@
+# Setup hook for writing octave packages that are run-time dependencies for
+# another package to a nix-support file.
+# `echo`s the full path name to the package derivation that is required.
+echo "Sourcing octave-write-required-octave-packages-hook.sh"
+
+octaveWriteRequiredOctavePackagesPhase() {
+ echo "Executing octaveWriteRequiredOctavePackagesPhase"
+
+ mkdir -p $out/nix-support
+ echo ${requiredOctavePackages} > $out/nix-support/required-octave-packages
+}
+
+# Yes its a bit long...
+if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then
+ echo "Using octaveWriteRequiredOctavePackagesPhase"
+ preDistPhases+=" octaveWriteRequiredOctavePackagesPhase"
+fi
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh
new file mode 100644
index 0000000000..032ea398ac
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh
@@ -0,0 +1,17 @@
+# Setup hook for writing octave packages that are run-time dependencies for
+# another package to a nix-support file.
+# `echo`s the full path name to the package derivation that is required.
+echo "Sourcing write-required-octave-packages-hook.sh"
+
+writeRequiredOctavePackagesPhase() {
+ echo "Executing writeRequiredOctavePackagesPhase"
+
+ mkdir -p $out/nix-support
+ echo ${requiredOctavePackages} > $out/nix-support/required-octave-packages
+}
+
+# Yes its a bit long...
+if [ -z "${dontWriteRequiredOctavePackagesPhase-}" ]; then
+ echo "Using writeRequiredOctavePackagesPhase"
+ preDistPhases+=" writeRequiredOctavePackagesPhase"
+fi
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/with-packages.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/with-packages.nix
new file mode 100644
index 0000000000..f00befbb00
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/with-packages.nix
@@ -0,0 +1,6 @@
+{ buildEnv, octavePackages }:
+
+# Takes the buildEnv defined for Octave and the set of octavePackages, and returns
+# a function, which when given a function whose return value is a list of extra
+# packages to install, builds and returns that environment.
+f: let packages = f octavePackages; in buildEnv.override { extraLibs = packages; }
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap-octave.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap-octave.nix
new file mode 100644
index 0000000000..1e4616136a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap-octave.nix
@@ -0,0 +1,16 @@
+{ lib
+, octave
+, makeSetupHook
+, makeWrapper
+}:
+
+# Defined in trivial-builders.nix
+# Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv
+# as nativeBuildInput
+# Each of the substitutions is available in the wrap.sh script as @thingSubstituted@
+makeSetupHook {
+ name = "${octave.name}-pkgs-setup-hook";
+ deps = makeWrapper;
+ substitutions.executable = octave.interpreter;
+ substitutions.octave = octave;
+} ./wrap.sh
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap.sh b/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap.sh
new file mode 100644
index 0000000000..a5969fca2a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/wrap.sh
@@ -0,0 +1,132 @@
+# Unlinks a directory (given as the first argument), and re-creates that
+# directory as an actual directory. Then descends into the directory of
+# the same name in the origin (arg_2/arg_3) and symlinks the contents of
+# that directory into the passed end-location.
+unlinkDirReSymlinkContents() {
+ local dirToUnlink="$1"
+ local origin="$2"
+ local contentsLocation="$3"
+
+ unlink $dirToUnlink/$contentsLocation
+ mkdir -p $dirToUnlink/$contentsLocation
+ for f in $origin/$contentsLocation/*; do
+ ln -s -t "$dirToUnlink/$contentsLocation" "$f"
+ done
+}
+
+# Using unlinkDirReSymlinkContents, un-symlinks directories down to
+# $out/share/octave, and then creates the octave_packages directory.
+createOctavePackagesPath() {
+ local desiredOut=$1
+ local origin=$2
+
+ if [ -L "$out/share" ]; then
+ unlinkDirReSymlinkContents "$desiredOut" "$origin" "share"
+ fi
+
+ if [ -L "$out/share/octave" ]; then
+ unlinkDirReSymlinkContents "$desiredOut" "$origin" "share/octave"
+ fi
+
+ # Now that octave_packages has a path rather than symlinks, create the
+ # octave_packages directory for installed packages.
+ mkdir -p "$desiredOut/share/octave/octave_packages"
+}
+
+# First, descends down to $out/share/octave/site/m/startup/octaverc, and
+# copies that start-up file. Once done, it performs a `chmod` to allow
+# writing. Lastly, it `echo`s the location of the locally installed packages
+# to the startup file, allowing octave to discover installed packages.
+addPkgLocalList() {
+ local desiredOut=$1
+ local origin=$2
+ local octaveSite="share/octave/site"
+ local octaveSiteM="$octaveSite/m"
+ local octaveSiteStartup="$octaveSiteM/startup"
+ local siteOctavercStartup="$octaveSiteStartup/octaverc"
+
+ unlinkDirReSymlinkContents "$desiredOut" "$origin" "$octaveSite"
+ unlinkDirReSymlinkContents "$desiredOut" "$origin" "$octaveSiteM"
+ unlinkDirReSymlinkContents "$desiredOut" "$origin" "$octaveSiteStartup"
+
+ unlink "$out/$siteOctavercStartup"
+ cp "$origin/$siteOctavercStartup" "$desiredOut/$siteOctavercStartup"
+ chmod u+w "$desiredOut/$siteOctavercStartup"
+ echo "pkg local_list $out/.octave_packages" >> "$desiredOut/$siteOctavercStartup"
+}
+
+# Wrapper function for wrapOctaveProgramsIn. Takes one argument, a
+# space-delimited string of packages' paths that will be installed.
+wrapOctavePrograms() {
+ wrapOctaveProgramsIn "$out/bin" "$out" "$@"
+}
+
+# Wraps all octave programs in $out/bin with all the propagated inputs that
+# a particular package requires. $1 is the directory to look for binaries in
+# to wrap. $2 is the path to the octave ENVIRONMENT. $3 is the space-delimited
+# string of packages.
+wrapOctaveProgramsIn() {
+ local dir="$1"
+ local octavePath="$2"
+ local pkgs="$3"
+ local f
+
+ buildOctavePath "$octavePath" "$pkgs"
+
+ # Find all regular files in the output directory that are executable.
+ if [ -d "$dir" ]; then
+ find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
+ echo "wrapping \`$f'..."
+ local -a wrap_args=("$f"
+ --prefix PATH ':' "$program_PATH"
+ )
+ local -a wrapProgramArgs=("${wrap_args[@]}")
+ wrapProgram "${wrapProgramArgs[@]}"
+ done
+ fi
+}
+
+# Build the PATH environment variable by walking through the closure of
+# dependencies. Starts by constructing the `program_PATH` variable with the
+# environment's path, then adding the original octave's location, and marking
+# them in `octavePathsSeen`.
+buildOctavePath() {
+ local octavePath="$1"
+ local packages="$2"
+
+ local pathsToSearch="$octavePath $packages"
+
+ # Create an empty table of Octave paths.
+ declare -A octavePathsSeen=()
+ program_PATH=
+ octavePathsSeen["$out"]=1
+ octavePathsSeen["@octave@"]=1
+ addToSearchPath program_PATH "$out/bin"
+ addToSearchPath program_PATH "@octave@/bin"
+ echo "program_PATH to change to is: $program_PATH"
+ for path in $pathsToSearch; do
+ echo "Recurse to propagated-build-input: $path"
+ _addToOctavePath $path
+ done
+}
+
+# Adds the bin directories to the program_PATH variable.
+# Recurses on any paths declared in `propagated-build-inputs`, while avoiding
+# duplicating paths by flagging the directires it has seen in `octavePathsSeen`.
+_addToOctavePath() {
+ local dir="$1"
+ # Stop if we've already visited this path.
+ if [ -n "${octavePathsSeen[$dir]}" ]; then return; fi
+ octavePathsSeen[$dir]=1
+ # addToSearchPath is defined in stdenv/generic/setup.sh. It has the effect
+ # of calling `export X=$dir/...:$X`.
+ addToSearchPath program_PATH $dir/bin
+
+ # Inspect the propagated inputs (if they exist) and recur on them.
+ local prop="$dir/nix-support/propagated-build-inputs"
+ if [ -e $prop ]; then
+ for new_path in $(cat $prop); do
+ _addToOctavePath $new_path
+ done
+ fi
+}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
index 75fe1bac8c..66e0b284fc 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix
@@ -168,11 +168,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "4c55233ae95a6aef4d93291fe8ad12709b11e575"; # Jan 21, 2021
+ crossVersion = "1.3.5"; # Jan 24, 2021
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
- sha256 = "04bxn43ir7b4c2bb1z1l71l93hrysjv00h879nm70m99q6vxq2hc";
+ sha256 = "1sa2f8s1hc604g5y98w6m6y5q43s9jiyrpnp4b34zkfx1qs3w6l4";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -200,8 +200,8 @@ in {
perl532 = common {
perl = pkgs.perl532;
buildPerl = buildPackages.perl532;
- version = "5.32.0";
- sha256 = "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg";
+ version = "5.32.1";
+ sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3";
};
# the latest Devel version
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
index 191d589aa9..659157e24c 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
@@ -5,7 +5,7 @@
let
generic =
- { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper
+ { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper
, symlinkJoin, writeText, autoconf, automake, bison, flex, libtool
, pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
, systemd, system-sendmail, valgrind, xcbuild
@@ -97,7 +97,7 @@ let
(enabledExtensions ++ (getDepsRecursively enabledExtensions)));
extNames = map getExtName enabledExtensions;
- extraInit = writeText "php.ini" ''
+ extraInit = writeText "php-extra-init-${version}.ini" ''
${lib.concatStringsSep "\n"
(lib.textClosureList extensionTexts extNames)}
${extraConfig}
@@ -112,7 +112,8 @@ let
withExtensions = mkWithExtensions allArgs allExtensionFunctions;
phpIni = "${phpWithExtensions}/lib/php.ini";
unwrapped = php;
- tests = nixosTests.php;
+ # Select the right php tests for the php version
+ tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}";
inherit (php-packages) extensions buildPecl;
packages = php-packages.tools;
meta = php.meta // {
@@ -121,7 +122,7 @@ let
};
paths = [ php ];
postBuild = ''
- cp ${extraInit} $out/lib/php.ini
+ ln -s ${extraInit} $out/lib/php.ini
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
index 341797fa3f..623eefec41 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
url = "https://www.software-lab.de/${pname}-${version}.tgz";
sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2";
};
- buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [openssl] ++ optional stdenv.is64bit jdk;
patchPhase = ''
sed -i "s/which java/command -v java/g" mkAsm
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix
index 19e6c93378..863df66899 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/pure/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb";
};
- buildInputs = [ bison flex makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ bison flex ];
propagatedBuildInputs = [ llvm gmp mpfr readline ];
NIX_LDFLAGS = "-lLLVMJIT";
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch
new file mode 100644
index 0000000000..6c0ae46846
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch
@@ -0,0 +1,181 @@
+From fab838b2ee7cfb9037c24f0f18dfe01aa379b3f7 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson
+Date: Mon, 18 Jan 2021 15:11:46 -0600
+Subject: [3.6] closes bpo-42938: Replace snprintf with Python unicode
+ formatting in ctypes param reprs. (GH-24250)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
+
+Co-authored-by: Benjamin Peterson
+Rebased for Python 2.7 by Michał Górny
+---
+ Lib/ctypes/test/test_parameters.py | 43 +++++++++++++++++++
+ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 +
+ Modules/_ctypes/callproc.c | 49 +++++++++++-----------
+ 3 files changed, 69 insertions(+), 25 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+
+diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
+index 23c1b6e225..3456882ccb 100644
+--- a/Lib/ctypes/test/test_parameters.py
++++ b/Lib/ctypes/test/test_parameters.py
+@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestCase):
+ with self.assertRaises(ZeroDivisionError):
+ WorseStruct().__setstate__({}, b'foo')
+
++ def test_parameter_repr(self):
++ from ctypes import (
++ c_bool,
++ c_char,
++ c_wchar,
++ c_byte,
++ c_ubyte,
++ c_short,
++ c_ushort,
++ c_int,
++ c_uint,
++ c_long,
++ c_ulong,
++ c_longlong,
++ c_ulonglong,
++ c_float,
++ c_double,
++ c_longdouble,
++ c_char_p,
++ c_wchar_p,
++ c_void_p,
++ )
++ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^$")
++ self.assertEqual(repr(c_char.from_param('a')), "")
++ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^$")
++ self.assertEqual(repr(c_byte.from_param(98)), "")
++ self.assertEqual(repr(c_ubyte.from_param(98)), "")
++ self.assertEqual(repr(c_short.from_param(511)), "")
++ self.assertEqual(repr(c_ushort.from_param(511)), "")
++ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^$")
++ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^$")
++ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^$")
++ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^$")
++ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^$")
++ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^$")
++ self.assertEqual(repr(c_float.from_param(1.5)), "")
++ self.assertEqual(repr(c_double.from_param(1.5)), "")
++ self.assertEqual(repr(c_double.from_param(1e300)), "")
++ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^$")
++ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^$")
++ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^$")
++ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^$")
++
+ ################################################################
+
+ if __name__ == '__main__':
+diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+new file mode 100644
+index 0000000000..7df65a156f
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+@@ -0,0 +1,2 @@
++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
++:class:`ctypes.c_longdouble` values.
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index 066fefc0cc..421addf353 100644
+--- a/Modules/_ctypes/callproc.c
++++ b/Modules/_ctypes/callproc.c
+@@ -460,50 +460,51 @@ PyCArg_dealloc(PyCArgObject *self)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+- char buffer[256];
+ switch(self->tag) {
+ case 'b':
+ case 'B':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.b);
+- break;
+ case 'h':
+ case 'H':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.h);
+- break;
+ case 'i':
+ case 'I':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.i);
+- break;
+ case 'l':
+ case 'L':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.l);
+- break;
+
+ #ifdef HAVE_LONG_LONG
+ case 'q':
+ case 'Q':
+- sprintf(buffer,
++ return PyString_FromFormat(
+ "",
+ self->tag, self->value.q);
+- break;
+ #endif
+ case 'd':
+- sprintf(buffer, "",
+- self->tag, self->value.d);
+- break;
+- case 'f':
+- sprintf(buffer, "",
+- self->tag, self->value.f);
+- break;
+-
++ case 'f': {
++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
++ if (f == NULL) {
++ return NULL;
++ }
++ PyObject *r = PyObject_Repr(f);
++ if (r == NULL) {
++ Py_DECREF(f);
++ return NULL;
++ }
++ PyObject *result = PyString_FromFormat(
++ "", self->tag, PyString_AsString(r));
++ Py_DECREF(r);
++ Py_DECREF(f);
++ return result;
++ }
+ case 'c':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.c);
+- break;
+
+ /* Hm, are these 'z' and 'Z' codes useful at all?
+ Shouldn't they be replaced by the functionality of c_string
+@@ -512,16 +513,14 @@ PyCArg_repr(PyCArgObject *self)
+ case 'z':
+ case 'Z':
+ case 'P':
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self->value.p);
+ break;
+
+ default:
+- sprintf(buffer, "",
++ return PyString_FromFormat("",
+ self->tag, self);
+- break;
+ }
+- return PyString_FromString(buffer);
+ }
+
+ static PyMemberDef PyCArgType_members[] = {
+--
+cgit v1.2.3
+
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 85af394e3f..37d43e33d8 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -103,6 +103,9 @@ let
# Patch is likely to go away in the next release (if there is any)
./CVE-2019-20907.patch
+
+ ./CVE-2021-3177.patch
+
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/find_library.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/find_library.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/find_library.patch
rename to third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.6/find_library.patch
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
index a1f9d68eb1..4324fc5ea6 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
@@ -1,18 +1,18 @@
-From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk
Date: Mon, 28 Aug 2017 09:24:06 +0200
Subject: [PATCH] Don't use ldconfig
---
- Lib/ctypes/util.py | 70 ++----------------------------------------------------
- 1 file changed, 2 insertions(+), 68 deletions(-)
+ Lib/ctypes/util.py | 78 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 76 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 5e8b31a854..7b45ce6c15 100644
+index 0c2510e..79635a8 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
-@@ -94,46 +94,7 @@ elif os.name == "posix":
- import re, tempfile
+@@ -100,54 +100,7 @@ elif os.name == "posix":
+ return thefile.read(4) == elf_header
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
@@ -51,15 +51,23 @@ index 5e8b31a854..7b45ce6c15 100644
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
-- res = re.search(expr, trace)
+- res = re.findall(expr, trace)
- if not res:
- return None
-- return os.fsdecode(res.group(0))
+-
+- for file in res:
+- # Check if the given file is an elf file: gcc can report
+- # some files that are linker scripts and not actual
+- # shared objects. See bpo-41976 for more details
+- if not _is_elf(file):
+- continue
+- return os.fsdecode(file)
+-
+ return None
-
if sys.platform == "sunos5":
-@@ -255,34 +216,7 @@ elif os.name == "posix":
+ # use /usr/ccs/bin/dump on solaris
+@@ -268,34 +221,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
@@ -96,5 +104,5 @@ index 5e8b31a854..7b45ce6c15 100644
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
-2.15.0
+2.30.0
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index 7bc6084f61..1ae8d19ac5 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
@@ -222,9 +222,9 @@ in with passthru; stdenv.mkDerivation {
else
./3.7/fix-finding-headers-when-cross-compiling.patch
)
- ] ++ optionals (isPy36 || isPy37) [
+ ] ++ optionals (isPy36) [
# Backport a fix for ctypes.util.find_library.
- ./3.7/find_library.patch
+ ./3.6/find_library.patch
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
index d6030a4bf1..2a4ffeb421 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -128,10 +128,10 @@ in {
sourceVersion = {
major = "3";
minor = "6";
- patch = "12";
+ patch = "13";
suffix = "";
};
- sha256 = "cJU6m11okdkuZdGEw1EhJqFYFL7hXh7/LdzOBDNOmpk=";
+ sha256 = "pHpDpTq7QihqLBGWU0P/VnEbnmTo0RvyxnAaT7jOGg8=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -141,10 +141,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
- patch = "9";
+ patch = "10";
suffix = "";
};
- sha256 = "008v6g1jkrjrdmiqlgjlq6msbbj848bvkws6ppwva1ahn03k14li";
+ sha256 = "+NgudXLIbsnVXIYnquUEAST9IgOvQAw4PIIbmAMG7ms=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -154,10 +154,10 @@ in {
sourceVersion = {
major = "3";
minor = "8";
- patch = "7";
+ patch = "8";
suffix = "";
};
- sha256 = "sha256-3cwd8Wu1uHqkLsXSCluQLy0IjKommyjgFZD5enmOxQo=";
+ sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -167,10 +167,10 @@ in {
sourceVersion = {
major = "3";
minor = "9";
- patch = "1";
+ patch = "2";
suffix = "";
};
- sha256 = "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r";
+ sha256 = "PCA0xU+BFEj1FmaNzgnSQAigcWw6eU3YY5tTiMveJH0=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -181,9 +181,9 @@ in {
major = "3";
minor = "10";
patch = "0";
- suffix = "a4";
+ suffix = "a5";
};
- sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M=";
+ sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -191,6 +191,7 @@ in {
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (python38.override {
self = python3Minimal;
+ pythonAttr = "python3Minimal";
# strip down that python version as much as possible
openssl = null;
readline = null;
@@ -218,9 +219,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
- patch = "2";
+ patch = "3";
};
- sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1";
+ sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
@@ -234,9 +235,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
- patch = "2";
+ patch = "3";
};
- sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx";
+ sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2";
pythonVersion = "3.6";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
@@ -251,9 +252,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
- patch = "2";
+ patch = "3";
};
- sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64
+ sha256 = "1cfpdyvbvzwc0ynjr7248jhwgcpl7073wlp7w3g2v4fnrh1bc4pl"; # linux64
pythonVersion = "2.7";
inherit passthruFun;
};
@@ -264,9 +265,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
- patch = "2";
+ patch = "3";
};
- sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64
+ sha256 = "02lys9bjky9bqg6ggv8djirbd3zzcsq7755v4yvwm0k4a7fmzf2g"; # linux64
pythonVersion = "3.6";
inherit passthruFun;
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index 85811a3747..eb45205ff7 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -2,7 +2,7 @@
echo "Sourcing pytest-check-hook"
declare -ar disabledTests
-declare -ar disabledTestFiles
+declare -ar disabledTestPaths
function _concatSep {
local result
@@ -37,12 +37,12 @@ function pytestCheckPhase() {
disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
args+=" -k \""$disabledTestsString"\""
fi
- for file in ${disabledTestFiles[@]}; do
- if [ ! -f "$file" ]; then
- echo "Disabled test file \"$file\" does not exist. Aborting"
+ for path in ${disabledTestPaths[@]}; do
+ if [ ! -e "$path" ]; then
+ echo "Disabled tests path \"$path\" does not exist. Aborting"
exit 1
fi
- args+=" --ignore=\"$file\""
+ args+=" --ignore=\"$path\""
done
args+=" ${pytestFlagsArray[@]}"
eval "@pythonCheckInterpreter@ $args"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
index 5eccebf024..42e82cd3a5 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto=";
};
- buildInputs = [ rakudo makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ rakudo ];
installPhase = ''
mkdir -p "$out"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix
index cd2b74db05..8b49a743b4 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/rascal/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6";
};
- buildInputs = [ makeWrapper jdk ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jdk ];
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rebol/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rebol/default.nix
deleted file mode 100644
index 39a4108e04..0000000000
--- a/third_party/nixpkgs/pkgs/development/interpreters/rebol/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
-
-stdenv.mkDerivation rec {
- pname = "rebol-nightly";
- version = "3-alpha";
- src = fetchFromGitHub {
- rev = "bd45d0de512ff5953e098301c3d610f6024515d6";
- owner = "earl";
- repo = "r3";
- sha256 = "0pirn6936rxi894xxdvj7xdwlwmmxq2wz36jyjnj26667v2n543c";
- };
-
- r3 = fetchurl {
- url = "http://rebolsource.net/downloads/experimental/r3-linux-x64-gbf237fc";
- sha256 = "0cm86kn4lcbvyy6pqg67x53y0wz353y0vg7pfqv65agxj1ynxnrx";
- name = "r3";
- };
-
- buildInputs = [ glibc libX11 libXt perl ];
-
- configurePhase = ''
- cp ${r3} make/r3-make
- chmod 777 make/r3-make
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make
- cd make
- perl -pi -e 's#-m32##g' makefile
- perl -pi -e 's#sudo .*#echo#g' makefile
- make prep
- '';
- buildPhase = ''
- make
- mkdir -p $out/bin
- cp r3 $out/bin
- '';
-
- meta = with lib; {
- description = "Relative expression based object language, a language where code is data";
- maintainers = with maintainers; [ vrthra ];
- platforms = [ "x86_64-linux" ];
- license = licenses.asl20;
- homepage = "http://www.rebol.com/";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
index ca34d5055c..883b0b2f39 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix
@@ -1,17 +1,24 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "scheme48-1.9.2";
-
- meta = {
- homepage = "http://s48.org/";
- description = "Scheme 48";
- platforms = with lib.platforms; unix;
- license = lib.licenses.bsd3;
- };
+stdenv.mkDerivation rec {
+ pname = "scheme48";
+ version = "1.9.2";
src = fetchurl {
- url = "http://s48.org/1.9.2/scheme48-1.9.2.tgz";
+ url = "http://s48.org/${version}/scheme48-${version}.tgz";
sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw";
};
+
+ # Make more reproducible by removing build user and date.
+ postPatch = ''
+ substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""'
+ '';
+
+ meta = with lib; {
+ homepage = "http://s48.org/";
+ description = "Scheme 48 interpreter for R5RS";
+ platforms = platforms.unix;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.siraben ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
index 81ebcedf7b..e04069f6ae 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix
@@ -15,7 +15,7 @@
, rustc
, rust-cbindgen
, yasm
-, llvmPackages
+, llvmPackages_11
, nspr
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf213
cargo
- llvmPackages.llvm # for llvm-objdump
+ llvmPackages_11.llvm # for llvm-objdump
perl
pkg-config
python3
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix
index d76ceb3421..37a7fee8a8 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix
@@ -2,10 +2,10 @@
callPackage ./generic.nix (args // rec {
release = "8.6";
- version = "${release}.9";
+ version = "${release}.11";
src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
- sha256 = "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d";
+ sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c";
};
})
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
index 60ce4d89f1..91e13ed32c 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
# using the [makefile](https://github.com/wasmerio/wasmer/blob/master/Makefile).
# Enabling cranelift as this used to be the old default. At least one backend is
# needed for the run subcommand to work.
- cargoBuildFlags = [ "--features 'backend-cranelift'" ];
+ cargoBuildFlags = [ "--features" "backend-cranelift" ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/junit/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/junit/default.nix
index 2cb9ab001c..79f73879e6 100644
--- a/third_party/nixpkgs/pkgs/development/java-modules/junit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/java-modules/junit/default.nix
@@ -1,12 +1,17 @@
-{ lib, pkgs, mavenbuild, fetchMaven }:
+{ lib, pkgs, mavenbuild, fetchMaven, maven, jdk8 }:
with pkgs.javaPackages;
let
poms = import (../poms.nix) { inherit fetchMaven; };
collections = import (../collections.nix) { inherit pkgs; };
+ mavenbuild-jdk8 = mavenbuild.override {
+ maven = maven.override {
+ jdk = jdk8;
+ };
+ };
in rec {
- junitGen = { mavenDeps, sha512, version }: mavenbuild {
+ junitGen = { mavenDeps, sha512, version }: mavenbuild-jdk8 {
inherit mavenDeps sha512 version;
name = "junit-${version}";
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
index eac127b6dc..96d0031270 100644
--- a/third_party/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
+++ b/third_party/nixpkgs/pkgs/development/java-modules/maven-hello/default.nix
@@ -1,11 +1,21 @@
-{ lib, pkgs, mavenbuild }:
+{ lib
+, pkgs
+, mavenbuild
+, maven
+, jdk8
+}:
with pkgs.javaPackages;
let
poms = import ../poms.nix { inherit fetchMaven; };
+ mavenbuild-jdk8 = mavenbuild.override {
+ maven = maven.override {
+ jdk = jdk8;
+ };
+ };
in rec {
- mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
+ mavenHelloRec = { mavenDeps, mavenbuild, sha512, version, skipTests ? true, quiet ? true }: mavenbuild {
inherit mavenDeps sha512 version skipTests quiet;
name = "maven-hello-${version}";
@@ -31,6 +41,7 @@ in rec {
mavenDeps = [];
sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2";
version = "1.0";
+ mavenbuild = mavenbuild-jdk8;
};
mavenHello_1_1 = mavenHelloRec {
@@ -39,5 +50,6 @@ in rec {
version = "1.1";
skipTests = false;
quiet = false;
+ mavenbuild = mavenbuild-jdk8;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
index 208c74981d..8a8ab23d49 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2021.Q1.3";
+ version = "2021.Q1.4";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4=";
+ sha256 = "mA7YalgcfjfYdmKPk8L4mfDJWn0rimPDoDB9/S3pyNM=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix
index 1c356b59d8..527545e683 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix
@@ -1,26 +1,32 @@
-{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
+
stdenv.mkDerivation rec {
pname = "arb";
version = "2.17.0";
+
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = pname;
rev = version;
sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
};
- buildInputs = [mpir gmp mpfr flint];
+
+ buildInputs = [ mpir gmp mpfr flint ];
+
configureFlags = [
"--with-gmp=${gmp}"
"--with-mpir=${mpir}"
"--with-mpfr=${mpfr}"
"--with-flint=${flint}"
];
+
doCheck = true;
+
meta = with lib; {
description = "A library for arbitrary-precision interval arithmetic";
homepage = "https://arblib.org/";
- license = lib.licenses.lgpl21Plus;
+ license = licenses.lgpl21Plus;
maintainers = teams.sage.members;
- platforms = lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
index fe67cf04e6..6094c0b8f4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "10.2.1";
+ version = "10.2.2";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "sha256-fY500kh2mvI/yJTYu4jwXjIxeTPL5NqPPFa+j4mp/MQ=";
+ sha256 = "sha256-lClfxi7MQ3PlqWx7Yrkj/XGoHzFaqVl7KCqv2FWelDU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
index 29781446c8..670dee26b2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libinstpatch";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "swami";
repo = pname;
rev = "v${version}";
- sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb";
+ sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
index 9c636e0205..821a9ea922 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
- sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx";
+ sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
index 79f09f4846..f074287ab1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lilv";
- version = "0.24.10";
+ version = "0.24.12";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi";
+ sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE=";
};
patches = [ ./lilv-pkgconfig.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
index 45caf0b36c..616ad5b0c8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lv2";
- version = "1.18.0";
+ version = "1.18.2";
src = fetchurl {
url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
- sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
+ sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4=";
};
nativeBuildInputs = [ pkg-config wafHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index 937eef2d0d..39fb5d7eb2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
@@ -1,32 +1,41 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "aws-c-common";
- version = "0.4.64";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
+ sha256 = "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg";
};
+ patches = [
+ # Remove once https://github.com/awslabs/aws-c-common/pull/764 is merged
+ (fetchpatch {
+ url = "https://github.com/awslabs/aws-c-common/commit/4f85fb3e398d4e4d320d3559235267b26cbc9531.patch";
+ sha256 = "1jg3mz507w4kwgmg57kvz419gvw47pd9rkjr6jhsmvardmyyskap";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
+ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-Wno-nullability-extension -Wno-typedef-redefinition";
+ doCheck = true;
+
meta = with lib; {
description = "AWS SDK for C common core";
homepage = "https://github.com/awslabs/aws-c-common";
license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with maintainers; [ orivej eelco ];
- # https://github.com/awslabs/aws-c-common/issues/754
- broken = stdenv.hostPlatform.isMusl;
+ maintainers = with maintainers; [ orivej eelco r-burns ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
index 4cfabc77bb..18dddee6bd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }:
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }:
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ]
+ buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ]
++ lib.optional stdenv.hostPlatform.isMusl libexecinfo;
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
index e2074cc835..337149e6f8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }:
+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }:
stdenv.mkDerivation rec {
pname = "aws-c-io";
- version = "0.7.1";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
+ sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ aws-c-cal aws-c-common s2n ];
+ buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 7b10fc463d..d6fbb97014 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib
, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums
, CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake curl ];
buildInputs = [
- curl openssl s2n zlib
+ curl openssl s2n-tls zlib
aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums
] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) ||
diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix
index 6e3a5abaaa..d6e1d75437 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "babl";
- version = "0.1.84";
+ version = "0.1.86";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
+ sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix
index 78ef4c2f33..fd4e2cfe9f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix
@@ -1,8 +1,6 @@
{
# general
lib
-, callPackage
-, runCommand
, resholvePackage
, bash
, shellcheck
@@ -46,7 +44,9 @@ resholvePackage rec {
inherit src;
installPhase = ''
+ runHook preInstall
install -Dt $out/bin bashup.events
+ runHook postInstall
'';
inherit doCheck;
@@ -54,9 +54,11 @@ resholvePackage rec {
# check based on https://github.com/bashup/events/blob/master/.dkrc
checkPhase = ''
+ runHook preCheck
SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events
${bash}/bin/bash -n ./bashup.events
${bash}/bin/bash ./bashup.events
+ runHook postCheck
'';
solutions = {
@@ -70,7 +72,11 @@ resholvePackage rec {
inherit doInstallCheck;
installCheckInputs = [ bash ];
- installCheckPhase = installCheck "${bash}/bin/bash";
+ installCheckPhase = ''
+ runHook preInstallCheck
+ ${installCheck "${bash}/bin/bash"}
+ runHook postInstallCheck
+ '';
meta = with lib; {
inherit branch;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
index dd72b7eb41..700fe4f468 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bctoolbox";
- version = "4.4.21";
+ version = "4.4.24";
nativeBuildInputs = [ cmake bcunit ];
buildInputs = [ mbedtls ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25";
+ sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0=";
};
# Do not build static libraries
diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
index e08fc1ae3e..833d200ffa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "belle-sip";
- version = "4.4.21";
+ version = "4.4.26";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw";
+ sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4=";
};
nativeBuildInputs = [ antlr3_4 cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix
new file mode 100644
index 0000000000..a23acdbdc8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+
+, expat
+, libcdio
+, libcdio-paranoia
+, libpulseaudio
+, smooth
+, uriparser
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "BoCA";
+ version = "1.0.3";
+
+ src = fetchFromGitHub {
+ owner = "enzo1982";
+ repo = "boca";
+ rev = "v${version}";
+ sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ expat
+ libcdio
+ libcdio-paranoia
+ libpulseaudio
+ smooth
+ uriparser
+ zlib
+ ];
+
+ makeFlags = [
+ "prefix=$(out)"
+ ];
+
+ meta = with lib; {
+ description = "A component library used by the fre:ac audio converter";
+ license = licenses.gpl2Plus;
+ homepage = "https://github.com/enzo1982/boca";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
index b3d754fb54..79232107cd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "${baseurl}/boolstuff.html";
license = "GPL";
maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
index abff1268bf..6158eb8751 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
@@ -132,7 +132,8 @@ stdenv.mkDerivation {
license = licenses.boost;
platforms = platforms.unix ++ platforms.windows;
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
- ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin";
+ ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"
+ ++ optionals (versionOlder version "1.73") lib.platforms.riscv;
maintainers = with maintainers; [ peti ];
};
@@ -149,6 +150,9 @@ stdenv.mkDerivation {
cat << EOF >> user-config.jam
using gcc : cross : ${stdenv.cc.targetPrefix}c++ ;
EOF
+ # Build b2 with buildPlatform CC/CXX.
+ sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \
+ -i ./tools/build/src/engine/build.sh
'';
NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
diff --git a/third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix
index f213629620..20ca175d7b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/bootil/default.nix
@@ -1,18 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
stdenv.mkDerivation {
- name = "bootil-unstable-2015-12-17";
-
- meta = {
- description = "Garry Newman's personal utility library";
- homepage = "https://github.com/garrynewman/bootil";
- # License unsure - see https://github.com/garrynewman/bootil/issues/21
- license = lib.licenses.free;
- maintainers = [ lib.maintainers.abigailbuccaneer ];
- platforms = lib.platforms.all;
- # Build uses `-msse` and `-mfpmath=sse`
- badPlatforms = [ "aarch64-linux" ];
- };
+ pname = "bootil";
+ version = "unstable-2015-12-17";
src = fetchFromGitHub {
owner = "garrynewman";
@@ -21,11 +11,13 @@ stdenv.mkDerivation {
sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
};
- patches = [ (fetchpatch {
- url = "https://github.com/garrynewman/bootil/pull/22.patch";
- name = "github-pull-request-22.patch";
- sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
- }) ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/garrynewman/bootil/pull/22.patch";
+ name = "github-pull-request-22.patch";
+ sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
+ })
+ ];
# Avoid guessing where files end up. Just use current directory.
postPatch = ''
@@ -42,4 +34,15 @@ stdenv.mkDerivation {
install -D libbootil_static.a $out/lib/libbootil_static.a
cp -r include $out
'';
+
+ meta = with lib; {
+ description = "Garry Newman's personal utility library";
+ homepage = "https://github.com/garrynewman/bootil";
+ # License unsure - see https://github.com/garrynewman/bootil/issues/21
+ license = licenses.free;
+ maintainers = [ maintainers.abigailbuccaneer ];
+ platforms = platforms.all;
+ # Build uses `-msse` and `-mfpmath=sse`
+ badPlatforms = [ "aarch64-linux" ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
index 2346153e2a..cb40e535b0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix
@@ -2,8 +2,8 @@
callPackage ./generic.nix (args // {
baseVersion = "2.17";
- revision = "2";
- sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb";
+ revision = "3";
+ sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr";
postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix
index fdc06df948..944b5276c5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "actor-framework";
- version = "0.17.6";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
- sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz";
+ sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx";
};
nativeBuildInputs = [ cmake ];
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
cmakeFlags = [
- "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+ "-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
];
doCheck = true;
checkTarget = "test";
preCheck = ''
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
- export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib
+ export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
+ export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/third_party/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
index 47f4197274..8a14fb3a5f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
@@ -1,18 +1,7 @@
-From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Thu, 28 Feb 2019 16:25:49 +0100
-Subject: [PATCH] allow setting paths in makefile
-
-and install headers and libs
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b507e2b0..d21e5c56 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,13 +19,13 @@ BUILD_DIR = out
+diff -u a/Makefile b/Makefile
+--- a/Makefile 2020-12-27 18:48:53.934098765 +0100
++++ b/Makefile 2020-12-27 18:50:44.022674117 +0100
+@@ -19,13 +19,13 @@
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
PREFIX ?= /usr/local
EXEC_PREFIX = $(PREFIX)
@@ -20,24 +9,16 @@ index b507e2b0..d21e5c56 100644
+BINDIR ?= $(EXEC_PREFIX)/bin
DATAROOTDIR = $(PREFIX)/share
DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
- SYSCONFDIR = $(PREFIX)/etc
+ SYSCONFDIR ?= $(PREFIX)/etc
HTMLDIR = $(DOCDIR)
-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
+ PID_FILE ?= /var/run/$(CPROG).pid
# build tools
- MKDIR = mkdir -p
-@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG)
- unit_test: $(UNIT_TEST_PROG)
-
- ifeq ($(CAN_INSTALL),1)
--install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
-+install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
- install -d -m 755 "$(DOCDIR)"
- install -m 644 *.md "$(DOCDIR)"
- install -d -m 755 "$(BINDIR)"
+@@ -337,10 +337,10 @@
install -m 755 $(CPROG) "$(BINDIR)/"
install-headers:
@@ -50,6 +31,3 @@ index b507e2b0..d21e5c56 100644
install-slib: lib$(CPROG).so
$(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
---
-2.19.2
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix
index 8a3474a491..fbbfb6ba73 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/civetweb/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "civetweb";
- version = "1.11";
+ version = "1.13";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv";
+ sha256 = "/q7Q1lavIR3i126uI4NsKByHJ6Tp+DSN60R4YxR506U=";
};
makeFlags = [
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ installTargets = [
+ "install-headers"
+ "install-lib"
+ "install-slib"
+ "install"
+ ];
+
preInstall = ''
mkdir -p $dev/include
mkdir -p $out/lib
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
index b40aea70b4..09b0ffba98 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cm256cc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cm256cc";
- version = "1.0.5";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "cm256cc";
rev = "v${version}";
- sha256 = "0d16y3lhdwr644am4sxqpshpbc3qik6dgr1w2c39vy75w9ff61a0";
+ sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
index 654ad955ae..17bd390038 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
description = "Simple C++ unit testing framework";
maintainers = with maintainers; [ bosu ];
license = lib.licenses.lgpl3;
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix
index 8e3fadc7f0..39bed60252 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cpputest/default.nix
@@ -1,19 +1,19 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "4.0";
pname = "cpputest";
+ version = "4.0";
src = fetchurl {
url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1";
};
- meta = {
- homepage = "http://cpputest.github.io/";
+ meta = with lib; {
+ homepage = "https://cpputest.github.io/";
description = "Unit testing and mocking framework for C/C++";
- platforms = lib.platforms.linux ;
- license = lib.licenses.bsd3;
- maintainers = [ lib.maintainers.juliendehos ];
+ platforms = platforms.all;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.juliendehos ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix
index 0402af92b3..fe553cb37b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, nasm, which
+{ lib, stdenv, fetchFromGitHub
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !enableStatic
}:
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
substituteInPlace GNUmakefile \
--replace "AR = libtool" "AR = ar" \
--replace "ARFLAGS = -static -o" "ARFLAGS = -cru"
+
+ # See https://github.com/weidai11/cryptopp/issues/1011
+ substituteInPlace GNUmakefile \
+ --replace "ZOPT = -O0" "ZOPT ="
+ '';
+
+ preConfigure = ''
+ sh TestScripts/configure.sh
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
index fa7d70d521..096910b238 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
@@ -2,6 +2,7 @@
, guiSupport ? false, libX11
# see http://dlib.net/compile.html
+, sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport
, cudaSupport ? true
}:
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
+ "-DUSE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
"-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix
index 4709441a10..a8697207ed 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix
@@ -14,7 +14,7 @@ assert withFlint -> flint != null;
stdenv.mkDerivation rec {
pname = "eclib";
- version = "20190909"; # upgrade might break the sage interface
+ version = "20210223"; # upgrade might break the sage interface
# sage tests to run:
# src/sage/interfaces/mwrank.py
# src/sage/libs/eclib
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "JohnCremona";
repo = pname;
rev = "v${version}";
- sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da";
+ sha256 = "sha256-xnSw5cdg4PLa0GT/blCYDz/IG5aj+HG2NHSlyCiH9g0=";
};
buildInputs = [
pari
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix
index 24927fe853..a80c317b06 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, alsaLib }:
+{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }:
stdenv.mkDerivation rec {
pname = "flite";
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.isLinux [ alsaLib ];
+ # https://github.com/festvox/flite/pull/60.
+ # Replaces `ar` with `$(AR)` in config/common_make_rules.
+ # Improves cross-compilation compatibility.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch";
+ sha256 = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8=";
+ })
+ ];
+
configureFlags = [
"--enable-shared"
] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
index 7b5fff29a2..adda15696e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl
-, buildPackages
+, buildPackages, pkgsHostHost
, pkg-config, which, makeWrapper
, zlib, bzip2, libpng, gnumake, glib
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
postInstall = glib.flattenInclude + ''
substituteInPlace $dev/bin/freetype-config \
- --replace ${buildPackages.pkg-config} ${pkg-config}
+ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
wrapProgram "$dev/bin/freetype-config" \
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix
index f96707b549..19b03eb620 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix
@@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "geos-3.9.0";
+ pname = "geos";
+ version = "3.9.1";
src = fetchurl {
- url = "https://download.osgeo.org/geos/${name}.tar.bz2";
- sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk=";
+ url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2";
+ sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo=";
};
enableParallelBuilding = true;
@@ -18,6 +19,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C++ port of the Java Topology Suite (JTS)";
homepage = "https://trac.osgeo.org/geos";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Only;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
index 220b68fa18..071e749b40 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gexiv2";
- version = "0.12.1";
+ version = "0.12.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla";
+ sha256 = "IyK1UqyjMO73lySmmcUaMCNF1eB0c4V4s5i38v+XlEw=";
};
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
index e2e0ba3bcc..38ef25770a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.3.2";
+ version = "3.3.3";
pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
- sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw";
+ sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4=";
};
propagatedBuildInputs = [ libGL ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz
similarity index 87%
rename from third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz
rename to third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz
index f77e490ebf..36aaf51cce 100644
Binary files a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz differ
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 54882ba671..8bf7830073 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
@@ -42,7 +42,7 @@
let
version = "2.32";
- patchSuffix = "-35";
+ patchSuffix = "-37";
sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";
in
@@ -63,10 +63,10 @@ stdenv.mkDerivation ({
and using git or something would complicate bootstrapping.
Fortunately it's not too big.
$ git checkout origin/release/2.32/master; git describe
- glibc-2.32-35-g082798622d
- $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz
+ glibc-2.32-37-g760e1d2878
+ $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz
*/
- ./2.32-35.patch.gz
+ ./2.32-master.patch.gz
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
index 74b94e68f5..a08997ea2c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gnu-config/default.nix
@@ -1,20 +1,20 @@
{ lib, stdenv, fetchurl }:
let
- rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79";
+ rev = "6faca61810d335c7837f320733fe8e15a1431fc2";
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
configGuess = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
- sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU=";
+ sha256 = "06wkkhpbx9slmknr2g7mcd8x3zsdhnmmay25l31h3rkdp1wkq7kx";
};
configSub = fetchurl {
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
- sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s=";
+ sha256 = "1qkph8cqanmgy3s4a18bm1a4vk62i8pf8cy5pc1hkpqwn4g6l0di";
};
in stdenv.mkDerivation {
pname = "gnu-config";
- version = "2020-05-04";
+ version = "2021-01-25";
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
index fdf4254328..af45128140 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -1,4 +1,20 @@
-{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
+{ lib
+, stdenv
+, clang-tools
+, grpc
+, curl
+, cmake
+, pkg-config
+, fetchFromGitHub
+, doxygen
+, protobuf
+, crc32c
+, c-ares
+, fetchurl
+, openssl
+, zlib
+, libnsl
+}:
let
googleapis = fetchFromGitHub {
owner = "googleapis";
@@ -39,7 +55,7 @@ in stdenv.mkDerivation rec {
sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa";
};
- buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ];
+ buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ];
nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
outputs = [ "out" "dev" ];
@@ -58,6 +74,5 @@ in stdenv.mkDerivation rec {
homepage = "https://github.com/googleapis/google-cloud-cpp";
description = "C++ Idiomatic Clients for Google Cloud Platform services";
maintainers = with maintainers; [ ];
- broken = true; # Broken on Hydra since 2020-05-19
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
index d6a1b44fe4..5374dc75e1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -1,15 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
, gflags, libnsl
}:
stdenv.mkDerivation rec {
- version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd";
+ sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
fetchSubmodules = true;
};
patches = [
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]
+ buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ]
++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
+ "-DgRPC_RE2_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index 178bf64f5c..40b10d0983 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, meson
, ninja
@@ -10,7 +11,7 @@
, gobject-introspection
, enableZbar ? false
, faacSupport ? false
-, faac ? null
+, faac
, faad2
, libass
, libkate
@@ -34,7 +35,6 @@
, bluez
, chromaprint
, curl
-, darwin
, directfb
, fdk_aac
, flite
@@ -79,24 +79,29 @@
, x265
, libxml2
, srt
+, vo-aacenc
+, VideoToolbox
+, AudioToolbox
+, AVFoundation
+, CoreMedia
+, CoreVideo
+, Foundation
+, MediaToolbox
}:
-assert faacSupport -> faac != null;
-
-let
- inherit (lib) optional optionals;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
};
patches = [
+ # Use pkgconfig to inject the includedirs
./fix_pkgconfig_includedir.patch
];
@@ -108,13 +113,15 @@ in stdenv.mkDerivation rec {
python3
gettext
gobject-introspection
- ] ++ optionals stdenv.isLinux [
+ ] ++ lib.optionals stdenv.isLinux [
wayland # for wayland-scanner
];
buildInputs = [
gst-plugins-base
orc
+ # gobject-introspection has to be in both nativeBuildInputs and
+ # buildInputs. The build tries to link against libgirepository-1.0.so
gobject-introspection
faad2
libass
@@ -161,16 +168,17 @@ in stdenv.mkDerivation rec {
libxml2
libintl
srt
- ] ++ optionals enableZbar [
+ vo-aacenc
+ ] ++ lib.optionals enableZbar [
zbar
- ] ++ optionals faacSupport [
+ ] ++ lib.optionals faacSupport [
faac
- ] ++ optionals stdenv.isLinux [
+ ] ++ lib.optionals stdenv.isLinux [
bluez
libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
wayland
wayland-protocols
- ] ++ optionals (!stdenv.isDarwin) [
+ ] ++ lib.optionals (!stdenv.isDarwin) [
# wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin
wildmidi
@@ -197,7 +205,7 @@ in stdenv.mkDerivation rec {
serd
sord
sratom
- ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ] ++ lib.optionals stdenv.isDarwin [
# For unknown reasons the order is important, e.g. if
# VideoToolbox is last, we get:
# fatal error: 'VideoToolbox/VideoToolbox.h' file not found
@@ -208,7 +216,7 @@ in stdenv.mkDerivation rec {
CoreVideo
Foundation
MediaToolbox
- ]);
+ ];
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
@@ -239,7 +247,6 @@ in stdenv.mkDerivation rec {
"-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
"-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
"-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
- "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing
"-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing
"-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs
"-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support
@@ -247,10 +254,10 @@ in stdenv.mkDerivation rec {
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
]
- ++ optionals (!stdenv.isLinux) [
+ ++ lib.optionals (!stdenv.isLinux) [
"-Dva=disabled" # see comment on `libva` in `buildInputs`
]
- ++ optionals stdenv.isDarwin [
+ ++ lib.optionals stdenv.isDarwin [
"-Dbluez=disabled"
"-Dchromaprint=disabled"
"-Ddirectfb=disabled"
@@ -267,11 +274,11 @@ in stdenv.mkDerivation rec {
"-Dladspa=disabled" # requires lrdf
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
"-Dwildmidi=disabled" # see dependencies above
- ] ++ optionals (!gst-plugins-base.glEnabled) [
- "-Dgl=disabled"]
- ++ optionals (!gst-plugins-base.waylandEnabled) [
+ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
+ "-Dgl=disabled"
+ ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
"-Dwayland=disabled"
- ] ++ optionals (!gst-plugins-base.glEnabled) [
+ ] ++ lib.optionals (!gst-plugins-base.glEnabled) [
# `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
# but its meson build system does not declare the dependency.
"-Dapplemedia=disabled"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index bac59ac4c4..4f39262206 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
@@ -31,7 +31,8 @@
# errors. Suspected is that a newer version than clang
# is needed than 5.0 but it is not clear.
, enableCocoa ? false
-, darwin
+, Cocoa
+, OpenGL
, enableGl ? (enableX11 || enableWayland || enableCocoa)
, enableCdparanoia ? (!stdenv.isDarwin)
, cdparanoia
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
};
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
libvisual
] ++ lib.optionals stdenv.isDarwin [
pango
- darwin.apple_sdk.frameworks.OpenGL
+ OpenGL
] ++ lib.optionals enableAlsa [
alsaLib
] ++ lib.optionals enableX11 [
@@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals enableWayland [
wayland
wayland-protocols
- ] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
+ ] ++ lib.optional enableCocoa Cocoa
++ lib.optional enableCdparanoia cdparanoia;
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index a5b4c0b827..84badf3041 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
outputBin = "dev";
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix
index 1fdd67d836..a86308ea3c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix
@@ -1,17 +1,17 @@
-{ callPackage, CoreServices }:
+{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }:
rec {
gstreamer = callPackage ./core { inherit CoreServices; };
gstreamermm = callPackage ./gstreamermm { };
- gst-plugins-base = callPackage ./base { inherit gstreamer; };
+ gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; };
- gst-plugins-good = callPackage ./good { inherit gst-plugins-base; };
+ gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; };
- gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; };
+ gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
- gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
+ gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; };
gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; };
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
index dc53a76bbc..a39eadafb0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "1.18.2";
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
index ebd5f83dd1..774fefbc35 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
index 3ab25863a8..b08759b8db 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix
@@ -25,13 +25,13 @@
, libsoup
, libpulseaudio
, libintl
-, darwin
+, Cocoa
, lame
, mpg123
, twolame
-, gtkSupport ? false, gtk3 ? null
-, qt5Support ? false, qt5 ? null
-, raspiCameraSupport ? false, libraspberrypi ? null
+, gtkSupport ? false, gtk3
+, qt5Support ? false, qt5
+, raspiCameraSupport ? false, libraspberrypi
, enableJack ? true, libjack2
, libXdamage
, libXext
@@ -44,12 +44,8 @@
, wavpack
}:
-assert gtkSupport -> gtk3 != null;
-assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
+assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
-let
- inherit (lib) optionals;
-in
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.18.2";
@@ -57,7 +53,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
};
@@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
ninja
gettext
nasm
- ] ++ optionals stdenv.isLinux [
+ ] ++ lib.optionals stdenv.isLinux [
wayland-protocols
];
@@ -98,39 +94,39 @@ stdenv.mkDerivation rec {
xorg.libXfixes
xorg.libXdamage
wavpack
- ] ++ optionals raspiCameraSupport [
+ ] ++ lib.optionals raspiCameraSupport [
libraspberrypi
- ] ++ optionals gtkSupport [
+ ] ++ lib.optionals gtkSupport [
# for gtksink
gtk3
- ] ++ optionals qt5Support (with qt5; [
+ ] ++ lib.optionals qt5Support (with qt5; [
qtbase
qtdeclarative
qtwayland
qtx11extras
- ]) ++ optionals stdenv.isDarwin [
- darwin.apple_sdk.frameworks.Cocoa
- ] ++ optionals stdenv.isLinux [
+ ]) ++ lib.optionals stdenv.isDarwin [
+ Cocoa
+ ] ++ lib.optionals stdenv.isLinux [
libv4l
libpulseaudio
libavc1394
libiec61883
libgudev
wayland
- ] ++ optionals enableJack [
+ ] ++ lib.optionals enableJack [
libjack2
];
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
- ] ++ optionals (!qt5Support) [
+ ] ++ lib.optionals (!qt5Support) [
"-Dqt5=disabled"
- ] ++ optionals (!gtkSupport) [
+ ] ++ lib.optionals (!gtkSupport) [
"-Dgtk3=disabled"
- ] ++ optionals (!enableJack) [
+ ] ++ lib.optionals (!enableJack) [
"-Djack=disabled"
- ] ++ optionals (!stdenv.isLinux) [
+ ] ++ lib.optionals (!stdenv.isLinux) [
"-Ddv1394=disabled" # Linux only
"-Doss4=disabled" # Linux only
"-Doss=disabled" # Linux only
@@ -138,7 +134,7 @@ stdenv.mkDerivation rec {
"-Dv4l2-gudev=disabled" # Linux-only
"-Dv4l2=disabled" # Linux-only
"-Dximagesrc=disabled" # Linux-only
- ] ++ optionals (!raspiCameraSupport) [
+ ] ++ lib.optionals (!raspiCameraSupport) [
"-Drpicamsrc=disabled"
];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index 3175cff4ac..f0755f201d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
version = "1.18.2";
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index bcecd11ce2..037face3d1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
version = "1.18.2";
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
index 8f35829ed3..7c70b7ead1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -16,7 +16,9 @@
, libintl
, lib
, opencore-amr
-, darwin
+, IOKit
+, CoreFoundation
+, DiskArbitration
}:
stdenv.mkDerivation rec {
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
};
@@ -49,11 +51,11 @@ stdenv.mkDerivation rec {
x264
libintl
opencore-amr
- ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ] ++ lib.optionals stdenv.isDarwin [
IOKit
CoreFoundation
DiskArbitration
- ]);
+ ];
mesonFlags = [
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a90d21c28e..2c92cd2236 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
version = "1.18.2";
src = fetchurl {
- url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
index 56693d24c7..d8010cdc63 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "gtk-layer-shell";
- version = "0.5.2";
+ version = "0.6.0";
outputs = [ "out" "dev" "devdoc" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "wmww";
repo = "gtk-layer-shell";
rev = "v${version}";
- sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";
+ sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
index 2d469c191e..72646fc198 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gtksourceview";
- version = "4.8.0";
+ version = "4.8.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
+ sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index b3615893b5..3f31a3f6db 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "2.7.2";
+ version = "2.7.4";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "harfbuzz";
repo = "harfbuzz";
rev = version;
- sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm";
+ sha256 = "sha256-uMkniDNBQ2mxDmeM7K/YQtZ3Avh9RVXYe7XsUErGas8=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix
index 34c3d26c55..4ae1772327 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix
@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation {
name = (appendToName "with-dicts" hunspell).name;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/68.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/68.nix
new file mode 100644
index 0000000000..5aeba0f262
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/icu/68.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+ version = "68.2";
+ sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7";
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix
index 035356ac86..da4ba218fd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
, fetchFromGitHub
, cmake
, cfitsio
@@ -14,19 +15,15 @@
stdenv.mkDerivation rec {
pname = "indilib";
- version = "1.8.8";
+ version = "1.8.9";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
- sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU=";
+ sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs=";
};
- patches = [
- ./udev-dir.patch
- ];
-
nativeBuildInputs = [
cmake
];
@@ -43,9 +40,15 @@ stdenv.mkDerivation rec {
fftw
];
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+ ];
+
meta = with lib; {
homepage = "https://www.indilib.org/";
description = "Implementation of the INDI protocol for POSIX operating systems";
+ changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix
new file mode 100644
index 0000000000..e6e82bc024
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-3rdparty.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, cfitsio
+, libusb1
+, zlib
+, boost
+, libnova
+, curl
+, libjpeg
+, gsl
+, fftw
+, indilib
+, libgphoto2
+, libraw
+, libftdi1
+, libdc1394
+, gpsd
+, ffmpeg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "indi-3rdparty";
+ version = "1.8.9";
+
+ src = fetchFromGitHub {
+ owner = "indilib";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy";
+ };
+
+ cmakeFlags = [
+ "-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+ "-DRULES_INSTALL_DIR=lib/udev/rules.d"
+ "-DWITH_SX=off"
+ "-DWITH_SBIG=off"
+ "-DWITH_APOGEE=off"
+ "-DWITH_FISHCAMP=off"
+ "-DWITH_DSI=off"
+ "-DWITH_QHY=off"
+ "-DWITH_ARMADILLO=off"
+ "-DWITH_PENTAX=off"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [
+ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
+ libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
+ ];
+
+ meta = with lib; {
+ homepage = "https://www.indilib.org/";
+ description = "Third party drivers for the INDI astronomical software suite";
+ changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [ hjones2199 ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix
new file mode 100644
index 0000000000..e52da9f2ea
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-full.nix
@@ -0,0 +1,11 @@
+{ callPackage, indilib, indi-3rdparty }:
+
+let
+ indi-with-drivers = ./indi-with-drivers.nix;
+in
+callPackage indi-with-drivers {
+ pkgName = "indi-full";
+ extraDrivers = [
+ indi-3rdparty
+ ];
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix
new file mode 100644
index 0000000000..b34abfd95c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/indilib/indi-with-drivers.nix
@@ -0,0 +1,9 @@
+{ buildEnv, indilib ? indilib, extraDrivers ? null , pkgName ? "indi-with-drivers" }:
+
+buildEnv {
+ name = pkgName;
+ paths = [
+ indilib
+ ]
+ ++ extraDrivers;
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch
deleted file mode 100644
index 7016800129..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500
-+++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600
-@@ -77,7 +77,7 @@
- ## the following are directories where stuff will be installed to
- set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
- set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
--set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
-
- set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
index ddf95ead24..5519a1fb76 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
outputs = [ "out" "bin" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix
index a820d947b7..ed086dac90 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix
@@ -1,23 +1,47 @@
-{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext
-, gobject-introspection, fixDarwinDylibNames, gnome3
+{ lib
+, stdenv
+, fetchurl
+, glib
+, meson
+, ninja
+, pkg-config
+, gettext
+, gobject-introspection
+, fixDarwinDylibNames
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, gnome3
}:
-let
+stdenv.mkDerivation rec {
pname = "json-glib";
- version = "1.4.4";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ version = "1.6.2";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3";
};
- propagatedBuildInputs = [ glib ];
- nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
- ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ gettext
+ gobject-introspection
+ glib
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
+ ] ++ lib.optional stdenv.hostPlatform.isDarwin [
+ fixDarwinDylibNames
+ ];
- outputs = [ "out" "dev" ];
+ propagatedBuildInputs = [
+ glib
+ ];
doCheck = true;
@@ -30,8 +54,8 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
homepage = "https://wiki.gnome.org/Projects/JsonGlib";
- license = licenses.lgpl2;
- maintainers = with maintainers; [ lethalman ];
+ license = licenses.lgpl21Plus;
+ maintainers = teams.gnome.members;
platforms = with platforms; unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
index b7754a186d..90d3f1da6e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, validatePkgConfig, fetchpatch }:
stdenv.mkDerivation rec {
pname = "jsoncpp";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';
- nativeBuildInputs = [ cmake python validatePkgConfig ];
+ nativeBuildInputs = [ cmake python3 validatePkgConfig ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index a9b3c41662..6c7365fd27 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,17 +1,19 @@
-{
- mkDerivation, lib,
- extra-cmake-modules,
- qtbase, qtx11extras, wayland,
+{ mkDerivation, lib
+, extra-cmake-modules
+, qtbase, qtx11extras, wayland
}:
mkDerivation {
name = "kguiaddons";
- meta = {
- maintainers = [ lib.maintainers.ttuegel ];
- broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
- };
+
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras wayland ];
propagatedBuildInputs = [ qtbase ];
+
outputs = [ "out" "dev" ];
+
+ meta = with lib; {
+ maintainers = [ maintainers.ttuegel ];
+ broken = versionOlder qtbase.version "5.14.0";
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix
index 129b578519..66bdcc03b9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lcms2/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, libtiff, libjpeg, zlib }:
stdenv.mkDerivation rec {
- name = "lcms2-2.11";
+ name = "lcms2-2.12";
src = fetchurl {
url = "mirror://sourceforge/lcms/${name}.tar.gz";
- sha256 = "0bkpf315925lhmd9i4mzjnkq5dh255r1lms0c0vzzkfpwk4bjjfw";
+ sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU=";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
index 8a9c80a617..61d87211e0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.12.3";
+ version = "1.12.4";
src = fetchFromGitHub {
- sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr";
+ sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
index 7543c6ddff..49d84c1b5c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libabigail";
- version = "1.8";
+ version = "1.8.2";
outputs = [ "bin" "out" "dev" ];
src = fetchurl {
url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw";
+ sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
index edbc61957c..5483909689 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "libaom";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchgit {
url = "https://aomedia.googlesource.com/aom";
rev = "v${version}";
- sha256 = "1vakwmcwvmmrdw7460m8hzq96y71lxqix8b2g07c6s12br0rrdhl";
+ sha256 = "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0";
};
patches = [ ./outputs.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
index ef9823130f..c7d4846833 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
pname = "libayatana-appindicator-gtk${gtkVersion}";
version = "0.5.5";
+ outputs = [ "out" "dev" ];
+
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "libayatana-appindicator";
@@ -18,11 +20,6 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
};
- prePatch = ''
- substituteInPlace configure.ac \
- --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0"
- '';
-
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
buildInputs =
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix
index 7c458bae19..b8e71c2dfd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation {
pname = "libbap";
- version = "master-2019-11-15";
+ version = "master-2020-11-25";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-bindings";
- rev = "1a30dd3e1df18c432a83a7038b555662d6982ae3";
- sha256 = "140gmak2kymh3r0fagb6ms66lmvwhhqj8pcd3qxc1p4ar330fwrh";
+ rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d";
+ sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil";
};
nativeBuildInputs = [ autoreconfHook which ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
index 11a6500642..584ea93293 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "libblockdev";
- version = "2.24";
+ version = "2.25";
src = fetchFromGitHub {
owner = "storaged-project";
repo = "libblockdev";
rev = "${version}-1";
- sha256 = "1gzwlwdv0jyb3lh2n016limy2ngfdsa05x7jvg9llf2ls672nq89";
+ sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ=";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix
index 02e73b0c04..f9b6538027 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libburn";
- version = "1.5.2.pl01";
+ version = "1.5.4";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
- sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8";
+ sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
index a84f010b9e..7ce8d6e7f8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "2.4";
+ version = "2.5";
in stdenv.mkDerivation rec {
pname = "libbytesize";
inherit version;
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
owner = "storaged-project";
repo = "libbytesize";
rev = version;
- sha256 = "1kq0hnw2yxjdmcrwvgp0x4j1arkka23k8vp2l6nqcw9lc15x18fp";
+ sha256 = "sha256-F8Ur8gtNYp4PYfBQ9sDJGBgW7KohJYNEU9SI2SbNuvM=";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix
index 087c928b79..b987c3dbb2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
+{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
stdenv.mkDerivation rec {
name = "libcdr-0.1.6";
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
};
+ patches = [
+ # Fix build with icu 68
+ # Remove in next release
+ (fetchpatch {
+ name = "libcdr-fix-icu-68";
+ url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894";
+ sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k";
+ })
+ ];
+
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix
index 341754376a..cb494f69fd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
-let version = "4.0.7"; in
+let version = "6.0.2"; in
stdenv.mkDerivation {
pname = "libcec";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
- sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw";
+ sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9";
};
nativeBuildInputs = [ pkg-config cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix
index 7a5c398492..ed6aae0f30 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
};
- majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" );
+ majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" );
src = fetchurl {
url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2";
sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
index f4e2df36d9..257673b1a9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
pname = "libdatrie";
version = "2019-12-20";
+ outputs = [ "bin" "out" "lib" "dev" ];
+
src = fetchFromGitHub {
owner = "tlwg";
repo = "libdatrie";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
index 994f010252..c26ccc347f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdmtx/default.nix
@@ -1,18 +1,27 @@
-{ lib, stdenv, fetchurl, pkg-config }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+}:
stdenv.mkDerivation rec {
- name = "libdmtx-0.7.4";
+ pname = "libdmtx";
+ version = "0.7.5";
- src = fetchurl {
- url = "mirror://sourceforge/libdmtx/${name}.tar.bz2";
- sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n";
+ src = fetchFromGitHub {
+ owner = "dmtx";
+ repo = "libdmtx";
+ rev = "v${version}";
+ sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
meta = {
description = "An open source software for reading and writing Data Matrix barcodes";
- homepage = "http://libdmtx.org";
+ homepage = "https://github.com/dmtx/libdmtx";
+ changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog";
platforms = lib.platforms.all;
maintainers = [ ];
license = lib.licenses.bsd2;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index e575624f81..b4ba311165 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [
"-Dtegra=true"
"-Detnaviv=true"
- ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false";
+ ];
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/mesa/drm";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
index c3a4986c83..d4a8b8f6f2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -1,4 +1,4 @@
-{ fetchsvn, stdenv, gnum4, tet }:
+{ lib, fetchsvn, stdenv, gnum4, tet }:
stdenv.mkDerivation (rec {
version = "3258";
@@ -8,6 +8,7 @@ stdenv.mkDerivation (rec {
url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
rev = (lib.strings.toInt version);
name = "elftoolchain-${version}";
+ sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz";
};
buildInputs = [ gnum4 tet ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
index daae6984ab..33b3f0b32e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libevdev";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchurl {
url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0jidjv78lay8kl3yigwhx9fii908sk7gn9nfd2ny12ql5ipc48im";
+ sha256 = "sha256-Y/TqFImFihCQgOC0C9Q+TgkDoeEuqIjVgduMSVdHwtA=";
};
nativeBuildInputs = [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch
new file mode 100644
index 0000000000..134c64441d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch
@@ -0,0 +1,44 @@
+--- Makefile.orig
++++ Makefile
+@@ -23,24 +23,25 @@
+ # SUCH DAMAGE.
+ #
+ # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
++#
++# Linux Makefile by Matt Smith , 2011/01/04
+
+-LIB= execinfo
++CC=cc
++AR=ar
++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -c
++EXECINFO_LDFLAGS=$(LDFLAGS)
+
+-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h
++all: static dynamic
+
+-INCS= execinfo.h
++static:
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
+
+-SHLIB_MAJOR= 1
+-SHLIB_MINOR= 0
++dynamic:
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So
+
+-NOPROFILE= yes
+-
+-DPADD= ${LIBM}
+-LDADD= -lm
+-
+-#WARNS?= 4
+-
+-#stacktraverse.c: gen.py
+-# ./gen.py > stacktraverse.c
+-
+-.include
++clean:
++ rm -rf *.o *.So *.a *.so
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
index f3f8920970..36f956e777 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
@@ -23,14 +23,11 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302";
})
- (fetchpatch {
- name = "30-linux-makefile.patch";
- url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1";
- sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf";
- })
+ ./30-linux-makefile.patch
];
makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
+ hardeningEnable = [ "stackprotector" ];
buildFlags =
lib.optional enableStatic "static"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
index 84ee18084c..7dfad49780 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
@@ -1,25 +1,13 @@
-From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001
-From: Christian Kampka
-Date: Wed, 25 Nov 2020 20:09:50 +0100
-Subject: [PATCH] Remove unsupported clang flags
-
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/src/Makefile b/src/Makefile
-index f13a6bb..b305150 100644
+index 2af4804..bcff809 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -69,7 +69,7 @@ PREFIX ?= /usr/local
+@@ -80,7 +80,7 @@ PREFIX ?= /usr/local
LIBDIRNAME ?= /lib/faketime
PLATFORM ?=$(shell uname)
--CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
-+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
+-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
ifeq ($(PLATFORM),SunOS)
CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
endif
---
-2.28.0
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
index 27487c6a31..ced1c3e7bb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl }:
+{ lib, stdenv, fetchurl, perl, coreutils }:
stdenv.mkDerivation rec {
pname = "libfaketime";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
patches = [
./no-date-in-gzip-man-page.patch
+ ./nix-store-date.patch
] ++ (lib.optionals stdenv.cc.isClang [
# https://github.com/wolfcw/libfaketime/issues/277
./0001-Remove-unsupported-clang-flags.patch
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace $a \
--replace /bin/bash ${stdenv.shell}
done
+ substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date
'';
PREFIX = placeholder "out";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch
new file mode 100644
index 0000000000..b88245dfe8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch
@@ -0,0 +1,29 @@
+From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001
+From: Finn Behrens
+Date: Fri, 5 Mar 2021 21:58:57 +0100
+Subject: [PATCH] use nix date path
+
+---
+ src/faketime.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/faketime.c b/src/faketime.c
+index af618f2..48e47da 100644
+--- a/src/faketime.c
++++ b/src/faketime.c
+@@ -50,11 +50,7 @@
+
+ const char version[] = "0.9.9";
+
+-#ifdef __APPLE__
+-static const char *date_cmd = "gdate";
+-#else
+-static const char *date_cmd = "date";
+-#endif
++static const char *date_cmd = "@DATE_CMD@";
+
+ #define PATH_BUFSIZE 4096
+
+--
+2.24.3 (Apple Git-128)
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
index f3f7313acc..979ba7eea5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix
@@ -2,6 +2,7 @@
, fetchFromGitLab
, pkg-config
, meson
+, python3
, ninja
, gusb
, pixman
@@ -10,13 +11,13 @@
, gobject-introspection
, coreutils
, gtk-doc
-, docbook_xsl
+, docbook-xsl-nons
, docbook_xml_dtd_43
}:
stdenv.mkDerivation rec {
pname = "libfprint";
- version = "1.90.5";
+ version = "1.90.7";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "libfprint";
repo = pname;
rev = "v${version}";
- sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j";
+ sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI=";
};
nativeBuildInputs = [
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
meson
ninja
gtk-doc
- docbook_xsl
+ docbook-xsl-nons
docbook_xml_dtd_43
gobject-introspection
];
@@ -44,16 +45,29 @@ stdenv.mkDerivation rec {
nss
];
- NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
+ checkInputs = [
+ python3
+ ];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
+ # Include virtual drivers for fprintd tests
+ "-Ddrivers=all"
];
+ doCheck = true;
+
+ postPatch = ''
+ patchShebangs \
+ tests/test-runner.sh \
+ tests/unittest_inspector.py \
+ tests/virtual-image.py
+ '';
+
meta = with lib; {
homepage = "https://fprint.freedesktop.org/";
description = "A library designed to make it easy to add support for consumer fingerprint readers";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Only;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
index 69b7bdc7d1..a666a7db52 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
@@ -1,15 +1,21 @@
-{ lib, stdenv, fetchurl, gnum4 }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "libfyaml";
- version = "0.5.7";
+ version = "0.6";
- src = fetchurl {
- url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz";
- sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j";
+ src = fetchFromGitHub {
+ owner = "pantoniou";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0b1wnalh49rbjykw4bj5k3y1d9yr8k6f0im221bl1gyrwlgw7hp5";
};
- nativeBuildInputs = [ gnum4 ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ postPatch = ''
+ echo ${version} > .tarball-version
+ '';
meta = with lib; {
homepage = "https://github.com/pantoniou/libfyaml";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
index 74098f7e00..80cd5bc13c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
-, buildPackages
+, buildPackages, fetchpatch
}:
assert enableCapabilities -> stdenv.isLinux;
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5";
};
+ patches = [
+ # fix build on 32bit musl
+ (fetchpatch {
+ name = "fix_building_with_disable-asm_on_x86.patch";
+ url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8";
+ sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw";
+ })
+ ];
+
outputs = [ "out" "dev" "info" ];
outputBin = "dev";
@@ -27,6 +36,8 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin gettext
++ lib.optional enableCapabilities libcap;
+ strictDeps = true;
+
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
index 88ba7dacc2..31a9579a89 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }:
+{ stdenv, lib, fetchFromGitLab
+, autoreconfHook, pkg-config, python3, addOpenGLRunpath
+, libX11, libXext, xorgproto
+}:
stdenv.mkDerivation rec {
pname = "libglvnd";
version = "1.3.2";
- src = fetchFromGitHub {
- owner = "NVIDIA";
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "glvnd";
repo = "libglvnd";
rev = "v${version}";
sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz";
@@ -31,8 +35,11 @@ stdenv.mkDerivation rec {
"-Wno-error=array-bounds"
] ++ lib.optional stdenv.cc.isClang "-Wno-error");
- # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
- configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
+ configureFlags = []
+ # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
+ ++ lib.optional stdenv.hostPlatform.isMusl "--disable-tls"
+ # Remove when aarch64-darwin asm support is upstream: https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/216
+ ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-asm";
outputs = [ "out" "dev" ];
@@ -47,8 +54,17 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The GL Vendor-Neutral Dispatch library";
- homepage = "https://github.com/NVIDIA/libglvnd";
- license = licenses.bsd2;
+ longDescription = ''
+ libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API
+ calls between multiple vendors. It allows multiple drivers from different
+ vendors to coexist on the same filesystem, and determines which vendor to
+ dispatch each API call to at runtime.
+ Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.
+ '';
+ inherit (src.meta) homepage;
+ # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd:
+ license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ];
platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ primeos ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix
index f7392ffb7d..be088496f2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libgxps";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
+ sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw=";
};
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
index b0872b9da1..71dfca5e64 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
@@ -1,9 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, dav1d, rav1e, libde265, x265, libpng,
libjpeg, libaom }:
stdenv.mkDerivation rec {
pname = "libheif";
- version = "1.9.1";
+ version = "1.11.0";
outputs = [ "bin" "out" "dev" "man" ];
@@ -11,21 +11,19 @@ stdenv.mkDerivation rec {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
- sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz";
+ sha256 = "sha256-xT0sfYPp5atYXnVpP8TYu2TC9/Z/ClyEP1OTSfcw1gw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libde265 x265 libpng libjpeg libaom ];
- # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config
+ buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ];
enableParallelBuilding = true;
meta = {
homepage = "http://www.libheif.org/";
description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
- license = lib.licenses.lgpl3;
+ license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ gebner ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix
index 7f5e739a99..fa396e9665 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, buildPackages
, cmake
, glib
@@ -22,7 +21,7 @@ assert introspectionSupport -> gobject-introspection != null && vala != null;
stdenv.mkDerivation rec {
pname = "libical";
- version = "3.0.8";
+ version = "3.0.9";
outputs = [ "out" "dev" ]; # "devdoc" ];
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "libical";
repo = "libical";
rev = "v${version}";
- sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68";
+ sha256 = "sha256-efdiGktLGITaQ6VinnfYG52fMhO0Av+JKROt2kTvS1U=";
};
nativeBuildInputs = [
@@ -68,19 +67,13 @@ stdenv.mkDerivation rec {
"-DGOBJECT_INTROSPECTION=True"
"-DICAL_GLIB_VAPI=True"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- "-DIMPORT_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/GlibSrcGenerator.cmake"
+ "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
];
patches = [
# Will appear in 3.1.0
# https://github.com/libical/libical/issues/350
./respect-env-tzdir.patch
- # Export src-generator binary for use while cross-compiling
- # https://github.com/libical/libical/pull/439
- (fetchpatch {
- url = "https://github.com/libical/libical/commit/1197d84b63dce179b55a6293cfd6d0523607baf1.patch";
- sha256 = "18i1khnwmw488s7g5a1kf05sladf8dbyhfc69mbcf6dkc4nnc3dg";
- })
];
# Using install check so we do not have to manually set
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
index 1c8502da49..c988c49a6e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
patchShebangs ./configure
'';
+ configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ];
+
meta = with lib; {
homepage = "https://pngquant.org/lib/";
description = "Image quantization library";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libisofs/default.nix
index a291410941..d80614609c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libisofs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libisofs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libisofs";
- version = "1.5.2";
+ version = "1.5.4";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
- sha256 = "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg";
+ sha256 = "sha256-qqDtgKdQGXkxb1BbCwF/Kcug6lRjt1EUO60sNgIVqI4=";
};
buildInputs = [ attr zlib ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
index 2426dfebe8..f2d4e00d1a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, nasm
+, openjdk
+, enableJava ? false # whether to build the java wrapper
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
}:
@@ -26,11 +28,18 @@ stdenv.mkDerivation rec {
moveToOutput include/transupp.h $dev_private
'';
- nativeBuildInputs = [ cmake nasm ];
+ nativeBuildInputs = [
+ cmake
+ nasm
+ ] ++ lib.optionals enableJava [
+ openjdk
+ ];
cmakeFlags = [
"-DENABLE_STATIC=${if enableStatic then "1" else "0"}"
"-DENABLE_SHARED=${if enableShared then "1" else "0"}"
+ ] ++ lib.optionals enableJava [
+ "-DWITH_JAVA=1"
];
doInstallCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix
new file mode 100644
index 0000000000..9c7d624e7f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, jansson, openssl }:
+
+stdenv.mkDerivation rec {
+ pname = "libjwt";
+ version = "1.12.1";
+
+ src = fetchFromGitHub {
+ owner = "benmcollins";
+ repo = "libjwt";
+ rev = "v${version}";
+ sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2";
+ };
+
+ buildInputs = [ jansson openssl ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ meta = with lib; {
+ homepage = "https://github.com/benmcollins/libjwt";
+ description = "JWT C Library";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ pnotequalnp ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix
index 850c7aa1df..9695b221cb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "libmbim";
- version = "1.24.4";
+ version = "1.24.6";
src = fetchurl {
url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
- sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x";
+ sha256 = "sha256-dgRlyqoczWmcFCkOl5HaRW1TAN0R6/TBSGFRAz6HXf0=";
};
outputs = [ "out" "dev" "man" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
new file mode 100644
index 0000000000..6ad0435a84
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, stdenv
+, fetchurl
+, bash-completion
+, pkg-config
+, perl
+, libxml2
+, fuse
+, gnutls
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libnbd";
+ version = "1.7.2";
+
+ src = fetchurl {
+ url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
+ hash = "sha256-+xC4wDEeWi3RteF04C/qjMmjM+lmhtrtXZZyM1UUli4=";
+ };
+
+ nativeBuildInputs = [
+ bash-completion
+ pkg-config
+ perl
+ ];
+ buildInputs = [
+ fuse
+ gnutls
+ libxml2
+ ];
+
+ installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.com/nbdkit/libnbd";
+ description = "Network Block Device client library in userspace";
+ longDescription = ''
+ NBD — Network Block Device — is a protocol for accessing Block Devices
+ (hard disks and disk-like things) over a Network. This is the NBD client
+ library in userspace, a simple library for writing NBD clients.
+
+ The key features are:
+ - Synchronous API for ease of use.
+ - Asynchronous API for writing non-blocking, multithreaded clients. You
+ can mix both APIs freely.
+ - High performance.
+ - Minimal dependencies for the basic library.
+ - Well-documented, stable API.
+ - Bindings in several programming languages.
+ - Shell (nbdsh) for command line and scripting.
+ '';
+ license = with licenses; lgpl21Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; linux;
+ };
+}
+# TODO: NBD URI support apparently is not enabled
+# TODO: package the 1.6-stable version too
+# TODO: git version needs ocaml
+# TODO: bindings for go, ocaml and python
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
index abbffcf0f9..40459dbca2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix
@@ -1,25 +1,31 @@
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
stdenv.mkDerivation {
- name = "libnixxml";
+ pname = "libnixxml";
+ version = "unstable-2020-06-25";
+
src = fetchFromGitHub {
owner = "svanderburg";
repo = "libnixxml";
rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a";
sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
};
- configureFlags = [ "--with-gd" "--with-glib" ];
- CFLAGS = "-Wall";
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ];
- doCheck = false;
- postPatch = ''
+
+ preConfigure = ''
./bootstrap
'';
+ configureFlags = [ "--with-gd" "--with-glib" ];
+ CFLAGS = "-Wall";
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
+
+ doCheck = false;
+
meta = with lib; {
description = "XML-based Nix-friendly data integration library";
- homepage = https://github.com/svanderburg/libnixxml;
+ homepage = "https://github.com/svanderburg/libnixxml";
license = licenses.mit;
maintainers = with maintainers; [ tomberek ];
platforms = platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix
index 10197bd8db..f46a203946 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libofx";
- version = "0.9.15";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "LibOFX";
repo = pname;
rev = version;
- sha256 = "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy";
+ sha256 = "sha256-gdLh5ZUciN4FCJwTCaJSKJ5RjXgNDXnDOUWkyTZwf2c=";
};
preConfigure = "./autogen.sh";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
deleted file mode 100644
index 1cbfe44ef4..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{lib, stdenv, fetchurl, protobuf}:
-
-stdenv.mkDerivation {
- name = "libosmpbf-1.3.3";
-
- src = fetchurl {
- url = "https://github.com/scrosby/OSM-binary/archive/v1.3.3.tar.gz";
- sha256 = "a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798";
- };
-
- buildInputs = [ protobuf ];
-
- sourceRoot = "OSM-binary-1.3.3/src";
-
- installFlags = [ "PREFIX=$(out)" ];
-
- meta = {
- homepage = "https://github.com/scrosby/OSM-binary";
- description = "C library to read and write OpenStreetMap PBF files";
- license = lib.licenses.lgpl3;
- platforms = lib.platforms.unix;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix
new file mode 100644
index 0000000000..2f83963d20
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkDerivation, fetchgit, cmake, pkg-config
+, marisa, qtlocation }:
+
+mkDerivation rec {
+ pname = "libosmscout";
+ version = "2017.06.30";
+
+ src = fetchgit {
+ url = "git://git.code.sf.net/p/libosmscout/code";
+ rev = "0c0fde4d9803539c99911389bc918377a93f350c";
+ sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ marisa qtlocation ];
+
+ meta = with lib; {
+ description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data";
+ homepage = "http://libosmscout.sourceforge.net/";
+ license = licenses.lgpl3Plus;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix
new file mode 100644
index 0000000000..e024874eab
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix
@@ -0,0 +1,27 @@
+{ cmake
+, fetchFromGitHub
+, lib
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libowlevelzs";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "zseri";
+ repo = "libowlevelzs";
+ rev = "v${version}";
+ sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with lib; {
+ description = "Zscheile Lowlevel (utility) library";
+ homepage = "https://github.com/zseri/libowlevelzs";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zseri ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix
index 0b30bf6c2b..c04d4a001a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix
@@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "libpcap";
- version = "1.9.1";
+ version = "1.10.0";
src = fetchurl {
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
- sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3";
+ sha256 = "sha256-jRK0JiPu7+6HLxI70NyF1TWwDfTULoZfmTxA97/JKx4=";
};
nativeBuildInputs = [ flex bison ]
@@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
linux = "linux";
darwin = "bpf";
}.${stdenv.hostPlatform.parsed.kernel.name})
+ ] ++ optionals stdenv.isDarwin [
+ "--disable-universal"
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
[ "ac_cv_linux_vers=2" ];
- prePatch = optionalString stdenv.isDarwin ''
- substituteInPlace configure --replace " -arch i386" ""
- '';
-
postInstall = ''
if [ "$dontDisableStatic" -ne "1" ]; then
rm -f $out/lib/libpcap.a
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix
new file mode 100644
index 0000000000..e6c507ad2b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libpostal/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ pname = "libpostal";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "openvenues";
+ repo = "libpostal";
+ rev = "v${version}";
+ sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ configureFlags = [
+ "--disable-data-download"
+ ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ];
+
+ meta = with lib; {
+ description = "A C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data";
+ homepage = "https://github.com/openvenues/libpostal";
+ license = licenses.mit;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
index 8bd187b530..e55cda5174 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ];
buildInputs = [ curl gettext libiconv readline ];
- configureFlags = ["--with-readline=${readline.dev}"];
propagatedBuildInputs = [ libxml2 mpfr icu ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
index 7bd3fa9702..42d8cbf285 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libqmi";
- version = "1.26.8";
+ version = "1.26.10";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
- sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA=";
+ sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k=";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librep/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librep/default.nix
index 74c45f00ad..cd007c5fe5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/librep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/librep/default.nix
@@ -1,37 +1,49 @@
-{ lib, stdenv, fetchurl
-, pkg-config, autoreconfHook
-, readline, texinfo
-, gdbm, gmp, libffi }:
-
-with lib;
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, gdbm
+, gmp
+, libffi
+, pkg-config
+, readline
+, texinfo
+}:
stdenv.mkDerivation rec {
pname = "librep";
version = "0.92.7";
- sourceName = "librep_${version}";
src = fetchurl {
- url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz";
+ url = "https://download.tuxfamily.org/${pname}/${pname}_${version}.tar.xz";
sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ readline texinfo ];
- propagatedBuildInputs = [ gdbm gmp libffi ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ texinfo
+ ];
+ buildInputs = [
+ gdbm
+ gmp
+ libffi
+ readline
+ ];
setupHook = ./setup-hook.sh;
- meta = {
+ meta = with lib;{
+ homepage = "http://sawfish.tuxfamily.org/";
description = "Fast, lightweight, and versatile Lisp environment";
longDescription = ''
- librep is a Lisp system for UNIX, comprising an
- interpreter, a byte-code compiler, and a virtual
- machine. It can serve as an application extension language
- but is also suitable for standalone scripts.
- '';
- homepage = "http://sawfish.wikia.com";
- license = licenses.gpl2;
+ librep is a Lisp system for UNIX, comprising an interpreter, a byte-code
+ compiler, and a virtual machine. It can serve as an application extension
+ language but is also suitable for standalone scripts.
+ '';
+ license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.unix;
};
}
# TODO: investigate fetchFromGithub
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
index d67342eebc..b7724d27a0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix
@@ -63,11 +63,6 @@ let
};
in {
- libressl_3_0 = generic {
- version = "3.0.2";
- sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
- };
-
libressl_3_1 = generic {
version = "3.1.4";
sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
index 20cb80b1ff..4189ba9c6f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "libsigsegv-2.12";
+ name = "libsigsegv-2.13";
src = fetchurl {
url = "mirror://gnu/libsigsegv/${name}.tar.gz";
- sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s";
+ sha256 = "sha256-vnjuQXawX3x1/wMpjYSHTbkPS2ydVQPw2hIms6PEgRk=";
};
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix
index db2cd04459..64ae1713fd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
enableParallelBuilding = true;
+ hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector";
+
+ # FIXME: the hardeingDisable attr above does not seems effective, so
+ # the need to disable stackprotector via configureFlags
+ configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp";
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
index 8922bedccd..011531b1a2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }:
stdenv.mkDerivation rec {
- name = "libspectrum-1.4.4";
+ name = "libspectrum-1.5.0";
src = fetchurl {
url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz";
- sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx";
+ sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw=";
};
nativeBuildInputs = [ perl pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch
new file mode 100644
index 0000000000..2c315067f4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/configure-socket-path.patch
@@ -0,0 +1,47 @@
+diff --git a/spnav.c b/spnav.c
+index f9e10f8..27149f7 100644
+--- a/spnav.c
++++ b/spnav.c
+@@ -36,7 +36,7 @@ OF SUCH DAMAGE.
+ #include
+ #include "spnav.h"
+
+-#define SPNAV_SOCK_PATH "/var/run/spnav.sock"
++#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock"
+
+ #ifdef USE_X11
+ #include
+@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail;
+ /* AF_UNIX socket used for alternative communication with daemon */
+ static int sock = -1;
+
++static char *spath = NULL;
++
++static char *socket_path()
++{
++ char *xdg_runtime_dir;
++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
++ if ( spath == NULL ) {
++ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
++ if ( spath != NULL ) {
++ sprintf(spath, sizeof(spath), "%s/spnav.sock", xdg_runtime_dir);
++ }
++ }
++ if(access(spath, F_OK)){
++ return spath;
++ }
++ }
++ return DEFAULT_SPNAV_SOCK_PATH;
++}
+
+ int spnav_open(void)
+ {
+@@ -92,7 +110,7 @@ int spnav_open(void)
+
+ memset(&addr, 0, sizeof addr);
+ addr.sun_family = AF_UNIX;
+- strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path));
++ strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path));
+
+
+ if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix
new file mode 100644
index 0000000000..9bd0a67041
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, libX11}:
+
+stdenv.mkDerivation rec {
+ version = "0.2.3";
+ pname = "libspnav";
+
+ src = fetchFromGitHub {
+ owner = "FreeSpacenav";
+ repo = "libspnav";
+ rev = "${pname}-${version}";
+ sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba";
+ };
+
+ buildInputs = [ libX11 ];
+
+ patches = [
+ # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
+ # to allow for a user service
+ ./configure-socket-path.patch
+ ];
+
+ configureFlags = [ "--disable-debug"];
+
+ preInstall = ''
+ mkdir -p $out/{lib,include}
+ '';
+
+ meta = with lib; {
+ homepage = "http://spacenav.sourceforge.net/";
+ description = "Device driver and SDK for 3Dconnexion 3D input devices";
+ longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ sohalt ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix
index ad00906bb8..97745813ef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix
@@ -4,12 +4,16 @@ stdenv.mkDerivation rec {
pname = "libthai";
version = "0.1.28";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz";
sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z";
};
- nativeBuildInputs = [ installShellFiles pkg-config ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ installShellFiles (lib.getBin libdatrie) pkg-config ];
buildInputs = [ libdatrie ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
index d69c8d670c..69410cf2b9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
+, fetchpatch
, autoreconfHook
, pkg-config
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
@@ -22,6 +23,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ patches = [ (fetchpatch {
+ # https://bugs.archlinux.org/task/69121
+ url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch";
+ sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq";
+ excludes = [ "libusb/version_nano.h" ];
+ }) ];
+
nativeBuildInputs = [ pkg-config autoreconfHook ];
propagatedBuildInputs =
lib.optional enableUdev udev ++
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
index a4447ed337..6b1a0120e4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,19 +1,20 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
- version = "1.40.0";
+ version = "1.41.0";
pname = "libuv";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg";
+ sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI=";
};
postPatch = let
toDisable = [
"getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
+ "tcp_connect_timeout" # tries to reach out to 8.8.8.8
"spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
"getaddrinfo_fail" "getaddrinfo_fail_sync"
"threadpool_multiple_event_loops" # times out on slow machines
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix
new file mode 100644
index 0000000000..4df5bde228
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }:
+
+stdenv.mkDerivation rec {
+ pname = "libxcrypt";
+ version = "4.4.18";
+
+ src = fetchFromGitHub {
+ owner = "besser82";
+ repo = "libxcrypt";
+ rev = "v${version}";
+ sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1";
+ };
+
+ preConfigure = ''
+ patchShebangs autogen.sh
+ ./autogen.sh
+ '';
+
+ nativeBuildInputs = [ autoconf automake libtool pkg-config perl ];
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others";
+ homepage = "https://github.com/besser82/libxcrypt/";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ dottedmag ];
+ license = licenses.lgpl21Plus;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
index 600e94d0a7..601c27c98e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libxl";
- version = "3.8.8";
+ version = "3.9.4.3";
src = fetchurl {
url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
- sha256 = "08jarfcl8l5mrmkx6bcifi3ghkaja9isz77zgggl84yl66js5pc3";
+ sha256 = "sha256-U8hXoqBzjSGigOXc29LZQk3KrGiYvBPBJPg5qihcAsY=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix
index 3a16b5202c..e6996a53c8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "lime";
- version = "4.4.0";
+ version = "4.4.21";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z";
+ sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I=";
};
buildInputs = [ bctoolbox soci belle-sip sqlite ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix
new file mode 100644
index 0000000000..e98903e3a8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix
@@ -0,0 +1,33 @@
+{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
+, qtbase, curl, libuv, glfw3 }:
+
+mkDerivation rec {
+ pname = "mapbox-gl-native";
+ version = "2020.06.07";
+
+ src = fetchFromGitHub {
+ owner = "mapbox";
+ repo = "mapbox-gl-native";
+ rev = "e18467d755f470b26f61f6893eddd76ecf0816e6";
+ sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ curl libuv glfw3 qtbase ];
+
+ cmakeFlags = [
+ "-DMBGL_WITH_QT=ON"
+ "-DMBGL_WITH_QT_LIB_ONLY=ON"
+ "-DMBGL_WITH_QT_HEADLESS=OFF"
+ ];
+ NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits";
+
+ meta = with lib; {
+ description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL";
+ homepage = "https://mapbox.com/mobile";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix
new file mode 100644
index 0000000000..1740b9ae58
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix
@@ -0,0 +1,32 @@
+{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }:
+
+mkDerivation rec {
+ pname = "mapbox-gl-qml";
+ version = "1.7.5";
+
+ src = fetchFromGitHub {
+ owner = "rinigus";
+ repo = "mapbox-gl-qml";
+ rev = version;
+ sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx";
+ };
+
+ nativeBuildInputs = [ qmake ];
+ buildInputs = [ qtlocation mapbox-gl-native ];
+
+ postPatch = ''
+ substituteInPlace mapbox-gl-qml.pro \
+ --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}'
+ '';
+
+ # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
+ NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5";
+
+ meta = with lib; {
+ description = "Unofficial Mapbox GL Native bindings for Qt QML";
+ homepage = "https://github.com/rinigus/mapbox-gl-qml";
+ license = licenses.lgpl3Only;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/maxflow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/maxflow/default.nix
new file mode 100644
index 0000000000..9c53a16d37
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/maxflow/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ pname = "maxflow";
+ version = "3.0.5";
+
+ src = fetchFromGitHub {
+ owner = "gerddie";
+ repo = pname;
+ rev = version;
+ hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with lib; {
+ description = "Software for computing mincut/maxflow in a graph";
+ homepage = "https://github.com/gerddie/maxflow";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.tadfisher ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
index 3cda9ff300..6cdc24770d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix
@@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
- version = "4.4.13";
+ version = "4.4.24";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw";
+ sha256 = "sha256-wAWcSvsLRzscpx9YAnBcsoYuy+77yJrU3+cNbRu0i7U=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
index 5e02a9fd52..43f63d91a6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ autoconf automake libtool glib readline makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ autoconf automake libtool glib readline ];
preConfigure = ''
substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix
new file mode 100644
index 0000000000..5a680b9da9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, lib, fetchFromGitLab, qmake, qtbase }:
+
+mkDerivation rec {
+ pname = "nemo-qml-plugin-dbus";
+ version = "2.1.23";
+
+ src = fetchFromGitLab {
+ domain = "git.sailfishos.org";
+ owner = "mer-core";
+ repo = "nemo-qml-plugin-dbus";
+ rev = version;
+ sha256 = "0ww478ds7a6h4naa7vslj6ckn9cpsgcml0q7qardkzmdmxsrv1ag";
+ };
+
+ nativeBuildInputs = [ qmake ];
+
+ postPatch = ''
+ substituteInPlace dbus.pro --replace ' tests' ""
+ substituteInPlace src/nemo-dbus/nemo-dbus.pro \
+ --replace /usr $out \
+ --replace '$$[QT_INSTALL_LIBS]' $out'/lib'
+ substituteInPlace src/plugin/plugin.pro \
+ --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}'
+ '';
+
+ meta = with lib; {
+ description = "Nemo DBus plugin for qml";
+ homepage = "https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus/";
+ license = licenses.lgpl2Only;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix
index 7b9bffb9bc..09169019a1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg,
+{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline,
fetchFromGitHub, lib,
multimediaSupport ? true
}:
let
- version = "2.1.0";
+ version = "2.1.5";
in
stdenv.mkDerivation {
pname = "notcurses";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config pandoc ];
- buildInputs = [ libunistring ncurses ]
+ buildInputs = [ libunistring ncurses readline ]
++ lib.optional multimediaSupport ffmpeg;
cmakeFlags =
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
- sha256 = "0jvngg40c1sqf85kqy6ya0vflpxsj7j4g6cw609992rifaghxiny";
+ sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix
index 4386542ff2..ab09931579 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix
@@ -5,7 +5,7 @@ let
in
stdenv.mkDerivation {
name = (appendToName "with-dicts" nuspell).name;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath}
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
index a71b2a6191..44a0e017a2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
+{ lib, stdenv, fetchurl, openssl, db, groff, libtool
+, withCyrusSasl ? true
+, cyrus_sasl
+}:
stdenv.mkDerivation rec {
pname = "openldap";
@@ -37,8 +40,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--with-yielding_select=yes"
"ac_cv_func_memcmp_working=yes"
- ] ++ lib.optional (openssl == null) "--without-tls"
- ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
+ ] ++ lib.optional (!withCyrusSasl) "--without-cyrus-sasl"
++ lib.optional stdenv.isFreeBSD "--with-pic";
postBuild = ''
@@ -54,19 +56,21 @@ stdenv.mkDerivation rec {
"moduledir=$(out)/lib/modules"
];
- # 1. Fixup broken libtool
- # 2. Libraries left in the build location confuse `patchelf --shrink-rpath`
+ # 1. Libraries left in the build location confuse `patchelf --shrink-rpath`
# Delete these to let patchelf discover the right path instead.
# FIXME: that one can be removed when https://github.com/NixOS/patchelf/pull/98
# is in Nixpkgs patchelf.
+ # 2. Fixup broken libtool for openssl and cyrus_sasl (if it is not disabled)
preFixup = ''
- sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \
- -e 's,-lssl,-L${openssl.out}/lib -lssl,' \
- -i $out/lib/libldap.la -i $out/lib/libldap_r.la
-
- rm -rf $out/var
+ rm -r $out/var
rm -r libraries/*/.libs
rm -r contrib/slapd-modules/passwd/*/.libs
+ for f in $out/lib/libldap.la $out/lib/libldap_r.la; do
+ substituteInPlace "$f" --replace '-lssl' '-L${openssl.out}/lib -lssl'
+ '' + lib.optionalString withCyrusSasl ''
+ substituteInPlace "$f" --replace '-lsasl2' '-L${cyrus_sasl.out}/lib -lsasl2'
+ '' + ''
+ done
'';
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
index 8eeff3de94..da7e9c755a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "openscenegraph";
- version = "3.6.4";
+ version = "3.6.5";
src = fetchFromGitHub {
owner = "openscenegraph";
repo = "OpenSceneGraph";
rev = "OpenSceneGraph-${version}";
- sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785";
+ sha256 = "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1";
};
nativeBuildInputs = [ pkg-config cmake doxygen ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
index ce4374be33..2edf02e738 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -160,8 +160,8 @@ in {
};
openssl_1_1 = common {
- version = "1.1.1i";
- sha256 = "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8";
+ version = "1.1.1j";
+ sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma";
patches = [
./1.1/nix-ssl-cert-file.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
index 9228424797..83eb77b603 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensubdiv";
- version = "3.4.3";
+ version = "3.4.4";
src = fetchFromGitHub {
owner = "PixarAnimationStudios";
repo = "OpenSubdiv";
rev = "v${lib.replaceChars ["."] ["_"] version}";
- sha256 = "0zpnpg2zzyavv9r3jakv3j2gn603b62rbczrflc6qmg6qvpgz0kr";
+ sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix
index 196cac4bca..d9d26d0b53 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "ortp";
- version = "4.4.9";
+ version = "4.4.24";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
- sha256 = "0igiw863gnf9f626v0igg1pj3fv4anvlvlk6xx3bk2zdi52a9kcc";
+ sha256 = "sha256-jM2kRInti7lG72bSTbdVZLshb3gvgm2EccnZNwzi8UU=";
};
# Do not build static libraries
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
index 436e0f85e1..b8cdff1f48 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
@@ -1,22 +1,49 @@
-{ lib, stdenv, fetchFromGitHub, cmake
-, qhull, flann, boost, vtk, eigen, pkg-config, qtbase
-, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
+{ lib
+, stdenv
+, fetchFromGitHub
+, wrapQtAppsHook
+, cmake
+, qhull
+, flann
+, boost
+, vtk
+, eigen
+, pkg-config
+, qtbase
+, libusb1
+, libpcap
+, libXt
+, libpng
+, Cocoa
+, AGL
+, OpenGL
}:
stdenv.mkDerivation rec {
- name = "pcl-1.11.1";
+ pname = "pcl";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
- rev = name;
+ rev = "${pname}-${version}";
sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1";
};
- nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = [ qhull flann boost eigen libusb1 libpcap
- libpng vtk qtbase libXt ]
- ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
+ nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+ buildInputs = [
+ qhull
+ flann
+ boost
+ eigen
+ libusb1
+ libpcap
+ libpng
+ vtk
+ qtbase
+ libXt
+ ]
+ ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ];
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
@@ -24,10 +51,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://pointclouds.org/";
- broken = lib.versionAtLeast qtbase.version "5.15";
description = "Open project for 2D/3D image and point cloud processing";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [viric];
+ maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux ++ darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
index d3f6bcb747..0a7e9b4d94 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "herwig";
- version = "7.2.1";
+ version = "7.2.2";
src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
- sha256 = "11m6xvardnk0i8x8b3dpwg4c4ncq0xmlfg2n5r5qmh6544pz7zyl";
+ sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k";
};
nativeBuildInputs = [ autoconf automake libtool ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A multi-purpose particle physics event generator";
homepage = "https://herwig.hepforge.org/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ veprbl ];
platforms = platforms.unix;
broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
index d5a272955f..ed92889b5b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "thepeg";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
- sha256 = "13x5gssv22mpa2w6i0vaalwcr57170vh3b4xrw8mrm3abqhwgav3";
+ sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp";
};
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Toolkit for High Energy Physics Event Generation";
homepage = "https://herwig.hepforge.org/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ veprbl ];
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch
rename to third_party/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch
similarity index 78%
rename from third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch
rename to third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch
index 99782e1bb2..4a6b21dd43 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch
@@ -1,19 +1,19 @@
diff --git a/meson_options.txt b/meson_options.txt
-index 050a4c31..c481e76c 100644
+index ce364d93..a6c8af72 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -148,6 +148,9 @@ option('udev',
+@@ -152,6 +152,9 @@ option('udev',
option('udevrulesdir',
type : 'string',
description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
+option('pipewire_pulse_prefix',
+ type : 'string',
-+ description : 'Install directory for the pipewire-pulse daemon')
++ description: 'Install directory for the pipewire-pulse daemon')
option('systemd-user-unit-dir',
type : 'string',
description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
-index 46dfbbc8..0d975cec 100644
+index 0a5e5042..4a70b0b0 100644
--- a/src/daemon/systemd/user/meson.build
+++ b/src/daemon/systemd/user/meson.build
@@ -9,7 +9,7 @@ install_data(
@@ -22,6 +22,6 @@ index 46dfbbc8..0d975cec 100644
systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
+systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
+ systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
configure_file(input : 'pipewire.service.in',
- output : 'pipewire.service',
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
new file mode 100644
index 0000000000..ce1085f37f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
@@ -0,0 +1,27 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index a6c8af72..8e5c3d73 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,9 @@ option('media-session',
+ description: 'Build and install pipewire-media-session',
+ type: 'boolean',
+ value: true)
++option('media-session-prefix',
++ description: 'Install directory for pipewire-media-session and its support files',
++ type: 'string')
+ option('man',
+ description: 'Build manpages',
+ type: 'boolean',
+diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
+index 4a70b0b0..84c9a19e 100644
+--- a/src/daemon/systemd/user/meson.build
++++ b/src/daemon/systemd/user/meson.build
+@@ -10,7 +10,7 @@ install_data(
+ systemd_config = configuration_data()
+ systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
+ systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
+-systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
++systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session'))
+
+ configure_file(input : 'pipewire.service.in',
+ output : 'pipewire.service',
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch
rename to third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch
rename to third_party/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index fc566d91e9..5c5578abc8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
@@ -17,6 +17,7 @@
, udev
, libva
, libsndfile
+, SDL2
, vulkan-headers
, vulkan-loader
, ncurses
@@ -42,7 +43,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
- version = "0.3.21";
+ version = "0.3.23";
outputs = [
"out"
@@ -60,18 +61,20 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
- hash = "sha256:2YJzPTMPIoQQeNja3F53SD4gtpdSlbD/i77hBWiQfuQ=";
+ hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA=";
};
patches = [
# Break up a dependency cycle between outputs.
- ./alsa-profiles-use-libdir.patch
- # Move installed tests into their own output.
- ./installed-tests-path.patch
+ ./0040-alsa-profiles-use-libdir.patch
# Change the path of the pipewire-pulse binary in the service definition.
- ./pipewire-pulse-path.patch
+ ./0050-pipewire-pulse-path.patch
+ # Change the path of the pipewire-media-session binary in the service definition.
+ ./0055-pipewire-media-session-path.patch
+ # Move installed tests into their own output.
+ ./0070-installed-tests-path.patch
# Add flag to specify configuration directory (different from the installation directory).
- ./pipewire-config-dir.patch
+ ./0080-pipewire-config-dir.patch
];
nativeBuildInputs = [
@@ -93,6 +96,7 @@ let
vulkan-headers
vulkan-loader
valgrind
+ SDL2
systemd
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
++ lib.optional ffmpegSupport ffmpeg
@@ -106,6 +110,7 @@ let
"-Dinstalled_tests=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"-Dpipewire_pulse_prefix=${placeholder "pulse"}"
+ "-Dmedia-session-prefix=${placeholder "mediaSession"}"
"-Dlibjack-path=${placeholder "jack"}/lib"
"-Dgstreamer=${mesonBool gstreamerSupport}"
"-Dffmpeg=${mesonBool ffmpegSupport}"
@@ -122,10 +127,23 @@ let
doCheck = true;
postInstall = ''
+ pushd .
+ cd $out
+ mkdir -p $out/nix-support/etc/pipewire
+ for f in etc/pipewire/*.conf; do bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done
+
+ mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d
+ for f in etc/pipewire/media-session.d/*.conf; do bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done
+ popd
+
+ moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession"
+ moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession"
+ moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession"
+ moveToOutput "bin/pipewire-media-session" "$mediaSession"
+
moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
moveToOutput "bin/pipewire-pulse" "$pulse"
- moveToOutput "bin/pipewire-media-session" "$mediaSession"
'';
passthru.tests = {
@@ -135,6 +153,17 @@ let
test-paths = callPackage ./test-paths.nix {
paths-out = [
"share/alsa/alsa.conf.d/50-pipewire.conf"
+ "nix-support/etc/pipewire/client.conf.json"
+ "nix-support/etc/pipewire/client-rt.conf.json"
+ "nix-support/etc/pipewire/jack.conf.json"
+ "nix-support/etc/pipewire/pipewire.conf.json"
+ "nix-support/etc/pipewire/pipewire-pulse.conf.json"
+ ];
+ paths-out-media-session = [
+ "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
+ "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
+ "nix-support/etc/pipewire/media-session.d/media-session.conf.json"
+ "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
];
paths-lib = [
"lib/alsa-lib/libasound_module_pcm_pipewire.so"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix
index 0ae6937419..11d00e7c2c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix
@@ -14,6 +14,7 @@ let
in runCommand "pipewire-test-paths" { } ''
touch $out
+ ${check-output pipewire.mediaSession paths-out-media-session}
${check-output pipewire.lib paths-lib}
${check-output pipewire paths-out}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix
new file mode 100644
index 0000000000..86ef2af96e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, lib
+, mkDerivation
+, fetchurl
+, cmake
+, pkg-config
+, polkit
+, glib
+, pcre
+, libselinux
+, libsepol
+, util-linux
+}:
+
+mkDerivation rec {
+ pname = "polkit-qt-1";
+ version = "0.113.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c=";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ glib
+ pcre
+ polkit
+ ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ];
+
+ meta = with lib; {
+ description = "A Qt wrapper around PolKit";
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
deleted file mode 100644
index 0da6e15eb2..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }:
-
-with lib;
-
-stdenv.mkDerivation {
- name = "polkit-qt-1-qt4-0.112.0";
-
- src = fetchurl {
- url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
- sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
- };
-
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = [ cmake pkg-config automoc4 ];
-
- propagatedBuildInputs = [ polkit glib qt4 ];
-
- postFixup =
- ''
- for i in $dev/lib/cmake/*/*.cmake; do
- echo "fixing $i"
- substituteInPlace $i \
- --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib
- done
- '';
-
- meta = with lib; {
- description = "A Qt wrapper around PolKit";
- maintainers = [ maintainers.ttuegel ];
- platforms = platforms.linux;
- license = licenses.lgpl21;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
deleted file mode 100644
index c4918d9d8e..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }:
-
-with lib;
-
-stdenv.mkDerivation {
- name = "polkit-qt-1-qt5-0.112.0";
-
- outputs = [ "out" "dev" ];
-
- src = fetchurl {
- url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
- sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
- };
-
- nativeBuildInputs = [ cmake pkg-config ];
-
- propagatedBuildInputs = [ polkit glib qtbase ];
-
- dontWrapQtApps = true;
-
- postFixup = ''
- # Fix library location in CMake module
- sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \
- -e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\"),"
- '';
-
- meta = {
- description = "A Qt wrapper around PolKit";
- maintainers = with lib.maintainers; [ ttuegel ];
- platforms = with lib.platforms; linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix
new file mode 100644
index 0000000000..e50b855ddd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/prime-server/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, curl, zeromq, czmq, libsodium }:
+
+stdenv.mkDerivation rec {
+ pname = "prime-server";
+ version = "0.6.7";
+
+ src = fetchFromGitHub {
+ owner = "kevinkreiser";
+ repo = "prime_server";
+ rev = version;
+ sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ curl zeromq czmq libsodium ];
+
+ meta = with lib; {
+ description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq";
+ homepage = "https://github.com/kevinkreiser/prime_server";
+ license = licenses.bsd2;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix
index ef1fa6efec..7d423ac034 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "protolock";
- version = "0.15.1";
+ version = "0.15.2";
src = fetchFromGitHub {
owner = "nilslice";
repo = "protolock";
rev = "v${version}";
- sha256 = "sha256-rnsHVJHFE/8JIOfMWqGBfIbIuOFyHtT54Vu/DaRY9js=";
+ sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0=";
};
vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So=";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index b72d9070ce..63e893ea69 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -99,6 +99,7 @@ let
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
+ ./qtwebkit-icu68.patch
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch
new file mode 100644
index 0000000000..73463d7567
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
index 3563a1991c..45cf6209ea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -112,6 +112,7 @@ let
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
+ ./qtwebkit-icu68.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch
new file mode 100644
index 0000000000..73463d7567
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index e72335f1d2..fdb68d89bc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -95,6 +95,7 @@ let
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
+ ./qtwebkit-icu68.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch
new file mode 100644
index 0000000000..73463d7567
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits::max());
+ text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
index b649b1d9c1..e5657bcb3c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh";
};
- buildInputs = [ ant jdk python makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ant jdk python ];
buildPhase = "ant dist";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix
new file mode 100644
index 0000000000..47d8fdb040
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake,
+ mesa, libGLU, glfw,
+ libX11, libXi, libXcursor, libXrandr, libXinerama,
+ alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib,
+ pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio,
+ includeEverything ? true
+}:
+
+stdenv.mkDerivation rec {
+ pname = "raylib";
+ version = "3.5.0";
+
+ src = fetchFromGitHub {
+ owner = "raysan5";
+ repo = pname;
+ rev = version;
+ sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj";
+ };
+
+ patches = [
+ # fixes examples not compiling in 3.5.0
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch";
+ sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [
+ mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama
+ ] ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional pulseSupport libpulseaudio;
+
+ # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
+ cmakeFlags = [
+ "-DUSE_EXTERNAL_GLFW=ON"
+ "-DSHARED=ON"
+ "-DBUILD_EXAMPLES=OFF"
+ ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON";
+
+ # fix libasound.so/libpulse.so not being found
+ preFixup = ''
+ ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"}
+ ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}
+ '';
+
+ meta = with lib; {
+ description = "A simple and easy-to-use library to enjoy videogames programming";
+ homepage = "http://www.raylib.com/";
+ license = licenses.zlib;
+ maintainers = with maintainers; [ adamlwgriffiths ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
index a42941cbb6..7a9818bce9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
- sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s=";
+ sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
index 618c91421b..433da05d08 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix
@@ -1,30 +1,40 @@
-{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, gtk2
+, librep
+, pkg-config
+}:
-with lib;
stdenv.mkDerivation rec {
-
pname = "rep-gtk";
version = "0.90.8.3";
- sourceName = "rep-gtk_${version}";
src = fetchurl {
- url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz";
+ url = "https://download.tuxfamily.org/librep/${pname}/${pname}_${version}.tar.xz";
sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ ];
- propagatedBuildInputs = [ librep gtk2 ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+ buildInputs = [
+ gtk2
+ librep
+ ];
patchPhase = ''
sed -e 's|installdir=$(repexecdir)|installdir=$(libdir)/rep|g' -i Makefile.in
'';
- meta = {
+ meta = with lib; {
+ homepage = "http://sawfish.tuxfamily.org";
description = "GTK bindings for librep";
- homepage = "http://sawfish.wikia.com";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.unix;
};
}
# TODO: investigate fetchFromGithub
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix
new file mode 100644
index 0000000000..35e48140fd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix
@@ -0,0 +1,21 @@
+{
+ stdenv, lib, fetchurl,
+ cmake, perl,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rinutils";
+ version = "0.8.0";
+
+ meta = with lib; {
+ homepage = "https://github.com/shlomif/rinutils";
+ license = licenses.mit;
+ };
+
+ src = fetchurl {
+ url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
+ sha256 = "1q09aihm5m42xiq2prpa9mf0srwiirzgzblkp5nl74i7zg6pg5hx";
+ };
+
+ nativeBuildInputs = [ cmake perl ];
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2geometry/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2geometry/default.nix
new file mode 100644
index 0000000000..afd5ffa0a0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/s2geometry/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, openssl, gtest }:
+
+stdenv.mkDerivation rec {
+ pname = "s2geometry";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "s2geometry";
+ rev = "v${version}";
+ sha256 = "1mx61bnn2f6bd281qlhn667q6yfg1pxzd2js88l5wpkqlfzzhfaz";
+ };
+
+ patches = [
+ # Fix build https://github.com/google/s2geometry/issues/165
+ (fetchpatch {
+ url = "https://github.com/google/s2geometry/commit/a4dddf40647c68cd0104eafc31e9c8fb247a6308.patch";
+ sha256 = "0fp3w4bg7pgf5vv4vacp9g06rbqzhxc2fg6i5appp93q6phiinvi";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ openssl gtest ];
+
+ meta = with lib; {
+ description = "Computational geometry and spatial indexing on the sphere";
+ homepage = "http://s2geometry.io/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
similarity index 74%
rename from third_party/nixpkgs/pkgs/development/libraries/s2n/default.nix
rename to third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
index 3ec66ebf52..2d3ebc6cb4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/s2n/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, openssl }:
stdenv.mkDerivation rec {
- pname = "s2n";
- version = "0.10.23";
+ pname = "s2n-tls";
+ version = "1.0.0";
src = fetchFromGitHub {
- owner = "awslabs";
+ owner = "aws";
repo = pname;
rev = "v${version}";
- sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki";
+ sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h";
};
nativeBuildInputs = [ cmake ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "C99 implementation of the TLS/SSL protocols";
- homepage = "https://github.com/awslabs/s2n";
+ homepage = "https://github.com/aws/s2n-tls";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
index 254ce08dc6..703a7f2e34 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ ];
meta = with lib; {
homepage = "https://github.com/liuq/QuadProgpp";
@@ -22,6 +21,6 @@ stdenv.mkDerivation rec {
Goldfarb-Idnani active-set dual method.
'';
maintainers = with maintainers; [ ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
index 72c4e5ac1e..241eb5a372 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -18,7 +18,7 @@ let
# this derivation. However, we should ensure on version bumps
# that the CUDA toolkit for `passthru.tests` is still
# up-to-date.
- version = "1.7.1";
+ version = "1.8.0";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index 7f815a31a5..bfb708531d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -1,14 +1,14 @@
version: {
x86_64-darwin-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";
- sha256 = "0n93r7bq6wjjxkczp8r5pjm1nvl75wns5higsvh7gsir0j6k7b5b";
+ hash = "sha256-V1lbztMB09wyWjdiJrwVwJ00DT8Kihy/TC2cKmdBLIE=";
};
x86_64-linux-cpu = {
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";
- sha256 = "0gpcj90nxyc69p53jiqwamd4gi7wzssk29csxfsyxsrzg3h36s7z";
+ hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
};
x86_64-linux-cuda = {
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
- sha256 = "01z61ryrflq306x7ay97k2fqc2q2z9c4c1zcnjfzr6412vg4fjb8";
+ hash = "sha256-rNEyE4+jfeX7cU0aNYd5b0pZGYT0PNPnDnS1PIsrMeM=";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix
index dbdc9ce287..5b603e6a0c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/serf/default.nix
@@ -1,15 +1,16 @@
-{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
+{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
, pkg-config, libiconv }:
stdenv.mkDerivation rec {
- name = "serf-1.3.9";
+ pname = "serf";
+ version = "1.3.9";
src = fetchurl {
- url = "https://www.apache.org/dist/serf/${name}.tar.bz2";
+ url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2";
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
};
- nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
+ nativeBuildInputs = [ pkg-config scons ];
buildInputs = [ apr openssl aprutil zlib libiconv ]
++ lib.optional (!stdenv.isCygwin) kerberos;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch b/third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch
index a7eefe7d5c..acfece7ef5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/serf/scons.patch
@@ -1,7 +1,16 @@
diff --git a/SConstruct b/SConstruct
-index 4358a23..0d862e7 100644
+index 4358a23..6ce7776 100644
--- a/SConstruct
+++ b/SConstruct
+@@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
+ # To be used to ensure a PREFIX directory is only created when installing.
+ def createPathIsDirCreateWithTarget(target):
+ def my_validator(key, val, env):
+- build_targets = (map(str, BUILD_TARGETS))
++ build_targets = (list(map(str, BUILD_TARGETS)))
+ if target in build_targets:
+ return PathVariable.PathIsDirCreate(key, val, env)
+ else:
@@ -155,6 +155,7 @@ if sys.platform == 'win32':
env = Environment(variables=opts,
tools=('default', 'textfile',),
@@ -10,3 +19,25 @@ index 4358a23..0d862e7 100644
)
env.Append(BUILDERS = {
+@@ -163,9 +164,9 @@ env.Append(BUILDERS = {
+ suffix='.def', src_suffix='.h')
+ })
+
+-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+- 'SERF_MINOR_VERSION ([0-9]+).*'
+- 'SERF_PATCH_VERSION ([0-9]+)',
++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
++ b'SERF_MINOR_VERSION ([0-9]+).*'
++ b'SERF_PATCH_VERSION ([0-9]+)',
+ env.File('serf.h').get_contents(),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
diff --git a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
deleted file mode 100644
index 06cf758761..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }:
-
-stdenv.mkDerivation rec {
- version = "2.3.1";
- name = "silgraphite-2.3.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
- sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ freetype libXft pango fontconfig];
-
- NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
-
- meta = {
- description = "An advanced font engine";
- maintainers = [ lib.maintainers.raskin ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix
index 29f640dedf..c3c4f8610c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/smarty3/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smarty3";
- version = "3.1.36";
+ version = "3.1.39";
src = fetchFromGitHub {
owner = "smarty-php";
repo = "smarty";
rev = "v${version}";
- sha256 = "0jljzw1xl2kjwf9cylp1ddnjhz7wbm499s03r479891max1m2mlf";
+ sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix
new file mode 100644
index 0000000000..f868623821
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+
+, gtk3
+, curl
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "smooth";
+ version = "0.9.6";
+
+ src = fetchFromGitHub {
+ owner = "enzo1982";
+ repo = "smooth";
+ rev = "v${version}";
+ sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ makeFlags = [
+ "prefix=$(out)"
+ ];
+
+ buildInputs = [
+ gtk3
+ curl
+ libxml2
+ ];
+
+ meta = with lib; {
+ description = "The smooth Class Library";
+ license = licenses.artistic2;
+ homepage = "http://www.smooth-project.org/";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index 7b6c98bebe..0fe1ce442f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix
@@ -49,8 +49,8 @@ let
in
{
spdlog_1 = generic {
- version = "1.8.1";
- sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k=";
+ version = "1.8.2";
+ sha256 = "sha256-vYled5Z9fmxuO9193lefpFzIHAiSgvYn2iOfneLidQ8=";
};
spdlog_0 = generic {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index b423e557a5..7e43fc7f5c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -8,7 +8,7 @@ let
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip";
- sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00";
+ sha256 = "0jgzaawf6vn15qyi15b6dlq80sk2gaiwfikingldx5mhjrwj7pfx";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix
index 6d8a334ce3..a0a1ac0360 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj";
};
+ postPatch = ''
+ substituteInPlace install-sh \
+ --replace "stripprog=" "stripprog=\$STRIP # "
+ '';
+
meta = {
homepage = "https://www.astro.caltech.edu/~mcs/tecla/";
description = "Command-line editing library";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
index fa506733c1..42e6e920be 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix
@@ -27,7 +27,21 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- postPatch = "patchShebangs script";
+ patches = [
+ # Do not rely on dynamic loader path
+ # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory
+ ./no-dynamic-loader-path.patch
+ ];
+
+ postPatch = ''
+ patchShebangs script
+ substituteInPlace src/tss2-tcti/tctildr-dl.c \
+ --replace '@PREFIX@' $out/lib/
+ substituteInPlace ./test/unit/tctildr-dl.c \
+ --replace ', "libtss2' ", \"$out/lib/libtss2" \
+ --replace ', "foo' ", \"$out/lib/foo" \
+ --replace ', TEST_TCTI_NAME' ", \"$out/lib/\"TEST_TCTI_NAME"
+ '';
configureFlags = [
"--enable-unit"
@@ -35,6 +49,14 @@ stdenv.mkDerivation rec {
];
doCheck = true;
+ preCheck = ''
+ # Since we rewrote the load path in the dynamic loader for the TCTI
+ # The various tcti implementation should be placed in their target directory
+ # before we could run tests
+ installPhase
+ # install already done, dont need another one
+ dontInstall=1
+ '';
postInstall = ''
# Do not install the upstream udev rules, they rely on specific
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch
new file mode 100644
index 0000000000..86cdcd1541
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch
@@ -0,0 +1,39 @@
+diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c
+index b364695c..b13be3ef 100644
+--- a/src/tss2-tcti/tctildr-dl.c
++++ b/src/tss2-tcti/tctildr-dl.c
+@@ -85,7 +85,15 @@ handle_from_name(const char *file,
+ if (handle == NULL) {
+ return TSS2_TCTI_RC_BAD_REFERENCE;
+ }
+- *handle = dlopen(file, RTLD_NOW);
++ size = snprintf(file_xfrm,
++ sizeof (file_xfrm),
++ "@PREFIX@%s",
++ file);
++ if (size >= sizeof (file_xfrm)) {
++ LOG_ERROR("TCTI name truncated in transform.");
++ return TSS2_TCTI_RC_BAD_VALUE;
++ }
++ *handle = dlopen(file_xfrm, RTLD_NOW);
+ if (*handle != NULL) {
+ return TSS2_RC_SUCCESS;
+ } else {
+@@ -94,7 +102,7 @@ handle_from_name(const char *file,
+ /* 'name' alone didn't work, try libtss2-tcti-.so.0 */
+ size = snprintf(file_xfrm,
+ sizeof (file_xfrm),
+- TCTI_NAME_TEMPLATE_0,
++ "@PREFIX@" TCTI_NAME_TEMPLATE_0,
+ file);
+ if (size >= sizeof (file_xfrm)) {
+ LOG_ERROR("TCTI name truncated in transform.");
+@@ -109,7 +117,7 @@ handle_from_name(const char *file,
+ /* libtss2-tcti-.so.0 didn't work, try libtss2-tcti-.so */
+ size = snprintf(file_xfrm,
+ sizeof (file_xfrm),
+- TCTI_NAME_TEMPLATE,
++ "@PREFIX@" TCTI_NAME_TEMPLATE,
+ file);
+ if (size >= sizeof (file_xfrm)) {
+ LOG_ERROR("TCTI name truncated in transform.");
diff --git a/third_party/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/valhalla/default.nix
new file mode 100644
index 0000000000..6eac19bcb2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/valhalla/default.nix
@@ -0,0 +1,35 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
+, zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite
+, luajit, geos, python3, zeromq }:
+
+stdenv.mkDerivation rec {
+ pname = "valhalla";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "valhalla";
+ repo = "valhalla";
+ rev = version;
+ sha256 = "04vxvzy6hnhdvb9lh1p5vqzzi2drv0g4l2gnbdp44glipbzgd4dr";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [
+ zlib curl protobuf prime-server boost sqlite libspatialite
+ luajit geos python3 zeromq
+ ];
+
+ cmakeFlags = [
+ "-DENABLE_TESTS=OFF"
+ "-DENABLE_BENCHMARKS=OFF"
+ ];
+
+ meta = with lib; {
+ description = "Open Source Routing Engine for OpenStreetMap";
+ homepage = "https://valhalla.readthedocs.io/";
+ license = licenses.mit;
+ maintainers = [ maintainers.Thra11 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
index 4265948c19..8ef209fe80 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
@@ -2,13 +2,10 @@
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
, zimg, libass, python3, libiconv
, ApplicationServices
-, ocrSupport ? false, tesseract ? null
-, imwriSupport? true, imagemagick7 ? null
+, ocrSupport ? false, tesseract
+, imwriSupport ? true, imagemagick
}:
-assert ocrSupport -> tesseract != null;
-assert imwriSupport -> imagemagick7 != null;
-
with lib;
stdenv.mkDerivation rec {
@@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
(python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract
- ++ optional imwriSupport imagemagick7;
+ ++ optional imwriSupport imagemagick;
configureFlags = [
(optionalString (!ocrSupport) "--disable-ocr")
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
index 26a1a6d680..5cd4b4608e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand
+{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix
new file mode 100644
index 0000000000..fb8dd43fe0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "vo-aacenc";
+ version = "0.1.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
+ sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY=";
+ };
+
+ meta = with lib; {
+ description = "VisualOn AAC encoder library";
+ homepage = "https://sourceforge.net/projects/opencore-amr/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.baloo ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
index f4d1f3c407..482e6be7bb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
version = "${majorVersion}.${minorVersion}";
src = fetchurl {
- url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
+ url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = sourceSha256;
};
@@ -94,6 +94,6 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
platforms = with platforms; unix;
# /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
- broken = if stdenv.isDarwin && (majorVersion == 7 || majorVersion == 8) then true else false;
+ broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8");
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 9bf91da6cd..490adf8e32 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -59,7 +59,7 @@ with lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.30.3";
+ version = "2.30.5";
outputs = [ "out" "dev" ];
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0zsy3say94d9bhaan0l6mfr59z03a5x4kngyy8b2i20n77q19skd";
+ sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx";
};
patches = optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
index 48178e7740..4635a80152 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
@@ -2,33 +2,22 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
- version = "4.6.0";
+ version = "4.7.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
- sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m";
+ sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97";
};
- # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed
- configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ];
+ # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
+ configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ];
outputs = [ "out" "dev" "doc" "lib" ];
nativeBuildInputs = [ autoreconfHook ];
- postPatch = ''
- # fix recursive cycle:
- # build flags (including location of header files) are exposed in the
- # public API of wolfssl, causing lib to depend on dev
- substituteInPlace configure.ac \
- --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' '
- substituteInPlace configure.ac \
- --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' '
- '';
-
-
postInstall = ''
# fix recursive cycle:
# wolfssl-config points to dev, dev propagates bin
@@ -41,7 +30,7 @@ stdenv.mkDerivation rec {
description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
homepage = "https://www.wolfssl.com/";
platforms = platforms.all;
- license = lib.licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ mcmtroffaes ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
index 151c74f0b7..da60f2b27f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
@@ -1,20 +1,24 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, wayland-protocols
-, pipewire, wayland, elogind, systemd, libdrm }:
+, pipewire, wayland, systemd, libdrm }:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-wlr";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc";
+ sha256 = "1vjz0y3ib1xw25z8hl679l2p6g4zcg7b8fcd502bhmnqgwgdcsfx";
};
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
- buildInputs = [ pipewire wayland elogind systemd libdrm ];
+ buildInputs = [ pipewire wayland systemd libdrm ];
+
+ mesonFlags = [
+ "-Dsd-bus-provider=libsystemd"
+ ];
meta = with lib; {
homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
index a3c35d123b..b37dfbdd70 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "zeromq";
- version = "4.3.3";
+ version = "4.3.4";
src = fetchFromGitHub {
owner = "zeromq";
repo = "libzmq";
rev = "v${version}";
- sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd";
+ sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM=";
};
nativeBuildInputs = [ cmake asciidoc pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/deps.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/deps.nix
index 86bcba5707..6a1d9c77b5 100644
--- a/third_party/nixpkgs/pkgs/development/misc/resholve/deps.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/resholve/deps.nix
@@ -60,13 +60,13 @@ rec {
# resholve's primary dependency is this developer build of the oil shell.
oildev = python27Packages.buildPythonPackage rec {
pname = "oildev-unstable";
- version = "2020-03-31";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "oilshell";
repo = "oil";
- rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a";
- sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2";
+ rev = "11c6bd3ca0e126862c7a1f938c8510779837affa";
+ hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY=";
/*
It's not critical to drop most of these; the primary target is
diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
index e8b4ed2cfb..4d039770ce 100644
--- a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
@@ -11,12 +11,12 @@
, doCheck ? true
}:
let
- version = "0.4.2";
+ version = "0.5.1";
rSrc = fetchFromGitHub {
owner = "abathur";
repo = "resholve";
rev = "v${version}";
- hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
+ hash = "sha256-+9MjvO1H+A3Ol2to5tWqdpNR7osQsYcbkX9avAqyrKw=";
};
deps = callPackage ./deps.nix {
/*
@@ -29,6 +29,9 @@ let
"${rSrc}/0002-add_MANIFEST_in.patch"
"${rSrc}/0003-fix_codegen_shebang.patch"
"${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch"
+ "${rSrc}/0005_revert_libc_locale.patch"
+ "${rSrc}/0006_disable_failing_libc_tests.patch"
+ "${rSrc}/0007_restore_root_init_py.patch"
];
};
in
diff --git a/third_party/nixpkgs/pkgs/development/misc/umr/default.nix b/third_party/nixpkgs/pkgs/development/misc/umr/default.nix
new file mode 100644
index 0000000000..158cef2eed
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/misc/umr/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchgit, bash-completion, cmake, pkg-config
+, libdrm, libpciaccess, llvmPackages, ncurses
+}:
+
+stdenv.mkDerivation rec {
+ pname = "umr";
+ version = "unstable-2021-02-18";
+
+ src = fetchgit {
+ url = "https://gitlab.freedesktop.org/tomstdenis/umr";
+ rev = "79e17f8f2807ed707fc1be369d0aad536f6dbc97";
+ sha256 = "IwTkHEuJ82hngPjFVIihU2rSolLBqHxQTNsP8puYPaY=";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ bash-completion
+ libdrm
+ libpciaccess
+ llvmPackages.llvm
+ ncurses
+ ];
+
+ # Remove static libraries (there are no dynamic libraries in there)
+ postInstall = ''
+ rm -r $out/lib
+ '';
+
+ meta = with lib; {
+ description = "A userspace debugging and diagnostic tool for AMD GPUs";
+ homepage = "https://gitlab.freedesktop.org/tomstdenis/umr";
+ license = licenses.mit;
+ maintainers = with maintainers; [ Flakebi ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index fd78fa9ac0..5db3538563 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -24,7 +24,8 @@
}:
let
- inherit (pkgs) stdenv lib fetchurl makeWrapper unzip;
+ inherit (pkgs) stdenv lib fetchurl;
+ inherit (pkgs.buildPackages) makeWrapper unzip;
# Determine the Android os identifier from Nix's system identifier
os = if stdenv.system == "x86_64-linux" then "linux"
diff --git a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix
index 5602f598e9..1aa81132c2 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
};
- buildInputs = [ makeWrapper which xdg-utils ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ which xdg-utils ];
unpackPhase = ''
mkdir -p phony-home $out/share/applications
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index f471dc977b..601cac372c 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index 0742247893..52257bfd46 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index 965a385ac5..78044752b5 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -64,7 +64,8 @@ stdenv.mkDerivation {
}
else throw "Platform: ${stdenv.system} not supported!";
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
buildCommand = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
index 0cc648f58f..240f287003 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
@@ -68,6 +68,10 @@ let
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies;
});
+ "@electron-forge/cli" = super."@electron-forge/cli".override {
+ buildInputs = [ self.node-pre-gyp self.rimraf ];
+ };
+
git-ssb = super.git-ssb.override {
buildInputs = [ self.node-gyp-build ];
meta.broken = since "10";
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
index 829c2f67fd..3b9a5ee494 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
@@ -75,6 +75,7 @@
, "diagnostic-languageserver"
, "dockerfile-language-server-nodejs"
, "elasticdump"
+, "@electron-forge/cli"
, "elm-oracle"
, "emoj"
, "emojione"
@@ -188,6 +189,7 @@
, "readability-cli"
, "redoc-cli"
, "reveal.js"
+, "rimraf"
, "rollup"
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
, "s3http"
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
index 6fa9a907f2..68c934bee7 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -22,22 +22,13 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.1102.1" = {
+ "@angular-devkit/architect-0.1102.3" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.1102.1";
+ version = "0.1102.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz";
- sha512 = "s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw==";
- };
- };
- "@angular-devkit/core-11.1.0" = {
- name = "_at_angular-devkit_slash_core";
- packageName = "@angular-devkit/core";
- version = "11.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz";
- sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.3.tgz";
+ sha512 = "+skN/lDvWPxiQl0d2maVtfqgr/aRIx4cZdlTTp20FQ14J8BK9xFHuexnhQ17jdVYCIrgWoPDz2d9ZRw7e6pXvA==";
};
};
"@angular-devkit/core-11.2.0" = {
@@ -49,22 +40,13 @@ let
sha512 = "qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q==";
};
};
- "@angular-devkit/core-11.2.1" = {
+ "@angular-devkit/core-11.2.3" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "11.2.1";
+ version = "11.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz";
- sha512 = "CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==";
- };
- };
- "@angular-devkit/schematics-11.1.0" = {
- name = "_at_angular-devkit_slash_schematics";
- packageName = "@angular-devkit/schematics";
- version = "11.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz";
- sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.3.tgz";
+ sha512 = "2JEGXzFqjTqVls2uIZEE0sk4VY9a/alxBAq8BFYIVbvzKsL9gAY71Ztf21zrhQrZop9qeuLJtOAbp00QyYUaQA==";
};
};
"@angular-devkit/schematics-11.2.0" = {
@@ -76,13 +58,13 @@ let
sha512 = "sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w==";
};
};
- "@angular-devkit/schematics-11.2.1" = {
+ "@angular-devkit/schematics-11.2.3" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "11.2.1";
+ version = "11.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.1.tgz";
- sha512 = "y2tzJq+MMwLdQ6Li+AxjozI51miN5CjK9x9jtFHi+njqJr595WTNQi39RjyHxAue1VFMr8gu1VBnKGKJ1J3vNA==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.3.tgz";
+ sha512 = "x/IKgZDn6z/MzQ28WF2GTP2N+n78iySQhLu6n6bpmdrFp9noi9QASzN+mAFiqSNO8XpO9oyIB5y2ERl8KBrU1g==";
};
};
"@angular-devkit/schematics-cli-0.1102.0" = {
@@ -346,22 +328,22 @@ let
sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==";
};
};
- "@babel/compat-data-7.12.13" = {
+ "@babel/compat-data-7.13.8" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz";
- sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz";
+ sha512 = "EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==";
};
};
- "@babel/core-7.12.17" = {
+ "@babel/core-7.13.8" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.12.17";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.12.17.tgz";
- sha512 = "V3CuX1aBywbJvV2yzJScRxeiiw0v2KZZYYE3giywxzFJL13RiyPjaaDwhDnxmgFTTS7FgvM2ijr4QmKNIu0AtQ==";
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz";
+ sha512 = "oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==";
};
};
"@babel/core-7.9.0" = {
@@ -382,13 +364,13 @@ let
sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==";
};
};
- "@babel/generator-7.12.17" = {
+ "@babel/generator-7.13.9" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
- version = "7.12.17";
+ version = "7.13.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz";
- sha512 = "DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==";
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz";
+ sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==";
};
};
"@babel/helper-annotate-as-pure-7.12.13" = {
@@ -409,22 +391,22 @@ let
sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==";
};
};
- "@babel/helper-compilation-targets-7.12.17" = {
+ "@babel/helper-compilation-targets-7.13.8" = {
name = "_at_babel_slash_helper-compilation-targets";
packageName = "@babel/helper-compilation-targets";
- version = "7.12.17";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz";
- sha512 = "5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA==";
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz";
+ sha512 = "pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==";
};
};
- "@babel/helper-create-class-features-plugin-7.12.17" = {
+ "@babel/helper-create-class-features-plugin-7.13.8" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.12.17";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.17.tgz";
- sha512 = "I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz";
+ sha512 = "qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==";
};
};
"@babel/helper-create-regexp-features-plugin-7.12.17" = {
@@ -436,13 +418,22 @@ let
sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==";
};
};
- "@babel/helper-explode-assignable-expression-7.12.13" = {
+ "@babel/helper-define-polyfill-provider-0.1.5" = {
+ name = "_at_babel_slash_helper-define-polyfill-provider";
+ packageName = "@babel/helper-define-polyfill-provider";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz";
+ sha512 = "nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==";
+ };
+ };
+ "@babel/helper-explode-assignable-expression-7.13.0" = {
name = "_at_babel_slash_helper-explode-assignable-expression";
packageName = "@babel/helper-explode-assignable-expression";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz";
- sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==";
+ url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz";
+ sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==";
};
};
"@babel/helper-function-name-7.12.13" = {
@@ -463,22 +454,22 @@ let
sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==";
};
};
- "@babel/helper-hoist-variables-7.12.13" = {
+ "@babel/helper-hoist-variables-7.13.0" = {
name = "_at_babel_slash_helper-hoist-variables";
packageName = "@babel/helper-hoist-variables";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz";
- sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw==";
+ url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz";
+ sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==";
};
};
- "@babel/helper-member-expression-to-functions-7.12.17" = {
+ "@babel/helper-member-expression-to-functions-7.13.0" = {
name = "_at_babel_slash_helper-member-expression-to-functions";
packageName = "@babel/helper-member-expression-to-functions";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.17.tgz";
- sha512 = "Bzv4p3ODgS/qpBE0DiJ9qf5WxSmrQ8gVTe8ClMfwwsY2x/rhykxxy3bXzG7AGTnPB2ij37zGJ/Q/6FruxHxsxg==";
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz";
+ sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==";
};
};
"@babel/helper-module-imports-7.12.13" = {
@@ -490,13 +481,13 @@ let
sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==";
};
};
- "@babel/helper-module-transforms-7.12.17" = {
+ "@babel/helper-module-transforms-7.13.0" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz";
- sha512 = "sFL+p6zOCQMm9vilo06M4VHuTxUAwa6IxgL56Tq1DVtA0ziAGTH1ThmJq7xwPqdQlgAbKX3fb0oZNbtRIyA5KQ==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz";
+ sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==";
};
};
"@babel/helper-optimise-call-expression-7.12.13" = {
@@ -508,31 +499,31 @@ let
sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==";
};
};
- "@babel/helper-plugin-utils-7.12.13" = {
+ "@babel/helper-plugin-utils-7.13.0" = {
name = "_at_babel_slash_helper-plugin-utils";
packageName = "@babel/helper-plugin-utils";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz";
- sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==";
+ url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz";
+ sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==";
};
};
- "@babel/helper-remap-async-to-generator-7.12.13" = {
+ "@babel/helper-remap-async-to-generator-7.13.0" = {
name = "_at_babel_slash_helper-remap-async-to-generator";
packageName = "@babel/helper-remap-async-to-generator";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz";
- sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA==";
+ url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz";
+ sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==";
};
};
- "@babel/helper-replace-supers-7.12.13" = {
+ "@babel/helper-replace-supers-7.13.0" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz";
- sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz";
+ sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==";
};
};
"@babel/helper-simple-access-7.12.13" = {
@@ -580,40 +571,40 @@ let
sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==";
};
};
- "@babel/helper-wrap-function-7.12.13" = {
+ "@babel/helper-wrap-function-7.13.0" = {
name = "_at_babel_slash_helper-wrap-function";
packageName = "@babel/helper-wrap-function";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz";
- sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw==";
+ url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz";
+ sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==";
};
};
- "@babel/helpers-7.12.17" = {
+ "@babel/helpers-7.13.0" = {
name = "_at_babel_slash_helpers";
packageName = "@babel/helpers";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.17.tgz";
- sha512 = "tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg==";
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz";
+ sha512 = "aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==";
};
};
- "@babel/highlight-7.12.13" = {
+ "@babel/highlight-7.13.8" = {
name = "_at_babel_slash_highlight";
packageName = "@babel/highlight";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz";
- sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==";
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz";
+ sha512 = "4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==";
};
};
- "@babel/parser-7.12.17" = {
+ "@babel/parser-7.13.9" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.12.17";
+ version = "7.13.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz";
- sha512 = "r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz";
+ sha512 = "nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==";
};
};
"@babel/plugin-external-helpers-7.8.3" = {
@@ -625,13 +616,13 @@ let
sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw==";
};
};
- "@babel/plugin-proposal-async-generator-functions-7.12.13" = {
+ "@babel/plugin-proposal-async-generator-functions-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-async-generator-functions";
packageName = "@babel/plugin-proposal-async-generator-functions";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz";
- sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz";
+ sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==";
};
};
"@babel/plugin-proposal-class-properties-7.12.13" = {
@@ -643,13 +634,22 @@ let
sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA==";
};
};
- "@babel/plugin-proposal-dynamic-import-7.12.17" = {
+ "@babel/plugin-proposal-class-properties-7.13.0" = {
+ name = "_at_babel_slash_plugin-proposal-class-properties";
+ packageName = "@babel/plugin-proposal-class-properties";
+ version = "7.13.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz";
+ sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==";
+ };
+ };
+ "@babel/plugin-proposal-dynamic-import-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-dynamic-import";
packageName = "@babel/plugin-proposal-dynamic-import";
- version = "7.12.17";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.17.tgz";
- sha512 = "ZNGoFZqrnuy9H2izB2jLlnNDAfVPlGl5NhFEiFe4D84ix9GQGygF+CWMGHKuE+bpyS/AOuDQCnkiRNqW2IzS1Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz";
+ sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==";
};
};
"@babel/plugin-proposal-export-default-from-7.12.13" = {
@@ -670,31 +670,31 @@ let
sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==";
};
};
- "@babel/plugin-proposal-json-strings-7.12.13" = {
+ "@babel/plugin-proposal-json-strings-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-json-strings";
packageName = "@babel/plugin-proposal-json-strings";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz";
- sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz";
+ sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==";
};
};
- "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = {
+ "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
packageName = "@babel/plugin-proposal-logical-assignment-operators";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz";
- sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz";
+ sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==";
};
};
- "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = {
+ "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz";
- sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz";
+ sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==";
};
};
"@babel/plugin-proposal-numeric-separator-7.12.13" = {
@@ -706,40 +706,40 @@ let
sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==";
};
};
- "@babel/plugin-proposal-object-rest-spread-7.12.13" = {
+ "@babel/plugin-proposal-object-rest-spread-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-object-rest-spread";
packageName = "@babel/plugin-proposal-object-rest-spread";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz";
- sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz";
+ sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==";
};
};
- "@babel/plugin-proposal-optional-catch-binding-7.12.13" = {
+ "@babel/plugin-proposal-optional-catch-binding-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
packageName = "@babel/plugin-proposal-optional-catch-binding";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz";
- sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz";
+ sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.12.17" = {
+ "@babel/plugin-proposal-optional-chaining-7.13.8" = {
name = "_at_babel_slash_plugin-proposal-optional-chaining";
packageName = "@babel/plugin-proposal-optional-chaining";
- version = "7.12.17";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz";
- sha512 = "TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz";
+ sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==";
};
};
- "@babel/plugin-proposal-private-methods-7.12.13" = {
+ "@babel/plugin-proposal-private-methods-7.13.0" = {
name = "_at_babel_slash_plugin-proposal-private-methods";
packageName = "@babel/plugin-proposal-private-methods";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz";
- sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz";
+ sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==";
};
};
"@babel/plugin-proposal-unicode-property-regex-7.12.13" = {
@@ -913,22 +913,22 @@ let
sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==";
};
};
- "@babel/plugin-transform-arrow-functions-7.12.13" = {
+ "@babel/plugin-transform-arrow-functions-7.13.0" = {
name = "_at_babel_slash_plugin-transform-arrow-functions";
packageName = "@babel/plugin-transform-arrow-functions";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz";
- sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz";
+ sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==";
};
};
- "@babel/plugin-transform-async-to-generator-7.12.13" = {
+ "@babel/plugin-transform-async-to-generator-7.13.0" = {
name = "_at_babel_slash_plugin-transform-async-to-generator";
packageName = "@babel/plugin-transform-async-to-generator";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz";
- sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz";
+ sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==";
};
};
"@babel/plugin-transform-block-scoped-functions-7.12.13" = {
@@ -949,31 +949,31 @@ let
sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==";
};
};
- "@babel/plugin-transform-classes-7.12.13" = {
+ "@babel/plugin-transform-classes-7.13.0" = {
name = "_at_babel_slash_plugin-transform-classes";
packageName = "@babel/plugin-transform-classes";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz";
- sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz";
+ sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==";
};
};
- "@babel/plugin-transform-computed-properties-7.12.13" = {
+ "@babel/plugin-transform-computed-properties-7.13.0" = {
name = "_at_babel_slash_plugin-transform-computed-properties";
packageName = "@babel/plugin-transform-computed-properties";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz";
- sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz";
+ sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==";
};
};
- "@babel/plugin-transform-destructuring-7.12.13" = {
+ "@babel/plugin-transform-destructuring-7.13.0" = {
name = "_at_babel_slash_plugin-transform-destructuring";
packageName = "@babel/plugin-transform-destructuring";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz";
- sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz";
+ sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==";
};
};
"@babel/plugin-transform-dotall-regex-7.12.13" = {
@@ -1003,22 +1003,22 @@ let
sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==";
};
};
- "@babel/plugin-transform-flow-strip-types-7.12.13" = {
+ "@babel/plugin-transform-flow-strip-types-7.13.0" = {
name = "_at_babel_slash_plugin-transform-flow-strip-types";
packageName = "@babel/plugin-transform-flow-strip-types";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.13.tgz";
- sha512 = "39/t9HtN+Jlc7EEY6oCSCf3kRrKIl2JULOGPnHZiaRjoYZEFaDXDZI32uE2NosQRh8o6N9B+8iGvDK7ToJhJaw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz";
+ sha512 = "EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg==";
};
};
- "@babel/plugin-transform-for-of-7.12.13" = {
+ "@babel/plugin-transform-for-of-7.13.0" = {
name = "_at_babel_slash_plugin-transform-for-of";
packageName = "@babel/plugin-transform-for-of";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz";
- sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz";
+ sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==";
};
};
"@babel/plugin-transform-function-name-7.12.13" = {
@@ -1048,40 +1048,40 @@ let
sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==";
};
};
- "@babel/plugin-transform-modules-amd-7.12.13" = {
+ "@babel/plugin-transform-modules-amd-7.13.0" = {
name = "_at_babel_slash_plugin-transform-modules-amd";
packageName = "@babel/plugin-transform-modules-amd";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz";
- sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz";
+ sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==";
};
};
- "@babel/plugin-transform-modules-commonjs-7.12.13" = {
+ "@babel/plugin-transform-modules-commonjs-7.13.8" = {
name = "_at_babel_slash_plugin-transform-modules-commonjs";
packageName = "@babel/plugin-transform-modules-commonjs";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz";
- sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz";
+ sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==";
};
};
- "@babel/plugin-transform-modules-systemjs-7.12.13" = {
+ "@babel/plugin-transform-modules-systemjs-7.13.8" = {
name = "_at_babel_slash_plugin-transform-modules-systemjs";
packageName = "@babel/plugin-transform-modules-systemjs";
- version = "7.12.13";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz";
- sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz";
+ sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==";
};
};
- "@babel/plugin-transform-modules-umd-7.12.13" = {
+ "@babel/plugin-transform-modules-umd-7.13.0" = {
name = "_at_babel_slash_plugin-transform-modules-umd";
packageName = "@babel/plugin-transform-modules-umd";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz";
- sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz";
+ sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==";
};
};
"@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = {
@@ -1120,13 +1120,13 @@ let
sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==";
};
};
- "@babel/plugin-transform-parameters-7.12.13" = {
+ "@babel/plugin-transform-parameters-7.13.0" = {
name = "_at_babel_slash_plugin-transform-parameters";
packageName = "@babel/plugin-transform-parameters";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz";
- sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz";
+ sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==";
};
};
"@babel/plugin-transform-property-literals-7.12.13" = {
@@ -1156,6 +1156,15 @@ let
sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==";
};
};
+ "@babel/plugin-transform-react-jsx-self-7.12.13" = {
+ name = "_at_babel_slash_plugin-transform-react-jsx-self";
+ packageName = "@babel/plugin-transform-react-jsx-self";
+ version = "7.12.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz";
+ sha512 = "FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ==";
+ };
+ };
"@babel/plugin-transform-react-jsx-source-7.12.13" = {
name = "_at_babel_slash_plugin-transform-react-jsx-source";
packageName = "@babel/plugin-transform-react-jsx-source";
@@ -1183,13 +1192,13 @@ let
sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==";
};
};
- "@babel/plugin-transform-runtime-7.12.17" = {
+ "@babel/plugin-transform-runtime-7.13.9" = {
name = "_at_babel_slash_plugin-transform-runtime";
packageName = "@babel/plugin-transform-runtime";
- version = "7.12.17";
+ version = "7.13.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.17.tgz";
- sha512 = "s+kIJxnaTj+E9Q3XxQZ5jOo+xcogSe3V78/iFQ5RmoT0jROdpcdxhfGdq/VLqW1hFSzw6VjqN8aQqTaAMixWsw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.9.tgz";
+ sha512 = "XCxkY/wBI6M6Jj2mlWxkmqbKPweRanszWbF3Tyut+hKh+PHcuIH/rSr/7lmmE7C3WW+HSIm2GT+d5jwmheuB0g==";
};
};
"@babel/plugin-transform-shorthand-properties-7.12.13" = {
@@ -1201,13 +1210,13 @@ let
sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==";
};
};
- "@babel/plugin-transform-spread-7.12.13" = {
+ "@babel/plugin-transform-spread-7.13.0" = {
name = "_at_babel_slash_plugin-transform-spread";
packageName = "@babel/plugin-transform-spread";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz";
- sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz";
+ sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==";
};
};
"@babel/plugin-transform-sticky-regex-7.12.13" = {
@@ -1219,13 +1228,13 @@ let
sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==";
};
};
- "@babel/plugin-transform-template-literals-7.12.13" = {
+ "@babel/plugin-transform-template-literals-7.13.0" = {
name = "_at_babel_slash_plugin-transform-template-literals";
packageName = "@babel/plugin-transform-template-literals";
- version = "7.12.13";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz";
- sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz";
+ sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==";
};
};
"@babel/plugin-transform-typeof-symbol-7.12.13" = {
@@ -1237,13 +1246,13 @@ let
sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==";
};
};
- "@babel/plugin-transform-typescript-7.12.17" = {
+ "@babel/plugin-transform-typescript-7.13.0" = {
name = "_at_babel_slash_plugin-transform-typescript";
packageName = "@babel/plugin-transform-typescript";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.17.tgz";
- sha512 = "1bIYwnhRoetxkFonuZRtDZPFEjl1l5r+3ITkxLC3mlMaFja+GQFo94b/WHEPjqWLU9Bc+W4oFZbvCGe9eYMu1g==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz";
+ sha512 = "elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==";
};
};
"@babel/plugin-transform-unicode-escapes-7.12.13" = {
@@ -1282,6 +1291,15 @@ let
sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg==";
};
};
+ "@babel/preset-env-7.13.9" = {
+ name = "_at_babel_slash_preset-env";
+ packageName = "@babel/preset-env";
+ version = "7.13.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.9.tgz";
+ sha512 = "mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ==";
+ };
+ };
"@babel/preset-flow-7.12.13" = {
name = "_at_babel_slash_preset-flow";
packageName = "@babel/preset-flow";
@@ -1318,22 +1336,22 @@ let
sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA==";
};
};
- "@babel/register-7.12.13" = {
- name = "_at_babel_slash_register";
- packageName = "@babel/register";
- version = "7.12.13";
+ "@babel/preset-typescript-7.13.0" = {
+ name = "_at_babel_slash_preset-typescript";
+ packageName = "@babel/preset-typescript";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/register/-/register-7.12.13.tgz";
- sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g==";
+ url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz";
+ sha512 = "LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==";
};
};
- "@babel/runtime-7.12.18" = {
- name = "_at_babel_slash_runtime";
- packageName = "@babel/runtime";
- version = "7.12.18";
+ "@babel/register-7.13.8" = {
+ name = "_at_babel_slash_register";
+ packageName = "@babel/register";
+ version = "7.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz";
- sha512 = "BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==";
+ url = "https://registry.npmjs.org/@babel/register/-/register-7.13.8.tgz";
+ sha512 = "yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ==";
};
};
"@babel/runtime-7.12.5" = {
@@ -1345,6 +1363,15 @@ let
sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
};
};
+ "@babel/runtime-7.13.9" = {
+ name = "_at_babel_slash_runtime";
+ packageName = "@babel/runtime";
+ version = "7.13.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz";
+ sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==";
+ };
+ };
"@babel/runtime-7.9.0" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -1363,13 +1390,13 @@ let
sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==";
};
};
- "@babel/traverse-7.12.17" = {
+ "@babel/traverse-7.13.0" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz";
- sha512 = "LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==";
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz";
+ sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==";
};
};
"@babel/types-7.10.4" = {
@@ -1381,13 +1408,13 @@ let
sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==";
};
};
- "@babel/types-7.12.17" = {
+ "@babel/types-7.13.0" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.12.17";
+ version = "7.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz";
- sha512 = "tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz";
+ sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==";
};
};
"@braintree/sanitize-url-3.1.0" = {
@@ -1426,22 +1453,22 @@ let
sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg==";
};
};
- "@bugsnag/js-7.7.0" = {
+ "@bugsnag/js-7.8.0" = {
name = "_at_bugsnag_slash_js";
packageName = "@bugsnag/js";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.7.0.tgz";
- sha512 = "ENdwgPnn7hBzkK1fZLFzK4HsIoE4nrmGlJI+rxuZFeXUkawx78ijt63Szf3yFnTt4Pa0yoDkiWS7H9dHDwH3kw==";
+ url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.8.0.tgz";
+ sha512 = "knSEXI4Znch4KzKooG3IgrYcZhKHYyTt/hGEmFhKCNmEiNGhGVisl0mbFCyjTBT+wYmWqqbv6kx4YOyGLCH0Yw==";
};
};
- "@bugsnag/node-7.7.0" = {
+ "@bugsnag/node-7.8.0" = {
name = "_at_bugsnag_slash_node";
packageName = "@bugsnag/node";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.7.0.tgz";
- sha512 = "pzxmKFDyEs5RYt63+IvxSOgd4Diio8VHvSWEr4S4V6rxM/5xopGv36oLVKGuf6qIn4ypy8nXXOGrlPIfl4sXyQ==";
+ url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.8.0.tgz";
+ sha512 = "2ZkXP5gmTE4LcPu2TB350BUmClbwsPZ1ZjYMiHqHDb2Xjoico0PNt6F9tBLjDRy9jS/pFGbjt/iOpyfr4GFm8A==";
};
};
"@bugsnag/safe-json-stringify-6.0.0" = {
@@ -1570,6 +1597,15 @@ let
sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==";
};
};
+ "@deepcode/dcignore-1.0.2" = {
+ name = "_at_deepcode_slash_dcignore";
+ packageName = "@deepcode/dcignore";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz";
+ sha512 = "DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg==";
+ };
+ };
"@devicefarmer/adbkit-2.11.3" = {
name = "_at_devicefarmer_slash_adbkit";
packageName = "@devicefarmer/adbkit";
@@ -1606,6 +1642,177 @@ let
sha512 = "HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==";
};
};
+ "@electron-forge/async-ora-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_async-ora";
+ packageName = "@electron-forge/async-ora";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.54.tgz";
+ sha512 = "OCoHds0BIXaB54HgKw6pjlHC1cnaTcfJfVVkPSJl1GLC3VShZ5bETJfsitwbiP2kbfKLUQFayW27sqbwnwQR2w==";
+ };
+ };
+ "@electron-forge/core-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_core";
+ packageName = "@electron-forge/core";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.54.tgz";
+ sha512 = "yggZeiwRLnIsQYCT5jKhx2L7I02CwUCjnIzA+CqUZXD0AU1c2o0BA/26dNOGvY/+pr5yWjOXcrGy1hvj3dnLmQ==";
+ };
+ };
+ "@electron-forge/installer-base-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-base";
+ packageName = "@electron-forge/installer-base";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.54.tgz";
+ sha512 = "q6Z5kBAE6StKqn+3Z5tXVHu7WGCb9OMeIomw9H9Q41UUIehF7V0J3tCWTkJdhZ8D6/tkXcis3GKptaj0wfMpyg==";
+ };
+ };
+ "@electron-forge/installer-darwin-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-darwin";
+ packageName = "@electron-forge/installer-darwin";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.54.tgz";
+ sha512 = "kRbH24+QBhbcIugnIvevnf43JGzLFLoyFsoY3YeyZeeDL3vfyg0vtSyUx0hfq1GpHG+zObDf3o18c3WbxdXlXA==";
+ };
+ };
+ "@electron-forge/installer-deb-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-deb";
+ packageName = "@electron-forge/installer-deb";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.54.tgz";
+ sha512 = "UbJR2Md0SBqex5AIv9YZ56hY2Iz5gZ6f1iAx0q4PlYpCY19W9nRXdudLNhx1w5go26DsT53+h6EzX2NGpBLq3Q==";
+ };
+ };
+ "@electron-forge/installer-dmg-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-dmg";
+ packageName = "@electron-forge/installer-dmg";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.54.tgz";
+ sha512 = "F9jwhUTzdFNlbLus7RQ8paoGPryr79JFYDLi42f0dyuFwlOjwlrA1wN5xWqrvcMeqFlc3DfjjeRWZ+10RQyorA==";
+ };
+ };
+ "@electron-forge/installer-exe-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-exe";
+ packageName = "@electron-forge/installer-exe";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.54.tgz";
+ sha512 = "PE7RBPerSenNcSkKXJWpervKNl7AVT+JeMzx61OHUQSw3h63NHRvXWh31llxk32mmJcaKRgGle2GsWob87Lv/w==";
+ };
+ };
+ "@electron-forge/installer-linux-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-linux";
+ packageName = "@electron-forge/installer-linux";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.54.tgz";
+ sha512 = "WQVV5fitsfTyktjb18m9Bx+Dho6rCFvVILqFNZAu1RfXIsjLl/h0WdkozdGDccfeDMqlRYmaNs3e5THn5swnAg==";
+ };
+ };
+ "@electron-forge/installer-rpm-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-rpm";
+ packageName = "@electron-forge/installer-rpm";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.54.tgz";
+ sha512 = "8gaJA2m8+Y/ZhV4xEeijXz8UksrliMEzyUAdwM5ZdAsmfmGlnhchGr0L6rI23D66dQP9DeyvUIuUwXrsTlj1nQ==";
+ };
+ };
+ "@electron-forge/installer-zip-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_installer-zip";
+ packageName = "@electron-forge/installer-zip";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.54.tgz";
+ sha512 = "KCY5zreA79wjZODhLmtrbFweTWdlh9JgmW9WruIrmHm3sK19rRhCdaZ+Dg5ZWUhMx2A79d5a2C7r78lWGcHl7A==";
+ };
+ };
+ "@electron-forge/maker-base-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_maker-base";
+ packageName = "@electron-forge/maker-base";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.54.tgz";
+ sha512 = "4y0y15ieb1EOR5mibtFM9tZzaShbAO0RZu6ARLCpD5BgKuJBzXRPfWvEmY6WeDNzoWTJ+mQdYikLAeOL2E9mew==";
+ };
+ };
+ "@electron-forge/plugin-base-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_plugin-base";
+ packageName = "@electron-forge/plugin-base";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.54.tgz";
+ sha512 = "8HwGzgNCHo2PgUfNnTch3Gvj7l6fqOgjnARK1y056UfsxFy+hwvHaAO+7LLfr7ktNwU/bH3hGhOpE+ZmBSwSqQ==";
+ };
+ };
+ "@electron-forge/publisher-base-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_publisher-base";
+ packageName = "@electron-forge/publisher-base";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.54.tgz";
+ sha512 = "Dny0jW0N8QcNYKHTtzQFZD4pBWJ7tclJWf3ZCX031vUKG7RhThdA06IPNzV6JtWJswrvAE9TPndzZONMza2V7g==";
+ };
+ };
+ "@electron-forge/shared-types-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_shared-types";
+ packageName = "@electron-forge/shared-types";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.54.tgz";
+ sha512 = "6CzWKFR17rxxeIqm1w5ZyT9uTAHSVAjhqL8c+TmizF2703GyCEusUkjP2UXt/tZNY4MJlukZoJM66Bct6oZJ+w==";
+ };
+ };
+ "@electron-forge/template-base-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_template-base";
+ packageName = "@electron-forge/template-base";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz";
+ sha512 = "LuSpeOiM6AzUbamz5U/NqRkn4y7dzof1JK1ISAb+6tORf7JU014aKqDcLdwgP8Lxaz6P1bdlMmNJTvg5+SBrEw==";
+ };
+ };
+ "@electron-forge/template-typescript-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_template-typescript";
+ packageName = "@electron-forge/template-typescript";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.54.tgz";
+ sha512 = "7V87LWH+vJ1YibM9MsTttbz7upfwLrmXgchQ399EfLxK306g7q/ouyGkeTerhLr2gCUAvm/Oqx+sXQ7402ol9w==";
+ };
+ };
+ "@electron-forge/template-typescript-webpack-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_template-typescript-webpack";
+ packageName = "@electron-forge/template-typescript-webpack";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.54.tgz";
+ sha512 = "1MIw1eGlMZg7KLG4oAEE0rB28WDOtz01OSoW2a2NqkmUzmu4BxJdSvQ97Tp7xCU0naW0H1uU39B9QOjJQgLGCQ==";
+ };
+ };
+ "@electron-forge/template-webpack-6.0.0-beta.54" = {
+ name = "_at_electron-forge_slash_template-webpack";
+ packageName = "@electron-forge/template-webpack";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.54.tgz";
+ sha512 = "4/zUOZ8MCZqs8PcUCeeG6ofpy6HT53tQiLknM23OPaFP6ckuE6kOunC6N/teijUrJuLpKl3P8d39SWPVacxEzg==";
+ };
+ };
+ "@electron/get-1.12.4" = {
+ name = "_at_electron_slash_get";
+ packageName = "@electron/get";
+ version = "1.12.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron/get/-/get-1.12.4.tgz";
+ sha512 = "6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==";
+ };
+ };
"@emmetio/abbreviation-2.2.1" = {
name = "_at_emmetio_slash_abbreviation";
packageName = "@emmetio/abbreviation";
@@ -1696,49 +1903,13 @@ let
sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==";
};
};
- "@eslint/eslintrc-0.3.0" = {
+ "@eslint/eslintrc-0.4.0" = {
name = "_at_eslint_slash_eslintrc";
packageName = "@eslint/eslintrc";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
- sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==";
- };
- };
- "@evocateur/libnpmaccess-3.1.2" = {
- name = "_at_evocateur_slash_libnpmaccess";
- packageName = "@evocateur/libnpmaccess";
- version = "3.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz";
- sha512 = "KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg==";
- };
- };
- "@evocateur/libnpmpublish-1.2.2" = {
- name = "_at_evocateur_slash_libnpmpublish";
- packageName = "@evocateur/libnpmpublish";
- version = "1.2.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz";
- sha512 = "MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==";
- };
- };
- "@evocateur/npm-registry-fetch-4.0.0" = {
- name = "_at_evocateur_slash_npm-registry-fetch";
- packageName = "@evocateur/npm-registry-fetch";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz";
- sha512 = "k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==";
- };
- };
- "@evocateur/pacote-9.6.5" = {
- name = "_at_evocateur_slash_pacote";
- packageName = "@evocateur/pacote";
- version = "9.6.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz";
- sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==";
+ url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz";
+ sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==";
};
};
"@exodus/schemasafe-1.0.0-rc.3" = {
@@ -1759,15 +1930,6 @@ let
sha512 = "ecpC6e3xTtMVVKWpp231L8vptoSPqwtKSmfJ8sXfMlQRtWbq8Bu1pCHR/pdAx9X4IYzygjrTa9IDAPpbGuSaMg==";
};
};
- "@expo/babel-preset-cli-0.2.18" = {
- name = "_at_expo_slash_babel-preset-cli";
- packageName = "@expo/babel-preset-cli";
- version = "0.2.18";
- src = fetchurl {
- url = "https://registry.npmjs.org/@expo/babel-preset-cli/-/babel-preset-cli-0.2.18.tgz";
- sha512 = "y2IZFynVtRxMQ4uxXYUnrnXZa+pvSH1R1aSUAfC6RsUb2UNOxC6zRehdLGSOyF4s9Wy+j3/CPm6fC0T5UJYoQg==";
- };
- };
"@expo/bunyan-4.0.0" = {
name = "_at_expo_slash_bunyan";
packageName = "@expo/bunyan";
@@ -1777,22 +1939,22 @@ let
sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";
};
};
- "@expo/config-3.3.28" = {
+ "@expo/config-3.3.30" = {
name = "_at_expo_slash_config";
packageName = "@expo/config";
- version = "3.3.28";
+ version = "3.3.30";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config/-/config-3.3.28.tgz";
- sha512 = "0zJBOZIl/p4KejUkz6G6uzMjGnWsooWayDk7TeFSCxWZ84HWGCx+LIXbEkc8c/CmMm9HyjYlhESw96mwZZzpPQ==";
+ url = "https://registry.npmjs.org/@expo/config/-/config-3.3.30.tgz";
+ sha512 = "mOFebiAcowOD9MCpXGtZG/oMku1vAOazGx9BGaDnrod5YHjmrIN65W+hP+eK2dQBcJV1VjbU5K3VpkXO6aWwBA==";
};
};
- "@expo/config-plugins-1.0.18" = {
+ "@expo/config-plugins-1.0.20" = {
name = "_at_expo_slash_config-plugins";
packageName = "@expo/config-plugins";
- version = "1.0.18";
+ version = "1.0.20";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.18.tgz";
- sha512 = "8Ey+22cEAOxK+SBJY+OazaLsPyL5FXdsykfBg/QQJE2Y/DTFebUVlr5bQyeqavbASDvmDxg3Fd71A8Se8+qT1g==";
+ url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.20.tgz";
+ sha512 = "BucZQbi7edu8Pin8zFUNsaQeZAj/8ga7Ei3PKivKZKd5F53DdFU6Yb+ZDyQ0UeOGDi0hZlZWdaBzmQqHEg37TQ==";
};
};
"@expo/config-types-40.0.0-beta.2" = {
@@ -1804,31 +1966,40 @@ let
sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg==";
};
};
- "@expo/configure-splash-screen-0.3.3" = {
+ "@expo/configure-splash-screen-0.3.4" = {
name = "_at_expo_slash_configure-splash-screen";
packageName = "@expo/configure-splash-screen";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.3.tgz";
- sha512 = "fWy6Z52Mj2a7yjdvpIJkP9G3kfkoXE79aHvTDwgggIE0KLhwnPF27v+KS0wJUf7b4JM6w0zKOlUZjQhn0kSNyA==";
+ url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.4.tgz";
+ sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw==";
};
};
- "@expo/dev-server-0.1.54" = {
+ "@expo/dev-server-0.1.56" = {
name = "_at_expo_slash_dev-server";
packageName = "@expo/dev-server";
- version = "0.1.54";
+ version = "0.1.56";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.54.tgz";
- sha512 = "15JC58wiL1N6N95lxM7pG42SY8geMYq19i0FSp5CsEvNZrbc1tuzaRGZhrW7I1EwOhNNdR2teyoLaIKCP7ynSg==";
+ url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.56.tgz";
+ sha512 = "BXKJW6KB7AckjJkDIM4mmuMhbiP9GQtmfsNoEsXg9Ci1NxJxu4vc/UdaL4tC+SLlDNpKgSIBvSNDY0AdPKUAeA==";
};
};
- "@expo/dev-tools-0.13.82" = {
+ "@expo/dev-tools-0.13.84" = {
name = "_at_expo_slash_dev-tools";
packageName = "@expo/dev-tools";
- version = "0.13.82";
+ version = "0.13.84";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.82.tgz";
- sha512 = "Uq3HoRP0/+w/c6LHdRAMEPLqO3NZS4cailJCYR/MXcZ6xGMrAOjBZwB64H7SP12ADyzhjOsISvr+JG5SE/lRRA==";
+ url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.84.tgz";
+ sha512 = "HmN5Gb+uSpLxIhHKjPgRSLZaAEJW8UmV6h2eQmVUrpc+VoT0M4roCHd50xJQv+OqLllgo9ZmmyWHnNckOd+RJA==";
+ };
+ };
+ "@expo/devcert-1.0.0" = {
+ name = "_at_expo_slash_devcert";
+ packageName = "@expo/devcert";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.0.0.tgz";
+ sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ==";
};
};
"@expo/image-utils-0.3.10" = {
@@ -1840,22 +2011,22 @@ let
sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA==";
};
};
- "@expo/json-file-8.2.27" = {
+ "@expo/json-file-8.2.28-alpha.0" = {
name = "_at_expo_slash_json-file";
packageName = "@expo/json-file";
- version = "8.2.27";
+ version = "8.2.28-alpha.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.27.tgz";
- sha512 = "Iyqg1jbXOTg0JfCGwMrkaaRmVFjQrWDBQAhYLTdvOD3GrXYuKI1vUV+3Wqw0NnU+TYoNUpi7aB8dNzPvLj0oag==";
+ url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.28-alpha.0.tgz";
+ sha512 = "cCQdw/Nfw8doXjN3onvUnWkuJjtVxx2iUjSOLMydvgI87YpW3x05uUXOVs4P+77YFVoFS6xbki+fmKK2JSCf8w==";
};
};
- "@expo/metro-config-0.1.54" = {
+ "@expo/metro-config-0.1.56" = {
name = "_at_expo_slash_metro-config";
packageName = "@expo/metro-config";
- version = "0.1.54";
+ version = "0.1.56";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.54.tgz";
- sha512 = "DOlTzNheS5IZDDmQjWt60mAmbFreH8xT3ZXc6y/k4UVq7khQ41/g5kl1AJOC9WzE6xgPtmDQqTWanBprn+OhzA==";
+ url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.56.tgz";
+ sha512 = "h7IBc8GWzqKhdv2OWqU9tU3i5ZMpoXU1gao+kZzvi02dEAV5GzKxvGPiZu9nsvXeeRlCIpzTHvzFPh5n5mtSnA==";
};
};
"@expo/osascript-2.0.24" = {
@@ -1867,13 +2038,13 @@ let
sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q==";
};
};
- "@expo/package-manager-0.0.38" = {
+ "@expo/package-manager-0.0.39-alpha.0" = {
name = "_at_expo_slash_package-manager";
packageName = "@expo/package-manager";
- version = "0.0.38";
+ version = "0.0.39-alpha.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.38.tgz";
- sha512 = "meuDK53dkORUCRnIMBOkgPNWMfH47KJgUFZ3b1shYD+JFpsk4OX4OieKdyFX/J6Q7HgHwFSJvdCCFxgPbsAQyg==";
+ url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.39-alpha.0.tgz";
+ sha512 = "NLd93cG7pVmJaoWeJZsTab6jOTMvgW0UZz3NGq2mf9jbxlJUEj9QIGF/tzt4dIhtfdDFd5FbEpGRidcE3jGdOg==";
};
};
"@expo/plist-0.0.11" = {
@@ -1894,13 +2065,13 @@ let
sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA==";
};
};
- "@expo/schemer-1.3.26" = {
+ "@expo/schemer-1.3.27-alpha.0" = {
name = "_at_expo_slash_schemer";
packageName = "@expo/schemer";
- version = "1.3.26";
+ version = "1.3.27-alpha.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.26.tgz";
- sha512 = "++PmBy75BpaPRrbIzmgpp3r73gtoa2PkSKucTXRH8OfADlF0FDJ7W0S1L6iKMhZml3339pjUMLo7a9A7OlgU6g==";
+ url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.27-alpha.0.tgz";
+ sha512 = "RJB1VCPROzfy4XFx79PLfz5WD5QvVSA6Xq2f6CUVyxOpWwpMyQfXA2vv3ebmLJYmr67OZDa26kn3fUxQLI4BHw==";
};
};
"@expo/simple-spinner-1.0.2" = {
@@ -1921,22 +2092,22 @@ let
sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==";
};
};
- "@expo/webpack-config-0.12.58" = {
+ "@expo/webpack-config-0.12.60" = {
name = "_at_expo_slash_webpack-config";
packageName = "@expo/webpack-config";
- version = "0.12.58";
+ version = "0.12.60";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.58.tgz";
- sha512 = "c3UrHaNll4+nBmmNA/1HU7OYm7USsaqzMqExfC+mB3E1RnPi0qft83zf7wgwNwQCcqs06NH3VRKxpmQ7qzKuNw==";
+ url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.60.tgz";
+ sha512 = "UieL5oLo4rm0jNx/Gzz6gs4fZ37THSdptvy4dQFsHGQrvZgxd1lCHEe4NNv56/Zs3H/FrX7vczpZ2fwS/LXvmQ==";
};
};
- "@expo/xdl-59.0.22" = {
+ "@expo/xdl-59.0.24" = {
name = "_at_expo_slash_xdl";
packageName = "@expo/xdl";
- version = "59.0.22";
+ version = "59.0.24";
src = fetchurl {
- url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.22.tgz";
- sha512 = "1kfDyr5Gg9f1d93eJJ2JXiMXvhtf5IGWMp4C+aSPcH1ajxaWGak9SRpkTGv0Mi0VN9jIimTFT+kTkWZv9W1VMQ==";
+ url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.24.tgz";
+ sha512 = "rl0lJ3z4v0VPu8Z37Vl2sTYSupAVjD6MxUHAJd+FRKgQMb7kyJUTpWvBAlbYCgMM+WH5XZZSvgWdwCTLocwPtw==";
};
};
"@fast-csv/format-4.3.5" = {
@@ -1957,67 +2128,67 @@ let
sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==";
};
};
- "@fluentui/date-time-utilities-7.9.0" = {
+ "@fluentui/date-time-utilities-7.9.1" = {
name = "_at_fluentui_slash_date-time-utilities";
packageName = "@fluentui/date-time-utilities";
- version = "7.9.0";
+ version = "7.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz";
- sha512 = "D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw==";
+ url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz";
+ sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ==";
};
};
- "@fluentui/dom-utilities-1.1.1" = {
+ "@fluentui/dom-utilities-1.1.2" = {
name = "_at_fluentui_slash_dom-utilities";
packageName = "@fluentui/dom-utilities";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz";
- sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g==";
+ url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz";
+ sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw==";
};
};
- "@fluentui/keyboard-key-0.2.13" = {
+ "@fluentui/keyboard-key-0.2.14" = {
name = "_at_fluentui_slash_keyboard-key";
packageName = "@fluentui/keyboard-key";
- version = "0.2.13";
+ version = "0.2.14";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.13.tgz";
- sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ==";
+ url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.14.tgz";
+ sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw==";
};
};
- "@fluentui/react-7.161.0" = {
+ "@fluentui/react-7.162.1" = {
name = "_at_fluentui_slash_react";
packageName = "@fluentui/react";
- version = "7.161.0";
+ version = "7.162.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react/-/react-7.161.0.tgz";
- sha512 = "TZQvDVeOrZrkkcOvrg3+EwOJYE8M9UWn01BIIOULv4tjKnIpRreyKHr/nrG0Cbb0PYEmqxUex0CR+RFCqIYlpg==";
+ url = "https://registry.npmjs.org/@fluentui/react/-/react-7.162.1.tgz";
+ sha512 = "egK9hEYePYlUGzh1Db7gxdUaiWZBRY5MG4Gb8jb5PzOq/Y0stP5pX+zfzLulp2Q0sWzP/03t6A9N84pnfcDYWQ==";
};
};
- "@fluentui/react-focus-7.17.4" = {
+ "@fluentui/react-focus-7.17.5" = {
name = "_at_fluentui_slash_react-focus";
packageName = "@fluentui/react-focus";
- version = "7.17.4";
+ version = "7.17.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.4.tgz";
- sha512 = "L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg==";
+ url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.5.tgz";
+ sha512 = "FBgvHMOpFnmMSGVV+QdlKNMQ61kEzqv2wjUObWxdpqxVUeFIk4rSAalCp2R8c2Sg8YxTGmH5ywhySQ6GQEM6sA==";
};
};
- "@fluentui/react-window-provider-1.0.1" = {
+ "@fluentui/react-window-provider-1.0.2" = {
name = "_at_fluentui_slash_react-window-provider";
packageName = "@fluentui/react-window-provider";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz";
- sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w==";
+ url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz";
+ sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw==";
};
};
- "@fluentui/theme-1.7.3" = {
+ "@fluentui/theme-1.7.4" = {
name = "_at_fluentui_slash_theme";
packageName = "@fluentui/theme";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.3.tgz";
- sha512 = "S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g==";
+ url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz";
+ sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ==";
};
};
"@gardenapple/yargs-17.0.0-candidate.0" = {
@@ -2065,13 +2236,13 @@ let
sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==";
};
};
- "@google-cloud/pubsub-2.9.0" = {
+ "@google-cloud/pubsub-2.10.0" = {
name = "_at_google-cloud_slash_pubsub";
packageName = "@google-cloud/pubsub";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.9.0.tgz";
- sha512 = "hxj8b4o+m3+XmMOfrl1jcQnPhG4C57YhL/8FHkmUdXeaRA5694TAqH+P0S3NUiM1DfsHqhp3glb2mYChwU7G/Q==";
+ url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.10.0.tgz";
+ sha512 = "XM/Fc6/W/LYzGH2pnhGLDR5E6JNZFMfzyUFP5bWgC4FK1KqIZ4g6hrnCCO38G4JfH2i1IuSQuefPF7FrZZo9tw==";
};
};
"@graphql-cli/common-4.1.0" = {
@@ -2119,13 +2290,13 @@ let
sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==";
};
};
- "@graphql-tools/import-6.2.6" = {
+ "@graphql-tools/import-6.3.0" = {
name = "_at_graphql-tools_slash_import";
packageName = "@graphql-tools/import";
- version = "6.2.6";
+ version = "6.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz";
- sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA==";
+ url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.3.0.tgz";
+ sha512 = "zmaVhJ3UPjzJSb005Pjn2iWvH+9AYRXI4IUiTi14uPupiXppJP3s7S25Si3+DbHpFwurDF2nWRxBLiFPWudCqw==";
};
};
"@graphql-tools/json-file-loader-6.2.6" = {
@@ -2146,13 +2317,13 @@ let
sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
};
};
- "@graphql-tools/merge-6.2.9" = {
+ "@graphql-tools/merge-6.2.10" = {
name = "_at_graphql-tools_slash_merge";
packageName = "@graphql-tools/merge";
- version = "6.2.9";
+ version = "6.2.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.9.tgz";
- sha512 = "4PPB2rOEjnN91CVltOIVdBOOTEsC+2sHzOVngSoqtgZxvLwcRKwivy3sBuL3WyucBonzpXlV97Q418njslYa/w==";
+ url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.10.tgz";
+ sha512 = "dM3n37PcslvhOAkCz7Cwk0BfoiSVKXGmCX+VMZkATbXk/0vlxUfNEpVfA5yF4IkP27F04SzFQSaNrbD0W2Rszw==";
};
};
"@graphql-tools/schema-7.1.3" = {
@@ -2200,13 +2371,13 @@ let
sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ==";
};
};
- "@grpc/grpc-js-1.2.8" = {
+ "@grpc/grpc-js-1.2.10" = {
name = "_at_grpc_slash_grpc-js";
packageName = "@grpc/grpc-js";
- version = "1.2.8";
+ version = "1.2.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.8.tgz";
- sha512 = "9C1xiCbnYe/3OFpSuRqz2JgFSOxv6+SlqFhXgRC1nHfXYbLnXvtmsI/NpaMs6k9ZNyV4gyaOOh5Z4McfegQGew==";
+ url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.10.tgz";
+ sha512 = "wj6GkNiorWYaPiIZ767xImmw7avMMVUweTvPFg4mJWOxz2180DKwfuxhJJZ7rpc1+7D3mX/v8vJdxTuIo71Ieg==";
};
};
"@grpc/proto-loader-0.5.6" = {
@@ -2839,13 +3010,13 @@ let
sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
};
};
- "@jsii/spec-1.21.0" = {
+ "@jsii/spec-1.24.0" = {
name = "_at_jsii_slash_spec";
packageName = "@jsii/spec";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.21.0.tgz";
- sha512 = "MWQpJKciYytEmYzuwsT+4UM1JPiQyCAqr3PfkZxuosoPUaF7vBrWSs2+TXDb5dcCwpSnSim9iKZrM/Uc2ppUzA==";
+ url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.24.0.tgz";
+ sha512 = "Km0va0ZBlzWPOijsNlo7SwozYT6Ej9h01xXYtBmoHw2CLccofOEQLV2Ig3+ydhU+aTW5yLKJrVPsAjJoaaBAgA==";
};
};
"@kwsites/file-exists-1.1.1" = {
@@ -2866,535 +3037,544 @@ let
sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==";
};
};
- "@lerna/add-3.21.0" = {
+ "@lerna/add-4.0.0" = {
name = "_at_lerna_slash_add";
packageName = "@lerna/add";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz";
- sha512 = "vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==";
+ url = "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz";
+ sha512 = "cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==";
};
};
- "@lerna/bootstrap-3.21.0" = {
+ "@lerna/bootstrap-4.0.0" = {
name = "_at_lerna_slash_bootstrap";
packageName = "@lerna/bootstrap";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.21.0.tgz";
- sha512 = "mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==";
+ url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-4.0.0.tgz";
+ sha512 = "RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==";
};
};
- "@lerna/changed-3.21.0" = {
+ "@lerna/changed-4.0.0" = {
name = "_at_lerna_slash_changed";
packageName = "@lerna/changed";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.21.0.tgz";
- sha512 = "hzqoyf8MSHVjZp0gfJ7G8jaz+++mgXYiNs9iViQGA8JlN/dnWLI5sWDptEH3/B30Izo+fdVz0S0s7ydVE3pWIw==";
+ url = "https://registry.npmjs.org/@lerna/changed/-/changed-4.0.0.tgz";
+ sha512 = "cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==";
};
};
- "@lerna/check-working-tree-3.16.5" = {
+ "@lerna/check-working-tree-4.0.0" = {
name = "_at_lerna_slash_check-working-tree";
packageName = "@lerna/check-working-tree";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.16.5.tgz";
- sha512 = "xWjVBcuhvB8+UmCSb5tKVLB5OuzSpw96WEhS2uz6hkWVa/Euh1A0/HJwn2cemyK47wUrCQXtczBUiqnq9yX5VQ==";
+ url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz";
+ sha512 = "/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==";
};
};
- "@lerna/child-process-3.16.5" = {
+ "@lerna/child-process-4.0.0" = {
name = "_at_lerna_slash_child-process";
packageName = "@lerna/child-process";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.16.5.tgz";
- sha512 = "vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg==";
+ url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-4.0.0.tgz";
+ sha512 = "XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==";
};
};
- "@lerna/clean-3.21.0" = {
+ "@lerna/clean-4.0.0" = {
name = "_at_lerna_slash_clean";
packageName = "@lerna/clean";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.21.0.tgz";
- sha512 = "b/L9l+MDgE/7oGbrav6rG8RTQvRiZLO1zTcG17zgJAAuhlsPxJExMlh2DFwJEVi2les70vMhHfST3Ue1IMMjpg==";
+ url = "https://registry.npmjs.org/@lerna/clean/-/clean-4.0.0.tgz";
+ sha512 = "uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==";
};
};
- "@lerna/cli-3.18.5" = {
+ "@lerna/cli-4.0.0" = {
name = "_at_lerna_slash_cli";
packageName = "@lerna/cli";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz";
- sha512 = "erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA==";
+ url = "https://registry.npmjs.org/@lerna/cli/-/cli-4.0.0.tgz";
+ sha512 = "Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==";
};
};
- "@lerna/collect-uncommitted-3.16.5" = {
+ "@lerna/collect-uncommitted-4.0.0" = {
name = "_at_lerna_slash_collect-uncommitted";
packageName = "@lerna/collect-uncommitted";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.16.5.tgz";
- sha512 = "ZgqnGwpDZiWyzIQVZtQaj9tRizsL4dUOhuOStWgTAw1EMe47cvAY2kL709DzxFhjr6JpJSjXV5rZEAeU3VE0Hg==";
+ url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz";
+ sha512 = "ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==";
};
};
- "@lerna/collect-updates-3.20.0" = {
+ "@lerna/collect-updates-4.0.0" = {
name = "_at_lerna_slash_collect-updates";
packageName = "@lerna/collect-updates";
- version = "3.20.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.20.0.tgz";
- sha512 = "qBTVT5g4fupVhBFuY4nI/3FSJtQVcDh7/gEPOpRxoXB/yCSnT38MFHXWl+y4einLciCjt/+0x6/4AG80fjay2Q==";
+ url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-4.0.0.tgz";
+ sha512 = "bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==";
};
};
- "@lerna/command-3.21.0" = {
+ "@lerna/command-4.0.0" = {
name = "_at_lerna_slash_command";
packageName = "@lerna/command";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/command/-/command-3.21.0.tgz";
- sha512 = "T2bu6R8R3KkH5YoCKdutKv123iUgUbW8efVjdGCDnCMthAQzoentOJfDeodBwn0P2OqCl3ohsiNVtSn9h78fyQ==";
+ url = "https://registry.npmjs.org/@lerna/command/-/command-4.0.0.tgz";
+ sha512 = "LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==";
};
};
- "@lerna/conventional-commits-3.22.0" = {
+ "@lerna/conventional-commits-4.0.0" = {
name = "_at_lerna_slash_conventional-commits";
packageName = "@lerna/conventional-commits";
- version = "3.22.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.22.0.tgz";
- sha512 = "z4ZZk1e8Mhz7+IS8NxHr64wyklHctCJyWpJKEZZPJiLFJ8yKto/x38O80R10pIzC0rr8Sy/OsjSH4bl0TbbgqA==";
+ url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz";
+ sha512 = "CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==";
};
};
- "@lerna/create-3.22.0" = {
+ "@lerna/create-4.0.0" = {
name = "_at_lerna_slash_create";
packageName = "@lerna/create";
- version = "3.22.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/create/-/create-3.22.0.tgz";
- sha512 = "MdiQQzCcB4E9fBF1TyMOaAEz9lUjIHp1Ju9H7f3lXze5JK6Fl5NYkouAvsLgY6YSIhXMY8AHW2zzXeBDY4yWkw==";
+ url = "https://registry.npmjs.org/@lerna/create/-/create-4.0.0.tgz";
+ sha512 = "mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==";
};
};
- "@lerna/create-symlink-3.16.2" = {
+ "@lerna/create-symlink-4.0.0" = {
name = "_at_lerna_slash_create-symlink";
packageName = "@lerna/create-symlink";
- version = "3.16.2";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz";
- sha512 = "pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw==";
+ url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-4.0.0.tgz";
+ sha512 = "I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==";
};
};
- "@lerna/describe-ref-3.16.5" = {
+ "@lerna/describe-ref-4.0.0" = {
name = "_at_lerna_slash_describe-ref";
packageName = "@lerna/describe-ref";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.16.5.tgz";
- sha512 = "c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw==";
+ url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-4.0.0.tgz";
+ sha512 = "eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==";
};
};
- "@lerna/diff-3.21.0" = {
+ "@lerna/diff-4.0.0" = {
name = "_at_lerna_slash_diff";
packageName = "@lerna/diff";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.21.0.tgz";
- sha512 = "5viTR33QV3S7O+bjruo1SaR40m7F2aUHJaDAC7fL9Ca6xji+aw1KFkpCtVlISS0G8vikUREGMJh+c/VMSc8Usw==";
+ url = "https://registry.npmjs.org/@lerna/diff/-/diff-4.0.0.tgz";
+ sha512 = "jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==";
};
};
- "@lerna/exec-3.21.0" = {
+ "@lerna/exec-4.0.0" = {
name = "_at_lerna_slash_exec";
packageName = "@lerna/exec";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.21.0.tgz";
- sha512 = "iLvDBrIE6rpdd4GIKTY9mkXyhwsJ2RvQdB9ZU+/NhR3okXfqKc6py/24tV111jqpXTtZUW6HNydT4dMao2hi1Q==";
+ url = "https://registry.npmjs.org/@lerna/exec/-/exec-4.0.0.tgz";
+ sha512 = "VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==";
};
};
- "@lerna/filter-options-3.20.0" = {
+ "@lerna/filter-options-4.0.0" = {
name = "_at_lerna_slash_filter-options";
packageName = "@lerna/filter-options";
- version = "3.20.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.20.0.tgz";
- sha512 = "bmcHtvxn7SIl/R9gpiNMVG7yjx7WyT0HSGw34YVZ9B+3xF/83N3r5Rgtjh4hheLZ+Q91Or0Jyu5O3Nr+AwZe2g==";
+ url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-4.0.0.tgz";
+ sha512 = "vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==";
};
};
- "@lerna/filter-packages-3.18.0" = {
+ "@lerna/filter-packages-4.0.0" = {
name = "_at_lerna_slash_filter-packages";
packageName = "@lerna/filter-packages";
- version = "3.18.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.18.0.tgz";
- sha512 = "6/0pMM04bCHNATIOkouuYmPg6KH3VkPCIgTfQmdkPJTullERyEQfNUKikrefjxo1vHOoCACDpy65JYyKiAbdwQ==";
+ url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-4.0.0.tgz";
+ sha512 = "+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==";
};
};
- "@lerna/get-npm-exec-opts-3.13.0" = {
+ "@lerna/get-npm-exec-opts-4.0.0" = {
name = "_at_lerna_slash_get-npm-exec-opts";
packageName = "@lerna/get-npm-exec-opts";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz";
- sha512 = "Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==";
+ url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz";
+ sha512 = "yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==";
};
};
- "@lerna/get-packed-3.16.0" = {
+ "@lerna/get-packed-4.0.0" = {
name = "_at_lerna_slash_get-packed";
packageName = "@lerna/get-packed";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz";
- sha512 = "AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw==";
+ url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-4.0.0.tgz";
+ sha512 = "rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==";
};
};
- "@lerna/github-client-3.22.0" = {
+ "@lerna/github-client-4.0.0" = {
name = "_at_lerna_slash_github-client";
packageName = "@lerna/github-client";
- version = "3.22.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.22.0.tgz";
- sha512 = "O/GwPW+Gzr3Eb5bk+nTzTJ3uv+jh5jGho9BOqKlajXaOkMYGBELEAqV5+uARNGWZFvYAiF4PgqHb6aCUu7XdXg==";
+ url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-4.0.0.tgz";
+ sha512 = "2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==";
};
};
- "@lerna/gitlab-client-3.15.0" = {
+ "@lerna/gitlab-client-4.0.0" = {
name = "_at_lerna_slash_gitlab-client";
packageName = "@lerna/gitlab-client";
- version = "3.15.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz";
- sha512 = "OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==";
+ url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz";
+ sha512 = "OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==";
};
};
- "@lerna/global-options-3.13.0" = {
+ "@lerna/global-options-4.0.0" = {
name = "_at_lerna_slash_global-options";
packageName = "@lerna/global-options";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.13.0.tgz";
- sha512 = "SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==";
+ url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-4.0.0.tgz";
+ sha512 = "TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==";
};
};
- "@lerna/has-npm-version-3.16.5" = {
+ "@lerna/has-npm-version-4.0.0" = {
name = "_at_lerna_slash_has-npm-version";
packageName = "@lerna/has-npm-version";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.5.tgz";
- sha512 = "WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q==";
+ url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz";
+ sha512 = "LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==";
};
};
- "@lerna/import-3.22.0" = {
+ "@lerna/import-4.0.0" = {
name = "_at_lerna_slash_import";
packageName = "@lerna/import";
- version = "3.22.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/import/-/import-3.22.0.tgz";
- sha512 = "uWOlexasM5XR6tXi4YehODtH9Y3OZrFht3mGUFFT3OIl2s+V85xIGFfqFGMTipMPAGb2oF1UBLL48kR43hRsOg==";
+ url = "https://registry.npmjs.org/@lerna/import/-/import-4.0.0.tgz";
+ sha512 = "FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==";
};
};
- "@lerna/info-3.21.0" = {
+ "@lerna/info-4.0.0" = {
name = "_at_lerna_slash_info";
packageName = "@lerna/info";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/info/-/info-3.21.0.tgz";
- sha512 = "0XDqGYVBgWxUquFaIptW2bYSIu6jOs1BtkvRTWDDhw4zyEdp6q4eaMvqdSap1CG+7wM5jeLCi6z94wS0AuiuwA==";
+ url = "https://registry.npmjs.org/@lerna/info/-/info-4.0.0.tgz";
+ sha512 = "8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==";
};
};
- "@lerna/init-3.21.0" = {
+ "@lerna/init-4.0.0" = {
name = "_at_lerna_slash_init";
packageName = "@lerna/init";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/init/-/init-3.21.0.tgz";
- sha512 = "6CM0z+EFUkFfurwdJCR+LQQF6MqHbYDCBPyhu/d086LRf58GtYZYj49J8mKG9ktayp/TOIxL/pKKjgLD8QBPOg==";
+ url = "https://registry.npmjs.org/@lerna/init/-/init-4.0.0.tgz";
+ sha512 = "wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==";
};
};
- "@lerna/link-3.21.0" = {
+ "@lerna/link-4.0.0" = {
name = "_at_lerna_slash_link";
packageName = "@lerna/link";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/link/-/link-3.21.0.tgz";
- sha512 = "tGu9GxrX7Ivs+Wl3w1+jrLi1nQ36kNI32dcOssij6bg0oZ2M2MDEFI9UF2gmoypTaN9uO5TSsjCFS7aR79HbdQ==";
+ url = "https://registry.npmjs.org/@lerna/link/-/link-4.0.0.tgz";
+ sha512 = "KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==";
};
};
- "@lerna/list-3.21.0" = {
+ "@lerna/list-4.0.0" = {
name = "_at_lerna_slash_list";
packageName = "@lerna/list";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/list/-/list-3.21.0.tgz";
- sha512 = "KehRjE83B1VaAbRRkRy6jLX1Cin8ltsrQ7FHf2bhwhRHK0S54YuA6LOoBnY/NtA8bHDX/Z+G5sMY78X30NS9tg==";
+ url = "https://registry.npmjs.org/@lerna/list/-/list-4.0.0.tgz";
+ sha512 = "L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==";
};
};
- "@lerna/listable-3.18.5" = {
+ "@lerna/listable-4.0.0" = {
name = "_at_lerna_slash_listable";
packageName = "@lerna/listable";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz";
- sha512 = "Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg==";
+ url = "https://registry.npmjs.org/@lerna/listable/-/listable-4.0.0.tgz";
+ sha512 = "/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==";
};
};
- "@lerna/log-packed-3.16.0" = {
+ "@lerna/log-packed-4.0.0" = {
name = "_at_lerna_slash_log-packed";
packageName = "@lerna/log-packed";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz";
- sha512 = "Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ==";
+ url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-4.0.0.tgz";
+ sha512 = "+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==";
};
};
- "@lerna/npm-conf-3.16.0" = {
+ "@lerna/npm-conf-4.0.0" = {
name = "_at_lerna_slash_npm-conf";
packageName = "@lerna/npm-conf";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz";
- sha512 = "HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA==";
+ url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-4.0.0.tgz";
+ sha512 = "uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==";
};
};
- "@lerna/npm-dist-tag-3.18.5" = {
+ "@lerna/npm-dist-tag-4.0.0" = {
name = "_at_lerna_slash_npm-dist-tag";
packageName = "@lerna/npm-dist-tag";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz";
- sha512 = "xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ==";
+ url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz";
+ sha512 = "F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==";
};
};
- "@lerna/npm-install-3.16.5" = {
+ "@lerna/npm-install-4.0.0" = {
name = "_at_lerna_slash_npm-install";
packageName = "@lerna/npm-install";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.5.tgz";
- sha512 = "hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg==";
+ url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-4.0.0.tgz";
+ sha512 = "aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==";
};
};
- "@lerna/npm-publish-3.18.5" = {
+ "@lerna/npm-publish-4.0.0" = {
name = "_at_lerna_slash_npm-publish";
packageName = "@lerna/npm-publish";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz";
- sha512 = "3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg==";
+ url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-4.0.0.tgz";
+ sha512 = "vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==";
};
};
- "@lerna/npm-run-script-3.16.5" = {
+ "@lerna/npm-run-script-4.0.0" = {
name = "_at_lerna_slash_npm-run-script";
packageName = "@lerna/npm-run-script";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.16.5.tgz";
- sha512 = "1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ==";
+ url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz";
+ sha512 = "Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==";
};
};
- "@lerna/otplease-3.18.5" = {
+ "@lerna/otplease-4.0.0" = {
name = "_at_lerna_slash_otplease";
packageName = "@lerna/otplease";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz";
- sha512 = "S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog==";
+ url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-4.0.0.tgz";
+ sha512 = "Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==";
};
};
- "@lerna/output-3.13.0" = {
+ "@lerna/output-4.0.0" = {
name = "_at_lerna_slash_output";
packageName = "@lerna/output";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/output/-/output-3.13.0.tgz";
- sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==";
+ url = "https://registry.npmjs.org/@lerna/output/-/output-4.0.0.tgz";
+ sha512 = "Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==";
};
};
- "@lerna/pack-directory-3.16.4" = {
+ "@lerna/pack-directory-4.0.0" = {
name = "_at_lerna_slash_pack-directory";
packageName = "@lerna/pack-directory";
- version = "3.16.4";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz";
- sha512 = "uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==";
+ url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-4.0.0.tgz";
+ sha512 = "NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==";
};
};
- "@lerna/package-3.16.0" = {
+ "@lerna/package-4.0.0" = {
name = "_at_lerna_slash_package";
packageName = "@lerna/package";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz";
- sha512 = "2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw==";
+ url = "https://registry.npmjs.org/@lerna/package/-/package-4.0.0.tgz";
+ sha512 = "l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==";
};
};
- "@lerna/package-graph-3.18.5" = {
+ "@lerna/package-graph-4.0.0" = {
name = "_at_lerna_slash_package-graph";
packageName = "@lerna/package-graph";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz";
- sha512 = "8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA==";
+ url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-4.0.0.tgz";
+ sha512 = "QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==";
};
};
- "@lerna/prerelease-id-from-version-3.16.0" = {
+ "@lerna/prerelease-id-from-version-4.0.0" = {
name = "_at_lerna_slash_prerelease-id-from-version";
packageName = "@lerna/prerelease-id-from-version";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz";
- sha512 = "qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA==";
+ url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz";
+ sha512 = "GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==";
};
};
- "@lerna/profiler-3.20.0" = {
+ "@lerna/profiler-4.0.0" = {
name = "_at_lerna_slash_profiler";
packageName = "@lerna/profiler";
- version = "3.20.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-3.20.0.tgz";
- sha512 = "bh8hKxAlm6yu8WEOvbLENm42i2v9SsR4WbrCWSbsmOElx3foRnMlYk7NkGECa+U5c3K4C6GeBbwgqs54PP7Ljg==";
+ url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-4.0.0.tgz";
+ sha512 = "/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==";
};
};
- "@lerna/project-3.21.0" = {
+ "@lerna/project-4.0.0" = {
name = "_at_lerna_slash_project";
packageName = "@lerna/project";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/project/-/project-3.21.0.tgz";
- sha512 = "xT1mrpET2BF11CY32uypV2GPtPVm6Hgtha7D81GQP9iAitk9EccrdNjYGt5UBYASl4CIDXBRxwmTTVGfrCx82A==";
+ url = "https://registry.npmjs.org/@lerna/project/-/project-4.0.0.tgz";
+ sha512 = "o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==";
};
};
- "@lerna/prompt-3.18.5" = {
+ "@lerna/prompt-4.0.0" = {
name = "_at_lerna_slash_prompt";
packageName = "@lerna/prompt";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz";
- sha512 = "rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ==";
+ url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-4.0.0.tgz";
+ sha512 = "4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==";
};
};
- "@lerna/publish-3.22.1" = {
+ "@lerna/publish-4.0.0" = {
name = "_at_lerna_slash_publish";
packageName = "@lerna/publish";
- version = "3.22.1";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.22.1.tgz";
- sha512 = "PG9CM9HUYDreb1FbJwFg90TCBQooGjj+n/pb3gw/eH5mEDq0p8wKdLFe0qkiqUkm/Ub5C8DbVFertIo0Vd0zcw==";
+ url = "https://registry.npmjs.org/@lerna/publish/-/publish-4.0.0.tgz";
+ sha512 = "K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==";
};
};
- "@lerna/pulse-till-done-3.13.0" = {
+ "@lerna/pulse-till-done-4.0.0" = {
name = "_at_lerna_slash_pulse-till-done";
packageName = "@lerna/pulse-till-done";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz";
- sha512 = "1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==";
+ url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz";
+ sha512 = "Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==";
};
};
- "@lerna/query-graph-3.18.5" = {
+ "@lerna/query-graph-4.0.0" = {
name = "_at_lerna_slash_query-graph";
packageName = "@lerna/query-graph";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz";
- sha512 = "50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA==";
+ url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-4.0.0.tgz";
+ sha512 = "YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==";
};
};
- "@lerna/resolve-symlink-3.16.0" = {
+ "@lerna/resolve-symlink-4.0.0" = {
name = "_at_lerna_slash_resolve-symlink";
packageName = "@lerna/resolve-symlink";
- version = "3.16.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz";
- sha512 = "Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ==";
+ url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz";
+ sha512 = "RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==";
};
};
- "@lerna/rimraf-dir-3.16.5" = {
+ "@lerna/rimraf-dir-4.0.0" = {
name = "_at_lerna_slash_rimraf-dir";
packageName = "@lerna/rimraf-dir";
- version = "3.16.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.16.5.tgz";
- sha512 = "bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA==";
+ url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz";
+ sha512 = "QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==";
};
};
- "@lerna/run-3.21.0" = {
+ "@lerna/run-4.0.0" = {
name = "_at_lerna_slash_run";
packageName = "@lerna/run";
- version = "3.21.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/run/-/run-3.21.0.tgz";
- sha512 = "fJF68rT3veh+hkToFsBmUJ9MHc9yGXA7LSDvhziAojzOb0AI/jBDp6cEcDQyJ7dbnplba2Lj02IH61QUf9oW0Q==";
+ url = "https://registry.npmjs.org/@lerna/run/-/run-4.0.0.tgz";
+ sha512 = "9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==";
};
};
- "@lerna/run-lifecycle-3.16.2" = {
+ "@lerna/run-lifecycle-4.0.0" = {
name = "_at_lerna_slash_run-lifecycle";
packageName = "@lerna/run-lifecycle";
- version = "3.16.2";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz";
- sha512 = "RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A==";
+ url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz";
+ sha512 = "IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==";
};
};
- "@lerna/run-topologically-3.18.5" = {
+ "@lerna/run-topologically-4.0.0" = {
name = "_at_lerna_slash_run-topologically";
packageName = "@lerna/run-topologically";
- version = "3.18.5";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz";
- sha512 = "6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg==";
+ url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-4.0.0.tgz";
+ sha512 = "EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==";
};
};
- "@lerna/symlink-binary-3.17.0" = {
+ "@lerna/symlink-binary-4.0.0" = {
name = "_at_lerna_slash_symlink-binary";
packageName = "@lerna/symlink-binary";
- version = "3.17.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.17.0.tgz";
- sha512 = "RLpy9UY6+3nT5J+5jkM5MZyMmjNHxZIZvXLV+Q3MXrf7Eaa1hNqyynyj4RO95fxbS+EZc4XVSk25DGFQbcRNSQ==";
+ url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz";
+ sha512 = "zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==";
};
};
- "@lerna/symlink-dependencies-3.17.0" = {
+ "@lerna/symlink-dependencies-4.0.0" = {
name = "_at_lerna_slash_symlink-dependencies";
packageName = "@lerna/symlink-dependencies";
- version = "3.17.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.17.0.tgz";
- sha512 = "KmjU5YT1bpt6coOmdFueTJ7DFJL4H1w5eF8yAQ2zsGNTtZ+i5SGFBWpb9AQaw168dydc3s4eu0W0Sirda+F59Q==";
+ url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz";
+ sha512 = "BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==";
};
};
- "@lerna/timer-3.13.0" = {
+ "@lerna/timer-4.0.0" = {
name = "_at_lerna_slash_timer";
packageName = "@lerna/timer";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/timer/-/timer-3.13.0.tgz";
- sha512 = "RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==";
+ url = "https://registry.npmjs.org/@lerna/timer/-/timer-4.0.0.tgz";
+ sha512 = "WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==";
};
};
- "@lerna/validation-error-3.13.0" = {
+ "@lerna/validation-error-4.0.0" = {
name = "_at_lerna_slash_validation-error";
packageName = "@lerna/validation-error";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.13.0.tgz";
- sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==";
+ url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-4.0.0.tgz";
+ sha512 = "1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==";
};
};
- "@lerna/version-3.22.1" = {
+ "@lerna/version-4.0.0" = {
name = "_at_lerna_slash_version";
packageName = "@lerna/version";
- version = "3.22.1";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/version/-/version-3.22.1.tgz";
- sha512 = "PSGt/K1hVqreAFoi3zjD0VEDupQ2WZVlVIwesrE5GbrL2BjXowjCsTDPqblahDUPy0hp6h7E2kG855yLTp62+g==";
+ url = "https://registry.npmjs.org/@lerna/version/-/version-4.0.0.tgz";
+ sha512 = "otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==";
};
};
- "@lerna/write-log-file-3.13.0" = {
+ "@lerna/write-log-file-4.0.0" = {
name = "_at_lerna_slash_write-log-file";
packageName = "@lerna/write-log-file";
- version = "3.13.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.13.0.tgz";
- sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==";
+ url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-4.0.0.tgz";
+ sha512 = "XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==";
+ };
+ };
+ "@malept/cross-spawn-promise-1.1.1" = {
+ name = "_at_malept_slash_cross-spawn-promise";
+ packageName = "@malept/cross-spawn-promise";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz";
+ sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==";
};
};
"@mark.probst/typescript-json-schema-0.32.0" = {
@@ -3433,13 +3613,13 @@ let
sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q==";
};
};
- "@microsoft/load-themed-styles-1.10.147" = {
+ "@microsoft/load-themed-styles-1.10.149" = {
name = "_at_microsoft_slash_load-themed-styles";
packageName = "@microsoft/load-themed-styles";
- version = "1.10.147";
+ version = "1.10.149";
src = fetchurl {
- url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.147.tgz";
- sha512 = "fqkftQUoc2fjR9F+4uZkCt2hJhgZlkgM33k4qD4UdI75+SDOK9Zp5iU3dWzvwDWWVIXTOE+GKMFlmUtrlKZ+fg==";
+ url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.149.tgz";
+ sha512 = "XXd9GWLHAagjzVCnR17Mx3gQmWZbLD9sBFMaWc2h4fs5a1yig3AO274tFQTLsLoU1vwzBOFsI5wveh8baxBiZg==";
};
};
"@mozilla/readability-0.4.1" = {
@@ -3469,13 +3649,13 @@ let
sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg==";
};
};
- "@nestjs/schematics-7.2.7" = {
+ "@nestjs/schematics-7.2.8" = {
name = "_at_nestjs_slash_schematics";
packageName = "@nestjs/schematics";
- version = "7.2.7";
+ version = "7.2.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.7.tgz";
- sha512 = "71XqMPf7s2P1Q6PVMDLbSLphVWgGDK2CgURVYyreuIWXVSoi9pcPIeO5k0Qb5n5jELlKwdrf66g05U2I6TIxzg==";
+ url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.8.tgz";
+ sha512 = "cxs76Ia1SHTp18jXTusZtUucNjAmorlTzSaeKUH+71fri2pA0JOS4RJlfta5znDuA26gboolanPE6U0ZzaLM3A==";
};
};
"@netflix/nerror-1.1.3" = {
@@ -3487,13 +3667,13 @@ let
sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
};
};
- "@netlify/build-9.1.3" = {
+ "@netlify/build-9.8.5" = {
name = "_at_netlify_slash_build";
packageName = "@netlify/build";
- version = "9.1.3";
+ version = "9.8.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.3.tgz";
- sha512 = "UaTinHY6ysncUEaT7u0i3GGL8r+qDnvqusLw+OWSavvnHIdvW6qdkRMZhQ6dUi3vSIh6NUKvddWCYdi49R4n+w==";
+ url = "https://registry.npmjs.org/@netlify/build/-/build-9.8.5.tgz";
+ sha512 = "/lT+bfnMgaenYLVAdQd8T1GPyohpN4LR2JkvWLlnm4JEWkyiXF/W5DaMOPBGxGIzIZq4ml9wh+YFZ9lzq6J89g==";
};
};
"@netlify/cache-utils-1.0.7" = {
@@ -3505,13 +3685,13 @@ let
sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA==";
};
};
- "@netlify/config-4.0.2" = {
+ "@netlify/config-4.0.4" = {
name = "_at_netlify_slash_config";
packageName = "@netlify/config";
- version = "4.0.2";
+ version = "4.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.2.tgz";
- sha512 = "Rw8OFNqKQRBUZJlAvn9dGsoYhDJenz66IDQYfR5oWk3Qf8wJZFVAMy+Bv8mduj9bMMg1SqotNCnn3fkQbjGRew==";
+ url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.4.tgz";
+ sha512 = "e/F9faSp79QGgb3k4nLae8FSXGdmtIndlGthocrrYvLb0mLEvJke+veqKH4u825oOcOvQZaYw5UnOyLRu8hcXQ==";
};
};
"@netlify/framework-info-2.3.0" = {
@@ -3523,13 +3703,13 @@ let
sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw==";
};
};
- "@netlify/functions-utils-1.3.13" = {
+ "@netlify/functions-utils-1.3.17" = {
name = "_at_netlify_slash_functions-utils";
packageName = "@netlify/functions-utils";
- version = "1.3.13";
+ version = "1.3.17";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.13.tgz";
- sha512 = "YhLVj9Vv9uyBrnEbg+dOgSFVRfYg1DFs1itmFR9q5ruI0pYwd2MlfmoYr436U+HFWAmZYC1F8e3Mh3bWEtsFnA==";
+ url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.17.tgz";
+ sha512 = "yRmM8/bKq2NCqJ8D3Fb46WQ0MkqV5tS3dcmKDuvbfElDU5y1rvzm11C/7CxiVvTbf2qXURumPng/m7coYzkRGA==";
};
};
"@netlify/git-utils-1.0.8" = {
@@ -3559,13 +3739,13 @@ let
sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A==";
};
};
- "@netlify/plugins-list-2.2.0" = {
+ "@netlify/plugins-list-2.4.0" = {
name = "_at_netlify_slash_plugins-list";
packageName = "@netlify/plugins-list";
- version = "2.2.0";
+ version = "2.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.2.0.tgz";
- sha512 = "8OCwatZIPsyze2KZ8fj21/+luzdTA78fxQ6p7UFLE9IRJlZqCRVXtgiIVd/HtEr6B9OacywX3fV1hVRBVlbmDA==";
+ url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.0.tgz";
+ sha512 = "006JT4L3G36rzGkFnpHr/GOVaEfapSNAfWfsfS16tcPwjwz9fGSndfODeou7x4IU5IrHgEOJ6xQQKKqNjbfj4g==";
};
};
"@netlify/run-utils-1.0.6" = {
@@ -3613,13 +3793,13 @@ let
sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g==";
};
};
- "@netlify/zip-it-and-ship-it-2.3.0" = {
+ "@netlify/zip-it-and-ship-it-2.5.0" = {
name = "_at_netlify_slash_zip-it-and-ship-it";
packageName = "@netlify/zip-it-and-ship-it";
- version = "2.3.0";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.3.0.tgz";
- sha512 = "dqYXA/e2ZY6bO7fvp18YKXLYE/CK8cAbjBE2mo339sA+xchoV3ryYEjsLpoYqFWofUBLQnCYahm4D9a4H7RT0A==";
+ url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.5.0.tgz";
+ sha512 = "TgI0eakD6melHIUBv3Ed/hN/6caiNg+UoeAAekrl5uTCBSxwEf730SzaDgYjKBKB71qP6ER8O0sGGz70gGiKxg==";
};
};
"@node-red/editor-api-1.2.9" = {
@@ -3883,6 +4063,15 @@ let
sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg==";
};
};
+ "@oclif/plugin-plugins-1.10.0" = {
+ name = "_at_oclif_slash_plugin-plugins";
+ packageName = "@oclif/plugin-plugins";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.10.0.tgz";
+ sha512 = "lfHNiuuCrCUtH9A912T/ztxRA9lS1lCZm+gcmVWksIJG/gwKH/fMn+GdLTbRzU2k6ojtMhBblYk1RWKxUEJuzA==";
+ };
+ };
"@oclif/plugin-plugins-1.9.5" = {
name = "_at_oclif_slash_plugin-plugins";
packageName = "@oclif/plugin-plugins";
@@ -3910,6 +4099,15 @@ let
sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw==";
};
};
+ "@octetstream/promisify-2.0.2" = {
+ name = "_at_octetstream_slash_promisify";
+ packageName = "@octetstream/promisify";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz";
+ sha512 = "7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg==";
+ };
+ };
"@octokit/auth-token-2.4.5" = {
name = "_at_octokit_slash_auth-token";
packageName = "@octokit/auth-token";
@@ -3919,6 +4117,15 @@ let
sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==";
};
};
+ "@octokit/core-3.2.5" = {
+ name = "_at_octokit_slash_core";
+ packageName = "@octokit/core";
+ version = "3.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/core/-/core-3.2.5.tgz";
+ sha512 = "+DCtPykGnvXKWWQI0E1XD+CCeWSBhB6kwItXqfFmNBlIlhczuDPbg+P6BtLnVBaRJDAjv+1mrUJuRsFSjktopg==";
+ };
+ };
"@octokit/endpoint-6.0.11" = {
name = "_at_octokit_slash_endpoint";
packageName = "@octokit/endpoint";
@@ -3928,13 +4135,22 @@ let
sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==";
};
};
- "@octokit/openapi-types-5.1.0" = {
+ "@octokit/graphql-4.6.0" = {
+ name = "_at_octokit_slash_graphql";
+ packageName = "@octokit/graphql";
+ version = "4.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.0.tgz";
+ sha512 = "CJ6n7izLFXLvPZaWzCQDjU/RP+vHiZmWdOunaCS87v+2jxMsW9FB5ktfIxybRBxZjxuJGRnxk7xJecWTVxFUYQ==";
+ };
+ };
+ "@octokit/openapi-types-5.3.1" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "5.1.0";
+ version = "5.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.1.0.tgz";
- sha512 = "bodZvSYgycbUuuKrC/anCBUExvaSSWzMMFz0xl7pcJujxnmGxvqvcFHktjx1ZOSyeNKLfYF0QCgibaHUGsZTng==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.3.1.tgz";
+ sha512 = "TvVk2QuIA0lQZcIMd6xbdGaGDVeNYIOa3l1ZVagAIk5K3t/WMYbcg4BISNDhzdVhm/TgQB26frAgd/GV81aHJA==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -3955,6 +4171,15 @@ let
sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==";
};
};
+ "@octokit/plugin-paginate-rest-2.11.0" = {
+ name = "_at_octokit_slash_plugin-paginate-rest";
+ packageName = "@octokit/plugin-paginate-rest";
+ version = "2.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.11.0.tgz";
+ sha512 = "7L9xQank2G3r1dGqrVPo1z62V5utbykOUzlmNHPz87Pww/JpZQ9KyG5CHtUzgmB4n5iDRKYNK/86A8D98HP0yA==";
+ };
+ };
"@octokit/plugin-request-log-1.0.3" = {
name = "_at_octokit_slash_plugin-request-log";
packageName = "@octokit/plugin-request-log";
@@ -3973,6 +4198,15 @@ let
sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
};
};
+ "@octokit/plugin-rest-endpoint-methods-4.13.4" = {
+ name = "_at_octokit_slash_plugin-rest-endpoint-methods";
+ packageName = "@octokit/plugin-rest-endpoint-methods";
+ version = "4.13.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.13.4.tgz";
+ sha512 = "MGxptzVfiP8O+aydC/riheYzS/yJ9P16M29OuvtZep/sF5sKuOCQP8Wf83YCKXRsQF+ZpYfke2snbPPSIMZKzg==";
+ };
+ };
"@octokit/request-5.4.14" = {
name = "_at_octokit_slash_request";
packageName = "@octokit/request";
@@ -4009,6 +4243,15 @@ let
sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==";
};
};
+ "@octokit/rest-18.3.4" = {
+ name = "_at_octokit_slash_rest";
+ packageName = "@octokit/rest";
+ version = "18.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.3.4.tgz";
+ sha512 = "NES0pHbwyFB1D0jrLkdnIXgEmze/gLE0JoSNgfAe4vwD77/qaQGO/lRWNuPPsoBVBjiW6mmA9CU5cYHujJTKQA==";
+ };
+ };
"@octokit/types-2.16.2" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
@@ -4018,13 +4261,13 @@ let
sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
};
};
- "@octokit/types-6.10.0" = {
+ "@octokit/types-6.12.1" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.10.0";
+ version = "6.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.10.0.tgz";
- sha512 = "aMDo10kglofejJ96edCBIgQLVuzMDyjxmhdgEcoUUD64PlHYSrNsAGqN0wZtoiX4/PCQ3JLA50IpkP1bcKD/cA==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.1.tgz";
+ sha512 = "eZTTWJxGBon01Ra4EX86rvlMZGkU5SeJ8BtwQlsv2wEqZttpjtefLetJndZTVbJ25qFKoyKMWsRFnwlOx7ZaDQ==";
};
};
"@open-policy-agent/opa-wasm-1.2.0" = {
@@ -4117,310 +4360,310 @@ let
sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg==";
};
};
- "@ot-builder/bin-composite-types-1.0.2" = {
+ "@ot-builder/bin-composite-types-1.0.3" = {
name = "_at_ot-builder_slash_bin-composite-types";
packageName = "@ot-builder/bin-composite-types";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.2.tgz";
- sha512 = "YWlWy5Btp4aSCX6stibMdAaB6Z7pgwimDXYlrgJ8HoXZkWmkWLXvpwPYw+zMWTNeWqOT+qAjnHacsl06ryZA6A==";
+ url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.3.tgz";
+ sha512 = "PEjk6MhiY53QQEW6NQAPYfNBdCqoFEE9OkG+25tvhJ6MWsEUz+hUq9argDjeP2DNckd4WRyGcmp6GtH8J4clLQ==";
};
};
- "@ot-builder/bin-util-1.0.2" = {
+ "@ot-builder/bin-util-1.0.3" = {
name = "_at_ot-builder_slash_bin-util";
packageName = "@ot-builder/bin-util";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.2.tgz";
- sha512 = "YHT0oXrmq3taDdIIopV6YBsH8DkzSkkiKW6a/jMZTYYb0tRHgybpuqRUq5uoDNnkA0ntl7sx+nf8p4e4TOUpJQ==";
+ url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.3.tgz";
+ sha512 = "x66vsg6oNJmQ/xp+sQLMUk2imXn5L0psdKj5FYziqZQ99B055+t8Ydf6FM42GRYW2xIczeDIesmLZkRaQPgTOA==";
};
};
- "@ot-builder/cli-help-shower-1.0.2" = {
+ "@ot-builder/cli-help-shower-1.0.3" = {
name = "_at_ot-builder_slash_cli-help-shower";
packageName = "@ot-builder/cli-help-shower";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.2.tgz";
- sha512 = "7LJTbtkACJjwEBPWvkzCFnoK6H7HPYSFiXNFBL+p4ta9/z4OQM6AawvAdmmA/nVXA77WwTB4j2pPNJj6wjvQNQ==";
+ url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.3.tgz";
+ sha512 = "gLKTb/EnGKl5qmhzRQum0szIT0v5Fzk0UxVWdbmJjeCl6xWNsWQd2sCUujIFVz0qaKGLPvImvn2W8Q5j8JnOkw==";
};
};
- "@ot-builder/cli-proc-1.0.2" = {
+ "@ot-builder/cli-proc-1.0.3" = {
name = "_at_ot-builder_slash_cli-proc";
packageName = "@ot-builder/cli-proc";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.2.tgz";
- sha512 = "JKG11KtIhj+n9FIbyzlE+8C3esEM0VrBUYhdm+q95DhG5b0Jvw0CoJBb9TpEK83jwYxJKbvVfoqOmtnJ5YJ2tA==";
+ url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.3.tgz";
+ sha512 = "m+oaigFwF2fuXEvK1OQxfF3n0c4KOnNdq0TV+nIqRHzovU/e4Z1WM8Z3uUt0MJFy4k+SS+HUlQTTAOP9VA1Fcw==";
};
};
- "@ot-builder/cli-shared-1.0.2" = {
+ "@ot-builder/cli-shared-1.0.3" = {
name = "_at_ot-builder_slash_cli-shared";
packageName = "@ot-builder/cli-shared";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.2.tgz";
- sha512 = "zpNhTkSUpK41jrWBZworApKhqslOVijcyOCbmJ2EitFSkajoA0PeFmjeLak3LR5HoMNIoS8yYcPtzr/lTt7vXQ==";
+ url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.3.tgz";
+ sha512 = "cGZvNRD/YQ1CKwfNoN+93PDkAifZJ5Ey57Pgaheo/K2C60WqNYooIhjI6ws4YKJ3fyR7Bnblm3i+X3Yk8VSCBg==";
};
};
- "@ot-builder/common-impl-1.0.2" = {
+ "@ot-builder/common-impl-1.0.3" = {
name = "_at_ot-builder_slash_common-impl";
packageName = "@ot-builder/common-impl";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.2.tgz";
- sha512 = "73L6qruH8QcEGpGuYCzE6tFqlAX/9wKAbIEhJWjk1ymEBGXIkBzIbhTGXxyGAgYmrDwT23pwMIG9ozH/okauvw==";
+ url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.3.tgz";
+ sha512 = "WflKduZfy2q3NbnBcHpkKRo/ifSxRaSqnTQkJD9UBmhS10zVYv6XoPL9NC/CAUjbeRLL8eS3WMdBZWaw6mwEvQ==";
};
};
- "@ot-builder/errors-1.0.2" = {
+ "@ot-builder/errors-1.0.3" = {
name = "_at_ot-builder_slash_errors";
packageName = "@ot-builder/errors";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.2.tgz";
- sha512 = "n1xUxFPmG+nM4BCM13vXNufkRtQ0dWHyTB3K5OtoYWoATle6ETfHiQk0S4k9IsIyjysVWUOvtRTPAO4hJA6csQ==";
+ url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.3.tgz";
+ sha512 = "tpgnvmZeaK36OvAcbDQ4eeCWxJMk223BHYT2xUw7cRq7fUXJZI7+CqSg81Hwbir1sL6SbHjl356bkgbut1zHJQ==";
};
};
- "@ot-builder/io-bin-cff-1.0.2" = {
+ "@ot-builder/io-bin-cff-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-cff";
packageName = "@ot-builder/io-bin-cff";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.2.tgz";
- sha512 = "N49Bj2EsaHPWfPAoM7zbzSpX+DniKHjpakVa6319F0lwY4FRUYqQPbvEEFDo8tgwDWDNuke1Rg4EQXCh4iENxQ==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.3.tgz";
+ sha512 = "LfXw3RkxrvudKYAwVsWMGXZ7R6fSUM9GFl4tBCOiY/MmSwkZ3pI7JicrVTLOs+ZuizKdtVQe5KfY/sjz0SyFeg==";
};
};
- "@ot-builder/io-bin-encoding-1.0.2" = {
+ "@ot-builder/io-bin-encoding-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-encoding";
packageName = "@ot-builder/io-bin-encoding";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.2.tgz";
- sha512 = "WFENprSBPDXmavzzKzegdjNKzhUCgDyoUEiIGpYCJqnylCW1/h8Ebw0HVt8Je3N4MZWT+9yah4+95C7wNNyYTA==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.3.tgz";
+ sha512 = "0QTgXPfEyItzkqNGXhxPIciOrF7+hbAwfnJf1yBSYvJl3JiE0FKpN3XDIWrPl71flkvvXFBHGoB+wIp8vwiLNw==";
};
};
- "@ot-builder/io-bin-ext-private-1.0.2" = {
+ "@ot-builder/io-bin-ext-private-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-ext-private";
packageName = "@ot-builder/io-bin-ext-private";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.2.tgz";
- sha512 = "L326SWioJmP9tN4rC7Cjg/UuKigraTREwZlhGPgFgvokTbJxBJOI5vYdAKBRWQoMauzqsq4a6+LZspmDehjIWg==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.3.tgz";
+ sha512 = "RRzfr6yzFTDx0w7L5AKIIJPZ0ab+5WUxUssnBxnBatzOnmtgJmobYdX4R6SLbFPiq+YDyAa/mB44EGLyWcVAgw==";
};
};
- "@ot-builder/io-bin-font-1.0.2" = {
+ "@ot-builder/io-bin-font-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-font";
packageName = "@ot-builder/io-bin-font";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.2.tgz";
- sha512 = "QmDocVL2Omtvbb3SAZVajNDHK2/wEvP9jRnHiMTWMKLKy8Q1EaHhxhZNTMmcPji9aoMuYFDn9FFUCyCDhgyJMQ==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.3.tgz";
+ sha512 = "Eq+tjzRqivY8e3r3rCzVppWizqXpXutacWO8Mdw0TqlnfSONVfJStLafzDTOKrbrr2m7dYEC7sBwkQz65iuARQ==";
};
};
- "@ot-builder/io-bin-glyph-store-1.0.2" = {
+ "@ot-builder/io-bin-glyph-store-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-glyph-store";
packageName = "@ot-builder/io-bin-glyph-store";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.2.tgz";
- sha512 = "GUoAfN1NFBDiHJ+vI1g4hmY6D+tDosOYWqnXYki9atBjH4biTxGB2qFAIz5WcNBZXeooQxjMb1eLt4zLl4gA3Q==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.3.tgz";
+ sha512 = "TNHLSZ7Hs6X92HMMjZQ6Zru84bbu/5p/SWJDIEq4IuiNrDGIrTHFtIAC4XfK5mWOFfP0fNXR00ox9wjeerYeZw==";
};
};
- "@ot-builder/io-bin-layout-1.0.2" = {
+ "@ot-builder/io-bin-layout-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-layout";
packageName = "@ot-builder/io-bin-layout";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.2.tgz";
- sha512 = "z6iC8jBSJ0sGszxxmyJ+esCZXdiLrUY9bCeqbx8UQWDa2DC9359okr6YHr9VPeiP8DN2ezT3g0DmXnKLzm/QgA==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.3.tgz";
+ sha512 = "XyyAgn6FjXgdyudq5CcbDoWpUbqlraqDiXHAY1XttpiIvLiTDtWj8KTryLoS8WkfaWLvZ/W2t8VylL6wvR4Saw==";
};
};
- "@ot-builder/io-bin-metadata-1.0.2" = {
+ "@ot-builder/io-bin-metadata-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-metadata";
packageName = "@ot-builder/io-bin-metadata";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.2.tgz";
- sha512 = "D2P4HXha0KM3MrTEu4/CSzJjT7jk0WD7qzopRk74z2dOc3O4qLQZ19fqSPUfBCpGWcaHF4u2QA+0Nuaw5oyyJg==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.3.tgz";
+ sha512 = "JmnK3csx7+M+61Id/w9+cRNz/hrCShNZbG04yPMAWKbq7YXuPRhX1/4/vdlDwmJFRF3V3TIz1WsIVpjmdrhocw==";
};
};
- "@ot-builder/io-bin-metric-1.0.2" = {
+ "@ot-builder/io-bin-metric-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-metric";
packageName = "@ot-builder/io-bin-metric";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.2.tgz";
- sha512 = "HpYj3YifEzfDfT640SE1UWqkmkrwqQMKjMqgivcMrfLRIkJwBIWW+oCZIoGlcvf9vY4CDDMmjPiQmZ2l43TrdQ==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.3.tgz";
+ sha512 = "b6pvou6rYgT+VUkRLM1UqdVcCCgi+/YIRuzLH+mKfYcP3oEhdK5g1FbX0gEzPHuwjIksOAq+z57JY5WuWkRAbQ==";
};
};
- "@ot-builder/io-bin-name-1.0.2" = {
+ "@ot-builder/io-bin-name-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-name";
packageName = "@ot-builder/io-bin-name";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.2.tgz";
- sha512 = "pE+NBTv2NKg7d0eDbs1TVdLERZ+BUJy7AXMa9Hq7c8tRYOg3krk+Fa48joKPQWtdezVQYtTMc/TJBOcC3Ww5fQ==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.3.tgz";
+ sha512 = "jDKoPRX4to+z5yuY/pZv7owEGjzjIvqqlZN8jNeDYwbnq1+Mheyfwe+0A5RnYSTdvQceLHtwRN722/rap33r7A==";
};
};
- "@ot-builder/io-bin-sfnt-1.0.2" = {
+ "@ot-builder/io-bin-sfnt-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-sfnt";
packageName = "@ot-builder/io-bin-sfnt";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.2.tgz";
- sha512 = "xXfccIbP1ZTSTp+r1ZZfq+S4HpNPe8Oy4sW0k5d92+rMSWmvImM2gm1v+PjC0A473QjyqZg7S9l3CPE+2qcbYw==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.3.tgz";
+ sha512 = "7AOYNulmBGQxvr+4jeQTz2cgS88l8arPE4m8EcLcNj9AGlKF5Mhk1an+OjH8JRvuHjRaq7yqfO8ZCdAaF32U9Q==";
};
};
- "@ot-builder/io-bin-ttf-1.0.2" = {
+ "@ot-builder/io-bin-ttf-1.0.3" = {
name = "_at_ot-builder_slash_io-bin-ttf";
packageName = "@ot-builder/io-bin-ttf";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.2.tgz";
- sha512 = "eCv/6sCAATeFoUwbQSw839RQz61z7nkMv/k075b56wBw8vPSqV6d/8zGkRKFjeE5ma+0PuuiYjH7FfDPCNV9uQ==";
+ url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.3.tgz";
+ sha512 = "xQFAG3lnzycqNrxbZ9jn8V+b9RzdgMg7YFRMd12TYoRzdoHaIh+v2DZ8lyhwkv3owvYDzr6iRCI6nts3mFQuug==";
};
};
- "@ot-builder/ot-1.0.2" = {
+ "@ot-builder/ot-1.0.3" = {
name = "_at_ot-builder_slash_ot";
packageName = "@ot-builder/ot";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.2.tgz";
- sha512 = "r4359lMQTpiQ2cHhxFuoonxo8rLFzUZw0NiEXTzCL0UxSu5kcGH7gDDGtHDdSB5a5W+qCNDLt/goD/FnYddlyg==";
+ url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.3.tgz";
+ sha512 = "fEQdRjO58o5PfnUSpx3KzqC4l5tpvX9tquKrvEi/MgKr08PykTs9iUFkzcfQ3+1zHDrebfrq2Peei0vpcaGC3Q==";
};
};
- "@ot-builder/ot-encoding-1.0.2" = {
+ "@ot-builder/ot-encoding-1.0.3" = {
name = "_at_ot-builder_slash_ot-encoding";
packageName = "@ot-builder/ot-encoding";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.2.tgz";
- sha512 = "mZ7s/hEHYaGZFpKZ+FB9vynHrZWWObCvnuCtRvcp51DwF4J8/NCp5VT3n7/20BSfEnghQQjhpk6z2RzQD9k3mA==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.3.tgz";
+ sha512 = "Bmd7Zdb6E791681fH2a7th9puyVbQb1YARYaIdns3fGu9+BJCrvZ2D5SBOIVuPen2TxSDZ5tfQkf/yjz63WbPQ==";
};
};
- "@ot-builder/ot-ext-private-1.0.2" = {
+ "@ot-builder/ot-ext-private-1.0.3" = {
name = "_at_ot-builder_slash_ot-ext-private";
packageName = "@ot-builder/ot-ext-private";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.2.tgz";
- sha512 = "XRRjq69p/MWKJOWfeAWJnMWF/4RrMlDIz3sp/pMn5vUivysh6qcOoOHHwkD2MFKI9PysmDgMrYIyxnKvmQczMA==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.3.tgz";
+ sha512 = "yu7C79YRwHV7W6cuee0ONsye2Dd6MOgAWcAcORtpFn5VjBc2Nvxs5OAXKlysbOeHtaVGfDub4w8phx/9ZfoxvA==";
};
};
- "@ot-builder/ot-glyphs-1.0.2" = {
+ "@ot-builder/ot-glyphs-1.0.3" = {
name = "_at_ot-builder_slash_ot-glyphs";
packageName = "@ot-builder/ot-glyphs";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.2.tgz";
- sha512 = "mTtKVG0n2O9KVFNBBgfitidkulXEA747tdQofa+mo6CZghFGgJaVSm4xXkqh0nv3TmuWPWcLUDzzXovrwSyaEg==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.3.tgz";
+ sha512 = "NJgyHqEINRlZnyEiP+tBsYvQceIvD2XBM1bcJqUCY4xwrOBGtEceP3ChVz44UQEBrtdIOCjv/nycxp55VIKqug==";
};
};
- "@ot-builder/ot-layout-1.0.2" = {
+ "@ot-builder/ot-layout-1.0.3" = {
name = "_at_ot-builder_slash_ot-layout";
packageName = "@ot-builder/ot-layout";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.2.tgz";
- sha512 = "FC/LkcZ1MB9cRdXMpOoYiC06tdLWWj1XdV4q8+L+q3wM0EGH8YzqHqoI9MXFpGlB9ucHC/FDWXybjXOYWFtQAA==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.3.tgz";
+ sha512 = "HIpQABvaJTKfFi4ui+Vu3AM51VV0Zr2sU3jtAy2kS8HFIyiNVlJCn925jc3n/NzLHvU2FjBeQDFr8o2sQGRchg==";
};
};
- "@ot-builder/ot-metadata-1.0.2" = {
+ "@ot-builder/ot-metadata-1.0.3" = {
name = "_at_ot-builder_slash_ot-metadata";
packageName = "@ot-builder/ot-metadata";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.2.tgz";
- sha512 = "WVZfIDb90XblRRuhK1EWsMePidBs96/uhv4T1/uNi8o8lhgdAszJo/qeOakhDqn29X3rWyYWZutAxVqx37GBsg==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.3.tgz";
+ sha512 = "JK6IPCVCuCdi5k6FQWEXMqdPlPoORuWan4skXWpe7s7NUXYHonJBwZ6sLrPqPIbYmOlEotxT93VvoUo1sqZS0A==";
};
};
- "@ot-builder/ot-name-1.0.2" = {
+ "@ot-builder/ot-name-1.0.3" = {
name = "_at_ot-builder_slash_ot-name";
packageName = "@ot-builder/ot-name";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.2.tgz";
- sha512 = "1mNhgVPmz88699vVMmyHp6SYUldRi0tmNLgzoH98Wrg4GghEGyu11fG7GMoT6HsrKxdXCysUZjWdMvsidfyoaw==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.3.tgz";
+ sha512 = "Z1VjRAoCgxMDloyOEoKWiimHf0S/AHXHsw57QtNAyPwzn8MR7tuzZ2epMxygrAQSaGHgOwPQ/th+fZ2RdvPuzA==";
};
};
- "@ot-builder/ot-sfnt-1.0.2" = {
+ "@ot-builder/ot-sfnt-1.0.3" = {
name = "_at_ot-builder_slash_ot-sfnt";
packageName = "@ot-builder/ot-sfnt";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.2.tgz";
- sha512 = "8jP3zzSP2u0kIj8JyMH9ZLJox97T6VC7dkiRwq9ekGMbxLa+5nWWh6DuAOSFfdlVyUK3I/4sl4aqSP7Lyp/hYw==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.3.tgz";
+ sha512 = "uLctpLG/QM15IBuP8GQG7UfwFEcWVLPwTbOlrx0K6he393YVtZ3t+QwNzT1T+Ucvy2E6oxnlDSzvlz+xGHLvJA==";
};
};
- "@ot-builder/ot-standard-glyph-namer-1.0.2" = {
+ "@ot-builder/ot-standard-glyph-namer-1.0.3" = {
name = "_at_ot-builder_slash_ot-standard-glyph-namer";
packageName = "@ot-builder/ot-standard-glyph-namer";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.2.tgz";
- sha512 = "xTPAXBMQq1iILVphw9L7DW0KBQdeniQ1l+42oCDJK4XtKAOkSQZ7IQUBHD2rJjX2LmklEm/isLfLDIZxFezj9g==";
+ url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.3.tgz";
+ sha512 = "JW9cwINVxteCadCKiBo4ufCWS7DP1t+RfcVbDgQ940VGIRm59MJw5CbVM50k4Pf3dYXHJmDYMGDzSKGAZ9x+6g==";
};
};
- "@ot-builder/prelude-1.0.2" = {
+ "@ot-builder/prelude-1.0.3" = {
name = "_at_ot-builder_slash_prelude";
packageName = "@ot-builder/prelude";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.2.tgz";
- sha512 = "h9JHlibcc4w6cTVcuIARxcmvH8JhuB0z6CcUj+s+7zfzlkQXghuOk6wgHzimcrxDDOZeRNmXJNG7RCqdDeAGiA==";
+ url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.3.tgz";
+ sha512 = "7GJ+sMzMqsI7Pe4bqM4lATQLdOJrxOoQudg3xJBe1C0UbVfXLmqvVUkKM1GMd3eR0C1sTkAxRdqILycAXzNwKQ==";
};
};
- "@ot-builder/primitive-1.0.2" = {
+ "@ot-builder/primitive-1.0.3" = {
name = "_at_ot-builder_slash_primitive";
packageName = "@ot-builder/primitive";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.2.tgz";
- sha512 = "bf03EipsJQZH4+o9QW11B54DzN0QdEyg61xZdbK5PCaoEeb0ahYYtzkb/CZF6nw3UFEVtci3MQww8XZWpEgydQ==";
+ url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.3.tgz";
+ sha512 = "IgtWW8Q+gb5lzXWyPivKG0CxU3CdPZUB6tjxA9Ui+TNxTZAmj1nxmJ90Cw9CODFkcywRykSHzo3WTgLGWH6kIQ==";
};
};
- "@ot-builder/rectify-1.0.2" = {
+ "@ot-builder/rectify-1.0.3" = {
name = "_at_ot-builder_slash_rectify";
packageName = "@ot-builder/rectify";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.2.tgz";
- sha512 = "tDbC/ap6X1JoJqTIlVsbWgi6IbVFZ5Fc+csNHI7B11/y5aY0Nz1Eupar+nnnoABtXNO3pWP0A3suY2z7U6B91A==";
+ url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.3.tgz";
+ sha512 = "nm6Ql6oyxEdDrGtFAPOqBlEKUGIyiM8QaI57MosPshfB8UUDJAI6uAaQP4pzV4Go8/6Do3zPkDnmqQIYt/lmmQ==";
};
};
- "@ot-builder/stat-glyphs-1.0.2" = {
+ "@ot-builder/stat-glyphs-1.0.3" = {
name = "_at_ot-builder_slash_stat-glyphs";
packageName = "@ot-builder/stat-glyphs";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.2.tgz";
- sha512 = "xFKPyM0zLRktvpTdzVQB+ffmzGbROJd4atcLKr+UB6hTSVcSiLBsOU+BQNeveb7Njz/mgAmFhnVkWO+2uSwIMA==";
+ url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.3.tgz";
+ sha512 = "1pZ7I/OXbQ5egHlHAK4bOthg04qp9Og/RPvFN2UTNAobRPEun/IOpnf6yO7t/JLR4Lvr1lxxDeQjt4tdPMOWOQ==";
};
};
- "@ot-builder/trace-1.0.2" = {
+ "@ot-builder/trace-1.0.3" = {
name = "_at_ot-builder_slash_trace";
packageName = "@ot-builder/trace";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.2.tgz";
- sha512 = "4+cOuSys8WTBOsvSXJqKgYlZu5TrukYpViSA3pbUnjWSJRmpGtwDtNiX62F8Wo/F+9pTIwOBwAbh/yWjYjCRng==";
+ url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.3.tgz";
+ sha512 = "wr+cLAXFEdXOyLpBRW9XR28NapfJhhqOnJIiOaC3g0A31nvQtINBZaiQ8o2tSekmcmhCOsimoYWpg/SjLgq0GA==";
};
};
- "@ot-builder/var-store-1.0.2" = {
+ "@ot-builder/var-store-1.0.3" = {
name = "_at_ot-builder_slash_var-store";
packageName = "@ot-builder/var-store";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.2.tgz";
- sha512 = "hMkIu2DaIiiBMkolGtjZ0P/Urx76zaSBeXO8aItjw0xiu/JGo843vngU7P6FNtingaolchrVrm6SRrIz7jFD6g==";
+ url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.3.tgz";
+ sha512 = "qJSHH+bll62V+T1oa2AvB/kAamgdFO2ZmTfkiyUK1Rb1zaBthYDADHXrzrAUdUARgAkXUXGHTZEGWc8WeU2smw==";
};
};
- "@ot-builder/variance-1.0.2" = {
+ "@ot-builder/variance-1.0.3" = {
name = "_at_ot-builder_slash_variance";
packageName = "@ot-builder/variance";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.2.tgz";
- sha512 = "VYSKYfLmfnQckio6C5SEsv5gaUkdKIPNX0Yusidc9EpmdoOyHdBGlHDmpWEtzyAni3Jl2eMHGhd+GCnfkdBhYA==";
+ url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.3.tgz";
+ sha512 = "K23fg29QU8hJkwqwhAHjVeoFVxzdEi8miOXopn8MIjPPnKUCQ+Zkbnml1I+XKrz9juQDhBszcB0kuPpBy4/hxA==";
};
};
"@parcel/fs-1.11.0" = {
@@ -4630,15 +4873,6 @@ let
sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg==";
};
};
- "@react-native-community/cli-platform-ios-4.13.0" = {
- name = "_at_react-native-community_slash_cli-platform-ios";
- packageName = "@react-native-community/cli-platform-ios";
- version = "4.13.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz";
- sha512 = "6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA==";
- };
- };
"@react-native-community/cli-server-api-4.9.0" = {
name = "_at_react-native-community_slash_cli-server-api";
packageName = "@react-native-community/cli-server-api";
@@ -4747,13 +4981,13 @@ let
sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
};
};
- "@schematics/angular-11.2.1" = {
+ "@schematics/angular-11.2.3" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "11.2.1";
+ version = "11.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.1.tgz";
- sha512 = "CnN4bkRwhCp7jc4HGJ9qp/xqLwmnkn/zRf/EEb5tHFC0Bz2WvoNuAoqPRSkgIis3L+Ozahmeb8JxTIdazK1Hog==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.3.tgz";
+ sha512 = "g+vc05FBebIrCQQvN0LcNPZLy8Y/5TfqgmV9M8djc+IZOzObt0Qp75PB2en84KAOx+2YsupAB5MVQHy+FzC8WA==";
};
};
"@schematics/schematics-0.1102.0" = {
@@ -4765,13 +4999,13 @@ let
sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA==";
};
};
- "@schematics/update-0.1102.1" = {
+ "@schematics/update-0.1102.3" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.1102.1";
+ version = "0.1102.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.1.tgz";
- sha512 = "BvTqw2OhKnX+VNHt613vGvjg+O1WNdeJYy79aaRCGsVZogOAjolnA7R4tzk6WelTLKo9k8wQZ9d+6IMplYQKNQ==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.3.tgz";
+ sha512 = "OQLdzokPmMyXT9x0vIfjcfanJHl9+/l/vMVIA4zbvRY5b5ujoaz7+sYQm3gnyq4oXxtNR3Yd9WEjjSIbvj90KA==";
};
};
"@segment/loosely-validate-event-2.0.0" = {
@@ -4801,13 +5035,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-3.7.0" = {
+ "@serverless/components-3.7.2" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "3.7.0";
+ version = "3.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.0.tgz";
- sha512 = "ndyDPykboC5PlkSFXXVAWwiWp4d8G1uLDqoyF3TWaNpmcjvHiLbBwmgRzV1E3u9Y9RE766EJqOxEBfdvsUXD4w==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.2.tgz";
+ sha512 = "3Fhy/d+3eMZfbPoR4h0atEUJQYdy+6tvYPvaZxOlzzcCEgYj6txAzLVKr617y/mMYqiw5XH91ojOOAtEfZVFWg==";
};
};
"@serverless/core-1.1.2" = {
@@ -4846,22 +5080,22 @@ let
sha512 = "f5bo8P5+xAxsnOCUnyEyAmiGTs9sTG8v8t5dTDAdCqSxEEJyl3/Ro5djeW5L2MHzw1XnIMxxrtG38m7rNQSFFg==";
};
};
- "@serverless/platform-client-4.1.0" = {
+ "@serverless/platform-client-4.2.0" = {
name = "_at_serverless_slash_platform-client";
packageName = "@serverless/platform-client";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.1.0.tgz";
- sha512 = "XoDUE5UDkt6JzEY4nWPdCd6ofldBLqfBAaqCcMlnYDNyTispHNVJeaxNvsFZc9EoUpneu6vTj3vhdviUAnzX8w==";
+ url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.0.tgz";
+ sha512 = "92/Mc09zQbJAw917KhJk0kM76Jpf3njoSevHEu9ASYx7OSjTbZw9B5VdOe4Z2m+4NvUwK0mWBNpSmCvd5uwOhg==";
};
};
- "@serverless/platform-client-china-2.1.4" = {
+ "@serverless/platform-client-china-2.1.7" = {
name = "_at_serverless_slash_platform-client-china";
packageName = "@serverless/platform-client-china";
- version = "2.1.4";
+ version = "2.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.4.tgz";
- sha512 = "jX+MoKgX7wkdg2lGUlUhbQNZLZkONs5jZa8edT+nDC8s9B1C5u5NO4mMuAy0ZigBQcfw/VVv2KvB06ntuw/QBA==";
+ url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.7.tgz";
+ sha512 = "XB5vTU1wsjb3gPzQ008gs5wms/NsR2xJRbLj7/Ly1Y8ytFtXp7vmENUFbR4RL/BVd+X4/K3bmVdnHS6dYSyrnw==";
};
};
"@serverless/platform-sdk-2.3.2" = {
@@ -5008,6 +5242,15 @@ let
sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==";
};
};
+ "@snyk/code-client-3.1.4" = {
+ name = "_at_snyk_slash_code-client";
+ packageName = "@snyk/code-client";
+ version = "3.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.4.tgz";
+ sha512 = "ZZWPWAaKgNii/HYtyO9guFDVpi5T/SoCWQIo/B/RbLbXLrdZ5VIHsn0E4ztY7Y69GjQCyrus5pu7adlYrwQtEQ==";
+ };
+ };
"@snyk/composer-lockfile-parser-1.4.1" = {
name = "_at_snyk_slash_composer-lockfile-parser";
packageName = "@snyk/composer-lockfile-parser";
@@ -5035,6 +5278,15 @@ let
sha512 = "DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ==";
};
};
+ "@snyk/fast-glob-3.2.6-patch" = {
+ name = "_at_snyk_slash_fast-glob";
+ packageName = "@snyk/fast-glob";
+ version = "3.2.6-patch";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz";
+ sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg==";
+ };
+ };
"@snyk/gemfile-1.2.0" = {
name = "_at_snyk_slash_gemfile";
packageName = "@snyk/gemfile";
@@ -5044,6 +5296,15 @@ let
sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==";
};
};
+ "@snyk/glob-parent-5.1.2-patch.1" = {
+ name = "_at_snyk_slash_glob-parent";
+ packageName = "@snyk/glob-parent";
+ version = "5.1.2-patch.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz";
+ sha512 = "OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ==";
+ };
+ };
"@snyk/graphlib-2.1.9-patch.3" = {
name = "_at_snyk_slash_graphlib";
packageName = "@snyk/graphlib";
@@ -5395,6 +5656,15 @@ let
sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==";
};
};
+ "@trysound/sax-0.1.1" = {
+ name = "_at_trysound_slash_sax";
+ packageName = "@trysound/sax";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz";
+ sha512 = "Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==";
+ };
+ };
"@types/accepts-1.3.5" = {
name = "_at_types_slash_accepts";
packageName = "@types/accepts";
@@ -5494,6 +5764,15 @@ let
sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
};
};
+ "@types/braces-3.0.0" = {
+ name = "_at_types_slash_braces";
+ packageName = "@types/braces";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz";
+ sha512 = "TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==";
+ };
+ };
"@types/cacheable-request-6.0.1" = {
name = "_at_types_slash_cacheable-request";
packageName = "@types/cacheable-request";
@@ -5539,15 +5818,6 @@ let
sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==";
};
};
- "@types/configstore-2.1.1" = {
- name = "_at_types_slash_configstore";
- packageName = "@types/configstore";
- version = "2.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/configstore/-/configstore-2.1.1.tgz";
- sha1 = "cd1e8553633ad3185c3f2f239ecff5d2643e92b6";
- };
- };
"@types/connect-3.4.34" = {
name = "_at_types_slash_connect";
packageName = "@types/connect";
@@ -5611,15 +5881,6 @@ let
sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w==";
};
};
- "@types/debug-0.0.30" = {
- name = "_at_types_slash_debug";
- packageName = "@types/debug";
- version = "0.0.30";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz";
- sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ==";
- };
- };
"@types/debug-4.1.5" = {
name = "_at_types_slash_debug";
packageName = "@types/debug";
@@ -5674,13 +5935,13 @@ let
sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg==";
};
};
- "@types/eslint-7.2.6" = {
+ "@types/eslint-7.2.7" = {
name = "_at_types_slash_eslint";
packageName = "@types/eslint";
- version = "7.2.6";
+ version = "7.2.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz";
- sha512 = "I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==";
+ url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.7.tgz";
+ sha512 = "EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q==";
};
};
"@types/eslint-scope-3.7.0" = {
@@ -5728,15 +5989,6 @@ let
sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==";
};
};
- "@types/events-3.0.0" = {
- name = "_at_types_slash_events";
- packageName = "@types/events";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
- sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
- };
- };
"@types/express-4.17.7" = {
name = "_at_types_slash_express";
packageName = "@types/express";
@@ -5782,13 +6034,13 @@ let
sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ==";
};
};
- "@types/filesize-5.0.0" = {
- name = "_at_types_slash_filesize";
- packageName = "@types/filesize";
- version = "5.0.0";
+ "@types/flat-cache-2.0.0" = {
+ name = "_at_types_slash_flat-cache";
+ packageName = "@types/flat-cache";
+ version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/filesize/-/filesize-5.0.0.tgz";
- sha512 = "zgn1Kmm6VfqruG9STpwpZiSnpzHjF9hlvHVw+5hhM20xRCOIgjxnXJxOoLuZ/aWS6v/M5d6fvXFbbVQfBe4cMg==";
+ url = "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz";
+ sha512 = "fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww==";
};
};
"@types/fs-capacitor-2.0.0" = {
@@ -5800,24 +6052,6 @@ let
sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==";
};
};
- "@types/get-port-3.2.0" = {
- name = "_at_types_slash_get-port";
- packageName = "@types/get-port";
- version = "3.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz";
- sha512 = "TiNg8R1kjDde5Pub9F9vCwZA/BNW9HeXP5b9j7Qucqncy/McfPZ6xze/EyBdXS5FhMIGN6Fx3vg75l5KHy3V1Q==";
- };
- };
- "@types/glob-5.0.36" = {
- name = "_at_types_slash_glob";
- packageName = "@types/glob";
- version = "5.0.36";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/glob/-/glob-5.0.36.tgz";
- sha512 = "KEzSKuP2+3oOjYYjujue6Z3Yqis5HKA1BsIC+jZ1v3lrRNdsqyNNtX0rQf6LSuI4DJJ2z5UV//zBZCcvM0xikg==";
- };
- };
"@types/glob-7.1.3" = {
name = "_at_types_slash_glob";
packageName = "@types/glob";
@@ -5872,15 +6106,6 @@ let
sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg==";
};
};
- "@types/hosted-git-info-2.7.0" = {
- name = "_at_types_slash_hosted-git-info";
- packageName = "@types/hosted-git-info";
- version = "2.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/hosted-git-info/-/hosted-git-info-2.7.0.tgz";
- sha512 = "OW/D8GqCyQtH8F7xDdDxzPJTBgknZeZhlCakUcBCya2rYPRN53F+0YJVwSPyiyAhrknnjkl3P9qVk0oBI4S1qw==";
- };
- };
"@types/html-minifier-terser-5.1.1" = {
name = "_at_types_slash_html-minifier-terser";
packageName = "@types/html-minifier-terser";
@@ -6043,13 +6268,13 @@ let
sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
};
};
- "@types/koa-2.13.0" = {
+ "@types/koa-2.13.1" = {
name = "_at_types_slash_koa";
packageName = "@types/koa";
- version = "2.13.0";
+ version = "2.13.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.0.tgz";
- sha512 = "hNs1Z2lX+R5sZroIy/WIGbPlH/719s/Nd5uIjSIAdHn9q+g7z6mxOnhwMjK1urE4/NUP0SOoYUOD4MnvD9FRNw==";
+ url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.1.tgz";
+ sha512 = "Qbno7FWom9nNqu0yHZ6A0+RWt4mrYBhw3wpBAQ3+IuzGcLlfeYkzZrnMq5wsxulN2np8M4KKeUpTodsOsSad5Q==";
};
};
"@types/koa-compose-3.2.5" = {
@@ -6079,6 +6304,33 @@ let
sha512 = "oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==";
};
};
+ "@types/lodash.chunk-4.2.6" = {
+ name = "_at_types_slash_lodash.chunk";
+ packageName = "@types/lodash.chunk";
+ version = "4.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz";
+ sha512 = "SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ==";
+ };
+ };
+ "@types/lodash.omit-4.5.6" = {
+ name = "_at_types_slash_lodash.omit";
+ packageName = "@types/lodash.omit";
+ version = "4.5.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz";
+ sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==";
+ };
+ };
+ "@types/lodash.union-4.6.6" = {
+ name = "_at_types_slash_lodash.union";
+ packageName = "@types/lodash.union";
+ version = "4.6.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz";
+ sha512 = "Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==";
+ };
+ };
"@types/long-4.0.1" = {
name = "_at_types_slash_long";
packageName = "@types/long";
@@ -6106,6 +6358,15 @@ let
sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==";
};
};
+ "@types/micromatch-4.0.1" = {
+ name = "_at_types_slash_micromatch";
+ packageName = "@types/micromatch";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz";
+ sha512 = "my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==";
+ };
+ };
"@types/mime-1.3.2" = {
name = "_at_types_slash_mime";
packageName = "@types/mime";
@@ -6214,13 +6475,13 @@ let
sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==";
};
};
- "@types/node-10.17.54" = {
+ "@types/node-10.17.55" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "10.17.54";
+ version = "10.17.55";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-10.17.54.tgz";
- sha512 = "c8Lm7+hXdSPmWH4B9z/P/xIXhFK3mCQin4yCYMd2p1qpMG5AfgyJuYZ+3q2dT7qLiMMMGMd5dnkFpdqJARlvtQ==";
+ url = "https://registry.npmjs.org/@types/node/-/node-10.17.55.tgz";
+ sha512 = "koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg==";
};
};
"@types/node-12.12.70" = {
@@ -6250,13 +6511,13 @@ let
sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
};
};
- "@types/node-14.14.31" = {
+ "@types/node-14.14.32" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "14.14.31";
+ version = "14.14.32";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz";
- sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==";
+ url = "https://registry.npmjs.org/@types/node/-/node-14.14.32.tgz";
+ sha512 = "/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg==";
};
};
"@types/node-6.14.13" = {
@@ -6367,13 +6628,13 @@ let
sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==";
};
};
- "@types/qs-6.9.5" = {
+ "@types/qs-6.9.6" = {
name = "_at_types_slash_qs";
packageName = "@types/qs";
- version = "6.9.5";
+ version = "6.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
- sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
+ url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz";
+ sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==";
};
};
"@types/range-parser-1.2.3" = {
@@ -6448,13 +6709,13 @@ let
sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==";
};
};
- "@types/rimraf-2.0.4" = {
- name = "_at_types_slash_rimraf";
- packageName = "@types/rimraf";
- version = "2.0.4";
+ "@types/sarif-2.1.3" = {
+ name = "_at_types_slash_sarif";
+ packageName = "@types/sarif";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz";
- sha512 = "8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==";
+ url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz";
+ sha512 = "zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w==";
};
};
"@types/sass-1.16.0" = {
@@ -6574,15 +6835,6 @@ let
sha512 = "FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==";
};
};
- "@types/tmp-0.0.33" = {
- name = "_at_types_slash_tmp";
- packageName = "@types/tmp";
- version = "0.0.33";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz";
- sha1 = "1073c4bc824754ae3d10cfab88ab0237ba964e4d";
- };
- };
"@types/tough-cookie-4.0.0" = {
name = "_at_types_slash_tough-cookie";
packageName = "@types/tough-cookie";
@@ -6592,13 +6844,13 @@ let
sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==";
};
};
- "@types/uglify-js-3.12.0" = {
+ "@types/uglify-js-3.13.0" = {
name = "_at_types_slash_uglify-js";
packageName = "@types/uglify-js";
- version = "3.12.0";
+ version = "3.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz";
- sha512 = "sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q==";
+ url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz";
+ sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==";
};
};
"@types/unist-2.0.3" = {
@@ -6646,13 +6898,13 @@ let
sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==";
};
};
- "@types/vscode-1.53.0" = {
+ "@types/vscode-1.54.0" = {
name = "_at_types_slash_vscode";
packageName = "@types/vscode";
- version = "1.53.0";
+ version = "1.54.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.53.0.tgz";
- sha512 = "XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ==";
+ url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.54.0.tgz";
+ sha512 = "sHHw9HG4bTrnKhLGgmEiOS88OLO/2RQytUN4COX9Djv81zc0FSZsSiYaVyjNidDzUSpXsySKBkZ31lk2/FbdCg==";
};
};
"@types/webpack-4.41.26" = {
@@ -6745,13 +6997,13 @@ let
sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==";
};
};
- "@typescript-eslint/eslint-plugin-4.15.1" = {
+ "@typescript-eslint/eslint-plugin-4.16.1" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz";
- sha512 = "yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz";
+ sha512 = "SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==";
};
};
"@typescript-eslint/experimental-utils-3.10.1" = {
@@ -6763,13 +7015,13 @@ let
sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
};
};
- "@typescript-eslint/experimental-utils-4.15.1" = {
+ "@typescript-eslint/experimental-utils-4.16.1" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz";
- sha512 = "9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz";
+ sha512 = "0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==";
};
};
"@typescript-eslint/parser-3.10.1" = {
@@ -6781,22 +7033,22 @@ let
sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
};
};
- "@typescript-eslint/parser-4.15.1" = {
+ "@typescript-eslint/parser-4.16.1" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.1.tgz";
- sha512 = "V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz";
+ sha512 = "/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==";
};
};
- "@typescript-eslint/scope-manager-4.15.1" = {
+ "@typescript-eslint/scope-manager-4.16.1" = {
name = "_at_typescript-eslint_slash_scope-manager";
packageName = "@typescript-eslint/scope-manager";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz";
- sha512 = "ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz";
+ sha512 = "6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==";
};
};
"@typescript-eslint/types-3.10.1" = {
@@ -6808,13 +7060,13 @@ let
sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
};
};
- "@typescript-eslint/types-4.15.1" = {
+ "@typescript-eslint/types-4.16.1" = {
name = "_at_typescript-eslint_slash_types";
packageName = "@typescript-eslint/types";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.1.tgz";
- sha512 = "iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz";
+ sha512 = "nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==";
};
};
"@typescript-eslint/typescript-estree-2.34.0" = {
@@ -6835,13 +7087,13 @@ let
sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
};
};
- "@typescript-eslint/typescript-estree-4.15.1" = {
+ "@typescript-eslint/typescript-estree-4.16.1" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz";
- sha512 = "z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz";
+ sha512 = "m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==";
};
};
"@typescript-eslint/visitor-keys-3.10.1" = {
@@ -6853,76 +7105,76 @@ let
sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
};
};
- "@typescript-eslint/visitor-keys-4.15.1" = {
+ "@typescript-eslint/visitor-keys-4.16.1" = {
name = "_at_typescript-eslint_slash_visitor-keys";
packageName = "@typescript-eslint/visitor-keys";
- version = "4.15.1";
+ version = "4.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz";
- sha512 = "tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww==";
+ url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz";
+ sha512 = "s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==";
};
};
- "@uifabric/foundation-7.9.24" = {
+ "@uifabric/foundation-7.9.25" = {
name = "_at_uifabric_slash_foundation";
packageName = "@uifabric/foundation";
- version = "7.9.24";
+ version = "7.9.25";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.24.tgz";
- sha512 = "f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q==";
+ url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.25.tgz";
+ sha512 = "E9YMzbbgvNtZEJx1/AZBJX6Ut2chgoA7/ODB9+el6QyUErL/WUeIlXHbl8TZungRL9e1T4Bma48CNvBT8Ul+Fg==";
};
};
- "@uifabric/icons-7.5.21" = {
+ "@uifabric/icons-7.5.22" = {
name = "_at_uifabric_slash_icons";
packageName = "@uifabric/icons";
- version = "7.5.21";
+ version = "7.5.22";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.21.tgz";
- sha512 = "ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ==";
+ url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.22.tgz";
+ sha512 = "xJwgJG2IoEM/sFc4qzG5vXE/eY+vuz6IxPVXH0UoQ+9XY2KRb9p5pjBIx4SM/h0belCBMPF5rGnWYeg6hi14dQ==";
};
};
- "@uifabric/merge-styles-7.19.1" = {
+ "@uifabric/merge-styles-7.19.2" = {
name = "_at_uifabric_slash_merge-styles";
packageName = "@uifabric/merge-styles";
- version = "7.19.1";
+ version = "7.19.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz";
- sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A==";
+ url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz";
+ sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g==";
};
};
- "@uifabric/react-hooks-7.13.11" = {
+ "@uifabric/react-hooks-7.13.12" = {
name = "_at_uifabric_slash_react-hooks";
packageName = "@uifabric/react-hooks";
- version = "7.13.11";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz";
- sha512 = "9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w==";
+ url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.12.tgz";
+ sha512 = "TVeBLMI9Cpo0duxt5NkyMAAPyTVsqYQSt+EmjDIZI92abptqBpuiLGXHnLaf+Egw8VgzBv5Vqs8ZRzMg6mhYkA==";
};
};
- "@uifabric/set-version-7.0.23" = {
+ "@uifabric/set-version-7.0.24" = {
name = "_at_uifabric_slash_set-version";
packageName = "@uifabric/set-version";
- version = "7.0.23";
+ version = "7.0.24";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.23.tgz";
- sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA==";
+ url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz";
+ sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg==";
};
};
- "@uifabric/styling-7.18.0" = {
+ "@uifabric/styling-7.18.1" = {
name = "_at_uifabric_slash_styling";
packageName = "@uifabric/styling";
- version = "7.18.0";
+ version = "7.18.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.0.tgz";
- sha512 = "PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg==";
+ url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.1.tgz";
+ sha512 = "yLavWTQ4rAE3uZ3h/odlCKyun3amjlESZu+KAdEfQWnsMMV4VFpJXc1Mhqm/Rzf9rNySaiZMzJ2R4urWcHTJHQ==";
};
};
- "@uifabric/utilities-7.33.4" = {
+ "@uifabric/utilities-7.33.5" = {
name = "_at_uifabric_slash_utilities";
packageName = "@uifabric/utilities";
- version = "7.33.4";
+ version = "7.33.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.4.tgz";
- sha512 = "FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA==";
+ url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz";
+ sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ==";
};
};
"@ungap/from-entries-0.2.1" = {
@@ -6943,13 +7195,13 @@ let
sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==";
};
};
- "@unicode/unicode-13.0.0-1.0.3" = {
+ "@unicode/unicode-13.0.0-1.0.4" = {
name = "_at_unicode_slash_unicode-13.0.0";
packageName = "@unicode/unicode-13.0.0";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.3.tgz";
- sha512 = "foNhrvnwzUpt6Od/L7hgkNwZkDjsGMPgPFdVcXSdcKKYNicNBySiypBwgLLMsdBLWS30aJ8eLjftifnGuNGN1g==";
+ url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.4.tgz";
+ sha512 = "0lYwG9JxFapUG1TguDx1PvJ8RhTuojnuRexG2Z2WWDXXAFlzIQgu+6Og7rXwvopU0I3fQK1f7Z+rGm9tD8rYbQ==";
};
};
"@uphold/request-logger-2.0.0" = {
@@ -6997,76 +7249,76 @@ let
sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA==";
};
};
- "@vue/compiler-core-3.0.5" = {
+ "@vue/compiler-core-3.0.7" = {
name = "_at_vue_slash_compiler-core";
packageName = "@vue/compiler-core";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.5.tgz";
- sha512 = "iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ==";
+ url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.7.tgz";
+ sha512 = "JFohgBXoyUc3mdeI2WxlhjQZ5fakfemJkZHX8Gu/nFbEg3+lKVUZmNKWmmnp9aOzJQZKoj77LjmFxiP+P+7lMQ==";
};
};
- "@vue/compiler-dom-3.0.5" = {
+ "@vue/compiler-dom-3.0.7" = {
name = "_at_vue_slash_compiler-dom";
packageName = "@vue/compiler-dom";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz";
- sha512 = "HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g==";
+ url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.7.tgz";
+ sha512 = "VnIH9EbWQm/Tkcp+8dCaNVsVvhm/vxCrIKWRkXY9215hTqOqQOvejT8IMjd2kc++nIsYMsdQk6H9qqBvoLe/Cw==";
};
};
- "@vue/compiler-sfc-3.0.5" = {
+ "@vue/compiler-sfc-3.0.7" = {
name = "_at_vue_slash_compiler-sfc";
packageName = "@vue/compiler-sfc";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.5.tgz";
- sha512 = "uOAC4X0Gx3SQ9YvDC7YMpbDvoCmPvP0afVhJoxRotDdJ+r8VO3q4hFf/2f7U62k4Vkdftp6DVni8QixrfYzs+w==";
+ url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.7.tgz";
+ sha512 = "37/QILpGE+J3V+bP9Slg9e6xGqfk+MmS2Yj8ChR4fS0/qWUU/YoYHE0GPIzjmBdH0JVOOmJqunxowIXmqNiHng==";
};
};
- "@vue/compiler-ssr-3.0.5" = {
+ "@vue/compiler-ssr-3.0.7" = {
name = "_at_vue_slash_compiler-ssr";
packageName = "@vue/compiler-ssr";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.5.tgz";
- sha512 = "Wm//Kuxa1DpgjE4P9W0coZr8wklOfJ35Jtq61CbU+t601CpPTK4+FL2QDBItaG7aoUUDCWL5nnxMkuaOgzTBKg==";
+ url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.7.tgz";
+ sha512 = "nHRbHeSpfXwjypettjrA16TjgfDcPEwq3m/zHnGyLC1QqdLtklXmpSM43/CPwwTCRa/qdt0pldJf22MiCEuTSQ==";
};
};
- "@vue/reactivity-3.0.5" = {
+ "@vue/reactivity-3.0.7" = {
name = "_at_vue_slash_reactivity";
packageName = "@vue/reactivity";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.5.tgz";
- sha512 = "3xodUE3sEIJgS7ntwUbopIpzzvi7vDAOjVamfb2l+v1FUg0jpd3gf62N2wggJw3fxBMr+QvyxpD+dBoxLsmAjw==";
+ url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.7.tgz";
+ sha512 = "FotWcNNaKhqpFZrdgsUOZ1enlJ5lhTt01CNTtLSyK7jYFgZBTuw8vKsEutZKDYZ1XKotOfoeO8N3pZQqmM6Etw==";
};
};
- "@vue/runtime-core-3.0.5" = {
+ "@vue/runtime-core-3.0.7" = {
name = "_at_vue_slash_runtime-core";
packageName = "@vue/runtime-core";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.5.tgz";
- sha512 = "Cnyi2NqREwOLcTEsIi1DQX1hHtkVj4eGm4hBG7HhokS05DqpK4/80jG6PCCnCH9rIJDB2FqtaODX397210plXg==";
+ url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.7.tgz";
+ sha512 = "DBAZAwVvdmMXuyd6/9qqj/kYr/GaLTmn1L2/QLxLwP+UfhIboiTSBc/tUUb8MRk7Bb98GzNeAWkkT6AfooS3dQ==";
};
};
- "@vue/runtime-dom-3.0.5" = {
+ "@vue/runtime-dom-3.0.7" = {
name = "_at_vue_slash_runtime-dom";
packageName = "@vue/runtime-dom";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.5.tgz";
- sha512 = "iilX1KySeIzHHtErT6Y44db1rhWK5tAI0CiJIPr+SJoZ2jbjoOSE6ff/jfIQakchbm1d6jq6VtRVnp5xYdOXKA==";
+ url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.7.tgz";
+ sha512 = "Oij4ruOtnpQpCj+/Q3JPzgpTJ1Q7+N67pA53A8KVITEtxfvKL46NN6dhAZ5NGqwX6RWZpYqWQNewITeF0pHr8g==";
};
};
- "@vue/shared-3.0.5" = {
+ "@vue/shared-3.0.7" = {
name = "_at_vue_slash_shared";
packageName = "@vue/shared";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.5.tgz";
- sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw==";
+ url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.7.tgz";
+ sha512 = "dn5FyfSc4ky424jH4FntiHno7Ss5yLkqKNmM/NXwANRnlkmqu74pnGetexDFVG5phMk9/FhwovUZCWGxsotVKg==";
};
};
"@webassemblyjs/ast-1.11.0" = {
@@ -7816,15 +8068,6 @@ let
sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==";
};
};
- "@zkochan/cmd-shim-3.1.0" = {
- name = "_at_zkochan_slash_cmd-shim";
- packageName = "@zkochan/cmd-shim";
- version = "3.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz";
- sha512 = "o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg==";
- };
- };
"CSSselect-0.4.1" = {
name = "CSSselect";
packageName = "CSSselect";
@@ -8194,6 +8437,15 @@ let
sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
};
};
+ "add-stream-1.0.0" = {
+ name = "add-stream";
+ packageName = "add-stream";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz";
+ sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa";
+ };
+ };
"addons-linter-2.13.1" = {
name = "addons-linter";
packageName = "addons-linter";
@@ -8239,13 +8491,13 @@ let
sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==";
};
};
- "adm-zip-0.5.3" = {
+ "adm-zip-0.5.4" = {
name = "adm-zip";
packageName = "adm-zip";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchurl {
- url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.3.tgz";
- sha512 = "zsoTXEwRNCxBzRHLENFLuecCcwzzXiEhWo1r3GP68iwi8Q/hW2RrqgeY1nfJ/AhNQNWnZq/4v0TbfMsUkI+TYw==";
+ url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.4.tgz";
+ sha512 = "GMQg1a1cAegh+/EgWbz+XHZrwB467iB/IgtToldvxs7Xa5Br8mPmvCeRfY/Un2fLzrlIPt6Yu7Cej+8Ut9TGPg==";
};
};
"adverb-where-0.0.9" = {
@@ -8329,15 +8581,6 @@ let
sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
};
};
- "agentkeepalive-3.5.2" = {
- name = "agentkeepalive";
- packageName = "agentkeepalive";
- version = "3.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz";
- sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==";
- };
- };
"agentkeepalive-4.1.4" = {
name = "agentkeepalive";
packageName = "agentkeepalive";
@@ -8428,13 +8671,13 @@ let
sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==";
};
};
- "ajv-7.1.1" = {
+ "ajv-7.2.1" = {
name = "ajv";
packageName = "ajv";
- version = "7.1.1";
+ version = "7.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz";
- sha512 = "ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz";
+ sha512 = "+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==";
};
};
"ajv-errors-1.0.1" = {
@@ -8446,6 +8689,15 @@ let
sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
};
};
+ "ajv-formats-1.5.1" = {
+ name = "ajv-formats";
+ packageName = "ajv-formats";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.5.1.tgz";
+ sha512 = "s1RBVF4HZd2UjGkb6t6uWoXjf6o7j7dXPQIL7vprcIT/67bTD6+5ocsU0UKShS2qWxueGDWuGfKHfOxHWrlTQg==";
+ };
+ };
"ajv-keywords-1.5.1" = {
name = "ajv-keywords";
packageName = "ajv-keywords";
@@ -9391,13 +9643,13 @@ let
sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==";
};
};
- "archiver-5.2.0" = {
+ "archiver-5.3.0" = {
name = "archiver";
packageName = "archiver";
- version = "5.2.0";
+ version = "5.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz";
- sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==";
+ url = "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz";
+ sha512 = "iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==";
};
};
"archiver-utils-2.1.0" = {
@@ -9607,15 +9859,6 @@ let
sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
};
};
- "array-differ-2.1.0" = {
- name = "array-differ";
- packageName = "array-differ";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz";
- sha512 = "KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==";
- };
- };
"array-differ-3.0.0" = {
name = "array-differ";
packageName = "array-differ";
@@ -9976,6 +10219,15 @@ let
sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
};
};
+ "asar-3.0.3" = {
+ name = "asar";
+ packageName = "asar";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz";
+ sha512 = "k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==";
+ };
+ };
"ascii-table-0.0.9" = {
name = "ascii-table";
packageName = "ascii-table";
@@ -10498,6 +10750,15 @@ let
sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3";
};
};
+ "author-regex-1.0.0" = {
+ name = "author-regex";
+ packageName = "author-regex";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz";
+ sha1 = "d08885be6b9bbf9439fe087c76287245f0a81450";
+ };
+ };
"auto-bind-4.0.0" = {
name = "auto-bind";
packageName = "auto-bind";
@@ -10579,13 +10840,13 @@ let
sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
};
};
- "aws-sdk-2.848.0" = {
+ "aws-sdk-2.858.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.848.0";
+ version = "2.858.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz";
- sha512 = "c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.858.0.tgz";
+ sha512 = "VXNnGmPcZu4ZRc0yqw4F6d43edrMMKQwOmZX9/hQW/l5DFGqdGzvaDKljZyD1FHNbmaxXz09RfLzjVEmq+CVzA==";
};
};
"aws-sign2-0.6.0" = {
@@ -10903,6 +11164,33 @@ let
sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500";
};
};
+ "babel-plugin-polyfill-corejs2-0.1.10" = {
+ name = "babel-plugin-polyfill-corejs2";
+ packageName = "babel-plugin-polyfill-corejs2";
+ version = "0.1.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz";
+ sha512 = "DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==";
+ };
+ };
+ "babel-plugin-polyfill-corejs3-0.1.7" = {
+ name = "babel-plugin-polyfill-corejs3";
+ packageName = "babel-plugin-polyfill-corejs3";
+ version = "0.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz";
+ sha512 = "u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==";
+ };
+ };
+ "babel-plugin-polyfill-regenerator-0.1.6" = {
+ name = "babel-plugin-polyfill-regenerator";
+ packageName = "babel-plugin-polyfill-regenerator";
+ version = "0.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz";
+ sha512 = "OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==";
+ };
+ };
"babel-plugin-styled-components-1.12.0" = {
name = "babel-plugin-styled-components";
packageName = "babel-plugin-styled-components";
@@ -11515,13 +11803,13 @@ let
sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
};
};
- "before-after-hook-2.1.1" = {
+ "before-after-hook-2.2.0" = {
name = "before-after-hook";
packageName = "before-after-hook";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.1.tgz";
- sha512 = "5ekuQOvO04MDj7kYZJaMab2S8SPjGJbotVNyv7QYFCOAwrGZs/YnoDNlh1U+m5hl7H2D/+n0taaAV/tfyd3KMA==";
+ url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.0.tgz";
+ sha512 = "jH6rKQIfroBbhEXVmI7XmXe3ix5S/PgJqpzdDPnR8JGLHWNYLsYZ6tK5iWOF/Ra3oqEX0NobXGlzbiylIzVphQ==";
};
};
"bencode-0.7.0" = {
@@ -12199,22 +12487,22 @@ let
sha512 = "nXWOXtQHbfPaMl6jyEF/rmRMrcemj2qn+OCAI/uZYurjfx7Dg3baoXdPzHOL0U8Cfvn8CWxKcnM/rgxL7DR4zw==";
};
};
- "bn.js-4.11.9" = {
+ "bn.js-4.12.0" = {
name = "bn.js";
packageName = "bn.js";
- version = "4.11.9";
+ version = "4.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz";
- sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==";
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz";
+ sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";
};
};
- "bn.js-5.1.3" = {
+ "bn.js-5.2.0" = {
name = "bn.js";
packageName = "bn.js";
- version = "5.1.3";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz";
- sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==";
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz";
+ sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==";
};
};
"bncode-0.2.3" = {
@@ -12811,13 +13099,13 @@ let
sha512 = "/l9Kg/c5o+n/0AqreMxh2jpzDMl1ikl4gUxT7RFNe3A3YRIyZkiREhwcjmqxiymJSRI/Qhew357xGn1SLw/xEw==";
};
};
- "bsocks-0.2.5" = {
+ "bsocks-0.2.6" = {
name = "bsocks";
packageName = "bsocks";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/bsocks/-/bsocks-0.2.5.tgz";
- sha512 = "w1yG8JmfKPIaTDLuR9TIxJM2Ma6nAiInRpLNZ43g3qPnPHjawCC4SV6Bdy84bEJQX1zJWYTgdod/BnQlDhq4Gg==";
+ url = "https://registry.npmjs.org/bsocks/-/bsocks-0.2.6.tgz";
+ sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w==";
};
};
"btcp-0.1.5" = {
@@ -13297,13 +13585,13 @@ let
sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1";
};
};
- "byte-size-5.0.1" = {
+ "byte-size-7.0.1" = {
name = "byte-size";
packageName = "byte-size";
- version = "5.0.1";
+ version = "7.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz";
- sha512 = "/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw==";
+ url = "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz";
+ sha512 = "crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==";
};
};
"bytebuffer-3.5.5" = {
@@ -13702,22 +13990,22 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001190" = {
+ "caniuse-lite-1.0.30001197" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001190";
+ version = "1.0.30001197";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001190.tgz";
- sha512 = "62KVw474IK8E+bACBYhRS0/L6o/1oeAVkpF2WetjV58S5vkzNh0/Rz3lD8D4YCbOTqi0/aD4X3LtoP7V5xnuAg==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz";
+ sha512 = "8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==";
};
};
- "canvas-2.6.1" = {
+ "canvas-2.7.0" = {
name = "canvas";
packageName = "canvas";
- version = "2.6.1";
+ version = "2.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz";
- sha512 = "S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==";
+ url = "https://registry.npmjs.org/canvas/-/canvas-2.7.0.tgz";
+ sha512 = "pzCxtkHb+5su5MQjTtepMDlIOtaXo277x0C0u3nMOxtkhTyQ+h2yNKhlROAaDllWgRyePAUitC08sXw26Eb6aw==";
};
};
"capital-case-1.0.4" = {
@@ -13828,13 +14116,13 @@ let
sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==";
};
};
- "cdk8s-1.0.0-beta.8" = {
+ "cdk8s-1.0.0-beta.10" = {
name = "cdk8s";
packageName = "cdk8s";
- version = "1.0.0-beta.8";
+ version = "1.0.0-beta.10";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.8.tgz";
- sha512 = "99jNfGUIVic0hZCWXTU1yQLJ5ww06O7egXkgjltlHS0Fom9MY4bzFpqlVTNlmKguEO5eK3OEjjkoek4qVpEbpw==";
+ url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.10.tgz";
+ sha512 = "zyvxm1kyklUbrCD475ULXPUM+VfOU2u8UN0rSFjJN8Tziv6w6lCUxRBAeJCF/Dn00M29dWmu/F9Nda0mUb8Jcg==";
};
};
"cdktf-0.1.0" = {
@@ -13855,13 +14143,13 @@ let
sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
};
};
- "chai-4.3.0" = {
+ "chai-4.3.3" = {
name = "chai";
packageName = "chai";
- version = "4.3.0";
+ version = "4.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/chai/-/chai-4.3.0.tgz";
- sha512 = "/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA==";
+ url = "https://registry.npmjs.org/chai/-/chai-4.3.3.tgz";
+ sha512 = "MPSLOZwxxnA0DhLE84klnGPojWFK5KuhP7/j5dTsxpr2S3XlkqJP5WbyYl1gCTWvG2Z5N+HD4F472WsbEZL6Pw==";
};
};
"chai-as-promised-7.1.1" = {
@@ -14296,13 +14584,13 @@ let
sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==";
};
};
- "chroma-js-2.1.0" = {
+ "chroma-js-2.1.1" = {
name = "chroma-js";
packageName = "chroma-js";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.0.tgz";
- sha512 = "uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg==";
+ url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.1.tgz";
+ sha512 = "gYc5/Dooshun2OikK7oY/hYnoEiZ0dxqRpXosEdYRYm505vU5mRsHFqIW062C9nMtr32DVErP6mlxuepo2kNkw==";
};
};
"chrome-dgram-3.0.6" = {
@@ -14539,13 +14827,13 @@ let
sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
};
};
- "clean-css-5.1.0" = {
+ "clean-css-5.1.1" = {
name = "clean-css";
packageName = "clean-css";
- version = "5.1.0";
+ version = "5.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.0.tgz";
- sha512 = "98ALLW4NOhZpvUEoSc2dJO23xE4S4SXc4mLieCVFGo8DNLTFQ3gzi7msW1lqSYJeGZSF5r5+W3KF6cEnkILnFQ==";
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.1.tgz";
+ sha512 = "GQ6HdEyJN0543mRTA/TkZ7RPoMXGWKq1shs9H86F2kLuixR0RI+xd4JfhJxWUW08FGKQXTKAKpVjKQXu5zkFNA==";
};
};
"clean-deep-3.4.0" = {
@@ -14863,13 +15151,13 @@ let
sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
};
};
- "clipboard-2.0.6" = {
+ "clipboard-2.0.7" = {
name = "clipboard";
packageName = "clipboard";
- version = "2.0.6";
+ version = "2.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz";
- sha512 = "g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==";
+ url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.7.tgz";
+ sha512 = "8M8WEZcIvs0hgOma+wAPkrUxpv0PMY1L6VsAJh/2DOKARIMpyWe6ZLcEoe1qktl6/ced5ceYHs+oGedSbgZ3sg==";
};
};
"clipboardy-1.2.3" = {
@@ -15115,6 +15403,15 @@ let
sha512 = "DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA==";
};
};
+ "cmd-shim-4.1.0" = {
+ name = "cmd-shim";
+ packageName = "cmd-shim";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz";
+ sha512 = "lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==";
+ };
+ };
"cmdln-3.2.1" = {
name = "cmdln";
packageName = "cmdln";
@@ -15268,13 +15565,13 @@ let
sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg==";
};
};
- "codemaker-1.21.0" = {
+ "codemaker-1.24.0" = {
name = "codemaker";
packageName = "codemaker";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/codemaker/-/codemaker-1.21.0.tgz";
- sha512 = "YxTt3lWcR6PC/3fByU7FGjIoUDOcTs1KmqRJcK14xN9X7wxBOWO129WuSTm/4XfKlz/3iSo9CtRX/5HYkE1oCQ==";
+ url = "https://registry.npmjs.org/codemaker/-/codemaker-1.24.0.tgz";
+ sha512 = "oKi5BNSyH0LBtFoxWKRvWnTut8NRdRgOzIF6/YKCaNnVECqq0oMqUpEBKNgcS+sOxfJfI/tkORpSdNGGVE0tmA==";
};
};
"codepage-1.4.0" = {
@@ -15403,13 +15700,13 @@ let
sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
};
};
- "color-string-1.5.4" = {
+ "color-string-1.5.5" = {
name = "color-string";
packageName = "color-string";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchurl {
- url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz";
- sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
+ url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz";
+ sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==";
};
};
"color-support-1.1.3" = {
@@ -15421,13 +15718,13 @@ let
sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
};
};
- "colorette-1.2.1" = {
+ "colorette-1.2.2" = {
name = "colorette";
packageName = "colorette";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
- sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
+ url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";
+ sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";
};
};
"colornames-1.1.1" = {
@@ -15988,13 +16285,13 @@ let
sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==";
};
};
- "compress-commons-4.0.2" = {
+ "compress-commons-4.1.0" = {
name = "compress-commons";
packageName = "compress-commons";
- version = "4.0.2";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.2.tgz";
- sha512 = "qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==";
+ url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.0.tgz";
+ sha512 = "ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA==";
};
};
"compressible-2.0.18" = {
@@ -16087,6 +16384,15 @@ let
sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg==";
};
};
+ "conf-9.0.2" = {
+ name = "conf";
+ packageName = "conf";
+ version = "9.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz";
+ sha512 = "rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw==";
+ };
+ };
"config-1.31.0" = {
name = "config";
packageName = "config";
@@ -16303,22 +16609,22 @@ let
sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
};
};
- "constructs-3.3.29" = {
+ "constructs-3.3.48" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.29";
+ version = "3.3.48";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.29.tgz";
- sha512 = "rGQzkq2M/qKZ0hMEtt4YPpsZKOwzmiyAQx3PqexXXsjdVnTqEfIwQuDpc+1jP6CtaBHl7rR6CxQcfsP5DmaERw==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.48.tgz";
+ sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ==";
};
};
- "constructs-3.3.5" = {
+ "constructs-3.3.61" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.5";
+ version = "3.3.61";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.5.tgz";
- sha512 = "qicg+YQ/8ftntU+PtvB+faUmGMCPMJyQ+Vo1Y7z2QdlDVRW1YJ5XVS4Skk4WlOfaJ9r/dvlSinB9+Vaw3Yb2Ww==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.61.tgz";
+ sha512 = "9zg2/Bl9y0Z/9eQ3NO8BcCWlAVs6hXGCcRH2bQLSqExyrE54qzh50Vtb7ULrKOkC5nT974VG+cWdeXrcC6JDqA==";
};
};
"consume-http-header-1.0.0" = {
@@ -16466,13 +16772,13 @@ let
sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==";
};
};
- "conventional-changelog-core-3.2.3" = {
+ "conventional-changelog-core-4.2.2" = {
name = "conventional-changelog-core";
packageName = "conventional-changelog-core";
- version = "3.2.3";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz";
- sha512 = "LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==";
+ url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz";
+ sha512 = "7pDpRUiobQDNkwHyJG7k9f6maPo9tfPzkSWbRq97GGiZqisElhnvUZSvyQH20ogfOjntB5aadvv6NNcKL1sReg==";
};
};
"conventional-changelog-preset-loader-2.3.4" = {
@@ -16511,13 +16817,13 @@ let
sha512 = "OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA==";
};
};
- "conventional-recommended-bump-5.0.1" = {
+ "conventional-recommended-bump-6.1.0" = {
name = "conventional-recommended-bump";
packageName = "conventional-recommended-bump";
- version = "5.0.1";
+ version = "6.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz";
- sha512 = "RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ==";
+ url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz";
+ sha512 = "uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==";
};
};
"convert-source-map-1.1.3" = {
@@ -16799,22 +17105,22 @@ let
sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==";
};
};
- "core-js-3.9.0" = {
+ "core-js-3.9.1" = {
name = "core-js";
packageName = "core-js";
- version = "3.9.0";
+ version = "3.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz";
- sha512 = "PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ==";
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz";
+ sha512 = "gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==";
};
};
- "core-js-compat-3.9.0" = {
+ "core-js-compat-3.9.1" = {
name = "core-js-compat";
packageName = "core-js-compat";
- version = "3.9.0";
+ version = "3.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz";
- sha512 = "YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==";
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz";
+ sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==";
};
};
"core-util-is-1.0.2" = {
@@ -16943,13 +17249,13 @@ let
sha1 = "868fd9092f439d1ef95f4a85e5fa4b9f07efc95c";
};
};
- "cpy-8.1.1" = {
+ "cpy-8.1.2" = {
name = "cpy";
packageName = "cpy";
- version = "8.1.1";
+ version = "8.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cpy/-/cpy-8.1.1.tgz";
- sha512 = "vqHT+9o67sMwJ5hUd/BAOYeemkU+MuFRsK2c36Xc3eefQpAsp1kAsyDxEDcc5JS1+y9l/XHPrIsVTcyGGmkUUQ==";
+ url = "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz";
+ sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==";
};
};
"crc-0.2.0" = {
@@ -17582,13 +17888,13 @@ let
sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
};
};
- "csstype-2.6.15" = {
+ "csstype-2.6.16" = {
name = "csstype";
packageName = "csstype";
- version = "2.6.15";
+ version = "2.6.16";
src = fetchurl {
- url = "https://registry.npmjs.org/csstype/-/csstype-2.6.15.tgz";
- sha512 = "FNeiVKudquehtR3t9TRRnsHL+lJhuHF5Zn9dt01jpojlurLEPDhhEtUkWmAUJ7/fOLaLG4dCDEnUsR0N1rZSsg==";
+ url = "https://registry.npmjs.org/csstype/-/csstype-2.6.16.tgz";
+ sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";
};
};
"csurf-1.11.0" = {
@@ -18239,15 +18545,6 @@ let
sha512 = "e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==";
};
};
- "dargs-4.1.0" = {
- name = "dargs";
- packageName = "dargs";
- version = "4.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz";
- sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17";
- };
- };
"dargs-6.1.0" = {
name = "dargs";
packageName = "dargs";
@@ -18257,6 +18554,15 @@ let
sha512 = "5dVBvpBLBnPwSsYXqfybFyehMmC/EenKEcf23AhCTgTf48JFBbmJKqoZBsERDnjL0FyiVTYWdFsRfTLHxLyKdQ==";
};
};
+ "dargs-7.0.0" = {
+ name = "dargs";
+ packageName = "dargs";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz";
+ sha512 = "2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==";
+ };
+ };
"dash-ast-1.0.0" = {
name = "dash-ast";
packageName = "dash-ast";
@@ -19112,13 +19418,13 @@ let
sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
};
};
- "defer-to-connect-2.0.0" = {
+ "defer-to-connect-2.0.1" = {
name = "defer-to-connect";
packageName = "defer-to-connect";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz";
- sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==";
+ url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz";
+ sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==";
};
};
"deferred-0.7.11" = {
@@ -19256,15 +19562,6 @@ let
sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ==";
};
};
- "delay-async-1.2.0" = {
- name = "delay-async";
- packageName = "delay-async";
- version = "1.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/delay-async/-/delay-async-1.2.0.tgz";
- sha512 = "BDhPL4k42yL2c0b5zTUlMIM3/wmv77HOgZi4ya/8tOHw16GZ1i9Qj7Tmy3xt0jWb4VmpQtklLPReUtOUZUuzuQ==";
- };
- };
"delayed-stream-1.0.0" = {
name = "delayed-stream";
packageName = "delayed-stream";
@@ -19589,22 +19886,13 @@ let
sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg==";
};
};
- "devcert-1.1.3" = {
- name = "devcert";
- packageName = "devcert";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/devcert/-/devcert-1.1.3.tgz";
- sha512 = "7/nIzKdQ8y2K0imjIP7dyg2GJ2h38Ps6VOMXWZHIarNDV3p6mTXyEugKFnkmsZ2DD58JEG34ILyVb3qdOMmP9w==";
- };
- };
- "devtools-protocol-0.0.818844" = {
+ "devtools-protocol-0.0.847576" = {
name = "devtools-protocol";
packageName = "devtools-protocol";
- version = "0.0.818844";
+ version = "0.0.847576";
src = fetchurl {
- url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz";
- sha512 = "AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==";
+ url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz";
+ sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg==";
};
};
"dezalgo-1.0.3" = {
@@ -20705,15 +20993,6 @@ let
sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
};
};
- "ejs-3.1.5" = {
- name = "ejs";
- packageName = "ejs";
- version = "3.1.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz";
- sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==";
- };
- };
"ejs-3.1.6" = {
name = "ejs";
packageName = "ejs";
@@ -20723,13 +21002,49 @@ let
sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==";
};
};
- "electron-to-chromium-1.3.671" = {
+ "electron-notarize-1.0.0" = {
+ name = "electron-notarize";
+ packageName = "electron-notarize";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz";
+ sha512 = "dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==";
+ };
+ };
+ "electron-osx-sign-0.5.0" = {
+ name = "electron-osx-sign";
+ packageName = "electron-osx-sign";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz";
+ sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==";
+ };
+ };
+ "electron-packager-15.2.0" = {
+ name = "electron-packager";
+ packageName = "electron-packager";
+ version = "15.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz";
+ sha512 = "BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA==";
+ };
+ };
+ "electron-rebuild-2.3.5" = {
+ name = "electron-rebuild";
+ packageName = "electron-rebuild";
+ version = "2.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-2.3.5.tgz";
+ sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
+ };
+ };
+ "electron-to-chromium-1.3.682" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.671";
+ version = "1.3.682";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.671.tgz";
- sha512 = "RTD97QkdrJKaKwRv9h/wGAaoR2lGxNXEcBXS31vjitgTPwTWAbLdS7cEsBK68eEQy7p6YyT8D5BxBEYHu2SuwQ==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.682.tgz";
+ sha512 = "zok2y37qR00U14uM6qBz/3iIjWHom2eRfC2S1StA0RslP7x34jX+j4mxv80t8OEOHLJPVG54ZPeaFxEI7gPrwg==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20824,13 +21139,13 @@ let
sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
};
};
- "emmet-2.3.1" = {
+ "emmet-2.3.2" = {
name = "emmet";
packageName = "emmet";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/emmet/-/emmet-2.3.1.tgz";
- sha512 = "u8h++9u3y9QWhn0imUXfQO+s80To5MGD97zd/00wGC39CfNGBPe//ZKepJz9I1LQ2FDRXHrn+e3JaN/53Y5z6A==";
+ url = "https://registry.npmjs.org/emmet/-/emmet-2.3.2.tgz";
+ sha512 = "PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw==";
};
};
"emoji-named-characters-1.0.2" = {
@@ -21094,13 +21409,13 @@ let
sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==";
};
};
- "engine.io-client-3.5.0" = {
+ "engine.io-client-3.5.1" = {
name = "engine.io-client";
packageName = "engine.io-client";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz";
- sha512 = "12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==";
+ url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz";
+ sha512 = "oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==";
};
};
"engine.io-parser-1.0.6" = {
@@ -21409,22 +21724,13 @@ let
sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
};
};
- "es-abstract-1.17.7" = {
+ "es-abstract-1.18.0" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.17.7";
+ version = "1.18.0";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz";
- sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
- };
- };
- "es-abstract-1.18.0-next.2" = {
- name = "es-abstract";
- packageName = "es-abstract";
- version = "1.18.0-next.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz";
- sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz";
+ sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==";
};
};
"es-get-iterator-1.1.2" = {
@@ -21436,13 +21742,13 @@ let
sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==";
};
};
- "es-module-lexer-0.3.26" = {
+ "es-module-lexer-0.4.1" = {
name = "es-module-lexer";
packageName = "es-module-lexer";
- version = "0.3.26";
+ version = "0.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz";
- sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==";
+ url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz";
+ sha512 = "ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==";
};
};
"es-to-primitive-1.2.1" = {
@@ -21589,13 +21895,13 @@ let
sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
};
};
- "esbuild-0.8.50" = {
+ "esbuild-0.8.57" = {
name = "esbuild";
packageName = "esbuild";
- version = "0.8.50";
+ version = "0.8.57";
src = fetchurl {
- url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.50.tgz";
- sha512 = "oidFLXssA7IccYzkqLVZSqNJDwDq8Mh/vqvrW+3fPWM7iUiC5O2bCllhnO8+K9LlyL/2Z6n+WwRJAz9fqSIVRg==";
+ url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.57.tgz";
+ sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA==";
};
};
"esc-exit-2.0.2" = {
@@ -21778,15 +22084,6 @@ let
sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==";
};
};
- "eslint-6.8.0" = {
- name = "eslint";
- packageName = "eslint";
- version = "6.8.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz";
- sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==";
- };
- };
"eslint-7.14.0" = {
name = "eslint";
packageName = "eslint";
@@ -21796,13 +22093,13 @@ let
sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
};
};
- "eslint-7.20.0" = {
+ "eslint-7.21.0" = {
name = "eslint";
packageName = "eslint";
- version = "7.20.0";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz";
- sha512 = "qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz";
+ sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==";
};
};
"eslint-plugin-no-unsanitized-3.1.4" = {
@@ -21832,13 +22129,13 @@ let
sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
};
};
- "eslint-plugin-vue-7.6.0" = {
+ "eslint-plugin-vue-7.7.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
- version = "7.6.0";
+ version = "7.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.6.0.tgz";
- sha512 = "qYpKwAvpcQXyUXVcG8Zd+fxHDx9iSgTQuO7dql7Ug/2BCvNNDr6s3I9p8MoUo23JJdO7ZAjW3vSwY/EBf4uBcw==";
+ url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz";
+ sha512 = "mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ==";
};
};
"eslint-scope-3.7.3" = {
@@ -22156,15 +22453,6 @@ let
sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
};
};
- "esy-solve-cudf-0.1.10" = {
- name = "esy-solve-cudf";
- packageName = "esy-solve-cudf";
- version = "0.1.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/esy-solve-cudf/-/esy-solve-cudf-0.1.10.tgz";
- sha512 = "/MrZOBH0wuJndvZN8pl+S3Mg3zJaK70PH9ZZwqDeJHulghEWROEZxpmenNiS9pqAaxyUVhTZJBt2/vL9jKCJbg==";
- };
- };
"etag-1.8.1" = {
name = "etag";
packageName = "etag";
@@ -22201,13 +22489,13 @@ let
sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g==";
};
};
- "event-loop-spinner-2.0.0" = {
+ "event-loop-spinner-2.1.0" = {
name = "event-loop-spinner";
packageName = "event-loop-spinner";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.0.0.tgz";
- sha512 = "1y4j/Mhttr8ordvHkbDsGzGrlQaSYJoXD/3YKUxiOXIk7myEn9UPfybEk/lLtrcU3D4QvCNmVUxVQaPtvAIaUw==";
+ url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.1.0.tgz";
+ sha512 = "RJ10wL8/F9AlfBgRCvYctJIXSb9XkVmSCK3GGUvPD3dJrvTjDeDT0tmhcbEC6I2NEjNM9xD38HQJ4F/f/gb4VQ==";
};
};
"event-pubsub-4.3.0" = {
@@ -22300,6 +22588,15 @@ let
sha512 = "t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ==";
};
};
+ "eventemitter2-6.4.4" = {
+ name = "eventemitter2";
+ packageName = "eventemitter2";
+ version = "6.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz";
+ sha512 = "HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==";
+ };
+ };
"eventemitter3-1.2.0" = {
name = "eventemitter3";
packageName = "eventemitter3";
@@ -22363,13 +22660,13 @@ let
sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==";
};
};
- "events-3.2.0" = {
+ "events-3.3.0" = {
name = "events";
packageName = "events";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
- sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+ url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz";
+ sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==";
};
};
"events-listener-1.1.0" = {
@@ -22669,13 +22966,13 @@ let
sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
};
};
- "expo-pwa-0.0.64" = {
+ "expo-pwa-0.0.66" = {
name = "expo-pwa";
packageName = "expo-pwa";
- version = "0.0.64";
+ version = "0.0.66";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.64.tgz";
- sha512 = "pMZ1UP5ionvJYw5ny602Av8KKhLHiv3W0rWUTOU2LZpPe4GQn+saHJMh1dSNDBo9gQ/QZM3x//pFqnI8tFqE9A==";
+ url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.66.tgz";
+ sha512 = "9+Pv5qL/W3PnInyXTYhCQ6ukzo2IFzQEJDss9b6frNvxBJzAJWR7F7dsvIaCOr5WrtMBStf4SVdWvGTdssi+XA==";
};
};
"express-2.5.11" = {
@@ -22768,13 +23065,13 @@ let
sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ==";
};
};
- "express-openapi-7.3.0" = {
+ "express-openapi-7.5.0" = {
name = "express-openapi";
packageName = "express-openapi";
- version = "7.3.0";
+ version = "7.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.3.0.tgz";
- sha512 = "SENL0+eC1P2NMXAZJr/xGTGlWw62pUbD49EkRKrVdCZO4M3dNLEfvPsdkDhvJvzL8YiFjrQ2C3hF77/RhVgC4w==";
+ url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.5.0.tgz";
+ sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ==";
};
};
"express-session-1.17.1" = {
@@ -23326,13 +23623,13 @@ let
sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw==";
};
};
- "fastq-1.10.1" = {
+ "fastq-1.11.0" = {
name = "fastq";
packageName = "fastq";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz";
- sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==";
+ url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz";
+ sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==";
};
};
"fault-1.0.4" = {
@@ -23704,6 +24001,15 @@ let
sha512 = "KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg==";
};
};
+ "filenamify-4.2.0" = {
+ name = "filenamify";
+ packageName = "filenamify";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/filenamify/-/filenamify-4.2.0.tgz";
+ sha512 = "pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==";
+ };
+ };
"filesize-3.6.1" = {
name = "filesize";
packageName = "filesize";
@@ -23884,15 +24190,6 @@ let
sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c";
};
};
- "find-yarn-workspace-root-1.2.1" = {
- name = "find-yarn-workspace-root";
- packageName = "find-yarn-workspace-root";
- version = "1.2.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz";
- sha512 = "dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==";
- };
- };
"find-yarn-workspace-root-2.0.0" = {
name = "find-yarn-workspace-root";
packageName = "find-yarn-workspace-root";
@@ -24127,6 +24424,15 @@ let
sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==";
};
};
+ "flora-colossus-1.0.1" = {
+ name = "flora-colossus";
+ packageName = "flora-colossus";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz";
+ sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==";
+ };
+ };
"flow-bin-0.118.0" = {
name = "flow-bin";
packageName = "flow-bin";
@@ -24136,13 +24442,13 @@ let
sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
};
};
- "flow-parser-0.145.0" = {
+ "flow-parser-0.146.0" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.145.0";
+ version = "0.146.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.145.0.tgz";
- sha512 = "dqpYiE0rZopmex5FR6pi/HTia8i+q/euc9WUWH6fTLt6sQgXjnAcsOwgMMLHCxwCSqPrvi/XFmBiicKitLNrKA==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.146.0.tgz";
+ sha512 = "lMaDIdcEsdtKL0B+VFp8et/AjnB+cU1HJ6KDrp4Lw3Gsq0Ck0cmWRDgWfUQxxDvY99ntQyA/IdyFxFK4izKo4g==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -24307,13 +24613,13 @@ let
sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q==";
};
};
- "follow-redirects-1.13.2" = {
+ "follow-redirects-1.13.3" = {
name = "follow-redirects";
packageName = "follow-redirects";
- version = "1.13.2";
+ version = "1.13.3";
src = fetchurl {
- url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz";
- sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==";
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz";
+ sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==";
};
};
"font-awesome-filetypes-2.1.0" = {
@@ -25081,6 +25387,15 @@ let
sha512 = "Ces2bm+LNuXehkvmN1/Z+oEDkI/jHBp9xdyBtBy7hcgvF18/pv/D8F6A6kQgNkMZsnBgLEv+VvdDxyqkfkYycw==";
};
};
+ "galactus-0.2.1" = {
+ name = "galactus";
+ packageName = "galactus";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz";
+ sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9";
+ };
+ };
"gauge-1.2.7" = {
name = "gauge";
packageName = "gauge";
@@ -25099,13 +25414,13 @@ let
sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
};
};
- "gaxios-4.1.0" = {
+ "gaxios-4.2.0" = {
name = "gaxios";
packageName = "gaxios";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gaxios/-/gaxios-4.1.0.tgz";
- sha512 = "vb0to8xzGnA2qcgywAjtshOKKVDf2eQhJoiL6fHhgW5tVN7wNk7egnYIO9zotfn3lQ3De1VPdf7V5/BWfCtCmg==";
+ url = "https://registry.npmjs.org/gaxios/-/gaxios-4.2.0.tgz";
+ sha512 = "Ms7fNifGv0XVU+6eIyL9LB7RVESeML9+cMvkwGS70xyD6w2Z80wl6RiqiJ9k1KFlJCUTQqFFc8tXmPQfSKUe8g==";
};
};
"gaze-1.1.3" = {
@@ -25189,15 +25504,6 @@ let
sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==";
};
};
- "genfun-5.0.0" = {
- name = "genfun";
- packageName = "genfun";
- version = "5.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz";
- sha512 = "KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==";
- };
- };
"gensync-1.0.0-beta.2" = {
name = "gensync";
packageName = "gensync";
@@ -25261,6 +25567,15 @@ let
sha1 = "ead774abee72e20409433a066366023dd6887a41";
};
};
+ "get-installed-path-2.1.1" = {
+ name = "get-installed-path";
+ packageName = "get-installed-path";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz";
+ sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA==";
+ };
+ };
"get-intrinsic-1.1.1" = {
name = "get-intrinsic";
packageName = "get-intrinsic";
@@ -25279,6 +25594,15 @@ let
sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==";
};
};
+ "get-package-info-1.0.0" = {
+ name = "get-package-info";
+ packageName = "get-package-info";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz";
+ sha1 = "6432796563e28113cd9474dbbd00052985a4999c";
+ };
+ };
"get-package-type-0.1.0" = {
name = "get-package-type";
packageName = "get-package-type";
@@ -25306,15 +25630,6 @@ let
sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc";
};
};
- "get-port-4.2.0" = {
- name = "get-port";
- packageName = "get-port";
- version = "4.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz";
- sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==";
- };
- };
"get-port-5.1.1" = {
name = "get-port";
packageName = "get-port";
@@ -25576,13 +25891,13 @@ let
sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA==";
};
};
- "git-raw-commits-2.0.0" = {
+ "git-raw-commits-2.0.10" = {
name = "git-raw-commits";
packageName = "git-raw-commits";
- version = "2.0.0";
+ version = "2.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz";
- sha512 = "w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==";
+ url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.10.tgz";
+ sha512 = "sHhX5lsbG9SOO6yXdlwgEMQ/ljIn7qMpAbJZCGfXX2fq5T8M5SrDnpYk9/4HswTildcIqatsWa91vty6VhWSaQ==";
};
};
"git-remote-origin-url-2.0.0" = {
@@ -25621,13 +25936,13 @@ let
sha512 = "qZWv4D3GBm9sHEq5Jvc2rGuwQbz52mJoNAhe/zZS+rlwft7n8BGAG0QCgXt6m+jxn82IwlpOT3UXY81LkFJufA==";
};
};
- "git-semver-tags-2.0.3" = {
+ "git-semver-tags-4.1.1" = {
name = "git-semver-tags";
packageName = "git-semver-tags";
- version = "2.0.3";
+ version = "4.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz";
- sha512 = "tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==";
+ url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz";
+ sha512 = "OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==";
};
};
"git-sha1-0.1.2" = {
@@ -25846,13 +26161,13 @@ let
sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
};
};
- "glob-parent-5.1.1" = {
+ "glob-parent-5.1.2" = {
name = "glob-parent";
packageName = "glob-parent";
- version = "5.1.1";
+ version = "5.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
- sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz";
+ sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==";
};
};
"glob-slash-1.0.0" = {
@@ -26072,13 +26387,13 @@ let
sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
};
};
- "globalthis-1.0.1" = {
+ "globalthis-1.0.2" = {
name = "globalthis";
packageName = "globalthis";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz";
- sha512 = "mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==";
+ url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz";
+ sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==";
};
};
"globalyzer-0.1.4" = {
@@ -26324,13 +26639,13 @@ let
sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww==";
};
};
- "got-11.8.1" = {
+ "got-11.8.2" = {
name = "got";
packageName = "got";
- version = "11.8.1";
+ version = "11.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/got/-/got-11.8.1.tgz";
- sha512 = "9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q==";
+ url = "https://registry.npmjs.org/got/-/got-11.8.2.tgz";
+ sha512 = "D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==";
};
};
"got-3.3.1" = {
@@ -26522,13 +26837,13 @@ let
sha512 = "xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg==";
};
};
- "graphql-subscriptions-1.2.0" = {
+ "graphql-subscriptions-1.2.1" = {
name = "graphql-subscriptions";
packageName = "graphql-subscriptions";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.0.tgz";
- sha512 = "uXvp729fztqwa7HFUFaAqKwNMwwOfsvu4HwOu7/35Cd44bNrMPCn97mNGN0ybuuZE36CPXBTaW/4U/xyOS4D9w==";
+ url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz";
+ sha512 = "95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==";
};
};
"graphql-tag-2.11.0" = {
@@ -26909,6 +27224,15 @@ let
sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
};
};
+ "has-bigints-1.0.1" = {
+ name = "has-bigints";
+ packageName = "has-bigints";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz";
+ sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==";
+ };
+ };
"has-binary-data-0.1.1" = {
name = "has-binary-data";
packageName = "has-binary-data";
@@ -27035,13 +27359,13 @@ let
sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
};
};
- "has-symbols-1.0.1" = {
+ "has-symbols-1.0.2" = {
name = "has-symbols";
packageName = "has-symbols";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
- sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
+ sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
};
};
"has-to-string-tag-x-1.4.1" = {
@@ -27332,6 +27656,15 @@ let
sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
};
};
+ "hcl-to-json-0.1.1" = {
+ name = "hcl-to-json";
+ packageName = "hcl-to-json";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hcl-to-json/-/hcl-to-json-0.1.1.tgz";
+ sha512 = "sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A==";
+ };
+ };
"he-0.5.0" = {
name = "he";
packageName = "he";
@@ -27818,13 +28151,13 @@ let
sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==";
};
};
- "htmlparser2-6.0.0" = {
+ "htmlparser2-6.0.1" = {
name = "htmlparser2";
packageName = "htmlparser2";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz";
- sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==";
+ url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz";
+ sha512 = "GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==";
};
};
"http-auth-2.0.7" = {
@@ -28062,13 +28395,13 @@ let
sha512 = "nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA==";
};
};
- "http2-wrapper-1.0.0-beta.5.2" = {
+ "http2-wrapper-1.0.3" = {
name = "http2-wrapper";
packageName = "http2-wrapper";
- version = "1.0.0-beta.5.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz";
- sha512 = "xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==";
+ url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz";
+ sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==";
};
};
"http_ece-1.1.0" = {
@@ -28332,6 +28665,15 @@ let
sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==";
};
};
+ "icss-utils-5.1.0" = {
+ name = "icss-utils";
+ packageName = "icss-utils";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz";
+ sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==";
+ };
+ };
"idb-kv-store-4.5.0" = {
name = "idb-kv-store";
packageName = "idb-kv-store";
@@ -28341,15 +28683,6 @@ let
sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA==";
};
};
- "idx-2.4.0" = {
- name = "idx";
- packageName = "idx";
- version = "2.4.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/idx/-/idx-2.4.0.tgz";
- sha512 = "FnV6fXF1/cXvam/OXAz98v3GbhQVws+ecMEVLxyQ1aXgK2nooTkTDqex5Lks84wiCsS1So6QtwwCYT6H+vIKkw==";
- };
- };
"ieee754-1.1.13" = {
name = "ieee754";
packageName = "ieee754";
@@ -28503,13 +28836,13 @@ let
sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==";
};
};
- "immer-7.0.9" = {
+ "immer-8.0.1" = {
name = "immer";
packageName = "immer";
- version = "7.0.9";
+ version = "8.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz";
- sha512 = "Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==";
+ url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz";
+ sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==";
};
};
"import-cwd-3.0.0" = {
@@ -28800,6 +29133,15 @@ let
sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==";
};
};
+ "init-package-json-2.0.2" = {
+ name = "init-package-json";
+ packageName = "init-package-json";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.2.tgz";
+ sha512 = "PO64kVeArePvhX7Ff0jVWkpnE1DfGRvaWcStYrPugcJz9twQGYibagKJuIMHCX7ENcp0M6LJlcjLBuLD5KeJMg==";
+ };
+ };
"ink-2.7.1" = {
name = "ink";
packageName = "ink";
@@ -29592,6 +29934,15 @@ let
sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
};
};
+ "is-ci-3.0.0" = {
+ name = "is-ci";
+ packageName = "is-ci";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz";
+ sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==";
+ };
+ };
"is-color-stop-1.1.0" = {
name = "is-color-stop";
packageName = "is-color-stop";
@@ -30195,13 +30546,13 @@ let
sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
};
};
- "is-path-inside-3.0.2" = {
+ "is-path-inside-3.0.3" = {
name = "is-path-inside";
packageName = "is-path-inside";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz";
- sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==";
+ url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz";
+ sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==";
};
};
"is-plain-obj-1.1.0" = {
@@ -30654,13 +31005,13 @@ let
sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==";
};
};
- "is-what-3.13.0" = {
+ "is-what-3.14.1" = {
name = "is-what";
packageName = "is-what";
- version = "3.13.0";
+ version = "3.14.1";
src = fetchurl {
- url = "https://registry.npmjs.org/is-what/-/is-what-3.13.0.tgz";
- sha512 = "qYTOcdAo0H0tvMTl9ZhsjpEZH5Q07JDVrPnFMAQgBM0UctGqVsKE7LgZPNZEFPw1EhUkpaBL/BKnRgVX7CoMTw==";
+ url = "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz";
+ sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==";
};
};
"is-whitespace-character-1.0.4" = {
@@ -30780,6 +31131,15 @@ let
sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
};
};
+ "isbinaryfile-3.0.3" = {
+ name = "isbinaryfile";
+ packageName = "isbinaryfile";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz";
+ sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==";
+ };
+ };
"isbinaryfile-4.0.6" = {
name = "isbinaryfile";
packageName = "isbinaryfile";
@@ -31149,13 +31509,13 @@ let
sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw==";
};
};
- "jitdb-2.3.1" = {
+ "jitdb-2.3.3" = {
name = "jitdb";
packageName = "jitdb";
- version = "2.3.1";
+ version = "2.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.1.tgz";
- sha512 = "ICaXDJFRvdXrA62m+ei41uH8a88PHZgp3t8C6V7EcsrFawiLHzrYqv+ianQss43TJOf9zgmnxjpZFeH0vK2ErA==";
+ url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.3.tgz";
+ sha512 = "wSB+iNzPm/Qcp1lKg8olKL0zeZdAhDVXLpWLKLWtqWN/vpHeu7vKmYxClsxhmV4YhZ/Hjzzi0oXBY8hVqKHQTA==";
};
};
"jju-1.4.0" = {
@@ -31257,6 +31617,15 @@ let
sha512 = "XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==";
};
};
+ "jquery-3.6.0" = {
+ name = "jquery";
+ packageName = "jquery";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz";
+ sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==";
+ };
+ };
"jquery-ui-1.12.1" = {
name = "jquery-ui";
packageName = "jquery-ui";
@@ -31500,13 +31869,13 @@ let
sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==";
};
};
- "jsdom-16.4.0" = {
+ "jsdom-16.5.0" = {
name = "jsdom";
packageName = "jsdom";
- version = "16.4.0";
+ version = "16.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz";
- sha512 = "lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==";
+ url = "https://registry.npmjs.org/jsdom/-/jsdom-16.5.0.tgz";
+ sha512 = "QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==";
};
};
"jsdom-7.2.2" = {
@@ -31545,49 +31914,49 @@ let
sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==";
};
};
- "jsii-1.21.0" = {
+ "jsii-1.24.0" = {
name = "jsii";
packageName = "jsii";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii/-/jsii-1.21.0.tgz";
- sha512 = "6siaRt1OyrQxC9pzLaFGj6bDkHMTsofcu8ODM0NCcukq2P4PlF1O39H0DV8Z40QF3KWbawJ/Utl7GtaSrdG2Ww==";
+ url = "https://registry.npmjs.org/jsii/-/jsii-1.24.0.tgz";
+ sha512 = "ROCFFFdbs2o8OgQEWvpMY/UMXshndkGr8TunG0NQx8kQfONYeCjgNFqMcbcyXuhlR+DI1MUGVVOzw6zc9geyGA==";
};
};
- "jsii-pacmak-1.21.0" = {
+ "jsii-pacmak-1.24.0" = {
name = "jsii-pacmak";
packageName = "jsii-pacmak";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.21.0.tgz";
- sha512 = "04/fIZqM31cfTf48v7ni7MGeAwBEREP1WhvGkf4TSAZmAdMx1FUWQxuKiDK1/YeEvIUhNHIy/Ng9GcoSf+Rwfg==";
+ url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.24.0.tgz";
+ sha512 = "8L5AOOy2LU3Y8tLy+KBTdmtxfu+Kn6g54htj+d1g3dVCxApC/G83C1DudhkYCxM3gDavsLPHhG6+fyopdTVV5A==";
};
};
- "jsii-reflect-1.21.0" = {
+ "jsii-reflect-1.24.0" = {
name = "jsii-reflect";
packageName = "jsii-reflect";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.21.0.tgz";
- sha512 = "OwXhVhe+NRv/e6jaGBdIpm3S1KQcEXTZN+USiBd+c4kROLqxw+ubpMBsEVSKEZ7t+4WksLTWWNot31VZkJrZ5g==";
+ url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.24.0.tgz";
+ sha512 = "LWWReRtLhmyUMRD5NOFDV+HJHP/ChHRa6alccSPU9vTL5tm9HtMW0oO2XaVj4a2YPujvQ+sH7APzndj60Qgzqw==";
};
};
- "jsii-rosetta-1.21.0" = {
+ "jsii-rosetta-1.24.0" = {
name = "jsii-rosetta";
packageName = "jsii-rosetta";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.21.0.tgz";
- sha512 = "8W0vcWTr28q+1NWhVAY4lOwOlPHdGdg8b/gPHFccRi9ZM4uwRjW7YjmqD9FmX74dEg1Qmvd8nujW4Opow6PFtQ==";
+ url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.24.0.tgz";
+ sha512 = "BMYxIjYG62wctUZFjYc5xKPNTgzTRRw2Fp8R9p4o0VeFE224ntyHgy9y7oKuCu+K1ev917NRoCLj7f2tyGTMAg==";
};
};
- "jsii-srcmak-0.1.222" = {
+ "jsii-srcmak-0.1.252" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.222";
+ version = "0.1.252";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.222.tgz";
- sha512 = "OLeezlo5ag/GoW+7YmiYVfE8zItDmV+rFcovlfYQCjCnksg6nX/e0t1mXOeLmCSetUNnu0DNrzwuqiO4hhgODQ==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.252.tgz";
+ sha512 = "nRQ2JdGUgAi5YXkxQwJ4lM3K4oTeGzVTIT+4nQ6FBLC0/eHQrJYbqNbX27xb/JzqidVzv7y7C0ykZGiBDByKSQ==";
};
};
"json-bigint-0.2.3" = {
@@ -31842,13 +32211,13 @@ let
sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
};
};
- "json-stringify-pretty-compact-2.0.0" = {
+ "json-stringify-pretty-compact-3.0.0" = {
name = "json-stringify-pretty-compact";
packageName = "json-stringify-pretty-compact";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz";
- sha512 = "WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==";
+ url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz";
+ sha512 = "Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==";
};
};
"json-stringify-safe-5.0.1" = {
@@ -33103,6 +33472,15 @@ let
sha512 = "IR5ASkAU4NHTN1JFeP9bYvhARhaBg8VD8yUcmvNIvFWg6L3dsM2yK1A9EM6MpPvWYKH9SEiljB59ZUa5s2pYnA==";
};
};
+ "libnpmaccess-4.0.1" = {
+ name = "libnpmaccess";
+ packageName = "libnpmaccess";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.1.tgz";
+ sha512 = "ZiAgvfUbvmkHoMTzdwmNWCrQRsDkOC+aM5BDfO0C9aOSwF3R1LdFDBD+Rer1KWtsoQYO35nXgmMR7OUHpDRxyA==";
+ };
+ };
"libnpmconfig-1.2.1" = {
name = "libnpmconfig";
packageName = "libnpmconfig";
@@ -33112,6 +33490,15 @@ let
sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==";
};
};
+ "libnpmpublish-4.0.0" = {
+ name = "libnpmpublish";
+ packageName = "libnpmpublish";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.0.tgz";
+ sha512 = "2RwYXRfZAB1x/9udKpZmqEzSqNd7ouBRU52jyG14/xG8EF+O9A62d7/XVR3iABEQHf1iYhkm0Oq9iXjrL3tsXA==";
+ };
+ };
"libsodium-0.7.9" = {
name = "libsodium";
packageName = "libsodium";
@@ -33319,6 +33706,15 @@ let
sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
};
};
+ "load-json-file-2.0.0" = {
+ name = "load-json-file";
+ packageName = "load-json-file";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+ sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+ };
+ };
"load-json-file-4.0.0" = {
name = "load-json-file";
packageName = "load-json-file";
@@ -33337,6 +33733,15 @@ let
sha512 = "cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==";
};
};
+ "load-json-file-6.2.0" = {
+ name = "load-json-file";
+ packageName = "load-json-file";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz";
+ sha512 = "gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==";
+ };
+ };
"load-plugin-2.3.1" = {
name = "load-plugin";
packageName = "load-plugin";
@@ -33931,6 +34336,15 @@ let
sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
};
};
+ "lodash.chunk-4.2.0" = {
+ name = "lodash.chunk";
+ packageName = "lodash.chunk";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz";
+ sha1 = "66e5ce1f76ed27b4303d8c6512e8d1216e8106bc";
+ };
+ };
"lodash.clone-4.5.0" = {
name = "lodash.clone";
packageName = "lodash.clone";
@@ -35272,6 +35686,15 @@ let
sha1 = "79e6674530da4183e87953bd686171e070da50b9";
};
};
+ "lzma-native-6.0.1" = {
+ name = "lzma-native";
+ packageName = "lzma-native";
+ version = "6.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lzma-native/-/lzma-native-6.0.1.tgz";
+ sha512 = "O6oWF0xe1AFvOCjU8uOZBZ/lhjaMNwHfVNaqVMqmoQXlRwBcFWpCAToiZOdXcKVMdo/5s/D0a2QgA5laMErxHQ==";
+ };
+ };
"machine-10.4.0" = {
name = "machine";
packageName = "machine";
@@ -35425,15 +35848,6 @@ let
sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
};
};
- "make-fetch-happen-5.0.2" = {
- name = "make-fetch-happen";
- packageName = "make-fetch-happen";
- version = "5.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz";
- sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==";
- };
- };
"make-fetch-happen-8.0.14" = {
name = "make-fetch-happen";
packageName = "make-fetch-happen";
@@ -35848,13 +36262,13 @@ let
sha512 = "+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A==";
};
};
- "marked-terminal-4.1.0" = {
+ "marked-terminal-4.1.1" = {
name = "marked-terminal";
packageName = "marked-terminal";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz";
- sha512 = "5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ==";
+ url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.1.tgz";
+ sha512 = "t7Mdf6T3PvOEyN01c3tYxDzhyKZ8xnkp8Rs6Fohno63L/0pFTJ5Qtwto2AQVuDtbQiWzD+4E5AAu1Z2iLc8miQ==";
};
};
"marky-1.2.1" = {
@@ -36388,6 +36802,15 @@ let
sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ==";
};
};
+ "memorystore-1.6.5" = {
+ name = "memorystore";
+ packageName = "memorystore";
+ version = "1.6.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.5.tgz";
+ sha512 = "2RD1kTZhF0nywVtps2NoQgbMiPO6o1+dIRUAi2cRQDxMyCKwOZdBrC/Lk9/ttlF6lHn3T6uCPwSbgWxEef9djQ==";
+ };
+ };
"memorystream-0.3.1" = {
name = "memorystream";
packageName = "memorystream";
@@ -36622,49 +37045,49 @@ let
sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
};
};
- "metro-babel-transformer-0.58.0" = {
+ "metro-babel-transformer-0.59.0" = {
name = "metro-babel-transformer";
packageName = "metro-babel-transformer";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.58.0.tgz";
- sha512 = "yBX3BkRhw2TCNPhe+pmLSgsAEA3huMvnX08UwjFqSXXI1aiqzRQobn92uKd1U5MM1Vx8EtXVomlJb95ZHNAv6A==";
+ url = "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.59.0.tgz";
+ sha512 = "fdZJl8rs54GVFXokxRdD7ZrQ1TJjxWzOi/xSP25VR3E8tbm3nBZqS+/ylu643qSr/IueABR+jrlqAyACwGEf6w==";
};
};
- "metro-react-native-babel-preset-0.58.0" = {
+ "metro-react-native-babel-preset-0.59.0" = {
name = "metro-react-native-babel-preset";
packageName = "metro-react-native-babel-preset";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.58.0.tgz";
- sha512 = "MRriNW+fF6jxABsgPphocUY6mIhmCm8idcrQZ58fT3Iti2vCdtkaK32TyCGUNUptzhUe2/cbE57j4aC+eaodAA==";
+ url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.59.0.tgz";
+ sha512 = "BoO6ncPfceIDReIH8pQ5tQptcGo5yRWQXJGVXfANbiKLq4tfgdZB1C1e2rMUJ6iypmeJU9dzl+EhPmIFKtgREg==";
};
};
- "metro-react-native-babel-transformer-0.58.0" = {
+ "metro-react-native-babel-transformer-0.59.0" = {
name = "metro-react-native-babel-transformer";
packageName = "metro-react-native-babel-transformer";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.58.0.tgz";
- sha512 = "3A73+cRq1eUPQ8g+hPNGgMUMCGmtQjwqHfoG1DwinAoJ/kr4WOXWWbGZo0xHJNBe/zdHGl0uHcDCp2knPglTdQ==";
+ url = "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.59.0.tgz";
+ sha512 = "1O3wrnMq4NcPQ1asEcl9lRDn/t+F1Oef6S9WaYVIKEhg9m/EQRGVrrTVP+R6B5Eeaj3+zNKbzM8Dx/NWy1hUbQ==";
};
};
- "metro-source-map-0.58.0" = {
+ "metro-source-map-0.59.0" = {
name = "metro-source-map";
packageName = "metro-source-map";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.58.0.tgz";
- sha512 = "yvN1YPmejmgiiS7T1aKBiiUTHPw2Vcm3r2TZ+DY92z/9PR4alysIywrCs/fTHs8rbDcKM5VfPCKGLpkBrbKeOw==";
+ url = "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.59.0.tgz";
+ sha512 = "0w5CmCM+ybSqXIjqU4RiK40t4bvANL6lafabQ2GP2XD3vSwkLY+StWzCtsb4mPuyi9R/SgoLBel+ZOXHXAH0eQ==";
};
};
- "metro-symbolicate-0.58.0" = {
+ "metro-symbolicate-0.59.0" = {
name = "metro-symbolicate";
packageName = "metro-symbolicate";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.58.0.tgz";
- sha512 = "uIVxUQC1E26qOMj13dKROhwAa2FmZk5eR0NcBqej/aXmQhpr8LjJg2sondkoLKUp827Tf/Fm9+pS4icb5XiqCw==";
+ url = "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.59.0.tgz";
+ sha512 = "asLaF2A7rndrToGFIknL13aiohwPJ95RKHf0NM3hP/nipiLDoMzXT6ZnQvBqDxkUKyP+51AI75DMtb+Wcyw4Bw==";
};
};
"micro-api-client-3.3.0" = {
@@ -37342,13 +37765,13 @@ let
sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==";
};
};
- "mkdirp-promise-5.0.1" = {
- name = "mkdirp-promise";
- packageName = "mkdirp-promise";
- version = "5.0.1";
+ "mkdirp-infer-owner-2.0.0" = {
+ name = "mkdirp-infer-owner";
+ packageName = "mkdirp-infer-owner";
+ version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz";
- sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1";
+ url = "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz";
+ sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==";
};
};
"mkpath-1.0.0" = {
@@ -37360,13 +37783,13 @@ let
sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d";
};
};
- "mobx-6.1.7" = {
+ "mobx-6.1.8" = {
name = "mobx";
packageName = "mobx";
- version = "6.1.7";
+ version = "6.1.8";
src = fetchurl {
- url = "https://registry.npmjs.org/mobx/-/mobx-6.1.7.tgz";
- sha512 = "2iIgg2o0jd/bWAK/9KHJ1uwKHGowKyaTUM4qarJ0qGdLskYcB3sJevjjV7t7jW0WVjItz6BBlPNiZ14oHTpvMg==";
+ url = "https://registry.npmjs.org/mobx/-/mobx-6.1.8.tgz";
+ sha512 = "U4yCvUeh6yKXRwFxm2lyJjXPVekOEar/R8ZKWAXem/3fthJqYflViawfjDAUh7lZEvbKqljC3NT/pSaUKpE+gg==";
};
};
"mobx-react-7.1.0" = {
@@ -37405,13 +37828,13 @@ let
sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==";
};
};
- "mocha-8.3.0" = {
+ "mocha-8.3.1" = {
name = "mocha";
packageName = "mocha";
- version = "8.3.0";
+ version = "8.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz";
- sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz";
+ sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ==";
};
};
"mock-require-3.0.3" = {
@@ -37621,13 +38044,13 @@ let
sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA==";
};
};
- "mp4-stream-3.1.2" = {
+ "mp4-stream-3.1.3" = {
name = "mp4-stream";
packageName = "mp4-stream";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.2.tgz";
- sha512 = "AviUjTA6aER9DFVFPNYd4KrEKfhw2Pi8OKBY46r39ORmyX8qfaYx6XBIUGFCl67gX4+Giv2FLF+Gh6P3g81xrQ==";
+ url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.3.tgz";
+ sha512 = "DUT8f0x2jHbZjNMdqe9h6lZdt6RENWTTdGn8z3TXa4uEsoltuNY9lCCij84mdm0q7xcV0E2W25WRxlKBMo4hSw==";
};
};
"mpath-0.5.2" = {
@@ -37648,13 +38071,13 @@ let
sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q==";
};
};
- "mqtt-packet-6.8.1" = {
+ "mqtt-packet-6.9.0" = {
name = "mqtt-packet";
packageName = "mqtt-packet";
- version = "6.8.1";
+ version = "6.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.8.1.tgz";
- sha512 = "XM+QN6/pNVvoTSAiaOCuOSy8AVau6/8LVdLyMhvv2wJqzJjp8IL/h4R+wTcfm+CV+HhL6i826pHqDTCCKyBdyA==";
+ url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.9.0.tgz";
+ sha512 = "cngFSAXWSl5XHKJYUQiYQjtp75zhf1vygY00NnJdhQoXOH2v3aizmaaMIHI5n1N/TJEHSAbHryQhFr3gJ9VNvA==";
};
};
"mri-1.1.6" = {
@@ -37846,15 +38269,6 @@ let
sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b";
};
};
- "multimatch-3.0.0" = {
- name = "multimatch";
- packageName = "multimatch";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz";
- sha512 = "22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==";
- };
- };
"multimatch-4.0.0" = {
name = "multimatch";
packageName = "multimatch";
@@ -37864,6 +38278,15 @@ let
sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==";
};
};
+ "multimatch-5.0.0" = {
+ name = "multimatch";
+ packageName = "multimatch";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz";
+ sha512 = "ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==";
+ };
+ };
"multiparty-2.2.0" = {
name = "multiparty";
packageName = "multiparty";
@@ -38494,15 +38917,6 @@ let
sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
};
};
- "needle-2.5.0" = {
- name = "needle";
- packageName = "needle";
- version = "2.5.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz";
- sha512 = "o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==";
- };
- };
"needle-2.6.0" = {
name = "needle";
packageName = "needle";
@@ -38594,13 +39008,13 @@ let
sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==";
};
};
- "netlify-6.1.9" = {
+ "netlify-6.1.13" = {
name = "netlify";
packageName = "netlify";
- version = "6.1.9";
+ version = "6.1.13";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify/-/netlify-6.1.9.tgz";
- sha512 = "+t/yyPusR0/bwB/IQPT5mcwe3erlS+x8rBy006f1Gu2WsbUHpI20/Qyz0h3SJ4m7sSqeDVTVidFqQjbxMLKb0w==";
+ url = "https://registry.npmjs.org/netlify/-/netlify-6.1.13.tgz";
+ sha512 = "B6NYBc7qXqtTyUIcWhA5hLi3TkV7AGwkyVJ7RGosZoqZuHOfilb+USplb9kEIX/bVRKG2Z07x6Efd+SvcKk01g==";
};
};
"netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = {
@@ -38612,13 +39026,13 @@ let
sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA==";
};
};
- "netlify-redirect-parser-3.0.3" = {
+ "netlify-redirect-parser-3.0.4" = {
name = "netlify-redirect-parser";
packageName = "netlify-redirect-parser";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.3.tgz";
- sha512 = "Enafs4wGjLXry4SREr0Rhc6A3k7hLhlJA/+M/jYzoDza9aK+xTV6Y0rHmWFW1ffUe2fN8kyrtxW++Fdipxffbw==";
+ url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.4.tgz";
+ sha512 = "l5OJ3EBh9twiBbsHdAmufoAnkS5FRDbY67p3Q0ukDD94ZSC2esXiN3kZd5lMuHqcpOBJlmjrG/xSCWBjVTbe/g==";
};
};
"netlify-redirector-0.2.1" = {
@@ -38819,13 +39233,13 @@ let
sha512 = "F5RA5GyDsJ9dYx2nFwzzy371BbFTBInQ/gO6arT+ngrI+1sDP5cSZxkWsVLgRoLMln4rs3xXBLjD2sLa7TnV1g==";
};
};
- "node-abi-2.19.3" = {
+ "node-abi-2.21.0" = {
name = "node-abi";
packageName = "node-abi";
- version = "2.19.3";
+ version = "2.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz";
- sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==";
+ url = "https://registry.npmjs.org/node-abi/-/node-abi-2.21.0.tgz";
+ sha512 = "smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg==";
};
};
"node-addon-api-1.7.2" = {
@@ -38973,15 +39387,6 @@ let
sha512 = "ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==";
};
};
- "node-fetch-npm-2.0.4" = {
- name = "node-fetch-npm";
- packageName = "node-fetch-npm";
- version = "2.0.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz";
- sha512 = "iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==";
- };
- };
"node-forge-0.10.0" = {
name = "node-forge";
packageName = "node-forge";
@@ -39090,13 +39495,13 @@ let
sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
};
};
- "node-ipc-9.1.3" = {
+ "node-ipc-9.1.4" = {
name = "node-ipc";
packageName = "node-ipc";
- version = "9.1.3";
+ version = "9.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.3.tgz";
- sha512 = "8RS4RZyS/KMKKYG8mrje+cLxwATe9dBCuOiqKFSWND4oOuKytfuKCiR9yinvhoXF/nGdX/WnbywaUee+9U87zA==";
+ url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.4.tgz";
+ sha512 = "A+f0mn2KxUt1uRTSd5ktxQUsn2OEhj5evo7NUi/powBzMSZ0vocdzDjlq9QN2v3LH6CJi3e5xAenpZ1QwU5A8g==";
};
};
"node-libs-browser-2.2.1" = {
@@ -39189,6 +39594,15 @@ let
sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
};
};
+ "node-pre-gyp-0.15.0" = {
+ name = "node-pre-gyp";
+ packageName = "node-pre-gyp";
+ version = "0.15.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz";
+ sha512 = "7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==";
+ };
+ };
"node-pre-gyp-0.6.39" = {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
@@ -39234,13 +39648,13 @@ let
sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
};
};
- "node-releases-1.1.70" = {
+ "node-releases-1.1.71" = {
name = "node-releases";
packageName = "node-releases";
- version = "1.1.70";
+ version = "1.1.71";
src = fetchurl {
- url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz";
- sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==";
+ url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz";
+ sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==";
};
};
"node-source-walk-4.2.0" = {
@@ -39684,15 +40098,6 @@ let
sha512 = "Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw==";
};
};
- "npm-pick-manifest-3.0.2" = {
- name = "npm-pick-manifest";
- packageName = "npm-pick-manifest";
- version = "3.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz";
- sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==";
- };
- };
"npm-pick-manifest-6.1.0" = {
name = "npm-pick-manifest";
packageName = "npm-pick-manifest";
@@ -39828,6 +40233,15 @@ let
sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==";
};
};
+ "nugget-2.0.1" = {
+ name = "nugget";
+ packageName = "nugget";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz";
+ sha1 = "201095a487e1ad36081b3432fa3cada4f8d071b0";
+ };
+ };
"num-sort-2.1.0" = {
name = "num-sort";
packageName = "num-sort";
@@ -40000,13 +40414,13 @@ let
sha1 = "793cef251d45ebdeac32ae40a8b6814faab1d483";
};
};
- "ob1-0.58.0" = {
+ "ob1-0.59.0" = {
name = "ob1";
packageName = "ob1";
- version = "0.58.0";
+ version = "0.59.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ob1/-/ob1-0.58.0.tgz";
- sha512 = "uZP44cbowAfHafP1k4skpWItk5iHCoRevMfrnUvYCfyNNPPJd3rfDCyj0exklWi2gDXvjlj2ObsfiqP/bs/J7Q==";
+ url = "https://registry.npmjs.org/ob1/-/ob1-0.59.0.tgz";
+ sha512 = "opXMTxyWJ9m68ZglCxwo0OPRESIC/iGmKFPXEXzMZqsVIrgoRXOHmoMDkQzz4y3irVjbyPJRAh5pI9fd0MJTFQ==";
};
};
"object-assign-1.0.0" = {
@@ -40207,13 +40621,13 @@ let
sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==";
};
};
- "object.fromentries-2.0.3" = {
+ "object.fromentries-2.0.4" = {
name = "object.fromentries";
packageName = "object.fromentries";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz";
- sha512 = "IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==";
+ url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz";
+ sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==";
};
};
"object.getownpropertydescriptors-2.1.2" = {
@@ -40261,13 +40675,13 @@ let
sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad";
};
};
- "object.values-1.1.2" = {
+ "object.values-1.1.3" = {
name = "object.values";
packageName = "object.values";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz";
- sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==";
+ url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz";
+ sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==";
};
};
"objectorarray-1.0.4" = {
@@ -40333,13 +40747,13 @@ let
sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
};
};
- "office-ui-fabric-react-7.161.0" = {
+ "office-ui-fabric-react-7.162.1" = {
name = "office-ui-fabric-react";
packageName = "office-ui-fabric-react";
- version = "7.161.0";
+ version = "7.162.1";
src = fetchurl {
- url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.161.0.tgz";
- sha512 = "BH326SCR6KS8vEbL1hJXXBMlG+sOBFEVDetLltJNKluFYhzmwiOun76ea6dzl+CHBh/7yLCkWlmtPIx1fQu81Q==";
+ url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.162.1.tgz";
+ sha512 = "ZJrjJsvnpgNHXdi8uCBigkF436Bj2cLYC8XMngUBU6Ha+IefCgXUbsIQhlfeWpt++l/8/tAFmu8vUnVj+GlhCQ==";
};
};
"omggif-1.0.10" = {
@@ -40513,13 +40927,13 @@ let
sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
};
};
- "oo-ascii-tree-1.21.0" = {
+ "oo-ascii-tree-1.24.0" = {
name = "oo-ascii-tree";
packageName = "oo-ascii-tree";
- version = "1.21.0";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.21.0.tgz";
- sha512 = "N91VyM/R9K8axskaVYSg+IJiSDJVKFQ2IfQyBp5Rv7t2YETjJDMgA6Ew9MGv82fhpz95qKLlZmgrQsb7scb2Eg==";
+ url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.24.0.tgz";
+ sha512 = "rJYspYyrr2lDCDnybz4/70eml5cen98r4u2uw8sGodROePXiKKE+2Al8tfiS6uYx7vUEozEHCLoNQ/2jpxa7gw==";
};
};
"opal-runtime-1.0.11" = {
@@ -40630,13 +41044,13 @@ let
sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow==";
};
};
- "openapi-framework-7.3.0" = {
+ "openapi-framework-7.5.0" = {
name = "openapi-framework";
packageName = "openapi-framework";
- version = "7.3.0";
+ version = "7.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.3.0.tgz";
- sha512 = "I0KDyH9LNYNfMUGK+nmM+0S+E1hiqKAikEIogGaVmKcJSenHaZyfbjuw1BdotBuQyCKSpcYg5yUZOyLwHVlytg==";
+ url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.5.0.tgz";
+ sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ==";
};
};
"openapi-jsonschema-parameters-1.2.0" = {
@@ -40666,13 +41080,13 @@ let
sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ==";
};
};
- "openapi-request-coercer-7.2.3" = {
+ "openapi-request-coercer-7.5.0" = {
name = "openapi-request-coercer";
packageName = "openapi-request-coercer";
- version = "7.2.3";
+ version = "7.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.2.3.tgz";
- sha512 = "w+CcKjQ/UWgtA5lgrCh7t/D2FGaKyQRXgMk8aWuT/y2a/pvdZbXdmdABWdafXB6iVlBr9CKXYHJUDlBcoKH2yQ==";
+ url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.5.0.tgz";
+ sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw==";
};
};
"openapi-request-validator-4.2.0" = {
@@ -40684,13 +41098,13 @@ let
sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg==";
};
};
- "openapi-request-validator-7.3.0" = {
+ "openapi-request-validator-7.4.0" = {
name = "openapi-request-validator";
packageName = "openapi-request-validator";
- version = "7.3.0";
+ version = "7.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.3.0.tgz";
- sha512 = "Apyo0eiR1ya63vWxjAKuPBkqr953133o5BgBxXS0gFSfvbK9tmXCPwYOhvafPknkoJGaCKy5psRuBRWjUuVNSg==";
+ url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz";
+ sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw==";
};
};
"openapi-response-validator-4.0.0" = {
@@ -40702,13 +41116,13 @@ let
sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg==";
};
};
- "openapi-response-validator-7.2.3" = {
+ "openapi-response-validator-7.4.0" = {
name = "openapi-response-validator";
packageName = "openapi-response-validator";
- version = "7.2.3";
+ version = "7.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz";
- sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g==";
+ url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz";
+ sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q==";
};
};
"openapi-sampler-1.0.0-beta.18" = {
@@ -41062,15 +41476,6 @@ let
sha512 = "9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w==";
};
};
- "ora-5.2.0" = {
- name = "ora";
- packageName = "ora";
- version = "5.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ora/-/ora-5.2.0.tgz";
- sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ==";
- };
- };
"ora-5.3.0" = {
name = "ora";
packageName = "ora";
@@ -41215,22 +41620,22 @@ let
sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
};
};
- "ot-builder-1.0.2" = {
+ "ot-builder-1.0.3" = {
name = "ot-builder";
packageName = "ot-builder";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.2.tgz";
- sha512 = "LLb8H2Rbe/x4BgzoTOWuWH2cQm0hJKu6PXVQc7WHNQuRx1O82Rg+0GeXjV36cznOXM6IsA1VZgsuLz9oNb+15Q==";
+ url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.3.tgz";
+ sha512 = "ApuXJZmB30IAspJwojBh2VxQfLMMqu6fkQ7nrNmG+ubL6uvgqW7kZYIyCcaXU4utONLP6bDP988bNovQXVfNAQ==";
};
};
- "otb-ttc-bundle-1.0.2" = {
+ "otb-ttc-bundle-1.0.3" = {
name = "otb-ttc-bundle";
packageName = "otb-ttc-bundle";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.2.tgz";
- sha512 = "FK+d5iSrwQogNNNT+IPsk3wNmwOK6xunP4fytztaU3zZUK3YtaiuJjp4VeqF1+CpOaFr6MYlQHOTfhChT+ssSg==";
+ url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.3.tgz";
+ sha512 = "U2Eh0kXe8YzP/F8sNJvqnBi8Y57oG4xcAND0IsGGSm+q1Csn30V0k34rA3rKmelnM/oXT5J0EbZKIvlapPdfLw==";
};
};
"ow-0.21.0" = {
@@ -41485,13 +41890,13 @@ let
sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==";
};
};
- "p-map-series-1.0.0" = {
+ "p-map-series-2.1.0" = {
name = "p-map-series";
packageName = "p-map-series";
- version = "1.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz";
- sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca";
+ url = "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz";
+ sha512 = "RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==";
};
};
"p-memoize-4.0.1" = {
@@ -41503,22 +41908,13 @@ let
sha512 = "km0sP12uE0dOZ5qP+s7kGVf07QngxyG0gS8sYFvFWhqlgzOsSy+m71aUejf/0akxj5W7gE//2G74qTv6b4iMog==";
};
};
- "p-pipe-1.2.0" = {
+ "p-pipe-3.1.0" = {
name = "p-pipe";
packageName = "p-pipe";
- version = "1.2.0";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz";
- sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9";
- };
- };
- "p-queue-4.0.0" = {
- name = "p-queue";
- packageName = "p-queue";
- version = "4.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz";
- sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==";
+ url = "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz";
+ sha512 = "08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==";
};
};
"p-queue-6.6.2" = {
@@ -41530,15 +41926,6 @@ let
sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==";
};
};
- "p-reduce-1.0.0" = {
- name = "p-reduce";
- packageName = "p-reduce";
- version = "1.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz";
- sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
- };
- };
"p-reduce-2.1.0" = {
name = "p-reduce";
packageName = "p-reduce";
@@ -41647,13 +42034,13 @@ let
sha512 = "wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==";
};
};
- "p-waterfall-1.0.0" = {
+ "p-waterfall-2.1.1" = {
name = "p-waterfall";
packageName = "p-waterfall";
- version = "1.0.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/p-waterfall/-/p-waterfall-1.0.0.tgz";
- sha1 = "7ed94b3ceb3332782353af6aae11aa9fc235bb00";
+ url = "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz";
+ sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==";
};
};
"pac-proxy-agent-3.0.1" = {
@@ -41908,6 +42295,15 @@ let
sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==";
};
};
+ "parse-author-2.0.0" = {
+ name = "parse-author";
+ packageName = "parse-author";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz";
+ sha1 = "d3460bf1ddd0dfaeed42da754242e65fb684a81f";
+ };
+ };
"parse-bmfont-ascii-1.0.6" = {
name = "parse-bmfont-ascii";
packageName = "parse-bmfont-ascii";
@@ -42250,15 +42646,6 @@ let
sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==";
};
};
- "parse5-5.1.1" = {
- name = "parse5";
- packageName = "parse5";
- version = "5.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz";
- sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==";
- };
- };
"parse5-6.0.1" = {
name = "parse5";
packageName = "parse5";
@@ -42700,6 +43087,15 @@ let
sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
};
};
+ "path-type-2.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+ sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+ };
+ };
"path-type-3.0.0" = {
name = "path-type";
packageName = "path-type";
@@ -43556,6 +43952,15 @@ let
sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
};
};
+ "postcss-8.2.7" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "8.2.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.2.7.tgz";
+ sha512 = "DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw==";
+ };
+ };
"postcss-calc-7.0.5" = {
name = "postcss-calc";
packageName = "postcss-calc";
@@ -43727,13 +44132,13 @@ let
sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==";
};
};
- "postcss-modules-3.2.2" = {
+ "postcss-modules-4.0.0" = {
name = "postcss-modules";
packageName = "postcss-modules";
- version = "3.2.2";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz";
- sha512 = "JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw==";
+ url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz";
+ sha512 = "ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw==";
};
};
"postcss-modules-extract-imports-1.1.0" = {
@@ -43754,6 +44159,15 @@ let
sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==";
};
};
+ "postcss-modules-extract-imports-3.0.0" = {
+ name = "postcss-modules-extract-imports";
+ packageName = "postcss-modules-extract-imports";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz";
+ sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==";
+ };
+ };
"postcss-modules-local-by-default-1.2.0" = {
name = "postcss-modules-local-by-default";
packageName = "postcss-modules-local-by-default";
@@ -43772,6 +44186,15 @@ let
sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==";
};
};
+ "postcss-modules-local-by-default-4.0.0" = {
+ name = "postcss-modules-local-by-default";
+ packageName = "postcss-modules-local-by-default";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz";
+ sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==";
+ };
+ };
"postcss-modules-scope-1.1.0" = {
name = "postcss-modules-scope";
packageName = "postcss-modules-scope";
@@ -43790,6 +44213,15 @@ let
sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==";
};
};
+ "postcss-modules-scope-3.0.0" = {
+ name = "postcss-modules-scope";
+ packageName = "postcss-modules-scope";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz";
+ sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==";
+ };
+ };
"postcss-modules-values-1.3.0" = {
name = "postcss-modules-values";
packageName = "postcss-modules-values";
@@ -43808,6 +44240,15 @@ let
sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==";
};
};
+ "postcss-modules-values-4.0.0" = {
+ name = "postcss-modules-values";
+ packageName = "postcss-modules-values";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz";
+ sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
+ };
+ };
"postcss-normalize-charset-4.0.1" = {
name = "postcss-normalize-charset";
packageName = "postcss-normalize-charset";
@@ -44294,13 +44735,13 @@ let
sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6";
};
};
- "prettier-eslint-11.0.0" = {
+ "prettier-eslint-12.0.0" = {
name = "prettier-eslint";
packageName = "prettier-eslint";
- version = "11.0.0";
+ version = "12.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-11.0.0.tgz";
- sha512 = "ACjL7T8m10HCO7DwYdXwhNWuZzQv86JkZAhVpzFV9brTMWi3i6LhqoELFaXf6RetDngujz89tnbDmGyvDl+rzA==";
+ url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-12.0.0.tgz";
+ sha512 = "N8SGGQwAosISXTNl1E57sBbtnqUGlyRWjcfIUxyD3HF4ynehA9GZ8IfJgiep/OfYvCof/JEpy9ZqSl250Wia7A==";
};
};
"prettier-eslint-8.8.2" = {
@@ -44312,13 +44753,13 @@ let
sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA==";
};
};
- "prettier-plugin-svelte-2.1.6" = {
+ "prettier-plugin-svelte-2.2.0" = {
name = "prettier-plugin-svelte";
packageName = "prettier-plugin-svelte";
- version = "2.1.6";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.6.tgz";
- sha512 = "eg6MhH394IYsljIcLMgCx/wozObkUFZJ1GkH+Nj8sZQilnNCFTeSBcEohBaNa9hr5RExvlJQJ8a2CEjMMrwL8g==";
+ url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.2.0.tgz";
+ sha512 = "Xdmqgr71tAuMqqzNCK52/v94g/Yv7V7lz+nmbO9NEA+9ol15VV3uUHOfydMNOo3SWvFaVlBcp947ebEaMWqVfQ==";
};
};
"prettier-stylelint-0.4.2" = {
@@ -44339,6 +44780,15 @@ let
sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg==";
};
};
+ "pretty-bytes-1.0.4" = {
+ name = "pretty-bytes";
+ packageName = "pretty-bytes";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz";
+ sha1 = "0a22e8210609ad35542f8c8d5d2159aff0751c84";
+ };
+ };
"pretty-bytes-4.0.2" = {
name = "pretty-bytes";
packageName = "pretty-bytes";
@@ -44420,6 +44870,15 @@ let
sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw==";
};
};
+ "pretty-ms-7.0.1" = {
+ name = "pretty-ms";
+ packageName = "pretty-ms";
+ version = "7.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz";
+ sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==";
+ };
+ };
"pretty-quick-3.1.0" = {
name = "pretty-quick";
packageName = "pretty-quick";
@@ -44618,6 +45077,15 @@ let
sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
};
};
+ "progress-stream-1.2.0" = {
+ name = "progress-stream";
+ packageName = "progress-stream";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz";
+ sha1 = "2cd3cfea33ba3a89c9c121ec3347abe9ab125f77";
+ };
+ };
"progress-string-1.2.2" = {
name = "progress-string";
packageName = "progress-string";
@@ -44672,6 +45140,15 @@ let
sha512 = "mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA==";
};
};
+ "promise-fs-2.1.1" = {
+ name = "promise-fs";
+ packageName = "promise-fs";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise-fs/-/promise-fs-2.1.1.tgz";
+ sha512 = "43p7e4QzAQ3w6eyN0+gbBL7jXiZFWLWYITg9wIObqkBySu/a5K1EDcQ/S6UyB/bmiZWDA4NjTbcopKLTaKcGSw==";
+ };
+ };
"promise-inflight-1.0.1" = {
name = "promise-inflight";
packageName = "promise-inflight";
@@ -44888,15 +45365,6 @@ let
sha512 = "IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==";
};
};
- "protoduck-5.0.1" = {
- name = "protoduck";
- packageName = "protoduck";
- version = "5.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz";
- sha512 = "WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==";
- };
- };
"proxy-addr-1.1.5" = {
name = "proxy-addr";
packageName = "proxy-addr";
@@ -45050,13 +45518,13 @@ let
sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==";
};
};
- "pug-code-gen-2.0.2" = {
+ "pug-code-gen-2.0.3" = {
name = "pug-code-gen";
packageName = "pug-code-gen";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz";
- sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==";
+ url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.3.tgz";
+ sha512 = "r9sezXdDuZJfW9J91TN/2LFbiqDhmltTFmGpHTsGdrNGp3p4SxAjjXEfnuK2e4ywYsRIVP0NeLbSAMHUcaX1EA==";
};
};
"pug-error-1.3.3" = {
@@ -45779,13 +46247,13 @@ let
sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
};
};
- "puppeteer-5.5.0" = {
+ "puppeteer-7.1.0" = {
name = "puppeteer";
packageName = "puppeteer";
- version = "5.5.0";
+ version = "7.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz";
- sha512 = "OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==";
+ url = "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz";
+ sha512 = "lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g==";
};
};
"purgecss-2.3.0" = {
@@ -45833,13 +46301,13 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
- "pyright-1.1.113" = {
+ "pyright-1.1.118" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.113";
+ version = "1.1.118";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz";
- sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.118.tgz";
+ sha512 = "nUBcMqJqzcXbNmXPA3BLa5E77lG+APARhBbY0d4q2KGs3Od9FR6YTABK6sUq3O1rVQf4MScz8ji4KbEBsD8FNg==";
};
};
"q-0.9.7" = {
@@ -46040,13 +46508,13 @@ let
sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
};
};
- "query-string-6.14.0" = {
+ "query-string-6.14.1" = {
name = "query-string";
packageName = "query-string";
- version = "6.14.0";
+ version = "6.14.1";
src = fetchurl {
- url = "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz";
- sha512 = "In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ==";
+ url = "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz";
+ sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==";
};
};
"querystring-0.2.0" = {
@@ -46094,6 +46562,15 @@ let
sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw==";
};
};
+ "queue-6.0.2" = {
+ name = "queue";
+ packageName = "queue";
+ version = "6.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz";
+ sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==";
+ };
+ };
"queue-microtask-1.2.2" = {
name = "queue-microtask";
packageName = "queue-microtask";
@@ -46247,13 +46724,13 @@ let
sha512 = "xZW1BT26g+gl8AF1kC/oXX97jCMVoLIbf6yx4eVMwLgOddGhhkJygimnfERSEmhUKiGs3DTymNao6wf/P23Nkg==";
};
};
- "random-access-file-2.1.5" = {
+ "random-access-file-2.2.0" = {
name = "random-access-file";
packageName = "random-access-file";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.5.tgz";
- sha512 = "lqmUGgF9X+LD0XSeWSHcs7U2nSLYp+RQvkDDqKWoxW8jcd13tZ00G6PHV32OZqDIHmS9ewoEUEa6jcvyB7UCvg==";
+ url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.2.0.tgz";
+ sha512 = "B744003Mj7v3EcuPl9hCiB2Ot4aZjgtU2mV6yFY1THiWU/XfGf1uSadR+SlQdJcwHgAWeG7Lbos0aUqjtj8FQg==";
};
};
"random-access-idb-1.2.1" = {
@@ -46499,6 +46976,15 @@ let
sha512 = "//LRTblJEcqbmmro1GCmZ39qZXD+JqzuD8Y5/IZU3Dhp3A1Yr0Xn68ks8MQ6qKfKvYCWDveUmRDKDA40c+sCXw==";
};
};
+ "rcedit-2.3.0" = {
+ name = "rcedit";
+ packageName = "rcedit";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz";
+ sha512 = "h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ==";
+ };
+ };
"re-emitter-1.1.4" = {
name = "re-emitter";
packageName = "re-emitter";
@@ -46535,13 +47021,13 @@ let
sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==";
};
};
- "react-dev-utils-11.0.2" = {
+ "react-dev-utils-11.0.3" = {
name = "react-dev-utils";
packageName = "react-dev-utils";
- version = "11.0.2";
+ version = "11.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz";
- sha512 = "xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ==";
+ url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.3.tgz";
+ sha512 = "4lEA5gF4OHrcJLMUV1t+4XbNDiJbsAWCH5Z2uqlTqW6dD7Cf5nEASkeXrCI/Mz83sI2o527oBIFKVMXtRf1Vtg==";
};
};
"react-devtools-core-4.10.1" = {
@@ -46661,13 +47147,13 @@ let
sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==";
};
};
- "read-cmd-shim-1.0.5" = {
+ "read-cmd-shim-2.0.0" = {
name = "read-cmd-shim";
packageName = "read-cmd-shim";
- version = "1.0.5";
+ version = "2.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz";
- sha512 = "v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==";
+ url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz";
+ sha512 = "HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==";
};
};
"read-last-lines-1.6.0" = {
@@ -46706,6 +47192,15 @@ let
sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==";
};
};
+ "read-package-json-3.0.1" = {
+ name = "read-package-json";
+ packageName = "read-package-json";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-package-json/-/read-package-json-3.0.1.tgz";
+ sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng==";
+ };
+ };
"read-package-json-fast-1.2.2" = {
name = "read-package-json-fast";
packageName = "read-package-json-fast";
@@ -46715,13 +47210,13 @@ let
sha512 = "39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==";
};
};
- "read-package-json-fast-2.0.1" = {
+ "read-package-json-fast-2.0.2" = {
name = "read-package-json-fast";
packageName = "read-package-json-fast";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz";
- sha512 = "bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug==";
+ url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz";
+ sha512 = "5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ==";
};
};
"read-package-tree-5.3.1" = {
@@ -46742,6 +47237,15 @@ let
sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
};
};
+ "read-pkg-2.0.0" = {
+ name = "read-pkg";
+ packageName = "read-pkg";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+ sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+ };
+ };
"read-pkg-3.0.0" = {
name = "read-pkg";
packageName = "read-pkg";
@@ -46769,6 +47273,15 @@ let
sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
};
};
+ "read-pkg-up-2.0.0" = {
+ name = "read-pkg-up";
+ packageName = "read-pkg-up";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+ sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+ };
+ };
"read-pkg-up-3.0.0" = {
name = "read-pkg-up";
packageName = "read-pkg-up";
@@ -47804,13 +48317,13 @@ let
sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
};
};
- "request-light-0.3.0" = {
+ "request-light-0.4.0" = {
name = "request-light";
packageName = "request-light";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/request-light/-/request-light-0.3.0.tgz";
- sha512 = "xlVlZVT0ZvCT+c3zm3SjeFCzchoQxsUUmx5fkal0I6RIDJK+lmb1UYyKJ7WM4dTfnzHP4ElWwAf8Dli8c0/tVA==";
+ url = "https://registry.npmjs.org/request-light/-/request-light-0.4.0.tgz";
+ sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==";
};
};
"request-progress-2.0.1" = {
@@ -48110,6 +48623,15 @@ let
sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
};
};
+ "resolve-package-1.0.1" = {
+ name = "resolve-package";
+ packageName = "resolve-package";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-package/-/resolve-package-1.0.1.tgz";
+ sha1 = "686f70b188bd7d675f5bbc4282ccda060abb9d27";
+ };
+ };
"resolve-url-0.2.1" = {
name = "resolve-url";
packageName = "resolve-url";
@@ -48506,13 +49028,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.39.0" = {
+ "rollup-2.40.0" = {
name = "rollup";
packageName = "rollup";
- version = "2.39.0";
+ version = "2.40.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.39.0.tgz";
- sha512 = "+WR3bttcq7zE+BntH09UxaW3bQo3vItuYeLsyk4dL2tuwbeSKJuvwiawyhEnvRdRgrII0Uzk00FpctHO/zB1kw==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz";
+ sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -48839,6 +49361,15 @@ let
sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==";
};
};
+ "rxjs-6.6.6" = {
+ name = "rxjs";
+ packageName = "rxjs";
+ version = "6.6.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz";
+ sha512 = "/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==";
+ };
+ };
"s3-stream-upload-2.0.2" = {
name = "s3-stream-upload";
packageName = "s3-stream-upload";
@@ -49514,15 +50045,6 @@ let
sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38";
};
};
- "serialize-error-5.0.0" = {
- name = "serialize-error";
- packageName = "serialize-error";
- version = "5.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz";
- sha512 = "/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==";
- };
- };
"serialize-error-6.0.0" = {
name = "serialize-error";
packageName = "serialize-error";
@@ -50090,13 +50612,13 @@ let
sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg==";
};
};
- "simple-git-2.35.1" = {
+ "simple-git-2.36.1" = {
name = "simple-git";
packageName = "simple-git";
- version = "2.35.1";
+ version = "2.36.1";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.1.tgz";
- sha512 = "Y5/hXf5ivfMziWRNGhVsbiG+1h4CkTW2qVC3dRidLuSZYAPFbLCPP1d7rgiL40lgRPhPTBuhVzNJAV9glWstEg==";
+ url = "https://registry.npmjs.org/simple-git/-/simple-git-2.36.1.tgz";
+ sha512 = "bN18Ea/4IJgqgbZyE9VpVEUkAu9vyP0VWP7acP0CRC1p/N80GGJ0HhIVeFJsm8TdJLBowiJpdLesQuAZ5TFSKw==";
};
};
"simple-markdown-0.4.4" = {
@@ -50144,13 +50666,13 @@ let
sha512 = "TQl9rm4rdKAVmhO++sXAb8TNN0D6JAD5iyI1mqEPNpxUzTRrtm4aOG1pDf/5W/qCFihiaoK6uuL9rvQz1x1VKw==";
};
};
- "simple-sha1-3.0.1" = {
+ "simple-sha1-3.1.0" = {
name = "simple-sha1";
packageName = "simple-sha1";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz";
- sha512 = "q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg==";
+ url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.1.0.tgz";
+ sha512 = "ArTptMRC1v08H8ihPD6l0wesKvMfF9e8XL5rIHPanI7kGOsSsbY514MwVu6X1PITHCTB2F08zB7cyEbfc4wQjg==";
};
};
"simple-swizzle-0.2.2" = {
@@ -50486,13 +51008,13 @@ let
sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
};
};
- "snyk-config-4.0.0-rc.2" = {
+ "snyk-config-4.0.0" = {
name = "snyk-config";
packageName = "snyk-config";
- version = "4.0.0-rc.2";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-config/-/snyk-config-4.0.0-rc.2.tgz";
- sha512 = "HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g==";
+ url = "https://registry.npmjs.org/snyk-config/-/snyk-config-4.0.0.tgz";
+ sha512 = "E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ==";
};
};
"snyk-cpp-plugin-2.2.1" = {
@@ -50504,13 +51026,13 @@ let
sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
};
};
- "snyk-docker-plugin-4.17.2" = {
+ "snyk-docker-plugin-4.17.3" = {
name = "snyk-docker-plugin";
packageName = "snyk-docker-plugin";
- version = "4.17.2";
+ version = "4.17.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz";
- sha512 = "fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ==";
+ url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz";
+ sha512 = "Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg==";
};
};
"snyk-go-parser-1.4.1" = {
@@ -50522,31 +51044,22 @@ let
sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w==";
};
};
- "snyk-go-plugin-1.16.5" = {
+ "snyk-go-plugin-1.17.0" = {
name = "snyk-go-plugin";
packageName = "snyk-go-plugin";
- version = "1.16.5";
+ version = "1.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.16.5.tgz";
- sha512 = "m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA==";
+ url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz";
+ sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q==";
};
};
- "snyk-gradle-plugin-3.13.0" = {
+ "snyk-gradle-plugin-3.13.2" = {
name = "snyk-gradle-plugin";
packageName = "snyk-gradle-plugin";
- version = "3.13.0";
+ version = "3.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.13.0.tgz";
- sha512 = "t7tibuRHMX0ot5woZlFpblTH20j8BKWxO4wwC7+dGsvS9VtXrlG73moeE5EXfOPb2E8OA7STPKGsEibVIl/j2w==";
- };
- };
- "snyk-module-2.1.0" = {
- name = "snyk-module";
- packageName = "snyk-module";
- version = "2.1.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/snyk-module/-/snyk-module-2.1.0.tgz";
- sha512 = "K5xeA39vLbm23Y/29wFEhKGvo7FwV4x9XhCP5gB22dBPyYiCCNiDERX4ofHQvtM6q96cL0hIroMdlbctv/0nPw==";
+ url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.13.2.tgz";
+ sha512 = "t7lBFgWwS3KU7SgmAeTJnTR44Wew84/IvNbNZ2fF0f+lXd1kZxMG1Ty2brETvxpl+U2JxC8ISILohGXsET+ySg==";
};
};
"snyk-module-3.1.0" = {
@@ -50576,6 +51089,15 @@ let
sha512 = "wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw==";
};
};
+ "snyk-nodejs-lockfile-parser-1.31.1" = {
+ name = "snyk-nodejs-lockfile-parser";
+ packageName = "snyk-nodejs-lockfile-parser";
+ version = "1.31.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz";
+ sha512 = "MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ==";
+ };
+ };
"snyk-nuget-plugin-1.21.0" = {
name = "snyk-nuget-plugin";
packageName = "snyk-nuget-plugin";
@@ -50612,31 +51134,31 @@ let
sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA==";
};
};
- "snyk-policy-1.14.1" = {
+ "snyk-policy-1.19.0" = {
name = "snyk-policy";
packageName = "snyk-policy";
- version = "1.14.1";
+ version = "1.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.14.1.tgz";
- sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==";
+ url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz";
+ sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==";
};
};
- "snyk-python-plugin-1.19.4" = {
+ "snyk-python-plugin-1.19.5" = {
name = "snyk-python-plugin";
packageName = "snyk-python-plugin";
- version = "1.19.4";
+ version = "1.19.5";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz";
- sha512 = "d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w==";
+ url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz";
+ sha512 = "wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw==";
};
};
- "snyk-resolve-1.0.1" = {
+ "snyk-resolve-1.1.0" = {
name = "snyk-resolve";
packageName = "snyk-resolve";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz";
- sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==";
+ url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz";
+ sha512 = "OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw==";
};
};
"snyk-resolve-deps-4.7.2" = {
@@ -50675,6 +51197,15 @@ let
sha1 = "6e026f92e64af7fcccea1ee53d524841e418a212";
};
};
+ "snyk-try-require-2.0.1" = {
+ name = "snyk-try-require";
+ packageName = "snyk-try-require";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz";
+ sha512 = "VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA==";
+ };
+ };
"socket.io-1.0.6" = {
name = "socket.io";
packageName = "socket.io";
@@ -50711,13 +51242,13 @@ let
sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
};
};
- "socket.io-3.1.1" = {
+ "socket.io-3.1.2" = {
name = "socket.io";
packageName = "socket.io";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz";
- sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA==";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz";
+ sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==";
};
};
"socket.io-adapter-0.2.0" = {
@@ -51044,6 +51575,15 @@ let
sha1 = "658535584861ec97d730d6cf41822e1f56684128";
};
};
+ "sort-keys-4.2.0" = {
+ name = "sort-keys";
+ packageName = "sort-keys";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz";
+ sha512 = "aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==";
+ };
+ };
"sort-keys-length-1.0.1" = {
name = "sort-keys-length";
packageName = "sort-keys-length";
@@ -51674,13 +52214,13 @@ let
sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
};
};
- "ssb-db2-1.17.1" = {
+ "ssb-db2-1.18.2" = {
name = "ssb-db2";
packageName = "ssb-db2";
- version = "1.17.1";
+ version = "1.18.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.17.1.tgz";
- sha512 = "XaKxShFGwy9NRSF26PnnLYQAUMeSb8xGilU2WZ3C2QJRmNQ3YJWBzIWI9d0cn547LuuE+AO9lQhh2SwRtJ2qTQ==";
+ url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.2.tgz";
+ sha512 = "0DDsZJNBDSUatlJD6oAwByBjTF9vzNHF3T6lcIY1AvuDfTXcLBVMwijCn2phPTda+0xzTVJiS8X4MuhkFrCtww==";
};
};
"ssb-ebt-5.6.7" = {
@@ -52763,22 +53303,22 @@ let
sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
};
};
- "string-width-4.2.0" = {
+ "string-width-4.2.2" = {
name = "string-width";
packageName = "string-width";
- version = "4.2.0";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz";
- sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
+ url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz";
+ sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==";
};
};
- "string.prototype.matchall-4.0.3" = {
+ "string.prototype.matchall-4.0.4" = {
name = "string.prototype.matchall";
packageName = "string.prototype.matchall";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz";
- sha512 = "OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==";
+ url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz";
+ sha512 = "pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==";
};
};
"string.prototype.repeat-0.2.0" = {
@@ -52790,31 +53330,31 @@ let
sha1 = "aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf";
};
};
- "string.prototype.trim-1.2.3" = {
+ "string.prototype.trim-1.2.4" = {
name = "string.prototype.trim";
packageName = "string.prototype.trim";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz";
- sha512 = "16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==";
+ url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz";
+ sha512 = "hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==";
};
};
- "string.prototype.trimend-1.0.3" = {
+ "string.prototype.trimend-1.0.4" = {
name = "string.prototype.trimend";
packageName = "string.prototype.trimend";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
- sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz";
+ sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==";
};
};
- "string.prototype.trimstart-1.0.3" = {
+ "string.prototype.trimstart-1.0.4" = {
name = "string.prototype.trimstart";
packageName = "string.prototype.trimstart";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
- sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz";
+ sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==";
};
};
"string2compact-1.3.0" = {
@@ -53267,13 +53807,13 @@ let
sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
};
};
- "stylelint-13.11.0" = {
+ "stylelint-13.12.0" = {
name = "stylelint";
packageName = "stylelint";
- version = "13.11.0";
+ version = "13.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz";
- sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==";
+ url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz";
+ sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==";
};
};
"stylelint-8.4.0" = {
@@ -53384,6 +53924,15 @@ let
sha512 = "es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==";
};
};
+ "sudo-prompt-9.2.1" = {
+ name = "sudo-prompt";
+ packageName = "sudo-prompt";
+ version = "9.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz";
+ sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==";
+ };
+ };
"sugarss-1.0.1" = {
name = "sugarss";
packageName = "sugarss";
@@ -53402,6 +53951,15 @@ let
sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==";
};
};
+ "sumchecker-3.0.1" = {
+ name = "sumchecker";
+ packageName = "sumchecker";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz";
+ sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
+ };
+ };
"superagent-1.8.5" = {
name = "superagent";
packageName = "superagent";
@@ -53555,13 +54113,13 @@ let
sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==";
};
};
- "svelte-3.32.3" = {
+ "svelte-3.35.0" = {
name = "svelte";
packageName = "svelte";
- version = "3.32.3";
+ version = "3.35.0";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte/-/svelte-3.32.3.tgz";
- sha512 = "5etu/wDwtewhnYO/631KKTjSmFrKohFLWNm1sWErVHXqGZ8eJLqrW0qivDSyYTcN8GbUqsR4LkIhftNFsjNehg==";
+ url = "https://registry.npmjs.org/svelte/-/svelte-3.35.0.tgz";
+ sha512 = "gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==";
};
};
"svelte-preprocess-4.6.9" = {
@@ -53573,13 +54131,13 @@ let
sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA==";
};
};
- "svelte2tsx-0.1.174" = {
+ "svelte2tsx-0.1.179" = {
name = "svelte2tsx";
packageName = "svelte2tsx";
- version = "0.1.174";
+ version = "0.1.179";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.174.tgz";
- sha512 = "+sOMKaiUw7GADDyg5rhQWi6ajL0LWytZbwRwyH62WP6OTjXGIM8/J9mOCA3uHA9dDI39OsmprcgfhUQp8ymekg==";
+ url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.179.tgz";
+ sha512 = "tfSRUuUziFPcD2w6fIfu9ybpkV2M7HQgmcelcdCC0bKVqR+pm6kdmIyo6L5kwR3IRjhq03DekkpVer1uXxTZ9A==";
};
};
"sver-compat-1.5.0" = {
@@ -53708,13 +54266,13 @@ let
sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw==";
};
};
- "swagger-ui-dist-3.43.0" = {
+ "swagger-ui-dist-3.44.1" = {
name = "swagger-ui-dist";
packageName = "swagger-ui-dist";
- version = "3.43.0";
+ version = "3.44.1";
src = fetchurl {
- url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz";
- sha512 = "PtE+g23bNbYv8qqAVoPBqNQth8hU5Sl5ZsQ7gHXlO5jlCt31dVTiKI9ArHIT1b23ZzUYTnKsFgPYYFoiWyNCAw==";
+ url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.44.1.tgz";
+ sha512 = "N0u+aN55bp53RRwi/wFbEbkQxcHqZ445ShZR/Ct1Jg+XCMxYtocrsGavh7kdNKw5+6Rs4QDD6GzUMiT28Z1u3Q==";
};
};
"swagger2openapi-6.2.3" = {
@@ -53834,13 +54392,13 @@ let
sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
};
};
- "systeminformation-4.34.14" = {
+ "systeminformation-4.34.15" = {
name = "systeminformation";
packageName = "systeminformation";
- version = "4.34.14";
+ version = "4.34.15";
src = fetchurl {
- url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.14.tgz";
- sha512 = "cPkHQIBgCZrfvenIfbXv1ChCPoXwqCBF8il2ZnqTBsyZPBNBFm6zij4W3f6Y/J4agBD3n56DGLl6TwZ8tLFsyA==";
+ url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.15.tgz";
+ sha512 = "GRm0ntHg/MTISxZSu7r0T8reU1LLXUZxMcuDnqCcxIP0V+vjrt7SsiTWKrlsiL/DnThgUQHo1PT7VlZ5aKxdlQ==";
};
};
"table-3.8.3" = {
@@ -54240,6 +54798,15 @@ let
sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492";
};
};
+ "temp-write-4.0.0" = {
+ name = "temp-write";
+ packageName = "temp-write";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/temp-write/-/temp-write-4.0.0.tgz";
+ sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==";
+ };
+ };
"tempfile-2.0.0" = {
name = "tempfile";
packageName = "tempfile";
@@ -54537,6 +55104,15 @@ let
sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7";
};
};
+ "throttleit-0.0.2" = {
+ name = "throttleit";
+ packageName = "throttleit";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
+ sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
+ };
+ };
"throttleit-1.0.0" = {
name = "throttleit";
packageName = "throttleit";
@@ -54564,6 +55140,15 @@ let
sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
};
};
+ "through2-0.2.3" = {
+ name = "through2";
+ packageName = "through2";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz";
+ sha1 = "eb3284da4ea311b6cc8ace3653748a52abf25a3f";
+ };
+ };
"through2-0.4.2" = {
name = "through2";
packageName = "through2";
@@ -55356,6 +55941,15 @@ let
sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
};
};
+ "tough-cookie-4.0.0" = {
+ name = "tough-cookie";
+ packageName = "tough-cookie";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz";
+ sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==";
+ };
+ };
"township-client-1.3.2" = {
name = "township-client";
packageName = "township-client";
@@ -55725,15 +56319,6 @@ let
sha512 = "wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg==";
};
};
- "tslib-2.0.3" = {
- name = "tslib";
- packageName = "tslib";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz";
- sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==";
- };
- };
"tslib-2.1.0" = {
name = "tslib";
packageName = "tslib";
@@ -55779,13 +56364,13 @@ let
sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
};
};
- "tsutils-3.20.0" = {
+ "tsutils-3.21.0" = {
name = "tsutils";
packageName = "tsutils";
- version = "3.20.0";
+ version = "3.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz";
- sha512 = "RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==";
+ url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz";
+ sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==";
};
};
"ttl-1.3.1" = {
@@ -56238,6 +56823,15 @@ let
sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==";
};
};
+ "typescript-4.2.3" = {
+ name = "typescript";
+ packageName = "typescript";
+ version = "4.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz";
+ sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==";
+ };
+ };
"typescript-eslint-parser-16.0.1" = {
name = "typescript-eslint-parser";
packageName = "typescript-eslint-parser";
@@ -56337,13 +56931,13 @@ let
sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
};
};
- "uglify-js-3.12.8" = {
+ "uglify-js-3.13.0" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.12.8";
+ version = "3.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.8.tgz";
- sha512 = "fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz";
+ sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==";
};
};
"uglify-js-3.4.10" = {
@@ -56481,6 +57075,15 @@ let
sha512 = "2ISqZLXtzp1l9f1V8Yr6S+zuhXxEwE1CjKHjXULFDHJcfhc9Gm3mn19hdPp4rlNGEdCivKYGKjYe3WRGnafYdA==";
};
};
+ "unbox-primitive-1.0.0" = {
+ name = "unbox-primitive";
+ packageName = "unbox-primitive";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz";
+ sha512 = "P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==";
+ };
+ };
"unbzip2-stream-1.4.3" = {
name = "unbzip2-stream";
packageName = "unbzip2-stream";
@@ -56715,13 +57318,13 @@ let
sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==";
};
};
- "unified-9.2.0" = {
+ "unified-9.2.1" = {
name = "unified";
packageName = "unified";
- version = "9.2.0";
+ version = "9.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz";
- sha512 = "vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==";
+ url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz";
+ sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==";
};
};
"unified-diff-3.1.0" = {
@@ -56931,13 +57534,13 @@ let
sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==";
};
};
- "unist-util-is-4.0.4" = {
+ "unist-util-is-4.1.0" = {
name = "unist-util-is";
packageName = "unist-util-is";
- version = "4.0.4";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz";
- sha512 = "3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==";
+ url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz";
+ sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==";
};
};
"unist-util-map-1.0.5" = {
@@ -57624,6 +58227,15 @@ let
sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
};
};
+ "username-5.1.0" = {
+ name = "username";
+ packageName = "username";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/username/-/username-5.1.0.tgz";
+ sha512 = "PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==";
+ };
+ };
"uslug-git+https://github.com/laurent22/uslug.git#emoji-support" = {
name = "uslug";
packageName = "uslug";
@@ -57940,13 +58552,13 @@ let
sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
};
};
- "v8-compile-cache-2.2.0" = {
+ "v8-compile-cache-2.3.0" = {
name = "v8-compile-cache";
packageName = "v8-compile-cache";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
- sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
+ url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz";
+ sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==";
};
};
"v8-debug-1.0.1" = {
@@ -58228,15 +58840,6 @@ let
sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew==";
};
};
- "vega-expression-3.0.1" = {
- name = "vega-expression";
- packageName = "vega-expression";
- version = "3.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.1.tgz";
- sha512 = "+UwOFEkBnAWo8Zud6i8O4Pd2W6QqmPUOaAhjNtj0OxRL+d+Duoy7M4edUDZ+YuoUcMnjjBFfDQu7oRAA1fIMEQ==";
- };
- };
"vega-expression-4.0.1" = {
name = "vega-expression";
packageName = "vega-expression";
@@ -58768,13 +59371,13 @@ let
sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==";
};
};
- "vls-0.5.10" = {
+ "vls-0.7.2" = {
name = "vls";
packageName = "vls";
- version = "0.5.10";
+ version = "0.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vls/-/vls-0.5.10.tgz";
- sha512 = "/zXdkUatCptsDGmrEVh0A/LEQ48qEwrKe+7HiIwUOmiz+0DkoHsyf/j6eppXMVRWMcHWopwd9/VTNCRlFf2NFw==";
+ url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz";
+ sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q==";
};
};
"vm-browserify-1.1.2" = {
@@ -58804,13 +59407,13 @@ let
sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
};
};
- "vsce-1.85.0" = {
+ "vsce-1.85.1" = {
name = "vsce";
packageName = "vsce";
- version = "1.85.0";
+ version = "1.85.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vsce/-/vsce-1.85.0.tgz";
- sha512 = "YVFwjXWvHRwk75mm3iL4Wr3auCdbBPTv2amtLf97ccqH0hkt0ZVBddu7iOs4HSEbSr9xiiaZwQHUsqMm6Ks0ag==";
+ url = "https://registry.npmjs.org/vsce/-/vsce-1.85.1.tgz";
+ sha512 = "IdfH8OCK+FgQGmihFoh6/17KBl4Ad3q4Sw3NFNI9T9KX6KdMR5az2/GO512cC9IqCjbgJl12CA7X84vYoc0ifg==";
};
};
"vscode-css-languageservice-3.0.13" = {
@@ -58840,22 +59443,22 @@ let
sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg==";
};
};
- "vscode-debugadapter-testsupport-1.44.0" = {
+ "vscode-debugadapter-testsupport-1.45.0" = {
name = "vscode-debugadapter-testsupport";
packageName = "vscode-debugadapter-testsupport";
- version = "1.44.0";
+ version = "1.45.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.44.0.tgz";
- sha512 = "5sPAQ4/OFPBvZoyx2nPI91Zv7CCZ63CS9XrsCaR1t2awEY+hv+yjwryaWpV0AQX6lrYOCO/PehYvzmDsGLEy6A==";
+ url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.45.0.tgz";
+ sha512 = "/5q/F2K1mNLfJWxXStG9pO86mgOeK73PoMJpOBZaniToplrzM7LgFEdXUPlzNH07//XZwzRsCFn7Eq3brqYk6Q==";
};
};
- "vscode-debugprotocol-1.44.0" = {
+ "vscode-debugprotocol-1.45.0" = {
name = "vscode-debugprotocol";
packageName = "vscode-debugprotocol";
- version = "1.44.0";
+ version = "1.45.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz";
- sha512 = "qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ==";
+ url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.45.0.tgz";
+ sha512 = "xU6XtdKJ0waWIt79Zt4WVyIQ3oDkhilku9Shbv7Vc4KXEr/npsf8dhinyIZXSIlH2lzJiE3imp1xbYpyRTIrhg==";
};
};
"vscode-emmet-helper-1.2.17" = {
@@ -58903,6 +59506,15 @@ let
sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==";
};
};
+ "vscode-json-languageservice-4.0.2" = {
+ name = "vscode-json-languageservice";
+ packageName = "vscode-json-languageservice";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.0.2.tgz";
+ sha512 = "d8Ahw990Cq/G60CzN26rehXcbhbMgMGMmXeN6C/V/RYZUhfs16EELRK+EL7b/3Y8ZGshtKqboePSeDVa94qqFg==";
+ };
+ };
"vscode-jsonrpc-3.5.0" = {
name = "vscode-jsonrpc";
packageName = "vscode-jsonrpc";
@@ -58957,15 +59569,6 @@ let
sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==";
};
};
- "vscode-jsonrpc-6.0.0-next.2" = {
- name = "vscode-jsonrpc";
- packageName = "vscode-jsonrpc";
- version = "6.0.0-next.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz";
- sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==";
- };
- };
"vscode-jsonrpc-6.1.0-next.2" = {
name = "vscode-jsonrpc";
packageName = "vscode-jsonrpc";
@@ -59065,15 +59668,6 @@ let
sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==";
};
};
- "vscode-languageserver-7.0.0-next.3" = {
- name = "vscode-languageserver";
- packageName = "vscode-languageserver";
- version = "7.0.0-next.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz";
- sha512 = "qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg==";
- };
- };
"vscode-languageserver-protocol-3.14.1" = {
name = "vscode-languageserver-protocol";
packageName = "vscode-languageserver-protocol";
@@ -59110,15 +59704,6 @@ let
sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA==";
};
};
- "vscode-languageserver-protocol-3.16.0-next.4" = {
- name = "vscode-languageserver-protocol";
- packageName = "vscode-languageserver-protocol";
- version = "3.16.0-next.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz";
- sha512 = "6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==";
- };
- };
"vscode-languageserver-protocol-3.17.0-next.5" = {
name = "vscode-languageserver-protocol";
packageName = "vscode-languageserver-protocol";
@@ -59344,13 +59929,13 @@ let
sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==";
};
};
- "vue-3.0.5" = {
+ "vue-3.0.7" = {
name = "vue";
packageName = "vue";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/vue/-/vue-3.0.5.tgz";
- sha512 = "TfaprOmtsAfhQau7WsomXZ8d9op/dkQLNIq8qPV3A0Vxs6GR5E+c1rfJS1SDkXRQj+dFyfnec7+U0Be1huiScg==";
+ url = "https://registry.npmjs.org/vue/-/vue-3.0.7.tgz";
+ sha512 = "8h4TikD+JabbMK9aRlBO4laG0AtNHRPHynxYgWZ9sq1YUPfzynd9Jeeb27XNyZytC7aCQRX9xe1+TQJuc181Tw==";
};
};
"vue-cli-plugin-apollo-0.21.3" = {
@@ -59398,13 +59983,13 @@ let
sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==";
};
};
- "vue-eslint-parser-7.5.0" = {
+ "vue-eslint-parser-7.6.0" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
- version = "7.5.0";
+ version = "7.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.5.0.tgz";
- sha512 = "6EHzl00hIpy4yWZo3qSbtvtVw1A1cTKOv1w95QSuAqGgk4113XtRjvNIiEGo49r0YWOPYsrmI4Dl64axL5Agrw==";
+ url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz";
+ sha512 = "QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==";
};
};
"vue-onsenui-helper-json-1.0.2" = {
@@ -59821,13 +60406,13 @@ let
sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
};
};
- "webtorrent-0.114.1" = {
+ "webtorrent-0.115.2" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "0.114.1";
+ version = "0.115.2";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.114.1.tgz";
- sha512 = "RJqwy6cTG1kysvd3xX2CJIAMeC/3e5M/MPu4MuZKcBxa2I+D75nONoNjP0cLTnE+gVb0MFQSQU93ln/2/f6k6g==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.2.tgz";
+ sha512 = "92m4mWoyLO8ly8hvw8w+pIk3J2oePxbKBf5SmAAWxQKrq9a3tbIL3VVj/B5gXovBhfpXdBvi93JFT4Ehn49bkw==";
};
};
"well-known-symbols-2.0.0" = {
@@ -59848,13 +60433,13 @@ let
sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
};
};
- "whatwg-fetch-3.6.1" = {
+ "whatwg-fetch-3.6.2" = {
name = "whatwg-fetch";
packageName = "whatwg-fetch";
- version = "3.6.1";
+ version = "3.6.2";
src = fetchurl {
- url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.1.tgz";
- sha512 = "IEmN/ZfmMw6G1hgZpVd0LuZXOQDisrMOZrzYd5x3RAK4bMPlJohKUZWZ9t/QsTvH0dV9TbPDcc2OSuIDcihnHA==";
+ url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz";
+ sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==";
};
};
"whatwg-mimetype-2.3.0" = {
@@ -60604,15 +61189,6 @@ let
sha512 = "fDKIHO5wCzTLCOGNJl1rzzJrZlTIzfZl8msOoJQZzRhYo0X/tFTm4+2B1zTibFYK01Nnd1kLZBjj4xjcFLePNQ==";
};
};
- "write-json-file-2.3.0" = {
- name = "write-json-file";
- packageName = "write-json-file";
- version = "2.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz";
- sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f";
- };
- };
"write-json-file-3.2.0" = {
name = "write-json-file";
packageName = "write-json-file";
@@ -60622,13 +61198,22 @@ let
sha512 = "3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==";
};
};
- "write-pkg-3.2.0" = {
+ "write-json-file-4.3.0" = {
+ name = "write-json-file";
+ packageName = "write-json-file";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz";
+ sha512 = "PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==";
+ };
+ };
+ "write-pkg-4.0.0" = {
name = "write-pkg";
packageName = "write-pkg";
- version = "3.2.0";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz";
- sha512 = "tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==";
+ url = "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz";
+ sha512 = "v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==";
};
};
"ws-0.4.31" = {
@@ -60721,6 +61306,15 @@ let
sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==";
};
};
+ "ws-7.4.4" = {
+ name = "ws";
+ packageName = "ws";
+ version = "7.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz";
+ sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==";
+ };
+ };
"x-default-browser-0.3.1" = {
name = "x-default-browser";
packageName = "x-default-browser";
@@ -61289,13 +61883,13 @@ let
sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec";
};
};
- "yaml-language-server-0.13.1-dcc82a9.0" = {
+ "yaml-language-server-0.13.1-d0f9b44.0" = {
name = "yaml-language-server";
packageName = "yaml-language-server";
- version = "0.13.1-dcc82a9.0";
+ version = "0.13.1-d0f9b44.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.1-dcc82a9.0.tgz";
- sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A==";
+ url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.1-d0f9b44.0.tgz";
+ sha512 = "6q5NKJiCqB1ptEopsA6pQDNDBnpwQ5o3A6im9Mus9XdB1gM0TCaR2TT9XU13CFo6JoCgVZ6s3lgoUOsbN8Y5Qw==";
};
};
"yaml-language-server-parser-0.1.2" = {
@@ -61523,13 +62117,13 @@ let
sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
};
};
- "yargs-parser-20.2.5" = {
+ "yargs-parser-20.2.6" = {
name = "yargs-parser";
packageName = "yargs-parser";
- version = "20.2.5";
+ version = "20.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz";
- sha512 = "jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==";
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz";
+ sha512 = "AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==";
};
};
"yargs-parser-4.2.1" = {
@@ -61604,6 +62198,15 @@ let
sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA==";
};
};
+ "yarn-or-npm-3.0.1" = {
+ name = "yarn-or-npm";
+ packageName = "yarn-or-npm";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yarn-or-npm/-/yarn-or-npm-3.0.1.tgz";
+ sha512 = "fTiQP6WbDAh5QZAVdbMQkecZoahnbOjClTQhzv74WX5h2Uaidj1isf9FDes11TKtsZ0/ZVfZsqZ+O3x6aLERHQ==";
+ };
+ };
"yauzl-2.10.0" = {
name = "yauzl";
packageName = "yauzl";
@@ -61784,13 +62387,13 @@ let
sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ==";
};
};
- "zip-stream-4.0.4" = {
+ "zip-stream-4.1.0" = {
name = "zip-stream";
packageName = "zip-stream";
- version = "4.0.4";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.4.tgz";
- sha512 = "a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==";
+ url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz";
+ sha512 = "zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==";
};
};
"zmq-2.15.3" = {
@@ -61826,15 +62429,15 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "11.2.1";
+ version = "11.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.1.tgz";
- sha512 = "FVwJQyPTMTTikrsKYqaP44/23UqTQ6txNt6xGoWPyI/v8VQ1afyjswcw4Z/zHWIoscmltjPuV00IYJ+NZLYPBQ==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.3.tgz";
+ sha512 = "j3kmhUj7QGd8IoNrwgFDtq3gfj4s4XLrk3jhfFhPc0N1m2WHHIShHix3hZ29ayewT+WpIwqZQYovCX21cQvGhA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.1102.1"
- sources."@angular-devkit/core-11.2.1"
- sources."@angular-devkit/schematics-11.2.1"
+ sources."@angular-devkit/architect-0.1102.3"
+ sources."@angular-devkit/core-11.2.3"
+ sources."@angular-devkit/schematics-11.2.3"
sources."@npmcli/ci-detect-1.3.0"
(sources."@npmcli/git-2.0.6" // {
dependencies = [
@@ -61847,11 +62450,11 @@ in
sources."@npmcli/promise-spawn-1.3.2"
(sources."@npmcli/run-script-1.8.3" // {
dependencies = [
- sources."read-package-json-fast-2.0.1"
+ sources."read-package-json-fast-2.0.2"
];
})
- sources."@schematics/angular-11.2.1"
- sources."@schematics/update-0.1102.1"
+ sources."@schematics/angular-11.2.3"
+ sources."@schematics/update-0.1102.3"
sources."@tootallnate/once-1.1.2"
sources."@yarnpkg/lockfile-1.1.0"
sources."abbrev-1.1.1"
@@ -62067,7 +62670,7 @@ in
sources."sourcemap-codec-1.4.8"
sources."sshpk-1.16.1"
sources."ssri-8.0.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."string_decoder-1.3.0"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
@@ -62303,7 +62906,7 @@ in
})
sources."handlebars-4.7.7"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."http-cache-semantics-4.1.0"
sources."ieee754-1.2.1"
sources."ignore-5.1.8"
@@ -62431,7 +63034,7 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
@@ -62584,7 +63187,7 @@ in
sources."request-promise-native-1.0.9"
sources."restore-cursor-2.0.0"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."saxes-3.1.11"
@@ -62638,10 +63241,10 @@ in
"@nestjs/cli" = nodeEnv.buildNodePackage {
name = "_at_nestjs_slash_cli";
packageName = "@nestjs/cli";
- version = "7.5.5";
+ version = "7.5.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.5.tgz";
- sha512 = "j45givEQQxMwZA4z78XQyYwNrLoe3PHtTRZsneRIWmgSNJ6t0Lfv9MGbNTot0hQ6LYLiEPnvWTpgg2tkKrwUmA==";
+ url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.6.tgz";
+ sha512 = "nJCoKFleVV6NCkezc+cokJCVnDQBJoxmBVggQ1XfJ6Lvjy9TFQfG2J/nDdVurxpm7mlJm/Yg/rbXxaiUZVcJAQ==";
};
dependencies = [
sources."@angular-devkit/core-11.2.0"
@@ -62649,7 +63252,7 @@ in
sources."@angular-devkit/schematics-cli-0.1102.0"
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -62659,26 +63262,19 @@ in
sources."supports-color-5.5.0"
];
})
- (sources."@nestjs/schematics-7.2.7" // {
- dependencies = [
- sources."@angular-devkit/core-11.1.0"
- sources."@angular-devkit/schematics-11.1.0"
- sources."chalk-4.1.0"
- sources."ora-5.2.0"
- ];
- })
+ sources."@nestjs/schematics-7.2.8"
sources."@schematics/schematics-0.1102.0"
sources."@types/anymatch-1.3.1"
- sources."@types/eslint-7.2.6"
+ sources."@types/eslint-7.2.7"
sources."@types/eslint-scope-3.7.0"
sources."@types/estree-0.0.45"
sources."@types/json-schema-7.0.7"
sources."@types/json5-0.0.29"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/parse-json-4.0.0"
sources."@types/source-list-map-0.1.2"
sources."@types/tapable-1.0.6"
- (sources."@types/uglify-js-3.12.0" // {
+ (sources."@types/uglify-js-3.13.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -62714,7 +63310,7 @@ in
sources."ajv-keywords-3.5.2"
sources."ansi-colors-4.1.1"
sources."ansi-escapes-4.3.1"
- sources."ansi-regex-5.0.0"
+ sources."ansi-regex-3.0.0"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.1"
sources."at-least-node-1.0.0"
@@ -62728,7 +63324,7 @@ in
sources."buffer-5.7.1"
sources."buffer-from-1.1.1"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.1"
@@ -62740,7 +63336,7 @@ in
sources."clone-1.0.4"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."commander-4.1.1"
sources."concat-map-0.0.1"
@@ -62749,7 +63345,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enhanced-resolve-4.5.0"
@@ -62764,7 +63360,7 @@ in
];
})
sources."estraverse-4.3.0"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."execa-4.1.0"
sources."external-editor-3.1.0"
sources."fast-deep-equal-3.1.3"
@@ -62784,7 +63380,7 @@ in
sources."function-bind-1.1.1"
sources."get-stream-5.2.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.4.1"
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
@@ -62797,9 +63393,11 @@ in
sources."inherits-2.0.4"
(sources."inquirer-7.3.3" // {
dependencies = [
+ sources."ansi-regex-5.0.0"
sources."chalk-4.1.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
];
})
sources."interpret-1.4.0"
@@ -62851,7 +63449,7 @@ in
sources."mute-stream-0.0.8"
sources."neo-async-2.6.2"
sources."node-emoji-1.10.0"
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."normalize-path-3.0.0"
sources."npm-run-path-4.0.1"
sources."object-assign-4.1.1"
@@ -62859,7 +63457,9 @@ in
sources."onetime-5.1.2"
(sources."ora-5.3.0" // {
dependencies = [
+ sources."ansi-regex-5.0.0"
sources."chalk-4.1.0"
+ sources."strip-ansi-6.0.0"
];
})
sources."os-name-4.0.0"
@@ -62907,14 +63507,9 @@ in
];
})
sources."sourcemap-codec-1.4.8"
- (sources."string-width-2.1.1" // {
- dependencies = [
- sources."ansi-regex-3.0.0"
- sources."strip-ansi-4.0.0"
- ];
- })
+ sources."string-width-2.1.1"
sources."string_decoder-1.3.0"
- sources."strip-ansi-6.0.0"
+ sources."strip-ansi-4.0.0"
sources."strip-bom-3.0.0"
sources."strip-final-newline-2.0.0"
sources."supports-color-7.2.0"
@@ -63001,7 +63596,7 @@ in
})
(sources."@apollo/protobufjs-1.0.5" // {
dependencies = [
- sources."@types/node-10.17.54"
+ sources."@types/node-10.17.55"
];
})
sources."@apollographql/apollo-tools-0.4.9"
@@ -63012,128 +63607,124 @@ in
sources."@apollographql/graphql-playground-html-1.6.26"
sources."@apollographql/graphql-upload-8-fork-8.1.3"
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
- (sources."@babel/core-7.12.17" // {
+ sources."@babel/compat-data-7.13.8"
+ (sources."@babel/core-7.13.8" // {
dependencies = [
- sources."@babel/generator-7.12.17"
- sources."@babel/types-7.12.17"
- sources."semver-5.7.1"
+ sources."@babel/generator-7.13.9"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/generator-7.12.11" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-annotate-as-pure-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helper-compilation-targets-7.12.17" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."@babel/helper-create-class-features-plugin-7.12.17"
+ sources."@babel/helper-compilation-targets-7.13.8"
+ sources."@babel/helper-create-class-features-plugin-7.13.8"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
- (sources."@babel/helper-explode-assignable-expression-7.12.13" // {
+ sources."@babel/helper-define-polyfill-provider-0.1.5"
+ (sources."@babel/helper-explode-assignable-expression-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-function-name-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-get-function-arity-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helper-hoist-variables-7.12.13" // {
+ (sources."@babel/helper-hoist-variables-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helper-member-expression-to-functions-7.12.17" // {
+ (sources."@babel/helper-member-expression-to-functions-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-module-imports-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helper-module-transforms-7.12.17" // {
+ (sources."@babel/helper-module-transforms-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-optimise-call-expression-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- sources."@babel/helper-plugin-utils-7.12.13"
- (sources."@babel/helper-remap-async-to-generator-7.12.13" // {
+ sources."@babel/helper-plugin-utils-7.13.0"
+ (sources."@babel/helper-remap-async-to-generator-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helper-replace-supers-7.12.13" // {
+ (sources."@babel/helper-replace-supers-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-simple-access-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
(sources."@babel/helper-split-export-declaration-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- (sources."@babel/helper-wrap-function-7.12.13" // {
+ (sources."@babel/helper-wrap-function-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/helpers-7.12.17" // {
+ (sources."@babel/helpers-7.13.0" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
- sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.17"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
+ sources."@babel/plugin-proposal-class-properties-7.13.0"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.17"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -63149,66 +63740,65 @@ in
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
sources."@babel/plugin-syntax-typescript-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-flow-strip-types-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-flow-strip-types-7.13.0"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
- sources."@babel/plugin-transform-typescript-7.12.17"
+ sources."@babel/plugin-transform-typescript-7.13.0"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.12.17" // {
+ (sources."@babel/preset-env-7.13.9" // {
dependencies = [
- sources."@babel/types-7.12.17"
- sources."semver-5.7.1"
+ sources."@babel/types-7.13.0"
];
})
sources."@babel/preset-flow-7.12.13"
sources."@babel/preset-modules-0.1.4"
- sources."@babel/preset-typescript-7.12.17"
- (sources."@babel/register-7.12.13" // {
+ sources."@babel/preset-typescript-7.13.0"
+ (sources."@babel/register-7.13.8" // {
dependencies = [
sources."make-dir-2.1.0"
sources."pify-4.0.1"
sources."semver-5.7.1"
];
})
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
(sources."@babel/template-7.12.13" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
];
})
- (sources."@babel/traverse-7.12.17" // {
+ (sources."@babel/traverse-7.13.0" // {
dependencies = [
- sources."@babel/generator-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/generator-7.13.9"
+ sources."@babel/types-7.13.0"
];
})
sources."@babel/types-7.10.4"
@@ -63363,19 +63953,19 @@ in
];
})
sources."@types/keygrip-1.0.2"
- sources."@types/koa-2.13.0"
+ sources."@types/koa-2.13.1"
sources."@types/koa-compose-3.2.5"
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
(sources."@types/node-fetch-2.5.7" // {
dependencies = [
sources."form-data-3.0.1"
];
})
sources."@types/normalize-package-data-2.4.0"
- sources."@types/qs-6.9.5"
+ sources."@types/qs-6.9.6"
sources."@types/range-parser-1.2.3"
sources."@types/serve-static-1.13.9"
sources."@types/through-0.0.30"
@@ -63389,24 +63979,24 @@ in
})
sources."@vue/cli-ui-addon-webpack-4.5.11"
sources."@vue/cli-ui-addon-widgets-4.5.11"
- (sources."@vue/compiler-core-3.0.5" // {
+ (sources."@vue/compiler-core-3.0.7" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
sources."source-map-0.6.1"
];
})
- sources."@vue/compiler-dom-3.0.5"
- (sources."@vue/compiler-sfc-3.0.5" // {
+ sources."@vue/compiler-dom-3.0.7"
+ (sources."@vue/compiler-sfc-3.0.7" // {
dependencies = [
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
sources."source-map-0.6.1"
];
})
- sources."@vue/compiler-ssr-3.0.5"
- sources."@vue/reactivity-3.0.5"
- sources."@vue/runtime-core-3.0.5"
- sources."@vue/runtime-dom-3.0.5"
- sources."@vue/shared-3.0.5"
+ sources."@vue/compiler-ssr-3.0.7"
+ sources."@vue/reactivity-3.0.7"
+ sources."@vue/runtime-core-3.0.7"
+ sources."@vue/runtime-dom-3.0.7"
+ sources."@vue/shared-3.0.7"
sources."@wry/context-0.4.4"
sources."@wry/equality-0.1.11"
sources."abbrev-1.1.1"
@@ -63544,6 +64134,9 @@ in
sources."aws4-1.11.0"
sources."babel-core-7.0.0-bridge.0"
sources."babel-plugin-dynamic-import-node-2.3.3"
+ sources."babel-plugin-polyfill-corejs2-0.1.10"
+ sources."babel-plugin-polyfill-corejs3-0.1.7"
+ sources."babel-plugin-polyfill-regenerator-0.1.6"
sources."backo2-1.0.2"
sources."balanced-match-1.0.0"
(sources."base-0.11.2" // {
@@ -63626,7 +64219,7 @@ in
];
})
sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
(sources."capital-case-1.0.4" // {
dependencies = [
sources."tslib-2.1.0"
@@ -63710,7 +64303,7 @@ in
];
})
sources."cli-width-3.0.0"
- sources."clipboard-2.0.6"
+ sources."clipboard-2.0.7"
(sources."cliui-6.0.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -63726,7 +64319,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
@@ -63756,8 +64349,8 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."copy-descriptor-0.1.1"
- sources."core-js-3.9.0"
- (sources."core-js-compat-3.9.0" // {
+ sources."core-js-3.9.1"
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -63778,7 +64371,7 @@ in
sources."crypto-random-string-1.0.0"
sources."cssesc-3.0.0"
sources."cssfilter-0.0.10"
- sources."csstype-2.6.15"
+ sources."csstype-2.6.16"
sources."csv-parser-1.12.1"
sources."dashdash-1.14.1"
sources."date-fns-1.30.1"
@@ -63853,7 +64446,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."elegant-spinner-1.0.1"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
@@ -63877,7 +64470,7 @@ in
})
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."es6-error-4.1.1"
sources."escalade-3.1.1"
@@ -63937,7 +64530,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
sources."figures-1.7.0"
sources."file-type-8.1.0"
@@ -63960,7 +64553,7 @@ in
})
sources."find-up-3.0.0"
sources."fkill-6.2.0"
- sources."flow-parser-0.145.0"
+ sources."flow-parser-0.146.0"
sources."for-each-0.3.3"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
@@ -63992,7 +64585,6 @@ in
sources."git-config-path-1.0.1"
(sources."git-parse-1.0.4" // {
dependencies = [
- sources."es-abstract-1.17.7"
sources."util.promisify-1.0.1"
];
})
@@ -64004,7 +64596,7 @@ in
sources."git-up-4.0.2"
sources."git-url-parse-11.4.3"
sources."glob-7.1.5"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.3.0"
(sources."global-agent-2.1.12" // {
dependencies = [
@@ -64014,7 +64606,7 @@ in
})
sources."global-dirs-0.1.1"
sources."globals-11.12.0"
- sources."globalthis-1.0.1"
+ sources."globalthis-1.0.2"
(sources."globby-9.2.0" // {
dependencies = [
sources."@nodelib/fs.stat-1.1.3"
@@ -64064,7 +64656,7 @@ in
];
})
sources."graphql-extensions-0.12.8"
- sources."graphql-subscriptions-1.2.0"
+ sources."graphql-subscriptions-1.2.1"
sources."graphql-tag-2.12.1"
sources."graphql-tools-4.0.8"
sources."graphql-type-json-0.3.2"
@@ -64077,9 +64669,10 @@ in
sources."ansi-regex-2.1.1"
];
})
+ sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
sources."has-symbol-support-x-1.4.2"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-to-string-tag-x-1.4.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -64114,7 +64707,7 @@ in
sources."hyperlinker-1.0.0"
sources."iconv-lite-0.4.24"
sources."icss-replace-symbols-1.1.0"
- sources."icss-utils-4.1.1"
+ sources."icss-utils-5.1.0"
sources."ieee754-1.2.1"
sources."ignore-5.1.8"
sources."ignore-by-default-1.0.1"
@@ -64150,7 +64743,9 @@ in
sources."ipaddr.js-1.9.1"
sources."is-accessor-descriptor-1.0.0"
sources."is-arrayish-0.2.1"
+ sources."is-bigint-1.0.1"
sources."is-binary-path-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-buffer-1.1.6"
sources."is-callable-1.2.3"
sources."is-ci-1.2.1"
@@ -64169,6 +64764,7 @@ in
sources."is-negative-zero-2.0.1"
sources."is-npm-1.0.0"
sources."is-number-7.0.0"
+ sources."is-number-object-1.0.4"
sources."is-obj-1.0.1"
sources."is-object-1.0.2"
sources."is-observable-1.1.0"
@@ -64182,6 +64778,7 @@ in
sources."is-retry-allowed-1.2.0"
sources."is-ssh-1.3.2"
sources."is-stream-1.1.0"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."is-typedarray-1.0.0"
sources."is-windows-1.0.2"
@@ -64368,7 +64965,7 @@ in
})
sources."node-dir-0.1.17"
sources."node-fetch-2.6.1"
- sources."node-ipc-9.1.3"
+ sources."node-ipc-9.1.4"
sources."node-modules-regexp-1.0.0"
(sources."node-notifier-9.0.0" // {
dependencies = [
@@ -64379,7 +64976,7 @@ in
sources."which-2.0.2"
];
})
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
(sources."nodemon-1.19.4" // {
dependencies = [
sources."debug-3.2.7"
@@ -64505,17 +65102,17 @@ in
];
})
sources."posix-character-classes-0.1.1"
- (sources."postcss-7.0.35" // {
+ (sources."postcss-8.2.7" // {
dependencies = [
+ sources."nanoid-3.1.20"
sources."source-map-0.6.1"
- sources."supports-color-6.1.0"
];
})
- sources."postcss-modules-3.2.2"
- sources."postcss-modules-extract-imports-2.0.0"
- sources."postcss-modules-local-by-default-3.0.3"
- sources."postcss-modules-scope-2.2.0"
- sources."postcss-modules-values-3.0.0"
+ sources."postcss-modules-4.0.0"
+ sources."postcss-modules-extract-imports-3.0.0"
+ sources."postcss-modules-local-by-default-4.0.0"
+ sources."postcss-modules-scope-3.0.0"
+ sources."postcss-modules-values-4.0.0"
sources."postcss-selector-parser-6.0.4"
sources."postcss-value-parser-4.1.0"
sources."prepend-http-1.0.4"
@@ -64533,7 +65130,7 @@ in
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
- sources."query-string-6.14.0"
+ sources."query-string-6.14.1"
sources."queue-microtask-1.2.2"
sources."range-parser-1.2.1"
(sources."raw-body-2.4.0" // {
@@ -64616,7 +65213,7 @@ in
sources."rss-parser-3.12.0"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
@@ -64747,9 +65344,9 @@ in
sources."streamsearch-0.1.2"
sources."strict-uri-encode-2.0.0"
sources."string-hash-1.1.3"
- sources."string-width-4.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string-width-4.2.2"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -64856,6 +65453,7 @@ in
sources."type-fest-0.6.0"
sources."type-is-1.6.18"
sources."typescript-3.9.9"
+ sources."unbox-primitive-1.0.0"
sources."unbzip2-stream-1.4.3"
(sources."undefsafe-2.0.3" // {
dependencies = [
@@ -64942,12 +65540,13 @@ in
(sources."vue-codemod-0.0.4" // {
dependencies = [
sources."globby-10.0.2"
- sources."vue-3.0.5"
+ sources."vue-3.0.7"
];
})
sources."watch-1.0.2"
sources."wcwidth-1.0.1"
sources."which-1.3.1"
+ sources."which-boxed-primitive-1.0.2"
sources."which-module-2.0.0"
sources."widest-line-3.1.0"
(sources."wrap-ansi-4.0.0" // {
@@ -65127,12 +65726,12 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/generator-7.12.17"
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/types-7.12.17"
+ sources."@babel/types-7.13.0"
sources."@webassemblyjs/ast-1.11.0"
sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
sources."@webassemblyjs/helper-api-error-1.11.0"
@@ -65201,55 +65800,63 @@ in
alloy = nodeEnv.buildNodePackage {
name = "alloy";
packageName = "alloy";
- version = "1.15.4";
+ version = "1.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/alloy/-/alloy-1.15.4.tgz";
- sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw==";
+ url = "https://registry.npmjs.org/alloy/-/alloy-1.16.0.tgz";
+ sha512 = "TR3y3sHEmRSAt7ikc9rWtWrpJ/2MpvgM5knMhbDJWxvqcvyTPagASAA5gktPJRhxnS2+RScVFEd0I6G/XGTuoQ==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- (sources."@babel/core-7.12.17" // {
+ sources."@babel/compat-data-7.13.8"
+ (sources."@babel/core-7.13.8" // {
dependencies = [
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.12.17" // {
+ (sources."@babel/generator-7.13.9" // {
dependencies = [
sources."source-map-0.5.7"
];
})
+ sources."@babel/helper-compilation-targets-7.13.8"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/helpers-7.12.17"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
+ sources."@babel/helper-validator-option-7.12.17"
+ sources."@babel/helpers-7.13.0"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
sources."async-3.2.0"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
+ sources."browserslist-4.16.3"
+ sources."caniuse-lite-1.0.30001197"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."commander-2.20.3"
sources."concat-map-0.0.1"
sources."convert-source-map-1.7.0"
sources."debug-4.3.2"
- sources."ejs-3.1.5"
+ sources."ejs-3.1.6"
+ sources."electron-to-chromium-1.3.682"
sources."ensure-posix-path-1.1.1"
+ sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
sources."filelist-1.0.2"
sources."fs-extra-5.0.0"
@@ -65293,6 +65900,7 @@ in
sources."minimist-1.2.5"
sources."moment-2.29.1"
sources."ms-2.1.2"
+ sources."node-releases-1.1.71"
sources."node.extend-2.0.2"
(sources."nomnom-1.8.1" // {
dependencies = [
@@ -65306,7 +65914,7 @@ in
sources."resolve-1.20.0"
sources."safe-buffer-5.1.2"
sources."sax-0.5.8"
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
sources."source-map-0.6.1"
sources."strip-ansi-0.1.1"
sources."supports-color-5.5.0"
@@ -65340,7 +65948,7 @@ in
dependencies = [
sources."@types/glob-7.1.3"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
@@ -65672,7 +66280,7 @@ in
sources."array-filter-1.0.0"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -65684,7 +66292,7 @@ in
sources."available-typed-arrays-1.0.2"
sources."balanced-match-1.0.0"
sources."base64-js-1.5.1"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."brace-expansion-1.1.11"
sources."brorand-1.1.0"
sources."browser-pack-6.1.0"
@@ -65715,7 +66323,7 @@ in
sources."core-util-is-1.0.2"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -65729,19 +66337,19 @@ in
sources."detective-5.2.0"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."domain-browser-1.2.0"
sources."duplexer2-0.1.4"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."evp_bytestokey-1.0.3"
sources."fast-safe-stringify-2.0.7"
sources."foreach-2.0.5"
@@ -65751,7 +66359,8 @@ in
sources."get-intrinsic-1.1.1"
sources."glob-7.1.6"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
(sources."hash-base-3.1.0" // {
dependencies = [
sources."readable-stream-3.6.0"
@@ -65767,13 +66376,17 @@ in
sources."inline-source-map-0.6.2"
sources."insert-module-globals-7.2.1"
sources."is-arguments-1.1.0"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-buffer-1.1.6"
sources."is-callable-1.2.3"
sources."is-core-module-2.2.0"
sources."is-date-object-1.0.2"
sources."is-generator-function-1.0.8"
sources."is-negative-zero-2.0.1"
+ sources."is-number-object-1.0.4"
sources."is-regex-1.1.2"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."is-typed-array-1.1.5"
sources."isarray-1.0.0"
@@ -65783,7 +66396,7 @@ in
sources."md5.js-1.3.5"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."minimalistic-assert-1.0.1"
@@ -65810,7 +66423,7 @@ in
sources."process-nextick-args-2.0.1"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."punycode-1.4.1"
@@ -65846,8 +66459,8 @@ in
];
})
sources."stream-splicer-2.0.1"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.3.0"
sources."subarg-1.0.0"
sources."syntax-error-1.4.0"
@@ -65857,6 +66470,7 @@ in
sources."tty-browserify-0.0.1"
sources."typedarray-0.0.6"
sources."umd-3.0.3"
+ sources."unbox-primitive-1.0.0"
sources."undeclared-identifiers-1.1.3"
(sources."url-0.11.0" // {
dependencies = [
@@ -65866,6 +66480,7 @@ in
sources."util-0.12.3"
sources."util-deprecate-1.0.2"
sources."vm-browserify-1.1.2"
+ sources."which-boxed-primitive-1.0.2"
sources."which-typed-array-1.1.4"
sources."wrappy-1.0.2"
sources."xtend-4.0.2"
@@ -65937,7 +66552,7 @@ in
sources."bitcoin-ops-1.4.1"
sources."bitcoinjs-lib-5.2.0"
sources."bluebird-3.7.2"
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
(sources."body-parser-1.19.0" // {
dependencies = [
sources."debug-2.6.9"
@@ -66060,7 +66675,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
(sources."hash-base-3.1.0" // {
dependencies = [
sources."safe-buffer-5.2.1"
@@ -66185,7 +66800,7 @@ in
sources."psl-1.8.0"
sources."pug-2.0.4"
sources."pug-attrs-2.0.4"
- sources."pug-code-gen-2.0.2"
+ sources."pug-code-gen-2.0.3"
sources."pug-error-1.3.3"
sources."pug-filters-3.1.1"
sources."pug-lexer-4.1.0"
@@ -66394,7 +67009,7 @@ in
];
})
sources."blob-to-buffer-1.2.9"
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."bncode-0.5.3"
sources."brace-expansion-1.1.11"
sources."buffer-alloc-1.2.0"
@@ -66618,7 +67233,7 @@ in
sources."qs-6.5.2"
sources."query-string-1.0.1"
sources."queue-microtask-1.2.2"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
sources."randombytes-2.1.0"
@@ -66767,14 +67382,14 @@ in
cdk8s-cli = nodeEnv.buildNodePackage {
name = "cdk8s-cli";
packageName = "cdk8s-cli";
- version = "1.0.0-beta.8";
+ version = "1.0.0-beta.10";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.8.tgz";
- sha512 = "3gtzVdy2/KcfUsXmbEuehe8O1L1EtjzEvfzBYcQtZ1VYJK+X95H2UXlDwI6ug+K8A/Fmnrh2TjtIq1Vakv0fcQ==";
+ url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.10.tgz";
+ sha512 = "9PI2OLv8PmnnZSNP3PN16gr/yMxBJinh/LMgjk66PBfVmAduojFzJ1pTYPE/vb4qBxHYP4BkEbR8Auxa+qyEvw==";
};
dependencies = [
- sources."@jsii/spec-1.21.0"
- sources."@types/node-10.17.54"
+ sources."@jsii/spec-1.24.0"
+ sources."@types/node-10.17.55"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."array-filter-1.0.0"
@@ -66783,10 +67398,10 @@ in
sources."call-bind-1.0.2"
sources."camelcase-6.2.0"
sources."case-1.6.3"
- sources."cdk8s-1.0.0-beta.8"
+ sources."cdk8s-1.0.0-beta.10"
sources."cliui-7.0.4"
sources."clone-2.1.2"
- (sources."codemaker-1.21.0" // {
+ (sources."codemaker-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
];
@@ -66795,7 +67410,7 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.29.3"
- sources."constructs-3.3.5"
+ sources."constructs-3.3.48"
sources."date-format-3.0.0"
sources."debug-4.3.2"
sources."decamelize-5.0.0"
@@ -66806,7 +67421,7 @@ in
sources."dot-case-3.0.4"
sources."emoji-regex-8.0.0"
sources."entities-2.0.3"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-get-iterator-1.1.2"
sources."es-to-primitive-1.2.1"
sources."escalade-3.1.1"
@@ -66825,7 +67440,8 @@ in
sources."get-intrinsic-1.1.1"
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
sources."is-arguments-1.1.0"
sources."is-bigint-1.0.1"
sources."is-boolean-object-1.1.0"
@@ -66843,31 +67459,31 @@ in
sources."is-weakmap-2.0.1"
sources."is-weakset-2.0.1"
sources."isarray-2.0.5"
- (sources."jsii-1.21.0" // {
+ (sources."jsii-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.21.0" // {
+ (sources."jsii-pacmak-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.21.0" // {
+ (sources."jsii-reflect-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.21.0" // {
+ (sources."jsii-rosetta-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.222" // {
+ (sources."jsii-srcmak-0.1.252" // {
dependencies = [
sources."fs-extra-9.1.0"
];
@@ -66889,7 +67505,7 @@ in
sources."object-is-1.1.5"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."oo-ascii-tree-1.21.0"
+ sources."oo-ascii-tree-1.24.0"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
@@ -66915,13 +67531,14 @@ in
sources."date-format-2.1.0"
];
})
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."string.prototype.repeat-0.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."strip-ansi-6.0.0"
sources."tslib-2.1.0"
sources."typescript-3.9.9"
+ sources."unbox-primitive-1.0.0"
sources."universalify-2.0.0"
sources."which-boxed-primitive-1.0.2"
sources."which-collection-1.0.1"
@@ -66943,7 +67560,7 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -66964,12 +67581,12 @@ in
sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA==";
};
dependencies = [
- sources."@jsii/spec-1.21.0"
+ sources."@jsii/spec-1.24.0"
sources."@skorfmann/terraform-cloud-1.9.1"
sources."@types/archiver-5.1.0"
sources."@types/glob-7.1.3"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/readline-sync-1.4.3"
sources."@types/stream-buffers-3.0.3"
sources."@types/uuid-8.3.0"
@@ -66977,7 +67594,7 @@ in
sources."ansi-escapes-4.3.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
- sources."archiver-5.2.0"
+ sources."archiver-5.3.0"
(sources."archiver-utils-2.1.0" // {
dependencies = [
sources."readable-stream-2.3.7"
@@ -67020,9 +67637,9 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.29.3"
- sources."compress-commons-4.0.2"
+ sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
- sources."constructs-3.3.29"
+ sources."constructs-3.3.61"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
sources."crc32-stream-4.0.2"
@@ -67041,7 +67658,7 @@ in
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."entities-2.0.3"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
(sources."es-get-iterator-1.1.2" // {
dependencies = [
sources."isarray-2.0.5"
@@ -67055,7 +67672,7 @@ in
sources."exit-on-epipe-1.0.1"
sources."find-up-4.1.0"
sources."flatted-2.0.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."foreach-2.0.5"
sources."fs-constants-1.0.0"
sources."fs-extra-8.1.0"
@@ -67066,8 +67683,9 @@ in
sources."glob-7.1.6"
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
+ sources."has-bigints-1.0.1"
sources."has-flag-4.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."ieee754-1.2.1"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -67106,7 +67724,7 @@ in
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."js-tokens-4.0.0"
- (sources."jsii-1.21.0" // {
+ (sources."jsii-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67114,10 +67732,10 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.21.0" // {
+ (sources."jsii-pacmak-1.24.0" // {
dependencies = [
sources."camelcase-6.2.0"
- sources."codemaker-1.21.0"
+ sources."codemaker-1.24.0"
sources."decamelize-5.0.0"
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67125,7 +67743,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.21.0" // {
+ (sources."jsii-reflect-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67133,7 +67751,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.21.0" // {
+ (sources."jsii-rosetta-1.24.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67141,7 +67759,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.222" // {
+ (sources."jsii-srcmak-0.1.252" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67198,11 +67816,11 @@ in
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
sources."object.entries-1.1.3"
- sources."object.fromentries-2.0.3"
- sources."object.values-1.1.2"
+ sources."object.fromentries-2.0.4"
+ sources."object.values-1.1.3"
sources."once-1.4.0"
sources."onetime-5.1.2"
- sources."oo-ascii-tree-1.21.0"
+ sources."oo-ascii-tree-1.24.0"
sources."open-7.4.2"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
@@ -67254,17 +67872,18 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."string-width-4.2.0"
- sources."string.prototype.matchall-4.0.3"
+ sources."string-width-4.2.2"
+ sources."string.prototype.matchall-4.0.4"
sources."string.prototype.repeat-0.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
sources."tar-stream-2.2.0"
sources."type-fest-0.11.0"
sources."typescript-3.9.9"
+ sources."unbox-primitive-1.0.0"
sources."universalify-0.1.2"
sources."util-deprecate-1.0.2"
sources."uuid-8.3.2"
@@ -67286,10 +67905,10 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
sources."yn-3.1.1"
sources."yoga-layout-prebuilt-1.10.0"
- sources."zip-stream-4.0.4"
+ sources."zip-stream-4.1.0"
];
buildInputs = globalBuildInputs;
meta = {
@@ -67304,15 +67923,15 @@ in
clean-css-cli = nodeEnv.buildNodePackage {
name = "clean-css-cli";
packageName = "clean-css-cli";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.0.tgz";
- sha512 = "c7TQ+Lq8azYtThXtWlf0m9Iw66wBLQ0LPUJIEKHWTn8HB2tQlbqY6BMoKdgW4NJVZOYquwQrrRszTqH8NjHgTg==";
+ url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.1.tgz";
+ sha512 = "y+nSP8lcBWXWHqBVK1o1UQjUR/s1Xu3H7rSXtp4R03orU8gGCkmYZjwhALMww6E6JChjoshpLodV+VfjAufaHw==";
};
dependencies = [
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
- sources."clean-css-5.1.0"
+ sources."clean-css-5.1.1"
sources."commander-7.1.0"
sources."concat-map-0.0.1"
sources."fs.realpath-1.0.0"
@@ -67387,7 +68006,7 @@ in
sources."path-is-absolute-1.0.1"
sources."prompt-1.1.0"
sources."punycode-2.1.1"
- sources."query-string-6.14.0"
+ sources."query-string-6.14.1"
sources."read-1.0.7"
sources."revalidator-0.1.8"
sources."rimraf-2.7.1"
@@ -67400,7 +68019,7 @@ in
sources."universal-url-2.0.0"
sources."utile-0.3.0"
sources."webidl-conversions-4.0.2"
- sources."whatwg-fetch-3.6.1"
+ sources."whatwg-fetch-3.6.2"
sources."whatwg-url-7.1.0"
(sources."winston-2.4.5" // {
dependencies = [
@@ -67535,10 +68154,10 @@ in
coc-git = nodeEnv.buildNodePackage {
name = "coc-git";
packageName = "coc-git";
- version = "2.2.1";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.1.tgz";
- sha512 = "UlT5D++GU9vWlK/bANGHDxtThdPOWWiVRg9Fsist2ytrg6pjNPSDT/f6US1J7aBCRCB9p2463e/G7JSUT4WTow==";
+ url = "https://registry.npmjs.org/coc-git/-/coc-git-2.3.1.tgz";
+ sha512 = "119J+uanlMO9xZA4yeyvjwbWKDckLUKUtJu6mreHuyQbd7x4Ea3qwjpWMlGl2+QLJQ78OPZjpbzzlc8FzDZY2A==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -67601,7 +68220,7 @@ in
sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw==";
};
dependencies = [
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -67722,10 +68341,10 @@ in
coc-metals = nodeEnv.buildNodePackage {
name = "coc-metals";
packageName = "coc-metals";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz";
- sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg==";
+ url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.2.tgz";
+ sha512 = "oONqWYHICin0t9chOrx6dkL2pEBeaFwrfwaBPX9we0bNrhQ3XQNLNC/O+/x4ZSHzHQ0hucmmGOuCoQ9Q7wbdGg==";
};
dependencies = [
sources."@chemzqm/neovim-5.2.13"
@@ -67764,14 +68383,14 @@ in
sources."define-properties-1.1.3"
sources."duplexer2-0.1.4"
sources."end-of-stream-1.4.4"
- sources."es-abstract-1.17.7"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."event-lite-0.1.2"
sources."execa-1.0.0"
sources."fast-diff-1.2.0"
sources."fb-watchman-2.0.1"
sources."flatted-2.0.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."fp-ts-2.9.5"
sources."fs-extra-8.1.0"
sources."fs-minipass-2.1.0"
@@ -67788,7 +68407,8 @@ in
sources."glob-7.1.6"
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
sources."http-proxy-agent-4.0.1"
sources."https-proxy-agent-5.0.0"
sources."ieee754-1.2.1"
@@ -67796,11 +68416,16 @@ in
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."int64-buffer-0.1.10"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-date-object-1.0.2"
sources."is-docker-2.1.1"
+ sources."is-negative-zero-2.0.1"
+ sources."is-number-object-1.0.4"
sources."is-regex-1.1.2"
sources."is-stream-1.1.0"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
@@ -67865,14 +68490,15 @@ in
sources."date-format-2.1.0"
];
})
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
sources."tar-6.1.0"
sources."traverse-0.3.9"
sources."tslib-2.1.0"
+ sources."unbox-primitive-1.0.0"
sources."universalify-0.1.2"
sources."unzipper-0.10.11"
sources."util-deprecate-1.0.2"
@@ -67887,6 +68513,7 @@ in
sources."vscode-languageserver-types-3.16.0"
sources."vscode-uri-2.1.2"
sources."which-2.0.2"
+ sources."which-boxed-primitive-1.0.2"
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
];
@@ -67902,10 +68529,10 @@ in
coc-pairs = nodeEnv.buildNodePackage {
name = "coc-pairs";
packageName = "coc-pairs";
- version = "1.2.22";
+ version = "1.2.23";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz";
- sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA==";
+ url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.23.tgz";
+ sha512 = "vV4rjZqtgHNTlXhHQyQ9cabwbwummPOtxyHYUJDZvfuAGKKTbFpvoC3iS6Qv1P7FTAaxuEpB72EME7+K1bdk7A==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -67920,15 +68547,20 @@ in
coc-prettier = nodeEnv.buildNodePackage {
name = "coc-prettier";
packageName = "coc-prettier";
- version = "1.1.20";
+ version = "1.1.22";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.20.tgz";
- sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A==";
+ url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.22.tgz";
+ sha512 = "4H7hWONnZ8kb0WzA9sd4HWMV1uDOMjQHYhLYEll+SShuZ11zUUWhg9tSiiY/srDJYKAUV2DsAE5kuoqYPa1jXg==";
};
dependencies = [
- sources."@babel/code-frame-7.12.13"
+ sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ (sources."@babel/highlight-7.13.8" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
+ sources."@eslint/eslintrc-0.4.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/eslint-visitor-keys-1.0.0"
@@ -67950,11 +68582,7 @@ in
sources."strip-ansi-4.0.0"
];
})
- (sources."ansi-escapes-4.3.1" // {
- dependencies = [
- sources."type-fest-0.11.0"
- ];
- })
+ sources."ansi-colors-4.1.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
@@ -67967,7 +68595,7 @@ in
sources."array-unique-0.2.1"
sources."arrify-1.0.1"
sources."assign-symbols-1.0.0"
- sources."astral-regex-1.0.0"
+ sources."astral-regex-2.0.0"
sources."atob-2.1.2"
sources."autoprefixer-7.2.6"
sources."bail-1.0.5"
@@ -67982,6 +68610,7 @@ in
dependencies = [
sources."ansi-regex-3.0.0"
sources."camelcase-4.1.0"
+ sources."chalk-2.4.2"
sources."is-fullwidth-code-point-2.0.0"
sources."string-width-2.1.1"
sources."strip-ansi-4.0.0"
@@ -68000,15 +68629,22 @@ in
sources."callsites-3.1.0"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.1.0"
- sources."chalk-2.4.2"
+ (sources."chalk-4.1.0" // {
+ dependencies = [
+ sources."ansi-styles-4.3.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
sources."character-entities-1.2.4"
sources."character-entities-html4-1.1.4"
sources."character-entities-legacy-1.1.4"
sources."character-reference-invalid-1.1.4"
- sources."chardet-0.7.0"
sources."ci-info-1.6.0"
sources."circular-json-0.3.3"
(sources."class-utils-0.3.6" // {
@@ -68030,8 +68666,6 @@ in
];
})
sources."cli-boxes-1.0.0"
- sources."cli-cursor-3.1.0"
- sources."cli-width-3.0.0"
(sources."cliui-4.1.0" // {
dependencies = [
sources."ansi-regex-3.0.0"
@@ -68057,14 +68691,10 @@ in
];
})
sources."copy-descriptor-0.1.1"
- sources."core-js-3.9.0"
+ sources."core-js-3.9.1"
sources."cosmiconfig-3.1.0"
sources."create-error-class-3.0.2"
- (sources."cross-spawn-6.0.5" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
+ sources."cross-spawn-7.0.3"
sources."crypto-random-string-1.0.0"
sources."currently-unhandled-0.4.1"
sources."debug-4.3.2"
@@ -68097,22 +68727,22 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
+ sources."enquirer-2.3.6"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-6.8.0" // {
+ (sources."eslint-7.21.0" // {
dependencies = [
- sources."eslint-utils-1.4.3"
- sources."semver-6.3.0"
+ sources."eslint-visitor-keys-2.0.0"
];
})
sources."eslint-scope-5.1.1"
sources."eslint-utils-2.1.0"
sources."eslint-visitor-keys-1.3.0"
- sources."espree-6.2.1"
+ sources."espree-7.3.1"
sources."esprima-4.0.1"
(sources."esquery-1.4.0" // {
dependencies = [
@@ -68130,6 +68760,9 @@ in
dependencies = [
sources."cross-spawn-5.1.0"
sources."lru-cache-4.1.5"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."which-1.3.1"
sources."yallist-2.1.2"
];
})
@@ -68142,7 +68775,6 @@ in
sources."is-extendable-1.0.1"
];
})
- sources."external-editor-3.1.0"
(sources."extglob-0.3.2" // {
dependencies = [
sources."is-extglob-1.0.0"
@@ -68209,13 +68841,12 @@ in
})
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."figures-3.2.0"
- sources."file-entry-cache-5.0.1"
+ sources."file-entry-cache-6.0.1"
sources."filename-regex-2.0.1"
sources."fill-range-2.2.4"
sources."find-up-2.1.0"
- sources."flat-cache-2.0.1"
- sources."flatted-2.0.2"
+ sources."flat-cache-3.0.4"
+ sources."flatted-3.1.1"
sources."for-in-1.0.2"
sources."for-own-0.1.5"
sources."fragment-cache-0.2.1"
@@ -68234,7 +68865,7 @@ in
sources."is-glob-2.0.1"
];
})
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.3.0"
sources."global-dirs-0.1.1"
sources."globals-12.4.0"
@@ -68272,7 +68903,6 @@ in
sources."hosted-git-info-2.8.8"
sources."html-tags-2.0.0"
sources."htmlparser2-3.10.1"
- sources."iconv-lite-0.4.24"
sources."ignore-4.0.6"
sources."import-fresh-3.3.0"
sources."import-lazy-2.1.0"
@@ -68283,17 +68913,6 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
- (sources."inquirer-7.3.3" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."chalk-4.1.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."has-flag-4.0.0"
- sources."strip-ansi-6.0.0"
- sources."supports-color-7.2.0"
- ];
- })
sources."invert-kv-2.0.0"
(sources."is-accessor-descriptor-1.0.0" // {
dependencies = [
@@ -68362,7 +68981,7 @@ in
sources."known-css-properties-0.5.0"
sources."latest-version-3.1.0"
sources."lcid-2.0.0"
- sources."levn-0.3.0"
+ sources."levn-0.4.1"
(sources."load-json-file-1.1.0" // {
dependencies = [
sources."parse-json-2.2.0"
@@ -68372,7 +68991,11 @@ in
sources."locate-path-2.0.0"
sources."lodash-4.17.21"
sources."lodash.merge-4.6.2"
- sources."log-symbols-2.2.0"
+ (sources."log-symbols-2.2.0" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
sources."loglevel-1.7.1"
(sources."loglevel-colored-level-prefix-1.0.0" // {
dependencies = [
@@ -68417,7 +69040,6 @@ in
})
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
- sources."mute-stream-0.0.8"
(sources."nanomatch-1.2.13" // {
dependencies = [
sources."arr-diff-4.0.0"
@@ -68435,7 +69057,11 @@ in
sources."normalize-path-2.1.1"
sources."normalize-range-0.1.2"
sources."normalize-selector-0.2.0"
- sources."npm-run-path-2.0.2"
+ (sources."npm-run-path-2.0.2" // {
+ dependencies = [
+ sources."path-key-2.0.1"
+ ];
+ })
sources."num2fraction-1.2.2"
sources."number-is-nan-1.0.1"
sources."object-assign-4.1.1"
@@ -68463,15 +69089,19 @@ in
];
})
sources."once-1.4.0"
- sources."onetime-5.1.2"
- sources."optionator-0.8.3"
+ sources."optionator-0.9.1"
(sources."os-locale-3.1.0" // {
dependencies = [
+ sources."cross-spawn-6.0.5"
sources."execa-1.0.0"
sources."get-stream-4.1.0"
+ sources."path-key-2.0.1"
+ sources."semver-5.7.1"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."which-1.3.1"
];
})
- sources."os-tmpdir-1.0.2"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
@@ -68497,7 +69127,7 @@ in
sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
sources."path-is-inside-1.0.2"
- sources."path-key-2.0.1"
+ sources."path-key-3.1.1"
sources."path-parse-1.0.6"
(sources."path-type-1.1.0" // {
dependencies = [
@@ -68509,7 +69139,11 @@ in
sources."pinkie-promise-2.0.1"
sources."pkg-dir-2.0.0"
sources."posix-character-classes-0.1.1"
- sources."postcss-6.0.23"
+ (sources."postcss-6.0.23" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
sources."postcss-html-0.12.0"
(sources."postcss-less-1.1.5" // {
dependencies = [
@@ -68528,18 +69162,22 @@ in
];
})
sources."postcss-media-query-parser-0.2.3"
- sources."postcss-reporter-5.0.0"
+ (sources."postcss-reporter-5.0.0" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
sources."postcss-resolve-nested-selector-0.1.1"
sources."postcss-safe-parser-3.0.1"
sources."postcss-sass-0.2.0"
sources."postcss-scss-1.0.6"
sources."postcss-selector-parser-3.1.2"
sources."postcss-value-parser-3.3.1"
- sources."prelude-ls-1.1.2"
+ sources."prelude-ls-1.2.1"
sources."prepend-http-1.0.4"
sources."preserve-0.2.0"
sources."prettier-2.2.1"
- sources."prettier-eslint-11.0.0"
+ sources."prettier-eslint-12.0.0"
(sources."prettier-stylelint-0.4.2" // {
dependencies = [
sources."debug-3.2.7"
@@ -68549,6 +69187,7 @@ in
})
(sources."prettier-tslint-0.4.2" // {
dependencies = [
+ sources."chalk-2.4.2"
sources."dir-glob-2.0.0"
sources."globby-8.0.2"
sources."ignore-3.3.10"
@@ -68591,7 +69230,7 @@ in
})
sources."regex-cache-0.4.4"
sources."regex-not-1.0.2"
- sources."regexpp-2.0.1"
+ sources."regexpp-3.1.0"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
sources."remark-8.0.0"
@@ -68614,14 +69253,10 @@ in
})
sources."resolve-from-4.0.0"
sources."resolve-url-0.2.1"
- sources."restore-cursor-3.1.0"
sources."ret-0.1.15"
- sources."rimraf-2.6.3"
- sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rimraf-3.0.2"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
- sources."safer-buffer-2.1.2"
sources."semver-7.3.4"
(sources."semver-diff-2.1.0" // {
dependencies = [
@@ -68634,13 +69269,15 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."shebang-command-1.2.0"
- sources."shebang-regex-1.0.0"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
sources."slash-1.0.0"
- (sources."slice-ansi-2.1.0" // {
+ (sources."slice-ansi-4.0.0" // {
dependencies = [
- sources."is-fullwidth-code-point-2.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
];
})
(sources."snapdragon-0.8.2" // {
@@ -68699,18 +69336,10 @@ in
sources."kind-of-5.1.0"
];
})
- (sources."string-width-4.2.0" // {
- dependencies = [
- sources."strip-ansi-6.0.0"
- ];
- })
+ sources."string-width-4.2.2"
sources."string_decoder-1.3.0"
sources."stringify-entities-1.3.2"
- (sources."strip-ansi-5.2.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- ];
- })
+ sources."strip-ansi-6.0.0"
sources."strip-bom-2.0.0"
sources."strip-eof-1.0.0"
(sources."strip-indent-1.0.1" // {
@@ -68725,6 +69354,7 @@ in
sources."ansi-regex-3.0.0"
sources."camelcase-4.1.0"
sources."camelcase-keys-4.2.0"
+ sources."chalk-2.4.2"
sources."debug-3.2.7"
sources."file-entry-cache-2.0.0"
sources."flat-cache-1.3.4"
@@ -68740,6 +69370,7 @@ in
sources."read-pkg-3.0.0"
sources."read-pkg-up-3.0.0"
sources."redent-2.0.0"
+ sources."rimraf-2.6.3"
sources."slice-ansi-1.0.0"
sources."string-width-2.1.1"
sources."strip-ansi-4.0.0"
@@ -68747,17 +69378,15 @@ in
sources."strip-indent-2.0.0"
sources."table-4.0.3"
sources."trim-newlines-2.0.0"
- sources."write-0.2.1"
];
})
sources."sugarss-1.0.1"
sources."supports-color-5.5.0"
sources."svg-tags-1.0.0"
- (sources."table-5.4.6" // {
+ (sources."table-6.0.7" // {
dependencies = [
- sources."emoji-regex-7.0.3"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
+ sources."ajv-7.2.1"
+ sources."json-schema-traverse-1.0.0"
];
})
sources."temp-dir-1.0.0"
@@ -68765,9 +69394,7 @@ in
sources."tempy-0.2.1"
sources."term-size-1.2.0"
sources."text-table-0.2.0"
- sources."through-2.3.8"
sources."timed-out-4.0.1"
- sources."tmp-0.0.33"
sources."to-object-path-0.3.0"
sources."to-regex-3.0.2"
(sources."to-regex-range-2.1.1" // {
@@ -68782,12 +69409,13 @@ in
sources."tslib-1.14.1"
(sources."tslint-5.20.1" // {
dependencies = [
+ sources."chalk-2.4.2"
sources."semver-5.7.1"
sources."tsutils-2.29.0"
];
})
- sources."tsutils-3.20.0"
- sources."type-check-0.3.2"
+ sources."tsutils-3.21.0"
+ sources."type-check-0.4.0"
sources."type-fest-0.8.1"
sources."typescript-3.9.9"
sources."unherit-1.1.3"
@@ -68813,20 +69441,28 @@ in
];
})
sources."unzip-response-2.0.1"
- sources."update-notifier-2.5.0"
+ (sources."update-notifier-2.5.0" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
sources."uri-js-4.4.1"
sources."urix-0.1.0"
sources."url-parse-lax-1.0.0"
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."validate-npm-package-license-3.0.4"
sources."vfile-2.3.0"
sources."vfile-location-2.0.6"
sources."vfile-message-1.1.1"
- sources."vue-eslint-parser-7.1.1"
- sources."which-1.3.1"
+ (sources."vue-eslint-parser-7.1.1" // {
+ dependencies = [
+ sources."espree-6.2.1"
+ ];
+ })
+ sources."which-2.0.2"
sources."which-module-2.0.0"
(sources."widest-line-2.0.1" // {
dependencies = [
@@ -68846,7 +69482,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."write-1.0.3"
+ sources."write-0.2.1"
sources."write-file-atomic-2.4.3"
sources."x-is-string-0.1.0"
sources."xdg-basedir-3.0.0"
@@ -68879,13 +69515,13 @@ in
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
- version = "1.1.113";
+ version = "1.1.118";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.113.tgz";
- sha512 = "a9mC0b7oVLT3KEHbBw1e7D7k2UD0lRaTk/HrZJJ/lkIDlpF/6TrwqTcL/BUWptUjwUA4sOOdAoQQeOR88Ugsww==";
+ url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.118.tgz";
+ sha512 = "QGMg/2IeDLnIJX972q5muqgaTtqQ/FBPGDR1WY2dHn0vckbhYaI8zuxrHveTTpqpxkAVimTHbAyfiUen11aQ+g==";
};
dependencies = [
- sources."pyright-1.1.113"
+ sources."pyright-1.1.118"
];
buildInputs = globalBuildInputs;
meta = {
@@ -68959,10 +69595,10 @@ in
coc-rust-analyzer = nodeEnv.buildNodePackage {
name = "coc-rust-analyzer";
packageName = "coc-rust-analyzer";
- version = "0.33.0";
+ version = "0.37.0";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.33.0.tgz";
- sha512 = "0KXO4O25iL5Cl+E5Tn7QCDh4FbeyGtQKP4VpKp6tP3gQyO8X4W5AN3RSj5RHHeV8TIT0EMoI26FRVQ2MiALmGg==";
+ url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.37.0.tgz";
+ sha512 = "hATxP0epa85YwVzUSYivWgCChPENb9ugKC1G5TOD/flfPRUIGqVVJQDKbqCo+sWUbhYnGLeIl04CJfFhNk/xKA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -68995,10 +69631,10 @@ in
coc-snippets = nodeEnv.buildNodePackage {
name = "coc-snippets";
packageName = "coc-snippets";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz";
- sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g==";
+ url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.1.tgz";
+ sha512 = "+81jc8T250Ipl50MMypedTqHvAAGPu/COg9wEUsBzEOHmA0r4ouvRhzjAOWt7G6L2dHdB4KJl8AWfiVZhc5dRA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -69036,28 +69672,31 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/core-7.12.17"
- sources."@babel/generator-7.12.17"
+ sources."@babel/compat-data-7.13.8"
+ sources."@babel/core-7.13.8"
+ sources."@babel/generator-7.13.9"
+ sources."@babel/helper-compilation-targets-7.13.8"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/helpers-7.12.17"
- (sources."@babel/highlight-7.12.13" // {
+ sources."@babel/helper-validator-option-7.12.17"
+ sources."@babel/helpers-7.13.0"
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.12.17"
+ sources."@babel/parser-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -69068,7 +69707,7 @@ in
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/unist-2.0.3"
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."array-union-2.1.0"
@@ -69083,7 +69722,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -69099,7 +69738,7 @@ in
sources."clone-regexp-2.2.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."concat-map-0.0.1"
sources."convert-source-map-1.7.0"
sources."cosmiconfig-7.0.0"
@@ -69121,7 +69760,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -69133,7 +69772,7 @@ in
sources."fast-diff-1.2.0"
sources."fast-glob-3.2.5"
sources."fastest-levenshtein-1.0.12"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."file-entry-cache-6.0.1"
sources."fill-range-7.0.1"
sources."find-up-4.1.0"
@@ -69144,7 +69783,7 @@ in
sources."gensync-1.0.0-beta.2"
sources."get-stdin-8.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
@@ -69216,7 +69855,7 @@ in
];
})
sources."ms-2.1.2"
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
(sources."normalize-package-data-3.0.0" // {
dependencies = [
sources."semver-7.3.4"
@@ -69266,6 +69905,7 @@ in
dependencies = [
sources."hosted-git-info-2.8.8"
sources."normalize-package-data-2.5.0"
+ sources."semver-5.7.1"
sources."type-fest-0.6.0"
];
})
@@ -69287,7 +69927,7 @@ in
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.1.2"
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
sources."signal-exit-3.0.3"
sources."slash-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -69303,7 +69943,7 @@ in
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
sources."specificity-0.4.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.3.0" // {
dependencies = [
sources."safe-buffer-5.2.1"
@@ -69312,7 +69952,7 @@ in
sources."strip-ansi-6.0.0"
sources."strip-indent-3.0.0"
sources."style-search-0.1.0"
- sources."stylelint-13.11.0"
+ sources."stylelint-13.12.0"
sources."sugarss-2.0.0"
sources."supports-color-5.5.0"
sources."svg-tags-1.0.0"
@@ -69323,14 +69963,14 @@ in
sources."trough-1.0.5"
sources."type-fest-0.18.1"
sources."typedarray-to-buffer-3.1.5"
- sources."unified-9.2.0"
+ sources."unified-9.2.1"
sources."uniq-1.0.1"
sources."unist-util-find-all-after-3.0.2"
- sources."unist-util-is-4.0.4"
+ sources."unist-util-is-4.1.0"
sources."unist-util-stringify-position-2.0.3"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."validate-npm-package-license-3.0.4"
sources."vfile-4.2.1"
sources."vfile-message-2.0.4"
@@ -69349,7 +69989,7 @@ in
sources."write-file-atomic-3.0.3"
sources."yallist-4.0.0"
sources."yaml-1.10.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
sources."zwitch-1.0.5"
];
buildInputs = globalBuildInputs;
@@ -69407,7 +70047,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ sources."@babel/highlight-7.13.8"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."balanced-match-1.0.0"
@@ -69460,10 +70100,10 @@ in
coc-tslint-plugin = nodeEnv.buildNodePackage {
name = "coc-tslint-plugin";
packageName = "coc-tslint-plugin";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.1.2.tgz";
- sha512 = "wLm2JJVkf2yUk3XzMSmAs8pnibQRTroHnF3XkIH7DJ5mrcrZe9o0Od2lYyuNxgJn2v6/Iw221o8/LfoamfywdQ==";
+ url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz";
+ sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag==";
};
dependencies = [
sources."balanced-match-1.0.0"
@@ -69493,13 +70133,13 @@ in
coc-tsserver = nodeEnv.buildNodePackage {
name = "coc-tsserver";
packageName = "coc-tsserver";
- version = "1.6.7";
+ version = "1.6.8";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz";
- sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg==";
+ url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.8.tgz";
+ sha512 = "No0Eio7RJDawPS2fuWyJgnbDRN9ivtxf085o4jOuSOrwFeId88Se1ngPoT7whVAOkAiW75KgqFyuLDlr9XH+9w==";
};
dependencies = [
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -69514,20 +70154,20 @@ in
coc-vetur = nodeEnv.buildNodePackage {
name = "coc-vetur";
packageName = "coc-vetur";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.3.tgz";
- sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg==";
+ url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.4.tgz";
+ sha512 = "9ZEPHykSx2J/OwLFocXSK1Bg4p35AegacFb0ZaWV9s0IEtdNSkYi25Y9CscqV6fQheMfyEl0f4rlI4yh6DbcPg==";
};
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@eslint/eslintrc-0.3.0"
+ sources."@eslint/eslintrc-0.4.0"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -69561,8 +70201,8 @@ in
sources."emoji-regex-8.0.0"
sources."enquirer-2.3.6"
sources."escape-string-regexp-1.0.5"
- sources."eslint-7.20.0"
- sources."eslint-plugin-vue-7.6.0"
+ sources."eslint-7.21.0"
+ sources."eslint-plugin-vue-7.7.0"
sources."eslint-scope-5.1.1"
(sources."eslint-utils-2.1.0" // {
dependencies = [
@@ -69598,7 +70238,7 @@ in
sources."function-bind-1.1.1"
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globals-12.4.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
@@ -69650,13 +70290,13 @@ in
];
})
sources."sprintf-js-1.0.3"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-json-comments-3.1.1"
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."json-schema-traverse-1.0.0"
];
})
@@ -69671,11 +70311,11 @@ in
sources."tsutils-2.29.0"
sources."type-check-0.4.0"
sources."type-fest-0.8.1"
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
sources."uri-js-4.4.1"
- sources."v8-compile-cache-2.2.0"
- sources."vls-0.5.10"
- (sources."vue-eslint-parser-7.5.0" // {
+ sources."v8-compile-cache-2.3.0"
+ sources."vls-0.7.2"
+ (sources."vue-eslint-parser-7.6.0" // {
dependencies = [
sources."eslint-visitor-keys-1.3.0"
sources."espree-6.2.1"
@@ -69698,10 +70338,10 @@ in
coc-vimlsp = nodeEnv.buildNodePackage {
name = "coc-vimlsp";
packageName = "coc-vimlsp";
- version = "0.11.0";
+ version = "0.11.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.0.tgz";
- sha512 = "tcou7cmYgzjLLPfLEyuea5umVkITER0IqDsJCc/3IeuPFyL03D7EDyeXIcyR+fJwXpJ0AzO6rzoLBMqpt4hYGg==";
+ url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.1.tgz";
+ sha512 = "vHerH6fO69i/5002OTCYMbBiswMcjKRMqLbIByw6aB4OuOXDBDi1zn+jX+LqRSI0sEsVJIL1VhqGvigOo2OWNg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -69751,10 +70391,10 @@ in
coc-yaml = nodeEnv.buildNodePackage {
name = "coc-yaml";
packageName = "coc-yaml";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.3.0.tgz";
- sha512 = "i71kwyF20R+vAHhuF9uBbvs6kkvKuSifMkxTeIbBnLobHE500rSSwUD2SPIvt+I1g1rfHrM0Sj89fzrhDA60NQ==";
+ url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.3.1.tgz";
+ sha512 = "OJeA16cZ7ds4QsyPP9Vmztca4DDpcz7odPN5O75+jb5nmTD5UgYWQE71sY10vIIqdI+dKYdWw+iausu90cuZHA==";
};
dependencies = [
sources."agent-base-4.3.0"
@@ -69766,16 +70406,18 @@ in
sources."http-proxy-agent-2.1.0"
sources."https-proxy-agent-2.2.4"
sources."js-yaml-3.14.1"
- sources."jsonc-parser-3.0.0"
+ sources."jsonc-parser-2.3.1"
sources."ms-2.0.0"
sources."prettier-2.0.5"
- (sources."request-light-0.2.5" // {
+ sources."request-light-0.2.5"
+ sources."sprintf-js-1.0.3"
+ (sources."vscode-json-languageservice-3.11.0" // {
dependencies = [
- sources."vscode-nls-4.1.2"
+ sources."jsonc-parser-3.0.0"
+ sources."vscode-languageserver-types-3.16.0-next.2"
+ sources."vscode-nls-5.0.0"
];
})
- sources."sprintf-js-1.0.3"
- sources."vscode-json-languageservice-3.11.0"
sources."vscode-jsonrpc-4.0.0"
(sources."vscode-languageserver-5.2.1" // {
dependencies = [
@@ -69788,16 +70430,10 @@ in
];
})
sources."vscode-languageserver-textdocument-1.0.1"
- sources."vscode-languageserver-types-3.16.0-next.2"
- sources."vscode-nls-5.0.0"
+ sources."vscode-languageserver-types-3.16.0"
+ sources."vscode-nls-4.1.2"
sources."vscode-uri-2.1.2"
- (sources."yaml-language-server-0.13.1-dcc82a9.0" // {
- dependencies = [
- sources."jsonc-parser-2.3.1"
- sources."vscode-languageserver-types-3.16.0"
- sources."vscode-nls-4.1.2"
- ];
- })
+ sources."yaml-language-server-0.13.1-d0f9b44.0"
sources."yaml-language-server-parser-0.1.3-fa8245c.0"
];
buildInputs = globalBuildInputs;
@@ -69848,10 +70484,10 @@ in
coinmon = nodeEnv.buildNodePackage {
name = "coinmon";
packageName = "coinmon";
- version = "0.0.27";
+ version = "0.0.28";
src = fetchurl {
- url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.27.tgz";
- sha512 = "aOxDy3oAUu5oKpjb+ZrQgOuT+yBPxbaOc4CMLD+c8uKyDbAodf/0Xee53xVihqeQtjvdCXszoAnMNtKid+/MrA==";
+ url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.28.tgz";
+ sha512 = "jARqwj0uyTfbcsTr3IDoaGI6ZXUV8e8qVjw+LaRBujvjgsiWypJweze5IZy0/sjNEKlptwB7GDjmuphtBzngFA==";
};
dependencies = [
sources."ansi-regex-3.0.0"
@@ -69866,7 +70502,7 @@ in
sources."colors-1.4.0"
sources."commander-2.20.3"
sources."escape-string-regexp-1.0.5"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."has-flag-3.0.0"
sources."is-fullwidth-code-point-2.0.0"
sources."log-symbols-2.2.0"
@@ -69893,10 +70529,10 @@ in
configurable-http-proxy = nodeEnv.buildNodePackage {
name = "configurable-http-proxy";
packageName = "configurable-http-proxy";
- version = "4.2.3";
+ version = "4.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.3.tgz";
- sha512 = "mwQ6sY7tS7sVN4WKD17MA7QGju9Fs1n3f0ZJ3G67WAoOvBCMzXIMxFLch7LQZyLnPVZnuCa90AOvkuD6YQE+Yw==";
+ url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.3.1.tgz";
+ sha512 = "/Q1Lb5YtxupfXD51GMf//a5ubHNj7gQZfbQj4xxnoKNhec4iUgjTQ9IiemsJJDFlp3Bqgh+cV4OW/zuVkibahg==";
};
dependencies = [
sources."@dabh/diagnostics-2.0.2"
@@ -69904,17 +70540,17 @@ in
sources."color-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
- sources."commander-6.2.1"
+ sources."commander-7.1.0"
sources."core-util-is-1.0.2"
sources."enabled-2.0.0"
sources."eventemitter3-4.0.7"
sources."fast-safe-stringify-2.0.7"
sources."fecha-4.2.0"
sources."fn.name-1.1.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."http-proxy-1.18.1"
sources."inherits-2.0.4"
sources."is-arrayish-0.3.2"
@@ -70028,7 +70664,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -70156,7 +70792,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-parse-1.0.3"
sources."fast-json-stable-stringify-2.1.0"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."figures-2.0.0"
sources."fill-range-7.0.1"
(sources."finalhandler-1.1.2" // {
@@ -70178,7 +70814,7 @@ in
sources."get-stream-5.2.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
sources."globby-11.0.2"
(sources."got-9.6.0" // {
@@ -70271,7 +70907,7 @@ in
sources."is-npm-4.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
sources."is-wsl-2.2.0"
@@ -70425,7 +71061,7 @@ in
sources."read-1.0.7"
sources."read-chunk-3.2.0"
sources."read-package-json-2.1.2"
- sources."read-package-json-fast-2.0.1"
+ sources."read-package-json-fast-2.0.2"
sources."readable-stream-2.3.7"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
@@ -70444,7 +71080,7 @@ in
sources."rimraf-3.0.2"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
@@ -70490,7 +71126,7 @@ in
sources."strip-final-newline-2.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-7.2.0"
- sources."systeminformation-4.34.14"
+ sources."systeminformation-4.34.15"
sources."tar-6.1.0"
sources."term-size-2.2.1"
sources."through-2.3.8"
@@ -70529,7 +71165,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -70576,13 +71212,13 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ sources."@babel/highlight-7.13.8"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.3"
sources."@types/minimatch-3.0.3"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.1.0"
sources."ansi-styles-3.2.1"
@@ -70637,7 +71273,7 @@ in
sources."concat-map-0.0.1"
sources."copy-descriptor-0.1.1"
sources."cp-file-7.0.0"
- sources."cpy-8.1.1"
+ sources."cpy-8.1.2"
sources."debug-2.6.9"
sources."decamelize-1.2.0"
(sources."decamelize-keys-1.1.0" // {
@@ -70953,7 +71589,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.2"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -71004,7 +71640,7 @@ in
sources."figures-2.0.0"
sources."form-data-2.5.1"
sources."formidable-1.2.2"
- sources."globalthis-1.0.1"
+ sources."globalthis-1.0.2"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
@@ -71097,10 +71733,10 @@ in
create-react-app = nodeEnv.buildNodePackage {
name = "create-react-app";
packageName = "create-react-app";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.2.tgz";
- sha512 = "B78UC1E8LwvbmvEjIPumKXvu9yeNTpaKrNVf0HpP5AJmGgq9fdipcYKtpqRNAwm06lvhpNhO3jvR9xeRQDsmog==";
+ url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.3.tgz";
+ sha512 = "Gz/ilrPq0ehiZ+K3L4jAZXGVep6NDkAytIdiHXsE4cWJav9uHe8xzEN84i3SjMYox6yNrBaULXHAkWdn4ZBF9Q==";
};
dependencies = [
sources."ansi-styles-4.3.0"
@@ -71664,7 +72300,7 @@ in
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
sources."random-access-memory-3.1.2"
sources."random-access-storage-1.4.1"
sources."randombytes-2.1.0"
@@ -71934,12 +72570,12 @@ in
sources."del-6.0.0"
sources."dir-glob-3.0.1"
sources."fast-glob-3.2.5"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fill-range-7.0.1"
sources."find-up-4.1.0"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."graceful-fs-4.2.6"
sources."ignore-5.1.8"
@@ -71950,7 +72586,7 @@ in
sources."is-glob-4.0.1"
sources."is-number-7.0.0"
sources."is-path-cwd-2.2.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-stream-2.0.0"
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
@@ -71970,7 +72606,7 @@ in
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."slash-3.0.0"
sources."temp-dir-2.0.0"
sources."tempy-0.7.1"
@@ -72026,15 +72662,15 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.65.3";
+ version = "6.66.1";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.65.3.tgz";
- sha512 = "GNai5B3ipW7ekXxj0WeFN7IsqY8+hXogeL5WWDn4F5z7DlB8idXmX/0RWv/2tS5Hnh4R9BzW1cJ5s2n85bhsSw==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.1.tgz";
+ sha512 = "Bz3addITPTKoIpVP7UVFlszh5JkqeuA7+6zIT9odBD5sJ/bHF3ZN5zQJ73WiY2nyifp0q2HzEwa1u1+ULDITAg==";
};
dependencies = [
sources."@fast-csv/format-4.3.5"
sources."@fast-csv/parse-4.3.6"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."JSONStream-1.3.5"
sources."ajv-6.12.6"
sources."asn1-0.2.4"
@@ -72169,6 +72805,611 @@ in
bypassCache = true;
reconstructLock = true;
};
+ "@electron-forge/cli" = nodeEnv.buildNodePackage {
+ name = "_at_electron-forge_slash_cli";
+ packageName = "@electron-forge/cli";
+ version = "6.0.0-beta.54";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz";
+ sha512 = "+Ui1BI8c5CnBawH2OEySa5QR8DzrFd/I9FHlClvrTsIDfsBAeMSv9NTbSNcmo9Af5kI+aNsLQa8tp1vD8DNrng==";
+ };
+ dependencies = [
+ sources."@electron-forge/async-ora-6.0.0-beta.54"
+ sources."@electron-forge/core-6.0.0-beta.54"
+ sources."@electron-forge/installer-base-6.0.0-beta.54"
+ sources."@electron-forge/installer-darwin-6.0.0-beta.54"
+ sources."@electron-forge/installer-deb-6.0.0-beta.54"
+ sources."@electron-forge/installer-dmg-6.0.0-beta.54"
+ sources."@electron-forge/installer-exe-6.0.0-beta.54"
+ sources."@electron-forge/installer-linux-6.0.0-beta.54"
+ sources."@electron-forge/installer-rpm-6.0.0-beta.54"
+ sources."@electron-forge/installer-zip-6.0.0-beta.54"
+ sources."@electron-forge/maker-base-6.0.0-beta.54"
+ sources."@electron-forge/plugin-base-6.0.0-beta.54"
+ sources."@electron-forge/publisher-base-6.0.0-beta.54"
+ sources."@electron-forge/shared-types-6.0.0-beta.54"
+ sources."@electron-forge/template-base-6.0.0-beta.54"
+ sources."@electron-forge/template-typescript-6.0.0-beta.54"
+ sources."@electron-forge/template-typescript-webpack-6.0.0-beta.54"
+ sources."@electron-forge/template-webpack-6.0.0-beta.54"
+ (sources."@electron/get-1.12.4" // {
+ dependencies = [
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
+ (sources."cacheable-request-6.1.0" // {
+ dependencies = [
+ sources."get-stream-5.2.0"
+ sources."lowercase-keys-2.0.0"
+ ];
+ })
+ sources."decompress-response-3.3.0"
+ sources."defer-to-connect-1.1.3"
+ sources."fs-extra-8.1.0"
+ sources."get-stream-4.1.0"
+ sources."got-9.6.0"
+ sources."json-buffer-3.0.0"
+ sources."keyv-3.1.0"
+ sources."lowercase-keys-1.0.1"
+ sources."p-cancelable-1.1.0"
+ sources."responselike-1.0.2"
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@malept/cross-spawn-promise-1.1.1"
+ sources."@sindresorhus/is-4.0.0"
+ sources."@szmarczak/http-timer-4.0.5"
+ sources."@types/cacheable-request-6.0.1"
+ sources."@types/glob-7.1.3"
+ sources."@types/http-cache-semantics-4.0.0"
+ sources."@types/keyv-3.1.1"
+ sources."@types/minimatch-3.0.3"
+ sources."@types/node-14.14.32"
+ sources."@types/responselike-1.0.0"
+ sources."@types/yauzl-2.9.1"
+ sources."abbrev-1.1.1"
+ sources."ajv-6.12.6"
+ (sources."ansi-escapes-4.3.1" // {
+ dependencies = [
+ sources."type-fest-0.11.0"
+ ];
+ })
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."aproba-1.2.0"
+ (sources."are-we-there-yet-1.1.5" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
+ ];
+ })
+ sources."array-find-index-1.0.2"
+ (sources."asar-3.0.3" // {
+ dependencies = [
+ sources."commander-5.1.0"
+ ];
+ })
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."asynckit-0.4.0"
+ sources."at-least-node-1.0.0"
+ sources."author-regex-1.0.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.11.0"
+ sources."balanced-match-1.0.0"
+ sources."base64-js-1.5.1"
+ sources."bcrypt-pbkdf-1.0.2"
+ sources."bl-4.1.0"
+ sources."bluebird-3.7.2"
+ sources."boolean-3.0.2"
+ sources."brace-expansion-1.1.11"
+ sources."buffer-5.7.1"
+ sources."buffer-alloc-1.2.0"
+ sources."buffer-alloc-unsafe-1.1.0"
+ sources."buffer-crc32-0.2.13"
+ sources."buffer-fill-1.0.0"
+ sources."buffer-from-1.1.1"
+ sources."cacheable-lookup-5.0.4"
+ sources."cacheable-request-7.0.1"
+ sources."camelcase-2.1.1"
+ sources."camelcase-keys-2.1.0"
+ sources."caseless-0.12.0"
+ sources."chalk-4.1.0"
+ sources."chardet-0.7.0"
+ sources."chownr-1.1.4"
+ sources."chromium-pickle-js-0.2.0"
+ sources."cli-cursor-3.1.0"
+ sources."cli-spinners-2.5.0"
+ sources."cli-width-3.0.0"
+ (sources."cliui-7.0.4" // {
+ dependencies = [
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ ];
+ })
+ sources."clone-1.0.4"
+ sources."clone-response-1.0.2"
+ sources."code-point-at-1.1.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
+ sources."commander-4.1.1"
+ sources."compare-version-0.1.2"
+ sources."concat-map-0.0.1"
+ sources."config-chain-1.1.12"
+ sources."console-control-strings-1.1.0"
+ sources."core-js-3.9.1"
+ sources."core-util-is-1.0.2"
+ sources."cross-spawn-7.0.3"
+ sources."currently-unhandled-0.4.1"
+ sources."dashdash-1.14.1"
+ (sources."debug-4.3.2" // {
+ dependencies = [
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."decamelize-1.2.0"
+ (sources."decompress-response-6.0.0" // {
+ dependencies = [
+ sources."mimic-response-3.1.0"
+ ];
+ })
+ sources."deep-extend-0.6.0"
+ sources."defaults-1.0.3"
+ sources."defer-to-connect-2.0.1"
+ (sources."define-properties-1.1.3" // {
+ dependencies = [
+ sources."object-keys-1.1.1"
+ ];
+ })
+ sources."delayed-stream-1.0.0"
+ sources."delegates-1.0.0"
+ sources."detect-libc-1.0.3"
+ sources."detect-node-2.0.4"
+ sources."duplexer3-0.1.4"
+ sources."ecc-jsbn-0.1.2"
+ sources."electron-notarize-1.0.0"
+ (sources."electron-osx-sign-0.5.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."electron-packager-15.2.0"
+ sources."electron-rebuild-2.3.5"
+ sources."emoji-regex-8.0.0"
+ sources."encodeurl-1.0.2"
+ sources."end-of-stream-1.4.4"
+ sources."env-paths-2.2.0"
+ sources."error-ex-1.3.2"
+ sources."es6-error-4.1.1"
+ sources."escalade-3.1.1"
+ sources."escape-string-regexp-1.0.5"
+ (sources."execa-1.0.0" // {
+ dependencies = [
+ sources."cross-spawn-6.0.5"
+ sources."get-stream-4.1.0"
+ sources."path-key-2.0.1"
+ sources."semver-5.7.1"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."which-1.3.1"
+ ];
+ })
+ sources."expand-tilde-2.0.2"
+ sources."extend-3.0.2"
+ sources."external-editor-3.1.0"
+ sources."extract-zip-2.0.1"
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fd-slicer-1.1.0"
+ sources."figures-3.2.0"
+ sources."filename-reserved-regex-2.0.0"
+ sources."filenamify-4.2.0"
+ (sources."find-up-5.0.0" // {
+ dependencies = [
+ sources."locate-path-6.0.0"
+ sources."p-limit-3.1.0"
+ sources."p-locate-5.0.0"
+ sources."path-exists-4.0.0"
+ ];
+ })
+ (sources."flora-colossus-1.0.1" // {
+ dependencies = [
+ sources."fs-extra-7.0.1"
+ ];
+ })
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
+ (sources."fs-extra-9.1.0" // {
+ dependencies = [
+ sources."jsonfile-6.1.0"
+ sources."universalify-2.0.0"
+ ];
+ })
+ sources."fs-minipass-1.2.7"
+ sources."fs.realpath-1.0.0"
+ sources."function-bind-1.1.1"
+ (sources."galactus-0.2.1" // {
+ dependencies = [
+ sources."debug-3.2.7"
+ sources."fs-extra-4.0.3"
+ sources."ms-2.1.3"
+ ];
+ })
+ (sources."gauge-2.7.4" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ sources."get-caller-file-2.0.5"
+ sources."get-installed-path-2.1.1"
+ (sources."get-package-info-1.0.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."get-stdin-4.0.1"
+ sources."get-stream-5.2.0"
+ sources."getpass-0.1.7"
+ sources."glob-7.1.6"
+ sources."global-agent-2.1.12"
+ sources."global-modules-1.0.0"
+ (sources."global-prefix-1.0.2" // {
+ dependencies = [
+ sources."which-1.3.1"
+ ];
+ })
+ sources."global-tunnel-ng-2.7.1"
+ sources."globalthis-1.0.2"
+ sources."got-11.8.2"
+ sources."graceful-fs-4.2.6"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.5"
+ sources."has-1.0.3"
+ sources."has-flag-4.0.0"
+ sources."has-unicode-2.0.1"
+ sources."homedir-polyfill-1.0.3"
+ sources."hosted-git-info-2.8.8"
+ sources."http-cache-semantics-4.1.0"
+ sources."http-signature-1.2.0"
+ sources."http2-wrapper-1.0.3"
+ sources."iconv-lite-0.4.24"
+ sources."ieee754-1.2.1"
+ sources."ignore-walk-3.0.3"
+ sources."indent-string-2.1.0"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."ini-1.3.8"
+ (sources."inquirer-7.3.3" // {
+ dependencies = [
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ ];
+ })
+ sources."is-arrayish-0.2.1"
+ sources."is-core-module-2.2.0"
+ sources."is-docker-2.1.1"
+ sources."is-finite-1.1.0"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."is-interactive-1.0.0"
+ sources."is-stream-1.1.0"
+ sources."is-typedarray-1.0.0"
+ sources."is-utf8-0.2.1"
+ sources."is-windows-1.0.2"
+ sources."is-wsl-2.2.0"
+ sources."isarray-1.0.0"
+ sources."isbinaryfile-3.0.3"
+ sources."isexe-2.0.0"
+ sources."isstream-0.1.2"
+ sources."jsbn-0.1.1"
+ sources."json-buffer-3.0.1"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."jsonfile-4.0.0"
+ sources."jsprim-1.4.1"
+ sources."junk-3.1.0"
+ sources."keyv-4.0.3"
+ sources."load-json-file-2.0.0"
+ sources."locate-path-2.0.0"
+ sources."lodash-4.17.21"
+ sources."lodash.get-4.4.2"
+ sources."log-symbols-4.0.0"
+ sources."loud-rejection-1.6.0"
+ sources."lowercase-keys-2.0.0"
+ (sources."lru-cache-6.0.0" // {
+ dependencies = [
+ sources."yallist-4.0.0"
+ ];
+ })
+ (sources."lzma-native-6.0.1" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
+ ];
+ })
+ sources."map-age-cleaner-0.1.3"
+ sources."map-obj-1.0.1"
+ (sources."matcher-3.0.0" // {
+ dependencies = [
+ sources."escape-string-regexp-4.0.0"
+ ];
+ })
+ sources."mem-4.3.0"
+ (sources."meow-3.7.0" // {
+ dependencies = [
+ sources."find-up-1.1.2"
+ sources."load-json-file-1.1.0"
+ sources."path-exists-2.1.0"
+ sources."path-type-1.1.0"
+ sources."read-pkg-1.1.0"
+ sources."read-pkg-up-1.0.1"
+ sources."strip-bom-2.0.0"
+ ];
+ })
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
+ sources."mimic-fn-2.1.0"
+ sources."mimic-response-1.0.1"
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.5"
+ sources."minipass-2.9.0"
+ sources."minizlib-1.3.3"
+ sources."mkdirp-0.5.5"
+ sources."ms-2.0.0"
+ sources."mute-stream-0.0.8"
+ (sources."needle-2.6.0" // {
+ dependencies = [
+ sources."debug-3.2.7"
+ sources."ms-2.1.3"
+ ];
+ })
+ sources."nice-try-1.0.5"
+ (sources."node-abi-2.21.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ sources."node-addon-api-1.7.2"
+ sources."node-fetch-2.6.1"
+ (sources."node-gyp-7.1.2" // {
+ dependencies = [
+ sources."nopt-5.0.0"
+ sources."rimraf-3.0.2"
+ ];
+ })
+ (sources."node-pre-gyp-0.11.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ sources."tar-4.4.13"
+ ];
+ })
+ sources."nopt-4.0.3"
+ (sources."normalize-package-data-2.5.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ sources."normalize-url-4.5.0"
+ sources."npm-bundled-1.1.1"
+ (sources."npm-conf-1.1.3" // {
+ dependencies = [
+ sources."pify-3.0.0"
+ ];
+ })
+ sources."npm-normalize-package-bin-1.0.1"
+ sources."npm-packlist-1.4.8"
+ (sources."npm-run-path-2.0.2" // {
+ dependencies = [
+ sources."path-key-2.0.1"
+ ];
+ })
+ sources."npmlog-4.1.2"
+ (sources."nugget-2.0.1" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."number-is-nan-1.0.1"
+ sources."oauth-sign-0.9.0"
+ sources."object-assign-4.1.1"
+ sources."object-keys-0.4.0"
+ sources."once-1.4.0"
+ sources."onetime-5.1.2"
+ sources."open-7.4.2"
+ sources."ora-5.3.0"
+ sources."os-homedir-1.0.2"
+ sources."os-tmpdir-1.0.2"
+ sources."osenv-0.1.5"
+ sources."p-cancelable-2.0.0"
+ sources."p-defer-1.0.0"
+ sources."p-finally-1.0.0"
+ sources."p-is-promise-2.1.0"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ sources."parse-author-2.0.0"
+ sources."parse-json-2.2.0"
+ sources."parse-ms-2.1.0"
+ sources."parse-passwd-1.0.0"
+ sources."path-exists-3.0.0"
+ sources."path-is-absolute-1.0.1"
+ sources."path-key-3.1.1"
+ sources."path-parse-1.0.6"
+ sources."path-type-2.0.0"
+ sources."pend-1.2.0"
+ sources."performance-now-2.1.0"
+ sources."pify-2.3.0"
+ sources."pinkie-2.0.4"
+ sources."pinkie-promise-2.0.1"
+ (sources."pkg-dir-4.2.0" // {
+ dependencies = [
+ sources."find-up-4.1.0"
+ sources."locate-path-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
+ sources."path-exists-4.0.0"
+ ];
+ })
+ sources."plist-3.0.1"
+ sources."prepend-http-2.0.0"
+ sources."pretty-bytes-1.0.4"
+ sources."pretty-ms-7.0.1"
+ sources."process-nextick-args-2.0.1"
+ sources."progress-2.0.3"
+ sources."progress-stream-1.2.0"
+ sources."proto-list-1.2.4"
+ sources."psl-1.8.0"
+ sources."pump-3.0.0"
+ sources."punycode-2.1.1"
+ sources."qs-6.5.2"
+ sources."quick-lru-5.1.1"
+ sources."rc-1.2.8"
+ sources."rcedit-2.3.0"
+ sources."read-pkg-2.0.0"
+ (sources."read-pkg-up-2.0.0" // {
+ dependencies = [
+ sources."find-up-2.1.0"
+ ];
+ })
+ sources."readable-stream-3.6.0"
+ sources."redent-1.0.0"
+ sources."repeating-2.0.1"
+ sources."request-2.88.2"
+ sources."require-directory-2.1.1"
+ sources."resolve-1.20.0"
+ sources."resolve-alpn-1.0.0"
+ sources."resolve-dir-1.0.1"
+ sources."resolve-package-1.0.1"
+ sources."responselike-2.0.0"
+ sources."restore-cursor-3.1.0"
+ sources."rimraf-2.7.1"
+ sources."roarr-2.15.4"
+ sources."run-async-2.4.1"
+ sources."rxjs-6.6.6"
+ sources."safe-buffer-5.2.1"
+ sources."safer-buffer-2.1.2"
+ sources."sax-1.2.4"
+ sources."semver-7.3.4"
+ sources."semver-compare-1.0.0"
+ sources."serialize-error-7.0.1"
+ sources."set-blocking-2.0.0"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
+ sources."signal-exit-3.0.3"
+ sources."single-line-log-1.1.2"
+ sources."source-map-0.6.1"
+ sources."source-map-support-0.5.19"
+ sources."spdx-correct-3.1.1"
+ sources."spdx-exceptions-2.3.0"
+ sources."spdx-expression-parse-3.0.1"
+ sources."spdx-license-ids-3.0.7"
+ sources."speedometer-0.1.4"
+ sources."sprintf-js-1.1.2"
+ sources."sshpk-1.16.1"
+ (sources."string-width-1.0.2" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ sources."string_decoder-1.3.0"
+ sources."strip-ansi-6.0.0"
+ sources."strip-bom-3.0.0"
+ sources."strip-eof-1.0.0"
+ sources."strip-indent-1.0.1"
+ sources."strip-json-comments-2.0.1"
+ sources."strip-outer-1.0.1"
+ sources."sudo-prompt-9.2.1"
+ sources."sumchecker-3.0.1"
+ sources."supports-color-7.2.0"
+ (sources."tar-6.1.0" // {
+ dependencies = [
+ sources."chownr-2.0.0"
+ sources."fs-minipass-2.1.0"
+ sources."minipass-3.1.3"
+ sources."minizlib-2.1.2"
+ sources."mkdirp-1.0.4"
+ sources."yallist-4.0.0"
+ ];
+ })
+ sources."throttleit-0.0.2"
+ sources."through-2.3.8"
+ (sources."through2-0.2.3" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ sources."readable-stream-1.1.14"
+ sources."string_decoder-0.10.31"
+ ];
+ })
+ sources."tmp-0.0.33"
+ sources."to-readable-stream-1.0.0"
+ sources."tough-cookie-2.5.0"
+ sources."trim-newlines-1.0.0"
+ sources."trim-repeated-1.0.0"
+ sources."tslib-1.14.1"
+ sources."tunnel-0.0.6"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."type-fest-0.13.1"
+ sources."universalify-0.1.2"
+ sources."uri-js-4.4.1"
+ sources."url-parse-lax-3.0.0"
+ sources."username-5.1.0"
+ sources."util-deprecate-1.0.2"
+ sources."uuid-3.4.0"
+ sources."validate-npm-package-license-3.0.4"
+ sources."verror-1.10.0"
+ sources."wcwidth-1.0.1"
+ sources."which-2.0.2"
+ sources."wide-align-1.1.3"
+ (sources."wrap-ansi-7.0.0" // {
+ dependencies = [
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ ];
+ })
+ sources."wrappy-1.0.2"
+ sources."xmlbuilder-9.0.7"
+ sources."xmldom-0.1.31"
+ sources."xtend-2.1.2"
+ sources."y18n-5.0.5"
+ sources."yallist-3.1.1"
+ (sources."yargs-16.2.0" // {
+ dependencies = [
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.2"
+ ];
+ })
+ sources."yargs-parser-20.2.6"
+ (sources."yarn-or-npm-3.0.1" // {
+ dependencies = [
+ sources."cross-spawn-6.0.5"
+ sources."path-key-2.0.1"
+ sources."semver-5.7.1"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."which-1.3.1"
+ ];
+ })
+ sources."yauzl-2.10.0"
+ sources."yocto-queue-0.1.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "A complete tool for building modern Electron applications";
+ homepage = "https://github.com/electron-userland/electron-forge#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
elm-oracle = nodeEnv.buildNodePackage {
name = "elm-oracle";
packageName = "elm-oracle";
@@ -72197,39 +73438,50 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/core-7.12.17"
- sources."@babel/generator-7.12.17"
+ sources."@babel/compat-data-7.13.8"
+ (sources."@babel/core-7.13.8" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
+ (sources."@babel/helper-compilation-targets-7.13.8" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/helpers-7.12.17"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
+ sources."@babel/helper-validator-option-7.12.17"
+ sources."@babel/helpers-7.13.0"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-syntax-jsx-7.12.13"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
- sources."@babel/plugin-transform-destructuring-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-react-jsx-7.12.17"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@sindresorhus/is-4.0.0"
sources."@szmarczak/http-timer-4.0.5"
sources."@types/cacheable-request-6.0.1"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/normalize-package-data-2.4.0"
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.2"
@@ -72248,6 +73500,7 @@ in
sources."auto-bind-4.0.0"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
+ sources."browserslist-4.16.3"
sources."cacheable-lookup-5.0.4"
(sources."cacheable-request-7.0.1" // {
dependencies = [
@@ -72263,6 +73516,7 @@ in
sources."quick-lru-4.0.1"
];
})
+ sources."caniuse-lite-1.0.30001197"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -72273,6 +73527,7 @@ in
sources."code-excerpt-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
+ sources."colorette-1.2.2"
sources."commondir-1.0.1"
sources."concat-map-0.0.1"
(sources."conf-7.1.2" // {
@@ -72296,13 +73551,15 @@ in
sources."mimic-response-3.1.0"
];
})
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."dot-prop-5.3.0"
+ sources."electron-to-chromium-1.3.682"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
sources."env-paths-2.2.0"
sources."error-ex-1.3.2"
+ sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
sources."execa-1.0.0"
sources."fast-deep-equal-3.1.3"
@@ -72315,13 +73572,13 @@ in
sources."get-stream-4.1.0"
sources."glob-7.1.6"
sources."globals-11.12.0"
- sources."got-11.8.1"
+ sources."got-11.8.2"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."hosted-git-info-2.8.8"
sources."http-cache-semantics-4.1.0"
- sources."http2-wrapper-1.0.0-beta.5.2"
+ sources."http2-wrapper-1.0.3"
sources."import-jsx-4.0.0"
sources."indent-string-4.0.0"
sources."inflight-1.0.6"
@@ -72393,6 +73650,7 @@ in
sources."minimist-options-4.1.0"
sources."ms-2.1.2"
sources."nice-try-1.0.5"
+ sources."node-releases-1.1.71"
sources."normalize-package-data-2.5.0"
sources."normalize-url-4.5.0"
sources."npm-run-path-2.0.2"
@@ -72485,7 +73743,7 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-eof-1.0.0"
sources."strip-indent-3.0.0"
@@ -72506,7 +73764,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."yallist-4.0.0"
sources."yargs-parser-18.1.3"
sources."yoga-layout-prebuilt-1.10.0"
@@ -72546,20 +73804,20 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."supports-color-5.5.0"
];
})
- sources."@fluentui/date-time-utilities-7.9.0"
- sources."@fluentui/dom-utilities-1.1.1"
- sources."@fluentui/keyboard-key-0.2.13"
- sources."@fluentui/react-7.161.0"
- sources."@fluentui/react-focus-7.17.4"
- sources."@fluentui/react-window-provider-1.0.1"
- sources."@fluentui/theme-1.7.3"
+ sources."@fluentui/date-time-utilities-7.9.1"
+ sources."@fluentui/dom-utilities-1.1.2"
+ sources."@fluentui/keyboard-key-0.2.14"
+ sources."@fluentui/react-7.162.1"
+ sources."@fluentui/react-focus-7.17.5"
+ sources."@fluentui/react-window-provider-1.0.2"
+ sources."@fluentui/theme-1.7.4"
(sources."@gulp-sourcemaps/identity-map-1.0.2" // {
dependencies = [
sources."normalize-path-2.1.1"
@@ -72570,7 +73828,7 @@ in
sources."normalize-path-2.1.1"
];
})
- sources."@microsoft/load-themed-styles-1.10.147"
+ sources."@microsoft/load-themed-styles-1.10.149"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -72606,7 +73864,7 @@ in
sources."@types/node-14.11.1"
sources."@types/pg-7.14.5"
sources."@types/pg-types-2.2.0"
- sources."@types/qs-6.9.5"
+ sources."@types/qs-6.9.6"
sources."@types/range-parser-1.2.3"
(sources."@types/request-2.48.5" // {
dependencies = [
@@ -72619,13 +73877,13 @@ in
sources."@types/sqlite3-3.1.6"
sources."@types/tough-cookie-4.0.0"
sources."@types/url-join-4.0.0"
- sources."@uifabric/foundation-7.9.24"
- sources."@uifabric/icons-7.5.21"
- sources."@uifabric/merge-styles-7.19.1"
- sources."@uifabric/react-hooks-7.13.11"
- sources."@uifabric/set-version-7.0.23"
- sources."@uifabric/styling-7.18.0"
- sources."@uifabric/utilities-7.33.4"
+ sources."@uifabric/foundation-7.9.25"
+ sources."@uifabric/icons-7.5.22"
+ sources."@uifabric/merge-styles-7.19.2"
+ sources."@uifabric/react-hooks-7.13.12"
+ sources."@uifabric/set-version-7.0.24"
+ sources."@uifabric/styling-7.18.1"
+ sources."@uifabric/utilities-7.33.5"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -72726,7 +73984,7 @@ in
sources."asn1-0.2.4"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -72774,7 +74032,7 @@ in
sources."blob-0.0.5"
sources."block-stream-0.0.9"
sources."bluebird-3.7.2"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."body-parser-1.19.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
@@ -72929,7 +74187,7 @@ in
sources."crc-3.8.0"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -72983,7 +74241,7 @@ in
sources."diff-4.0.2"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."difunc-0.0.4"
@@ -73004,7 +74262,7 @@ in
sources."ee-first-1.1.1"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."inherits-2.0.4"
];
})
@@ -73054,7 +74312,7 @@ in
sources."etag-1.8.1"
sources."event-emitter-0.3.5"
sources."eventemitter3-2.0.3"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."evp_bytestokey-1.0.3"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -73102,7 +74360,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-1.1.4"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."figgy-pudding-3.5.2"
sources."figures-2.0.0"
sources."file-uri-to-path-1.0.0"
@@ -73176,7 +74434,7 @@ in
sources."get-value-2.0.6"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
(sources."glob-stream-6.1.0" // {
dependencies = [
sources."glob-parent-3.1.0"
@@ -73242,7 +74500,7 @@ in
})
sources."has-cors-1.1.0"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-unicode-2.0.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -73307,7 +74565,7 @@ in
sources."is-negated-glob-1.0.0"
sources."is-number-7.0.0"
sources."is-path-cwd-2.2.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-object-2.0.4"
sources."is-promise-2.2.2"
sources."is-relative-1.0.0"
@@ -73423,7 +74681,7 @@ in
sources."micromatch-4.0.2"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-1.6.0"
@@ -73593,7 +74851,7 @@ in
sources."object.map-1.0.1"
sources."object.pick-1.3.0"
sources."object.reduce-1.0.1"
- sources."office-ui-fabric-react-7.161.0"
+ sources."office-ui-fabric-react-7.162.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -73603,7 +74861,7 @@ in
sources."openapi-types-7.2.3"
];
})
- (sources."openapi-framework-7.3.0" // {
+ (sources."openapi-framework-7.5.0" // {
dependencies = [
sources."openapi-types-7.2.3"
];
@@ -73613,17 +74871,17 @@ in
sources."openapi-types-7.2.3"
];
})
- (sources."openapi-request-coercer-7.2.3" // {
+ (sources."openapi-request-coercer-7.5.0" // {
dependencies = [
sources."openapi-types-7.2.3"
];
})
- (sources."openapi-request-validator-7.3.0" // {
+ (sources."openapi-request-validator-7.4.0" // {
dependencies = [
sources."openapi-types-7.2.3"
];
})
- (sources."openapi-response-validator-7.2.3" // {
+ (sources."openapi-response-validator-7.4.0" // {
dependencies = [
sources."openapi-types-7.2.3"
];
@@ -73740,7 +74998,7 @@ in
sources."psl-1.8.0"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."pump-3.0.0"
@@ -74181,7 +75439,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xmlhttprequest-ssl-1.5.5"
sources."xtend-4.0.2"
sources."y18n-3.2.2"
@@ -74227,20 +75485,20 @@ in
eslint = nodeEnv.buildNodePackage {
name = "eslint";
packageName = "eslint";
- version = "7.20.0";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz";
- sha512 = "qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz";
+ sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==";
};
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@eslint/eslintrc-0.3.0"
+ sources."@eslint/eslintrc-0.4.0"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -74305,7 +75563,7 @@ in
sources."fs.realpath-1.0.0"
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globals-12.4.0"
sources."has-flag-3.0.0"
sources."ignore-4.0.6"
@@ -74350,13 +75608,13 @@ in
];
})
sources."sprintf-js-1.0.3"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-json-comments-3.1.1"
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."json-schema-traverse-1.0.0"
];
})
@@ -74364,7 +75622,7 @@ in
sources."type-check-0.4.0"
sources."type-fest-0.8.1"
sources."uri-js-4.4.1"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."which-2.0.2"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
@@ -74383,22 +75641,22 @@ in
eslint_d = nodeEnv.buildNodePackage {
name = "eslint_d";
packageName = "eslint_d";
- version = "10.0.2";
+ version = "10.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.2.tgz";
- sha512 = "owgGugHDhfzqe2tjbkz+Htv4stRwFfXJEG6lc+c9dKxwgAvuYNurldosLJ2gyC66Uv/cPf4IS70wuUTmNLTrOQ==";
+ url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.4.tgz";
+ sha512 = "DEJaGxP6VDs3byYKQYw6Py8l2b1KH9S5vUo4IjvhWIEcdo5gjNkJjjzUCoExTIb0Bo7/GbKyNRI/dctUQ5f+7w==";
};
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
sources."has-flag-3.0.0"
sources."supports-color-5.5.0"
];
})
- sources."@eslint/eslintrc-0.3.0"
+ sources."@eslint/eslintrc-0.4.0"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
sources."ajv-6.12.6"
@@ -74429,7 +75687,7 @@ in
sources."emoji-regex-8.0.0"
sources."enquirer-2.3.6"
sources."escape-string-regexp-1.0.5"
- sources."eslint-7.20.0"
+ sources."eslint-7.21.0"
sources."eslint-scope-5.1.1"
(sources."eslint-utils-2.1.0" // {
dependencies = [
@@ -74464,7 +75722,7 @@ in
sources."fs.realpath-1.0.0"
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globals-12.4.0"
sources."has-flag-4.0.0"
sources."ignore-4.0.6"
@@ -74510,13 +75768,13 @@ in
];
})
sources."sprintf-js-1.0.3"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-json-comments-3.1.1"
sources."supports-color-8.1.1"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."json-schema-traverse-1.0.0"
];
})
@@ -74524,7 +75782,7 @@ in
sources."type-check-0.4.0"
sources."type-fest-0.8.1"
sources."uri-js-4.4.1"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."which-2.0.2"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
@@ -74543,14 +75801,11 @@ in
esy = nodeEnv.buildNodePackage {
name = "esy";
packageName = "esy";
- version = "0.6.7";
+ version = "0.6.8";
src = fetchurl {
- url = "https://registry.npmjs.org/esy/-/esy-0.6.7.tgz";
- sha512 = "G/C0wXDQy19eDqlFNmPg2kHmrllUez9deZd1OOIk/VTKtc75STdeE/Nl1NusVY+La/+eCtovNqk0/ZAb4Mg8gw==";
+ url = "https://registry.npmjs.org/esy/-/esy-0.6.8.tgz";
+ sha512 = "tSNYVoLV0ps3hVPG0kaJCdaB0cQKwPMuydPqZQ+VsyfA7TMBLIVv1hoqoVf6e6slyyCepPu2KMDApL2H2smlew==";
};
- dependencies = [
- sources."esy-solve-cudf-0.1.10"
- ];
buildInputs = globalBuildInputs;
meta = {
description = "Package builder for esy.";
@@ -74563,66 +75818,71 @@ in
expo-cli = nodeEnv.buildNodePackage {
name = "expo-cli";
packageName = "expo-cli";
- version = "4.1.6";
+ version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.1.6.tgz";
- sha512 = "C6UvtUWCsJyFOah57CKNeSP+tZeJDfED7dyHIWDQ+cQx2EYzNQVt4GIOu63u1Hzf3WArehxMroTmMayHCdhTeA==";
+ url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.2.1.tgz";
+ sha512 = "3qgir7nj1jD7L+ETEUBYQfwsd57GaOTLhJ+6rzwvRwSXdU04oM+nfiZHMyabgKHMzslyHpVnvOod9OjKVWTtuQ==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
+ sources."@babel/compat-data-7.13.8"
(sources."@babel/core-7.9.0" // {
dependencies = [
sources."semver-5.7.1"
];
})
- sources."@babel/generator-7.12.17"
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- (sources."@babel/helper-compilation-targets-7.12.17" // {
+ (sources."@babel/helper-compilation-targets-7.13.8" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.12.17"
+ sources."@babel/helper-create-class-features-plugin-7.13.8"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
- sources."@babel/helper-explode-assignable-expression-7.12.13"
+ (sources."@babel/helper-define-polyfill-provider-0.1.5" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-hoist-variables-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-remap-async-to-generator-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helper-wrap-function-7.12.13"
- sources."@babel/helpers-7.12.17"
- (sources."@babel/highlight-7.12.13" // {
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.0"
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.12.17"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.17"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-default-from-7.12.13"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.17"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -74640,47 +75900,48 @@ in
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
sources."@babel/plugin-syntax-typescript-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-flow-strip-types-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-flow-strip-types-7.13.0"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-assign-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-react-display-name-7.12.13"
sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-self-7.12.13"
sources."@babel/plugin-transform-react-jsx-source-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
- (sources."@babel/plugin-transform-runtime-7.12.17" // {
+ (sources."@babel/plugin-transform-runtime-7.13.9" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
];
})
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
- sources."@babel/plugin-transform-typescript-7.12.17"
+ sources."@babel/plugin-transform-typescript-7.13.0"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
(sources."@babel/preset-env-7.12.17" // {
@@ -74690,29 +75951,27 @@ in
})
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.12.17"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@expo/apple-utils-0.0.0-alpha.17"
- sources."@expo/babel-preset-cli-0.2.18"
sources."@expo/bunyan-4.0.0"
- sources."@expo/config-3.3.28"
- (sources."@expo/config-plugins-1.0.18" // {
+ sources."@expo/config-3.3.30"
+ (sources."@expo/config-plugins-1.0.20" // {
dependencies = [
- sources."slash-3.0.0"
sources."uuid-3.4.0"
sources."xcode-2.1.0"
];
})
sources."@expo/config-types-40.0.0-beta.2"
- (sources."@expo/configure-splash-screen-0.3.3" // {
+ (sources."@expo/configure-splash-screen-0.3.4" // {
dependencies = [
sources."commander-5.1.0"
sources."pngjs-5.0.0"
];
})
- (sources."@expo/dev-server-0.1.54" // {
+ (sources."@expo/dev-server-0.1.56" // {
dependencies = [
sources."body-parser-1.19.0"
sources."bytes-3.1.0"
@@ -74723,27 +75982,32 @@ in
sources."ms-2.0.0"
sources."qs-6.7.0"
sources."raw-body-2.4.0"
- sources."serialize-error-6.0.0"
sources."setprototypeof-1.1.1"
sources."statuses-1.5.0"
- sources."type-fest-0.12.0"
];
})
- sources."@expo/dev-tools-0.13.82"
+ sources."@expo/dev-tools-0.13.84"
+ (sources."@expo/devcert-1.0.0" // {
+ dependencies = [
+ sources."debug-3.2.7"
+ sources."rimraf-2.7.1"
+ sources."sudo-prompt-8.2.5"
+ ];
+ })
(sources."@expo/image-utils-0.3.10" // {
dependencies = [
sources."tempy-0.3.0"
];
})
- (sources."@expo/json-file-8.2.27" // {
+ (sources."@expo/json-file-8.2.28-alpha.0" // {
dependencies = [
sources."@babel/code-frame-7.10.4"
sources."json5-1.0.1"
];
})
- sources."@expo/metro-config-0.1.54"
+ sources."@expo/metro-config-0.1.56"
sources."@expo/osascript-2.0.24"
- (sources."@expo/package-manager-0.0.38" // {
+ (sources."@expo/package-manager-0.0.39-alpha.0" // {
dependencies = [
sources."npm-package-arg-7.0.0"
sources."rimraf-3.0.2"
@@ -74756,17 +76020,17 @@ in
];
})
sources."@expo/results-1.0.0"
- sources."@expo/schemer-1.3.26"
+ sources."@expo/schemer-1.3.27-alpha.0"
sources."@expo/simple-spinner-1.0.2"
sources."@expo/spawn-async-1.5.0"
- (sources."@expo/webpack-config-0.12.58" // {
+ (sources."@expo/webpack-config-0.12.60" // {
dependencies = [
sources."@babel/runtime-7.9.0"
sources."is-wsl-2.2.0"
sources."react-refresh-0.8.3"
];
})
- (sources."@expo/xdl-59.0.22" // {
+ (sources."@expo/xdl-59.0.24" // {
dependencies = [
sources."chownr-1.1.4"
sources."fs-minipass-1.2.7"
@@ -74848,18 +76112,6 @@ in
sources."@npmcli/run-script-1.8.3"
sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3"
sources."@react-native-community/cli-debugger-ui-4.13.1"
- (sources."@react-native-community/cli-platform-ios-4.13.0" // {
- dependencies = [
- sources."ansi-styles-4.3.0"
- sources."chalk-3.0.0"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."has-flag-4.0.0"
- sources."supports-color-7.2.0"
- sources."uuid-3.4.0"
- sources."xcode-2.1.0"
- ];
- })
(sources."@react-native-community/cli-server-api-4.9.0" // {
dependencies = [
sources."ultron-1.0.2"
@@ -74882,10 +76134,6 @@ in
sources."@tootallnate/once-1.1.2"
sources."@types/anymatch-1.3.1"
sources."@types/cacheable-request-6.0.1"
- sources."@types/configstore-2.1.1"
- sources."@types/debug-0.0.30"
- sources."@types/events-3.0.0"
- sources."@types/get-port-3.2.0"
sources."@types/glob-7.1.3"
sources."@types/html-minifier-terser-5.1.1"
sources."@types/http-cache-semantics-4.0.0"
@@ -74894,19 +76142,15 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.7"
sources."@types/keyv-3.1.1"
- sources."@types/lodash-4.14.168"
sources."@types/minimatch-3.0.3"
- sources."@types/mkdirp-0.5.2"
sources."@types/node-9.6.61"
sources."@types/q-1.5.4"
sources."@types/responselike-1.0.0"
sources."@types/retry-0.12.0"
- sources."@types/rimraf-2.0.4"
sources."@types/source-list-map-0.1.2"
sources."@types/tapable-1.0.6"
sources."@types/text-table-0.2.1"
- sources."@types/tmp-0.0.33"
- (sources."@types/uglify-js-3.12.0" // {
+ (sources."@types/uglify-js-3.13.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -74970,11 +76214,7 @@ in
];
})
sources."ansi-colors-3.2.4"
- (sources."ansi-escapes-4.3.1" // {
- dependencies = [
- sources."type-fest-0.11.0"
- ];
- })
+ sources."ansi-escapes-3.2.0"
sources."ansi-html-0.0.7"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -74990,7 +76230,7 @@ in
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
- sources."array-filter-0.0.1"
+ sources."array-filter-1.0.0"
sources."array-flatten-1.1.1"
sources."array-map-0.0.0"
sources."array-reduce-0.0.0"
@@ -75001,7 +76241,7 @@ in
sources."asn1-0.2.4"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -75018,11 +76258,7 @@ in
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
sources."atob-2.1.2"
- (sources."available-typed-arrays-1.0.2" // {
- dependencies = [
- sources."array-filter-1.0.0"
- ];
- })
+ sources."available-typed-arrays-1.0.2"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."axios-0.21.1"
@@ -75030,6 +76266,13 @@ in
sources."babel-extract-comments-1.0.0"
sources."babel-loader-8.1.0"
sources."babel-plugin-dynamic-import-node-2.3.3"
+ (sources."babel-plugin-polyfill-corejs2-0.1.10" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."babel-plugin-polyfill-corejs3-0.1.7"
+ sources."babel-plugin-polyfill-regenerator-0.1.6"
sources."babel-plugin-syntax-object-rest-spread-6.13.0"
sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0"
sources."babel-plugin-transform-object-rest-spread-6.26.0"
@@ -75059,7 +76302,7 @@ in
sources."bindings-1.5.0"
sources."bluebird-3.7.2"
sources."bmp-js-0.1.0"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
(sources."body-parser-1.18.3" // {
dependencies = [
sources."debug-2.6.9"
@@ -75134,7 +76377,7 @@ in
})
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."caseless-0.12.0"
(sources."chalk-4.1.0" // {
dependencies = [
@@ -75202,8 +76445,8 @@ in
sources."color-3.1.3"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
- sources."colorette-1.2.1"
+ sources."color-string-1.5.5"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."command-exists-1.2.9"
@@ -75254,18 +76497,19 @@ in
sources."loader-utils-2.0.0"
sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
+ sources."p-limit-3.1.0"
(sources."p-locate-4.1.0" // {
dependencies = [
sources."p-limit-2.3.0"
];
})
+ sources."path-exists-4.0.0"
sources."pkg-dir-4.2.0"
sources."semver-6.3.0"
- sources."slash-3.0.0"
];
})
- sources."core-js-3.9.0"
- (sources."core-js-compat-3.9.0" // {
+ sources."core-js-3.9.1"
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -75274,7 +76518,7 @@ in
sources."cosmiconfig-5.2.1"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -75354,7 +76598,6 @@ in
sources."rimraf-2.7.1"
];
})
- sources."delay-async-1.2.0"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."depd-1.1.2"
@@ -75368,18 +76611,9 @@ in
sources."ms-2.0.0"
];
})
- (sources."devcert-1.1.3" // {
- dependencies = [
- sources."@types/glob-5.0.36"
- sources."@types/node-8.10.66"
- sources."debug-3.2.7"
- sources."rimraf-2.7.1"
- sources."sudo-prompt-8.2.5"
- ];
- })
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."dir-glob-3.0.1"
@@ -75413,10 +76647,10 @@ in
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."emoji-regex-8.0.0"
@@ -75447,7 +76681,7 @@ in
})
sources."error-stack-parser-2.0.6"
sources."errorhandler-1.5.1"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-get-iterator-1.1.2"
sources."es-to-primitive-1.2.1"
sources."escalade-3.1.1"
@@ -75464,7 +76698,7 @@ in
sources."esutils-2.0.3"
sources."etag-1.8.1"
sources."eventemitter3-2.0.3"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."eventsource-1.0.7"
sources."evp_bytestokey-1.0.3"
sources."exec-async-2.2.0"
@@ -75490,7 +76724,7 @@ in
sources."ms-2.0.0"
];
})
- (sources."expo-pwa-0.0.64" // {
+ (sources."expo-pwa-0.0.66" // {
dependencies = [
sources."commander-2.20.0"
];
@@ -75517,7 +76751,7 @@ in
sources."fast-deep-equal-1.1.0"
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."faye-websocket-0.10.0"
sources."figgy-pudding-3.5.2"
sources."figures-3.2.0"
@@ -75537,10 +76771,17 @@ in
];
})
sources."find-cache-dir-2.1.0"
- sources."find-up-5.0.0"
+ (sources."find-up-5.0.0" // {
+ dependencies = [
+ sources."locate-path-6.0.0"
+ sources."p-limit-3.1.0"
+ sources."p-locate-5.0.0"
+ sources."path-exists-4.0.0"
+ ];
+ })
sources."find-yarn-workspace-root-2.0.0"
sources."flush-write-stream-1.1.1"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."for-in-1.0.2"
sources."foreach-2.0.5"
sources."forever-agent-0.6.1"
@@ -75600,7 +76841,7 @@ in
sources."getenv-0.7.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-4.4.0"
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
@@ -75610,13 +76851,13 @@ in
sources."pify-2.3.0"
];
})
- (sources."got-11.8.1" // {
+ (sources."got-11.8.2" // {
dependencies = [
sources."@sindresorhus/is-4.0.0"
sources."@szmarczak/http-timer-4.0.5"
sources."cacheable-request-7.0.1"
sources."decompress-response-6.0.0"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."get-stream-5.2.0"
sources."json-buffer-3.0.1"
sources."keyv-4.0.3"
@@ -75645,8 +76886,9 @@ in
];
})
sources."has-1.0.3"
+ sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-unicode-2.0.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -75715,18 +76957,17 @@ in
];
})
sources."http-signature-1.2.0"
- sources."http2-wrapper-1.0.0-beta.5.2"
+ sources."http2-wrapper-1.0.3"
sources."https-browserify-1.0.0"
sources."https-proxy-agent-5.0.0"
sources."humanize-ms-1.2.1"
sources."iconv-lite-0.4.23"
sources."icss-utils-4.1.1"
- sources."idx-2.4.0"
sources."ieee754-1.2.1"
sources."iferr-0.1.5"
sources."ignore-5.1.8"
sources."ignore-walk-3.0.3"
- sources."immer-7.0.9"
+ sources."immer-8.0.1"
(sources."import-fresh-2.0.0" // {
dependencies = [
sources."resolve-from-3.0.0"
@@ -75863,7 +77104,7 @@ in
sources."json5-1.0.1"
];
})
- sources."locate-path-6.0.0"
+ sources."locate-path-3.0.0"
sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.assign-4.2.0"
@@ -75912,16 +77153,16 @@ in
sources."merge-stream-2.0.0"
sources."merge2-1.4.1"
sources."methods-1.1.2"
- sources."metro-babel-transformer-0.58.0"
- sources."metro-react-native-babel-preset-0.58.0"
- sources."metro-react-native-babel-transformer-0.58.0"
- sources."metro-source-map-0.58.0"
- sources."metro-symbolicate-0.58.0"
+ sources."metro-babel-transformer-0.59.0"
+ sources."metro-react-native-babel-preset-0.59.0"
+ sources."metro-react-native-babel-transformer-0.59.0"
+ sources."metro-source-map-0.59.0"
+ sources."metro-symbolicate-0.59.0"
sources."microevent.ts-0.1.1"
sources."micromatch-4.0.2"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-2.5.2"
@@ -76020,7 +77261,7 @@ in
];
})
sources."node-fetch-2.6.1"
- sources."node-forge-0.7.6"
+ sources."node-forge-0.10.0"
(sources."node-gyp-7.1.2" // {
dependencies = [
sources."rimraf-3.0.2"
@@ -76035,7 +77276,7 @@ in
sources."punycode-1.4.1"
];
})
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
sources."normalize-url-3.3.0"
@@ -76066,7 +77307,7 @@ in
sources."nth-check-1.0.2"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
- sources."ob1-0.58.0"
+ sources."ob1-0.59.0"
sources."object-assign-4.1.1"
(sources."object-copy-0.1.0" // {
dependencies = [
@@ -76089,7 +77330,7 @@ in
sources."object.entries-1.1.3"
sources."object.getownpropertydescriptors-2.1.2"
sources."object.pick-1.3.0"
- sources."object.values-1.1.2"
+ sources."object.values-1.1.3"
sources."obuf-1.1.2"
sources."omggif-1.0.10"
sources."on-finished-2.3.0"
@@ -76119,8 +77360,8 @@ in
})
sources."p-cancelable-1.1.0"
sources."p-finally-1.0.0"
- sources."p-limit-3.1.0"
- sources."p-locate-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
sources."p-map-3.0.0"
sources."p-retry-4.1.0"
(sources."p-some-4.1.0" // {
@@ -76170,14 +77411,10 @@ in
];
})
sources."pascalcase-0.1.1"
- (sources."password-prompt-1.1.2" // {
- dependencies = [
- sources."ansi-escapes-3.2.0"
- ];
- })
+ sources."password-prompt-1.1.2"
sources."path-browserify-0.0.1"
sources."path-dirname-1.0.2"
- sources."path-exists-4.0.0"
+ sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
sources."path-is-inside-1.0.2"
sources."path-key-2.0.1"
@@ -76195,19 +77432,11 @@ in
(sources."pkg-dir-3.0.0" // {
dependencies = [
sources."find-up-3.0.0"
- sources."locate-path-3.0.0"
- sources."p-limit-2.3.0"
- sources."p-locate-3.0.0"
- sources."path-exists-3.0.0"
];
})
(sources."pkg-up-3.1.0" // {
dependencies = [
sources."find-up-3.0.0"
- sources."locate-path-3.0.0"
- sources."p-limit-2.3.0"
- sources."p-locate-3.0.0"
- sources."path-exists-3.0.0"
];
})
sources."plist-3.0.1"
@@ -76364,7 +77593,7 @@ in
sources."psl-1.8.0"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."puka-1.0.1"
@@ -76393,7 +77622,7 @@ in
})
sources."raw-body-2.3.3"
sources."rc-1.2.8"
- (sources."react-dev-utils-11.0.2" // {
+ (sources."react-dev-utils-11.0.3" // {
dependencies = [
sources."@babel/code-frame-7.10.4"
sources."array-union-2.1.0"
@@ -76411,13 +77640,12 @@ in
sources."loader-utils-2.0.0"
sources."locate-path-5.0.0"
sources."open-7.4.2"
- sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
+ sources."path-exists-4.0.0"
sources."path-key-3.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."shell-quote-1.7.2"
- sources."slash-3.0.0"
sources."which-2.0.2"
];
})
@@ -76426,7 +77654,7 @@ in
sources."react-refresh-0.4.3"
sources."read-chunk-3.2.0"
sources."read-last-lines-1.6.0"
- sources."read-package-json-fast-2.0.1"
+ sources."read-package-json-fast-2.0.2"
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."isarray-1.0.0"
@@ -76526,11 +77754,7 @@ in
];
})
sources."select-hose-2.0.0"
- (sources."selfsigned-1.10.8" // {
- dependencies = [
- sources."node-forge-0.10.0"
- ];
- })
+ sources."selfsigned-1.10.8"
sources."semver-7.3.2"
(sources."send-0.16.2" // {
dependencies = [
@@ -76539,9 +77763,9 @@ in
sources."ms-2.0.0"
];
})
- (sources."serialize-error-5.0.0" // {
+ (sources."serialize-error-6.0.0" // {
dependencies = [
- sources."type-fest-0.8.1"
+ sources."type-fest-0.12.0"
];
})
sources."serialize-javascript-4.0.0"
@@ -76563,13 +77787,17 @@ in
sources."sha.js-2.4.11"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
- sources."shell-quote-1.6.1"
+ (sources."shell-quote-1.6.1" // {
+ dependencies = [
+ sources."array-filter-0.0.1"
+ ];
+ })
sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."simple-plist-1.1.1"
sources."simple-swizzle-0.2.2"
sources."sisteransi-1.0.5"
- sources."slash-1.0.0"
+ sources."slash-3.0.0"
(sources."slugid-1.1.0" // {
dependencies = [
sources."uuid-2.0.3"
@@ -76673,9 +77901,9 @@ in
];
})
sources."stream-shift-1.0.1"
- sources."string-width-4.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string-width-4.2.2"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
(sources."stringify-object-3.3.0" // {
dependencies = [
@@ -76726,18 +77954,22 @@ in
sources."crypto-random-string-2.0.0"
sources."del-6.0.0"
sources."globby-11.0.2"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-stream-2.0.0"
sources."p-map-4.0.0"
sources."rimraf-3.0.2"
- sources."slash-3.0.0"
sources."temp-dir-2.0.0"
sources."type-fest-0.16.0"
sources."unique-string-2.0.0"
];
})
sources."term-size-2.2.1"
- sources."terminal-link-2.1.1"
+ (sources."terminal-link-2.1.1" // {
+ dependencies = [
+ sources."ansi-escapes-4.3.1"
+ sources."type-fest-0.11.0"
+ ];
+ })
(sources."terser-4.8.0" // {
dependencies = [
sources."commander-2.20.3"
@@ -76751,11 +77983,13 @@ in
sources."find-up-4.1.0"
sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
+ sources."p-limit-3.1.0"
(sources."p-locate-4.1.0" // {
dependencies = [
sources."p-limit-2.3.0"
];
})
+ sources."path-exists-4.0.0"
sources."pkg-dir-4.2.0"
sources."semver-6.3.0"
sources."source-map-0.6.1"
@@ -76799,6 +78033,7 @@ in
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
sources."ultron-1.1.1"
+ sources."unbox-primitive-1.0.0"
sources."unicode-canonical-property-names-ecmascript-1.0.4"
sources."unicode-match-property-ecmascript-1.0.4"
sources."unicode-match-property-value-ecmascript-1.2.0"
@@ -77015,10 +78250,12 @@ in
})
(sources."webpackbar-4.0.0" // {
dependencies = [
+ sources."ansi-escapes-4.3.1"
sources."ansi-styles-4.3.0"
sources."chalk-2.4.2"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
+ sources."type-fest-0.11.0"
sources."wrap-ansi-6.2.0"
];
})
@@ -77103,10 +78340,6 @@ in
sources."emoji-regex-7.0.3"
sources."find-up-3.0.0"
sources."is-fullwidth-code-point-2.0.0"
- sources."locate-path-3.0.0"
- sources."p-limit-2.3.0"
- sources."p-locate-3.0.0"
- sources."path-exists-3.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
@@ -77532,7 +78765,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."faunadb-4.0.3"
sources."fill-range-7.0.1"
sources."fn-annotate-1.2.0"
@@ -77547,7 +78780,7 @@ in
sources."get-value-2.0.6"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.3.0"
(sources."globby-8.0.2" // {
dependencies = [
@@ -77808,7 +79041,7 @@ in
})
sources."stealthy-require-1.1.1"
sources."strict-uri-encode-1.1.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -77876,10 +79109,10 @@ in
firebase-tools = nodeEnv.buildNodePackage {
name = "firebase-tools";
packageName = "firebase-tools";
- version = "9.4.0";
+ version = "9.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.4.0.tgz";
- sha512 = "qqiNUiMb60GNIz/d8lv4eCSzBU/0AjcdnwWfGsOlGgeWRks9SeuWXvXt6JF7bn/7t15+z41Q7S4avsIRhAHD1Q==";
+ url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.5.0.tgz";
+ sha512 = "M73hIhqfdzGO4eMAd+Jj8V2RPG1KDmhjdnHQaZsJOwmPXyX4eBeOO7dpeHTXU5bYg8AeHVzkCOcLobBcXgYxZw==";
};
dependencies = [
sources."@apidevtools/json-schema-ref-parser-9.0.7"
@@ -77888,12 +79121,12 @@ in
sources."@google-cloud/precise-date-2.0.3"
sources."@google-cloud/projectify-2.0.1"
sources."@google-cloud/promisify-2.0.3"
- (sources."@google-cloud/pubsub-2.9.0" // {
+ (sources."@google-cloud/pubsub-2.10.0" // {
dependencies = [
sources."google-auth-library-7.0.2"
];
})
- (sources."@grpc/grpc-js-1.2.8" // {
+ (sources."@grpc/grpc-js-1.2.10" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -77925,11 +79158,10 @@ in
sources."@tootallnate/once-1.1.2"
sources."@types/archiver-5.1.0"
sources."@types/duplexify-3.6.0"
- sources."@types/filesize-5.0.0"
sources."@types/glob-7.1.3"
sources."@types/long-4.0.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
sources."abort-controller-3.0.0"
@@ -77947,7 +79179,7 @@ in
sources."ansicolors-0.3.2"
sources."anymatch-3.1.1"
sources."aproba-1.2.0"
- sources."archiver-5.2.0"
+ sources."archiver-5.3.0"
(sources."archiver-utils-2.1.0" // {
dependencies = [
sources."readable-stream-2.3.7"
@@ -78005,7 +79237,7 @@ in
sources."emoji-regex-8.0.0"
sources."has-flag-4.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
];
@@ -78047,13 +79279,13 @@ in
sources."color-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."colors-1.0.3"
sources."colorspace-1.1.2"
sources."combined-stream-1.0.8"
sources."commander-4.1.1"
sources."compare-semver-1.1.0"
- sources."compress-commons-4.0.2"
+ sources."compress-commons-4.1.0"
sources."compressible-2.0.18"
(sources."compression-1.7.4" // {
dependencies = [
@@ -78235,7 +79467,7 @@ in
sources."strip-ansi-3.0.1"
];
})
- sources."gaxios-4.1.0"
+ sources."gaxios-4.2.0"
sources."gcp-metadata-4.2.1"
sources."get-stream-4.1.0"
(sources."get-uri-3.0.2" // {
@@ -78246,7 +79478,7 @@ in
})
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."glob-slash-1.0.0"
sources."glob-slasher-1.0.1"
sources."global-dirs-2.1.0"
@@ -78298,7 +79530,7 @@ in
sources."is-npm-4.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-promise-2.2.2"
sources."is-stream-2.0.0"
sources."is-stream-ended-0.1.4"
@@ -78525,7 +79757,7 @@ in
})
sources."rsvp-4.8.5"
sources."run-async-2.4.1"
- (sources."rxjs-6.6.3" // {
+ (sources."rxjs-6.6.6" // {
dependencies = [
sources."tslib-1.14.1"
];
@@ -78686,7 +79918,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -78701,14 +79933,14 @@ in
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xdg-basedir-4.0.0"
sources."xmlbuilder-9.0.7"
sources."xmldom-0.1.31"
sources."xregexp-2.0.0"
sources."xtend-4.0.2"
sources."yallist-4.0.0"
- sources."zip-stream-4.0.4"
+ sources."zip-stream-4.1.0"
];
buildInputs = globalBuildInputs;
meta = {
@@ -78751,13 +79983,13 @@ in
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."require-directory-2.1.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
sources."y18n-5.0.5"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -78780,7 +80012,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -78904,7 +80136,7 @@ in
sources."resolve-1.20.0"
sources."restore-cursor-3.1.0"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
sources."semver-7.3.4"
sources."shebang-command-2.0.0"
@@ -78915,7 +80147,7 @@ in
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-final-newline-2.0.0"
sources."strip-indent-3.0.0"
@@ -78936,7 +80168,7 @@ in
sources."which-2.0.2"
sources."wrappy-1.0.2"
sources."yallist-4.0.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -79114,7 +80346,7 @@ in
})
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -79372,7 +80604,7 @@ in
sources."indent-string-4.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."lossless-json-1.0.4"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
];
@@ -79669,15 +80901,15 @@ in
gitmoji-cli = nodeEnv.buildNodePackage {
name = "gitmoji-cli";
packageName = "gitmoji-cli";
- version = "3.2.18";
+ version = "3.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.18.tgz";
- sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew==";
+ url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.0.tgz";
+ sha512 = "xvuBiQdo0pbBaucrIIGEicPU5ibX+aCDdr9X7kHpsy55q+qqLlzhDJ0aF8LtYFgSI4/hsrk2gSYMVLRAyy6HQg==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -79691,7 +80923,8 @@ in
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
- sources."ajv-6.12.6"
+ sources."ajv-7.2.1"
+ sources."ajv-formats-1.5.1"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -79734,8 +80967,12 @@ in
sources."clone-response-1.0.2"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."conf-7.1.2"
- sources."configstore-5.0.1"
+ sources."conf-9.0.2"
+ (sources."configstore-5.0.1" // {
+ dependencies = [
+ sources."dot-prop-5.3.0"
+ ];
+ })
sources."cross-spawn-7.0.3"
sources."crypto-random-string-2.0.0"
sources."debounce-fn-4.0.0"
@@ -79749,7 +80986,7 @@ in
sources."deep-extend-0.6.0"
sources."defaults-1.0.3"
sources."defer-to-connect-1.1.3"
- sources."dot-prop-5.3.0"
+ sources."dot-prop-6.0.1"
sources."duplexer3-0.1.4"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
@@ -79760,7 +80997,6 @@ in
sources."execa-5.0.0"
sources."external-editor-3.1.0"
sources."fast-deep-equal-3.1.3"
- sources."fast-json-stable-stringify-2.1.0"
sources."figures-3.2.0"
sources."find-up-3.0.0"
sources."function-bind-1.1.1"
@@ -79797,7 +81033,7 @@ in
sources."is-interactive-1.0.0"
sources."is-npm-5.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-obj-1.1.0"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
@@ -79806,7 +81042,7 @@ in
sources."js-tokens-4.0.0"
sources."json-buffer-3.0.0"
sources."json-parse-even-better-errors-2.3.1"
- sources."json-schema-traverse-0.4.1"
+ sources."json-schema-traverse-1.0.0"
sources."json-schema-typed-7.0.3"
sources."keyv-3.1.0"
sources."kind-of-6.0.3"
@@ -79827,7 +81063,7 @@ in
];
})
sources."map-obj-4.1.0"
- (sources."meow-8.1.2" // {
+ (sources."meow-9.0.0" // {
dependencies = [
sources."type-fest-0.18.1"
];
@@ -79895,11 +81131,12 @@ in
sources."redent-3.0.0"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
+ sources."require-from-string-2.0.2"
sources."resolve-1.20.0"
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."semver-7.3.4"
@@ -79915,7 +81152,7 @@ in
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."string_decoder-1.3.0"
sources."strip-ansi-6.0.0"
sources."strip-final-newline-2.0.0"
@@ -79943,7 +81180,7 @@ in
sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
sources."yallist-4.0.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -79967,7 +81204,7 @@ in
sources."@ardatan/aggregate-error-0.0.6"
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -80001,7 +81238,7 @@ in
sources."tslib-2.1.0"
];
})
- (sources."@graphql-tools/import-6.2.6" // {
+ (sources."@graphql-tools/import-6.3.0" // {
dependencies = [
sources."tslib-2.1.0"
];
@@ -80016,7 +81253,7 @@ in
];
})
sources."@graphql-tools/load-6.2.4"
- (sources."@graphql-tools/merge-6.2.9" // {
+ (sources."@graphql-tools/merge-6.2.10" // {
dependencies = [
sources."@graphql-tools/utils-7.5.0"
sources."tslib-2.1.0"
@@ -80060,7 +81297,7 @@ in
sources."@nodelib/fs.walk-1.2.6"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/parse-json-4.0.0"
sources."@types/websocket-1.0.1"
sources."aggregate-error-3.1.0"
@@ -80156,7 +81393,7 @@ in
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-get-iterator-1.1.2"
sources."es-to-primitive-1.2.1"
sources."es6-promise-3.3.1"
@@ -80177,7 +81414,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-safe-stringify-2.0.7"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."figlet-1.5.0"
sources."figures-3.2.0"
sources."fill-range-7.0.1"
@@ -80197,7 +81434,7 @@ in
sources."get-stream-4.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.1"
(sources."got-9.6.0" // {
dependencies = [
@@ -80211,15 +81448,16 @@ in
sources."cosmiconfig-6.0.0"
];
})
- sources."graphql-subscriptions-1.2.0"
+ sources."graphql-subscriptions-1.2.1"
sources."graphql-type-json-0.3.2"
sources."graphql-upload-11.0.0"
sources."graphql-ws-4.1.5"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
+ sources."has-bigints-1.0.1"
sources."has-flag-4.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."http-cache-semantics-4.1.0"
sources."http-errors-1.8.0"
sources."http-signature-1.2.0"
@@ -80431,7 +81669,7 @@ in
sources."rimraf-3.0.2"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
- (sources."rxjs-6.6.3" // {
+ (sources."rxjs-6.6.6" // {
dependencies = [
sources."tslib-1.14.1"
];
@@ -80458,14 +81696,14 @@ in
sources."statuses-1.5.0"
sources."streamsearch-0.1.2"
sources."string-env-interpolation-1.0.1"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."strip-ansi-6.0.0"
];
})
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."strip-ansi-5.2.0"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
@@ -80487,6 +81725,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-fest-0.3.1"
+ sources."unbox-primitive-1.0.0"
sources."universalify-1.0.0"
sources."unixify-1.0.0"
sources."uri-js-4.4.1"
@@ -80512,7 +81751,7 @@ in
sources."yallist-4.0.0"
sources."yaml-1.10.0"
sources."yargs-16.0.3"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -80979,7 +82218,7 @@ in
sources."lodash.toarray-4.4.0"
sources."map-canvas-0.1.5"
sources."marked-0.7.0"
- (sources."marked-terminal-4.1.0" // {
+ (sources."marked-terminal-4.1.1" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -81005,7 +82244,7 @@ in
sources."supports-color-7.2.0"
];
})
- sources."systeminformation-4.34.14"
+ sources."systeminformation-4.34.15"
sources."term-canvas-0.0.5"
sources."type-fest-0.11.0"
sources."wordwrap-0.0.3"
@@ -81220,7 +82459,7 @@ in
sources."gulp-cli-2.3.0"
sources."gulplog-1.0.0"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -81611,7 +82850,7 @@ in
sources."graceful-fs-4.2.6"
sources."gulplog-1.0.0"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -81882,7 +83121,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -82005,7 +83244,7 @@ in
sources."debug-3.2.7"
sources."ecstatic-3.3.2"
sources."eventemitter3-4.0.7"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."he-1.2.0"
sources."http-proxy-1.18.1"
sources."lodash-4.17.21"
@@ -82059,7 +83298,7 @@ in
sources."bs32-0.1.6"
sources."bsert-0.0.10"
sources."bsock-0.1.9"
- sources."bsocks-0.2.5"
+ sources."bsocks-0.2.6"
sources."btcp-0.1.5"
sources."budp-0.1.6"
sources."buffer-map-0.0.7"
@@ -82239,7 +83478,7 @@ in
sources."nan-2.14.2"
sources."napi-build-utils-1.0.2"
sources."nel-1.2.0"
- sources."node-abi-2.19.3"
+ sources."node-abi-2.21.0"
sources."noop-logger-0.1.1"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
@@ -82604,7 +83843,7 @@ in
sources."arch-2.2.0"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
- sources."clipboard-2.0.6"
+ sources."clipboard-2.0.7"
sources."clipboardy-2.3.0"
sources."clone-1.0.4"
sources."concat-map-0.0.1"
@@ -82627,7 +83866,7 @@ in
sources."is-stream-1.1.0"
sources."is-wsl-2.2.0"
sources."isexe-2.0.0"
- sources."jquery-3.5.1"
+ sources."jquery-3.6.0"
sources."jquery.terminal-2.22.0"
sources."jsonfile-2.4.0"
sources."keyboardevent-key-polyfill-1.1.0"
@@ -82871,7 +84110,7 @@ in
sources."rimraf-3.0.2"
sources."rsvp-3.6.2"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
@@ -82902,7 +84141,7 @@ in
sources."string_decoder-1.1.1"
];
})
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
@@ -82949,7 +84188,7 @@ in
})
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xregexp-2.0.0"
sources."yallist-3.1.1"
];
@@ -82974,9 +84213,9 @@ in
};
dependencies = [
sources."@iarna/toml-2.2.5"
- sources."@ot-builder/bin-composite-types-1.0.2"
- sources."@ot-builder/bin-util-1.0.2"
- (sources."@ot-builder/cli-help-shower-1.0.2" // {
+ sources."@ot-builder/bin-composite-types-1.0.3"
+ sources."@ot-builder/bin-util-1.0.3"
+ (sources."@ot-builder/cli-help-shower-1.0.3" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -82986,7 +84225,7 @@ in
sources."supports-color-7.2.0"
];
})
- (sources."@ot-builder/cli-proc-1.0.2" // {
+ (sources."@ot-builder/cli-proc-1.0.3" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -82996,7 +84235,7 @@ in
sources."supports-color-7.2.0"
];
})
- (sources."@ot-builder/cli-shared-1.0.2" // {
+ (sources."@ot-builder/cli-shared-1.0.3" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -83006,36 +84245,36 @@ in
sources."supports-color-7.2.0"
];
})
- sources."@ot-builder/common-impl-1.0.2"
- sources."@ot-builder/errors-1.0.2"
- sources."@ot-builder/io-bin-cff-1.0.2"
- sources."@ot-builder/io-bin-encoding-1.0.2"
- sources."@ot-builder/io-bin-ext-private-1.0.2"
- sources."@ot-builder/io-bin-font-1.0.2"
- sources."@ot-builder/io-bin-glyph-store-1.0.2"
- sources."@ot-builder/io-bin-layout-1.0.2"
- sources."@ot-builder/io-bin-metadata-1.0.2"
- sources."@ot-builder/io-bin-metric-1.0.2"
- sources."@ot-builder/io-bin-name-1.0.2"
- sources."@ot-builder/io-bin-sfnt-1.0.2"
- sources."@ot-builder/io-bin-ttf-1.0.2"
- sources."@ot-builder/ot-1.0.2"
- sources."@ot-builder/ot-encoding-1.0.2"
- sources."@ot-builder/ot-ext-private-1.0.2"
- sources."@ot-builder/ot-glyphs-1.0.2"
- sources."@ot-builder/ot-layout-1.0.2"
- sources."@ot-builder/ot-metadata-1.0.2"
- sources."@ot-builder/ot-name-1.0.2"
- sources."@ot-builder/ot-sfnt-1.0.2"
- sources."@ot-builder/ot-standard-glyph-namer-1.0.2"
- sources."@ot-builder/prelude-1.0.2"
- sources."@ot-builder/primitive-1.0.2"
- sources."@ot-builder/rectify-1.0.2"
- sources."@ot-builder/stat-glyphs-1.0.2"
- sources."@ot-builder/trace-1.0.2"
- sources."@ot-builder/var-store-1.0.2"
- sources."@ot-builder/variance-1.0.2"
- sources."@unicode/unicode-13.0.0-1.0.3"
+ sources."@ot-builder/common-impl-1.0.3"
+ sources."@ot-builder/errors-1.0.3"
+ sources."@ot-builder/io-bin-cff-1.0.3"
+ sources."@ot-builder/io-bin-encoding-1.0.3"
+ sources."@ot-builder/io-bin-ext-private-1.0.3"
+ sources."@ot-builder/io-bin-font-1.0.3"
+ sources."@ot-builder/io-bin-glyph-store-1.0.3"
+ sources."@ot-builder/io-bin-layout-1.0.3"
+ sources."@ot-builder/io-bin-metadata-1.0.3"
+ sources."@ot-builder/io-bin-metric-1.0.3"
+ sources."@ot-builder/io-bin-name-1.0.3"
+ sources."@ot-builder/io-bin-sfnt-1.0.3"
+ sources."@ot-builder/io-bin-ttf-1.0.3"
+ sources."@ot-builder/ot-1.0.3"
+ sources."@ot-builder/ot-encoding-1.0.3"
+ sources."@ot-builder/ot-ext-private-1.0.3"
+ sources."@ot-builder/ot-glyphs-1.0.3"
+ sources."@ot-builder/ot-layout-1.0.3"
+ sources."@ot-builder/ot-metadata-1.0.3"
+ sources."@ot-builder/ot-name-1.0.3"
+ sources."@ot-builder/ot-sfnt-1.0.3"
+ sources."@ot-builder/ot-standard-glyph-namer-1.0.3"
+ sources."@ot-builder/prelude-1.0.3"
+ sources."@ot-builder/primitive-1.0.3"
+ sources."@ot-builder/rectify-1.0.3"
+ sources."@ot-builder/stat-glyphs-1.0.3"
+ sources."@ot-builder/trace-1.0.3"
+ sources."@ot-builder/var-store-1.0.3"
+ sources."@ot-builder/variance-1.0.3"
+ sources."@unicode/unicode-13.0.0-1.0.4"
sources."amdefine-1.0.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -83124,8 +84363,8 @@ in
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."optionator-0.8.3"
- sources."ot-builder-1.0.2"
- (sources."otb-ttc-bundle-1.0.2" // {
+ sources."ot-builder-1.0.3"
+ (sources."otb-ttc-bundle-1.0.3" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -83175,7 +84414,7 @@ in
sources."split-1.0.1"
sources."sprintf-js-1.0.3"
sources."stack-trace-0.0.9"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
(sources."stylus-0.54.8" // {
dependencies = [
@@ -83227,7 +84466,7 @@ in
sources."y18n-5.0.5"
sources."yallist-4.0.0"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -83285,7 +84524,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."bufrw-1.3.0"
- sources."chai-4.3.0"
+ sources."chai-4.3.3"
sources."chai-as-promised-7.1.1"
sources."chalk-2.4.2"
sources."check-error-1.0.2"
@@ -83417,7 +84656,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.848.0" // {
+ (sources."aws-sdk-2.858.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -83453,7 +84692,7 @@ in
sources."charenc-0.0.2"
sources."chokidar-3.5.1"
sources."chownr-1.1.4"
- sources."chroma-js-2.1.0"
+ sources."chroma-js-2.1.1"
sources."clean-css-4.2.3"
sources."clean-html-1.5.0"
sources."cliss-0.0.2"
@@ -83461,7 +84700,7 @@ in
sources."color-3.1.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."combined-stream-1.0.8"
sources."command-line-usage-4.1.0"
sources."commander-2.17.1"
@@ -83578,7 +84817,7 @@ in
sources."file-uri-to-path-1.0.0"
sources."fill-range-7.0.1"
sources."find-up-2.1.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."font-awesome-filetypes-2.1.0"
sources."for-each-property-0.0.4"
sources."for-each-property-deep-0.0.3"
@@ -83605,7 +84844,7 @@ in
sources."getpass-0.1.7"
sources."github-from-package-0.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."graceful-fs-4.2.6"
sources."graphlib-2.1.8"
sources."growly-1.3.0"
@@ -83775,7 +85014,7 @@ in
sources."debug-4.3.2"
sources."html-minifier-4.0.0"
sources."ms-2.1.2"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
];
})
sources."minimatch-3.0.4"
@@ -83800,7 +85039,7 @@ in
sources."needle-2.6.0"
sources."nextgen-events-1.3.4"
sources."no-case-2.3.2"
- (sources."node-abi-2.19.3" // {
+ (sources."node-abi-2.21.0" // {
dependencies = [
sources."semver-5.7.1"
];
@@ -84071,7 +85310,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xml-name-validator-3.0.0"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
@@ -84163,7 +85402,7 @@ in
sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
};
dependencies = [
- sources."@babel/parser-7.12.17"
+ sources."@babel/parser-7.13.9"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.8.11"
@@ -84451,7 +85690,7 @@ in
sources."is-installed-globally-0.4.0"
sources."is-npm-5.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-promise-2.2.2"
sources."is-typedarray-1.0.0"
sources."is-yarn-global-0.3.0"
@@ -84544,7 +85783,7 @@ in
sources."signal-exit-3.0.3"
sources."statuses-1.5.0"
sources."steno-0.4.4"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
@@ -84579,7 +85818,7 @@ in
sources."y18n-5.0.5"
sources."yallist-4.0.0"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -84629,7 +85868,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
@@ -84677,13 +85916,13 @@ in
sources."fill-range-7.0.1"
sources."finalhandler-1.1.2"
sources."flatted-2.0.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."fs-extra-8.1.0"
sources."fs.realpath-1.0.0"
sources."fsevents-2.3.2"
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."graceful-fs-4.2.6"
sources."http-errors-1.7.2"
sources."http-proxy-1.18.1"
@@ -84729,7 +85968,7 @@ in
sources."rimraf-3.0.2"
sources."safer-buffer-2.1.2"
sources."setprototypeof-1.1.1"
- (sources."socket.io-3.1.1" // {
+ (sources."socket.io-3.1.2" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -84751,7 +85990,7 @@ in
sources."ms-2.1.2"
];
})
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."tmp-0.2.1"
sources."to-regex-range-5.0.1"
@@ -84765,10 +86004,10 @@ in
sources."void-elements-2.0.1"
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."y18n-5.0.5"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -84815,7 +86054,7 @@ in
sources."glob-stream-6.1.0"
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-absolute-1.0.0"
@@ -85137,314 +86376,244 @@ in
lerna = nodeEnv.buildNodePackage {
name = "lerna";
packageName = "lerna";
- version = "3.22.1";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/lerna/-/lerna-3.22.1.tgz";
- sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg==";
+ url = "https://registry.npmjs.org/lerna/-/lerna-4.0.0.tgz";
+ sha512 = "DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
- (sources."@evocateur/libnpmaccess-3.1.2" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
- sources."aproba-2.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."chalk-2.4.2"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."has-flag-3.0.0"
+ sources."supports-color-5.5.0"
];
})
- (sources."@evocateur/libnpmpublish-1.2.2" // {
+ sources."@lerna/add-4.0.0"
+ sources."@lerna/bootstrap-4.0.0"
+ sources."@lerna/changed-4.0.0"
+ sources."@lerna/check-working-tree-4.0.0"
+ sources."@lerna/child-process-4.0.0"
+ sources."@lerna/clean-4.0.0"
+ sources."@lerna/cli-4.0.0"
+ sources."@lerna/collect-uncommitted-4.0.0"
+ sources."@lerna/collect-updates-4.0.0"
+ sources."@lerna/command-4.0.0"
+ (sources."@lerna/conventional-commits-4.0.0" // {
dependencies = [
- sources."aproba-2.0.0"
- sources."semver-5.7.1"
+ sources."pify-5.0.0"
];
})
- sources."@evocateur/npm-registry-fetch-4.0.0"
- (sources."@evocateur/pacote-9.6.5" // {
+ (sources."@lerna/create-4.0.0" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."pify-5.0.0"
+ sources."yargs-parser-20.2.4"
];
})
- sources."@lerna/add-3.21.0"
- sources."@lerna/bootstrap-3.21.0"
- sources."@lerna/changed-3.21.0"
- sources."@lerna/check-working-tree-3.16.5"
- sources."@lerna/child-process-3.16.5"
- sources."@lerna/clean-3.21.0"
- sources."@lerna/cli-3.18.5"
- sources."@lerna/collect-uncommitted-3.16.5"
- sources."@lerna/collect-updates-3.20.0"
- sources."@lerna/command-3.21.0"
- (sources."@lerna/conventional-commits-3.22.0" // {
+ sources."@lerna/create-symlink-4.0.0"
+ sources."@lerna/describe-ref-4.0.0"
+ sources."@lerna/diff-4.0.0"
+ sources."@lerna/exec-4.0.0"
+ sources."@lerna/filter-options-4.0.0"
+ sources."@lerna/filter-packages-4.0.0"
+ sources."@lerna/get-npm-exec-opts-4.0.0"
+ sources."@lerna/get-packed-4.0.0"
+ sources."@lerna/github-client-4.0.0"
+ sources."@lerna/gitlab-client-4.0.0"
+ sources."@lerna/global-options-4.0.0"
+ sources."@lerna/has-npm-version-4.0.0"
+ sources."@lerna/import-4.0.0"
+ sources."@lerna/info-4.0.0"
+ sources."@lerna/init-4.0.0"
+ sources."@lerna/link-4.0.0"
+ sources."@lerna/list-4.0.0"
+ sources."@lerna/listable-4.0.0"
+ sources."@lerna/log-packed-4.0.0"
+ (sources."@lerna/npm-conf-4.0.0" // {
dependencies = [
- sources."pify-4.0.1"
+ sources."pify-5.0.0"
];
})
- (sources."@lerna/create-3.22.0" // {
+ sources."@lerna/npm-dist-tag-4.0.0"
+ sources."@lerna/npm-install-4.0.0"
+ (sources."@lerna/npm-publish-4.0.0" // {
dependencies = [
- sources."pify-4.0.1"
+ sources."normalize-package-data-3.0.0"
+ sources."pify-5.0.0"
+ sources."read-package-json-3.0.1"
];
})
- sources."@lerna/create-symlink-3.16.2"
- sources."@lerna/describe-ref-3.16.5"
- sources."@lerna/diff-3.21.0"
- sources."@lerna/exec-3.21.0"
- sources."@lerna/filter-options-3.20.0"
- sources."@lerna/filter-packages-3.18.0"
- sources."@lerna/get-npm-exec-opts-3.13.0"
- sources."@lerna/get-packed-3.16.0"
- sources."@lerna/github-client-3.22.0"
- sources."@lerna/gitlab-client-3.15.0"
- sources."@lerna/global-options-3.13.0"
- sources."@lerna/has-npm-version-3.16.5"
- sources."@lerna/import-3.22.0"
- sources."@lerna/info-3.21.0"
- sources."@lerna/init-3.21.0"
- sources."@lerna/link-3.21.0"
- sources."@lerna/list-3.21.0"
- sources."@lerna/listable-3.18.5"
- sources."@lerna/log-packed-3.16.0"
- (sources."@lerna/npm-conf-3.16.0" // {
+ sources."@lerna/npm-run-script-4.0.0"
+ sources."@lerna/otplease-4.0.0"
+ sources."@lerna/output-4.0.0"
+ sources."@lerna/pack-directory-4.0.0"
+ sources."@lerna/package-4.0.0"
+ sources."@lerna/package-graph-4.0.0"
+ sources."@lerna/prerelease-id-from-version-4.0.0"
+ sources."@lerna/profiler-4.0.0"
+ sources."@lerna/project-4.0.0"
+ sources."@lerna/prompt-4.0.0"
+ sources."@lerna/publish-4.0.0"
+ sources."@lerna/pulse-till-done-4.0.0"
+ sources."@lerna/query-graph-4.0.0"
+ sources."@lerna/resolve-symlink-4.0.0"
+ sources."@lerna/rimraf-dir-4.0.0"
+ sources."@lerna/run-4.0.0"
+ sources."@lerna/run-lifecycle-4.0.0"
+ sources."@lerna/run-topologically-4.0.0"
+ sources."@lerna/symlink-binary-4.0.0"
+ sources."@lerna/symlink-dependencies-4.0.0"
+ sources."@lerna/timer-4.0.0"
+ sources."@lerna/validation-error-4.0.0"
+ sources."@lerna/version-4.0.0"
+ (sources."@lerna/write-log-file-4.0.0" // {
dependencies = [
- sources."pify-4.0.1"
+ sources."write-file-atomic-3.0.3"
];
})
- sources."@lerna/npm-dist-tag-3.18.5"
- sources."@lerna/npm-install-3.16.5"
- (sources."@lerna/npm-publish-3.18.5" // {
- dependencies = [
- sources."pify-4.0.1"
- ];
- })
- sources."@lerna/npm-run-script-3.16.5"
- sources."@lerna/otplease-3.18.5"
- sources."@lerna/output-3.13.0"
- sources."@lerna/pack-directory-3.16.4"
- sources."@lerna/package-3.16.0"
- sources."@lerna/package-graph-3.18.5"
- sources."@lerna/prerelease-id-from-version-3.16.0"
- sources."@lerna/profiler-3.20.0"
- sources."@lerna/project-3.21.0"
- sources."@lerna/prompt-3.18.5"
- sources."@lerna/publish-3.22.1"
- sources."@lerna/pulse-till-done-3.13.0"
- sources."@lerna/query-graph-3.18.5"
- sources."@lerna/resolve-symlink-3.16.0"
- sources."@lerna/rimraf-dir-3.16.5"
- sources."@lerna/run-3.21.0"
- sources."@lerna/run-lifecycle-3.16.2"
- sources."@lerna/run-topologically-3.18.5"
- sources."@lerna/symlink-binary-3.17.0"
- sources."@lerna/symlink-dependencies-3.17.0"
- sources."@lerna/timer-3.13.0"
- sources."@lerna/validation-error-3.13.0"
- sources."@lerna/version-3.22.1"
- sources."@lerna/write-log-file-3.13.0"
- sources."@mrmlnc/readdir-enhanced-2.2.1"
- sources."@nodelib/fs.stat-1.1.3"
+ sources."@nodelib/fs.scandir-2.1.4"
+ sources."@nodelib/fs.stat-2.0.4"
+ sources."@nodelib/fs.walk-1.2.6"
+ sources."@npmcli/ci-detect-1.3.0"
+ sources."@npmcli/git-2.0.6"
+ sources."@npmcli/installed-package-contents-1.0.7"
+ sources."@npmcli/move-file-1.1.2"
+ sources."@npmcli/node-gyp-1.0.2"
+ sources."@npmcli/promise-spawn-1.3.2"
+ sources."@npmcli/run-script-1.8.3"
sources."@octokit/auth-token-2.4.5"
+ sources."@octokit/core-3.2.5"
(sources."@octokit/endpoint-6.0.11" // {
dependencies = [
sources."is-plain-object-5.0.0"
- sources."universal-user-agent-6.0.0"
];
})
- sources."@octokit/openapi-types-5.1.0"
+ sources."@octokit/graphql-4.6.0"
+ sources."@octokit/openapi-types-5.3.1"
sources."@octokit/plugin-enterprise-rest-6.0.1"
- (sources."@octokit/plugin-paginate-rest-1.1.2" // {
- dependencies = [
- sources."@octokit/types-2.16.2"
- ];
- })
+ sources."@octokit/plugin-paginate-rest-2.11.0"
sources."@octokit/plugin-request-log-1.0.3"
- (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // {
- dependencies = [
- sources."@octokit/types-2.16.2"
- ];
- })
+ sources."@octokit/plugin-rest-endpoint-methods-4.13.4"
(sources."@octokit/request-5.4.14" // {
dependencies = [
- sources."@octokit/request-error-2.0.5"
sources."is-plain-object-5.0.0"
- sources."universal-user-agent-6.0.0"
];
})
- (sources."@octokit/request-error-1.2.1" // {
- dependencies = [
- sources."@octokit/types-2.16.2"
- ];
- })
- sources."@octokit/rest-16.43.2"
- sources."@octokit/types-6.10.0"
- sources."@types/glob-7.1.3"
+ sources."@octokit/request-error-2.0.5"
+ sources."@octokit/rest-18.3.4"
+ sources."@octokit/types-6.12.1"
+ sources."@tootallnate/once-1.1.2"
sources."@types/minimatch-3.0.3"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.31"
sources."@types/normalize-package-data-2.4.0"
- sources."@zkochan/cmd-shim-3.1.0"
+ sources."@types/parse-json-4.0.0"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
- sources."agent-base-4.3.0"
- sources."agentkeepalive-3.5.2"
+ sources."add-stream-1.0.0"
+ sources."agent-base-6.0.2"
+ sources."agentkeepalive-4.1.4"
+ sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- sources."ansi-escapes-3.2.0"
+ (sources."ansi-escapes-4.3.1" // {
+ dependencies = [
+ sources."type-fest-0.11.0"
+ ];
+ })
sources."ansi-regex-2.1.1"
- sources."ansi-styles-3.2.1"
- sources."any-promise-1.3.0"
- sources."aproba-1.2.0"
- sources."are-we-there-yet-1.1.5"
- sources."argparse-1.0.10"
- sources."arr-diff-4.0.0"
- sources."arr-flatten-1.1.0"
- sources."arr-union-3.1.0"
- sources."array-differ-2.1.0"
+ sources."ansi-styles-4.3.0"
+ sources."aproba-2.0.0"
+ (sources."are-we-there-yet-1.1.5" // {
+ dependencies = [
+ sources."readable-stream-2.3.7"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
+ ];
+ })
+ sources."array-differ-3.0.0"
sources."array-find-index-1.0.2"
sources."array-ify-1.0.0"
- sources."array-union-1.0.2"
- sources."array-uniq-1.0.3"
- sources."array-unique-0.3.2"
- sources."arrify-1.0.1"
+ sources."array-union-2.1.0"
+ sources."arrify-2.0.1"
sources."asap-2.0.6"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."assign-symbols-1.0.0"
sources."asynckit-0.4.0"
- sources."atob-2.1.2"
- sources."atob-lite-2.0.0"
+ sources."at-least-node-1.0.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."balanced-match-1.0.0"
- (sources."base-0.11.2" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
sources."bcrypt-pbkdf-1.0.2"
- sources."before-after-hook-2.1.1"
- sources."bluebird-3.7.2"
+ sources."before-after-hook-2.2.0"
sources."brace-expansion-1.1.11"
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."btoa-lite-1.0.0"
+ sources."braces-3.0.2"
sources."buffer-from-1.1.1"
sources."builtins-1.0.3"
sources."byline-5.0.0"
- sources."byte-size-5.0.1"
- sources."cacache-12.0.4"
- sources."cache-base-1.0.1"
+ sources."byte-size-7.0.1"
+ sources."cacache-15.0.5"
sources."call-bind-1.0.2"
- sources."call-me-maybe-1.0.1"
- sources."caller-callsite-2.0.0"
- sources."caller-path-2.0.0"
- sources."callsites-2.0.0"
+ sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
sources."caseless-0.12.0"
- sources."chalk-2.4.2"
+ sources."chalk-4.1.0"
sources."chardet-0.7.0"
- sources."chownr-1.1.4"
+ sources."chownr-2.0.0"
sources."ci-info-2.0.0"
- (sources."class-utils-0.3.6" // {
+ sources."clean-stack-2.2.0"
+ sources."cli-cursor-3.1.0"
+ sources."cli-width-3.0.0"
+ (sources."cliui-7.0.4" // {
dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
- sources."cli-cursor-2.1.0"
- sources."cli-width-2.2.1"
- (sources."cliui-5.0.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
+ sources."ansi-regex-5.0.0"
+ sources."strip-ansi-6.0.0"
];
})
sources."clone-1.0.4"
sources."clone-deep-4.0.1"
+ sources."cmd-shim-4.1.0"
sources."code-point-at-1.1.0"
- sources."collection-visit-1.0.0"
- sources."color-convert-1.9.3"
- sources."color-name-1.1.3"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
sources."columnify-1.5.4"
sources."combined-stream-1.0.8"
(sources."compare-func-2.0.0" // {
dependencies = [
sources."dot-prop-5.3.0"
- sources."is-obj-2.0.0"
];
})
- sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
- sources."concat-stream-1.6.2"
+ sources."concat-stream-2.0.0"
sources."config-chain-1.1.12"
sources."console-control-strings-1.1.0"
sources."conventional-changelog-angular-5.0.12"
- (sources."conventional-changelog-core-3.2.3" // {
+ (sources."conventional-changelog-core-4.2.2" // {
dependencies = [
- sources."through2-3.0.2"
+ sources."normalize-package-data-3.0.0"
];
})
sources."conventional-changelog-preset-loader-2.3.4"
(sources."conventional-changelog-writer-4.1.0" // {
dependencies = [
- sources."readable-stream-3.6.0"
- sources."through2-4.0.2"
+ sources."semver-6.3.0"
];
})
sources."conventional-commits-filter-2.0.7"
- (sources."conventional-commits-parser-3.2.1" // {
- dependencies = [
- sources."readable-stream-3.6.0"
- sources."through2-4.0.2"
- ];
- })
- (sources."conventional-recommended-bump-5.0.1" // {
- dependencies = [
- sources."camelcase-4.1.0"
- sources."camelcase-keys-4.2.0"
- sources."concat-stream-2.0.0"
- sources."indent-string-3.2.0"
- sources."map-obj-2.0.0"
- sources."meow-4.0.1"
- sources."minimist-options-3.0.2"
- sources."quick-lru-1.1.0"
- sources."readable-stream-3.6.0"
- sources."redent-2.0.0"
- sources."strip-indent-2.0.0"
- sources."trim-newlines-2.0.0"
- ];
- })
- sources."copy-concurrently-1.0.5"
- sources."copy-descriptor-0.1.1"
+ sources."conventional-commits-parser-3.2.1"
+ sources."conventional-recommended-bump-6.1.0"
sources."core-util-is-1.0.2"
- sources."cosmiconfig-5.2.1"
- (sources."cross-spawn-6.0.5" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
+ sources."cosmiconfig-7.0.0"
+ sources."cross-spawn-7.0.3"
sources."currently-unhandled-0.4.1"
- sources."cyclist-1.0.1"
- sources."dargs-4.1.0"
+ sources."dargs-7.0.0"
sources."dashdash-1.14.1"
sources."dateformat-3.0.3"
- (sources."debug-3.1.0" // {
- dependencies = [
- sources."ms-2.0.0"
- ];
- })
+ sources."debug-4.3.2"
sources."debuglog-1.0.1"
sources."decamelize-1.2.0"
(sources."decamelize-keys-1.1.0" // {
@@ -85456,108 +86625,56 @@ in
sources."dedent-0.7.0"
sources."defaults-1.0.3"
sources."define-properties-1.1.3"
- sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
+ sources."depd-1.1.2"
sources."deprecation-2.3.1"
sources."detect-indent-5.0.0"
sources."dezalgo-1.0.3"
- sources."dir-glob-2.2.2"
- sources."dot-prop-4.2.1"
+ sources."dir-glob-3.0.1"
+ sources."dot-prop-6.0.1"
sources."duplexer-0.1.2"
- sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."emoji-regex-7.0.3"
+ sources."emoji-regex-8.0.0"
sources."encoding-0.1.13"
- sources."end-of-stream-1.4.4"
sources."env-paths-2.2.0"
sources."envinfo-7.7.4"
- sources."err-code-1.1.2"
+ sources."err-code-2.0.3"
sources."error-ex-1.3.2"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
- sources."es6-promise-4.2.8"
- sources."es6-promisify-5.0.0"
+ sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
- sources."esprima-4.0.1"
- sources."eventemitter3-3.1.2"
- sources."execa-1.0.0"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- sources."ms-2.0.0"
- ];
- })
+ sources."eventemitter3-4.0.7"
+ sources."execa-5.0.0"
sources."extend-3.0.2"
- (sources."extend-shallow-3.0.2" // {
- dependencies = [
- sources."is-extendable-1.0.1"
- ];
- })
(sources."external-editor-3.1.0" // {
dependencies = [
sources."iconv-lite-0.4.24"
];
})
- (sources."extglob-2.0.4" // {
- dependencies = [
- sources."define-property-1.0.0"
- sources."extend-shallow-2.0.1"
- ];
- })
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
- (sources."fast-glob-2.2.7" // {
- dependencies = [
- (sources."glob-parent-3.1.0" // {
- dependencies = [
- sources."is-glob-3.1.0"
- ];
- })
- ];
- })
+ sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
- sources."figgy-pudding-3.5.2"
- sources."figures-2.0.0"
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
+ sources."fastq-1.11.0"
+ sources."figures-3.2.0"
+ sources."fill-range-7.0.1"
sources."filter-obj-1.1.0"
- sources."find-up-3.0.0"
- sources."flush-write-stream-1.1.1"
- sources."for-in-1.0.2"
+ sources."find-up-4.1.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
- sources."fragment-cache-0.2.1"
- sources."from2-2.3.0"
- sources."fs-extra-8.1.0"
- sources."fs-minipass-1.2.7"
- sources."fs-write-stream-atomic-1.0.10"
+ sources."fs-extra-9.1.0"
+ sources."fs-minipass-2.1.0"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
(sources."gauge-2.7.4" // {
dependencies = [
+ sources."aproba-1.2.0"
sources."is-fullwidth-code-point-1.0.0"
sources."string-width-1.0.2"
];
})
- sources."genfun-5.0.0"
sources."get-caller-file-2.0.5"
sources."get-intrinsic-1.1.1"
(sources."get-pkg-repo-1.4.0" // {
@@ -85565,6 +86682,7 @@ in
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
sources."find-up-1.1.2"
+ sources."hosted-git-info-2.8.8"
sources."indent-string-2.1.0"
sources."load-json-file-1.1.0"
sources."map-obj-1.0.1"
@@ -85575,203 +86693,159 @@ in
sources."pify-2.3.0"
sources."read-pkg-1.1.0"
sources."read-pkg-up-1.0.1"
+ sources."readable-stream-2.3.7"
sources."redent-1.0.0"
+ sources."safe-buffer-5.1.2"
+ sources."string_decoder-1.1.1"
sources."strip-bom-2.0.0"
sources."strip-indent-1.0.1"
+ sources."through2-2.0.5"
sources."trim-newlines-1.0.0"
];
})
- sources."get-port-4.2.0"
+ sources."get-port-5.1.1"
sources."get-stdin-4.0.1"
- sources."get-stream-4.1.0"
- sources."get-value-2.0.6"
+ sources."get-stream-6.0.0"
sources."getpass-0.1.7"
- (sources."git-raw-commits-2.0.0" // {
- dependencies = [
- sources."camelcase-4.1.0"
- sources."camelcase-keys-4.2.0"
- sources."indent-string-3.2.0"
- sources."map-obj-2.0.0"
- sources."meow-4.0.1"
- sources."minimist-options-3.0.2"
- sources."quick-lru-1.1.0"
- sources."redent-2.0.0"
- sources."split2-2.2.0"
- sources."strip-indent-2.0.0"
- sources."trim-newlines-2.0.0"
- ];
- })
+ sources."git-raw-commits-2.0.10"
(sources."git-remote-origin-url-2.0.0" // {
dependencies = [
sources."pify-2.3.0"
];
})
- (sources."git-semver-tags-2.0.3" // {
+ (sources."git-semver-tags-4.1.1" // {
dependencies = [
- sources."camelcase-4.1.0"
- sources."camelcase-keys-4.2.0"
- sources."indent-string-3.2.0"
- sources."map-obj-2.0.0"
- sources."meow-4.0.1"
- sources."minimist-options-3.0.2"
- sources."quick-lru-1.1.0"
- sources."redent-2.0.0"
- sources."strip-indent-2.0.0"
- sources."trim-newlines-2.0.0"
+ sources."semver-6.3.0"
];
})
sources."git-up-4.0.2"
sources."git-url-parse-11.4.4"
sources."gitconfiglocal-1.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
- sources."glob-to-regexp-0.3.0"
- (sources."globby-9.2.0" // {
- dependencies = [
- sources."pify-4.0.1"
- ];
- })
+ sources."glob-parent-5.1.2"
+ sources."globby-11.0.2"
sources."graceful-fs-4.2.6"
- (sources."handlebars-4.7.7" // {
- dependencies = [
- sources."source-map-0.6.1"
- ];
- })
+ sources."handlebars-4.7.7"
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
- sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-flag-4.0.0"
+ sources."has-symbols-1.0.2"
sources."has-unicode-2.0.1"
- sources."has-value-1.0.0"
- (sources."has-values-1.0.0" // {
- dependencies = [
- sources."kind-of-4.0.0"
- ];
- })
- sources."hosted-git-info-2.8.8"
- sources."http-cache-semantics-3.8.1"
- sources."http-proxy-agent-2.1.0"
+ sources."hosted-git-info-3.0.8"
+ sources."http-cache-semantics-4.1.0"
+ sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
- sources."https-proxy-agent-2.2.4"
+ sources."https-proxy-agent-5.0.0"
+ sources."human-signals-2.1.0"
sources."humanize-ms-1.2.1"
sources."iconv-lite-0.6.2"
- sources."iferr-0.1.5"
- sources."ignore-4.0.6"
+ sources."ignore-5.1.8"
sources."ignore-walk-3.0.3"
- (sources."import-fresh-2.0.0" // {
+ (sources."import-fresh-3.3.0" // {
dependencies = [
- sources."resolve-from-3.0.0"
+ sources."resolve-from-4.0.0"
];
})
- sources."import-local-2.0.0"
+ sources."import-local-3.0.2"
sources."imurmurhash-0.1.4"
sources."indent-string-4.0.0"
sources."infer-owner-1.0.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
- (sources."init-package-json-1.10.3" // {
+ (sources."init-package-json-2.0.2" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."normalize-package-data-3.0.0"
+ sources."read-package-json-3.0.1"
];
})
- (sources."inquirer-6.5.2" // {
+ (sources."inquirer-7.3.3" // {
dependencies = [
- sources."ansi-regex-4.1.0"
- sources."strip-ansi-5.2.0"
+ sources."ansi-regex-5.0.0"
+ sources."strip-ansi-6.0.0"
];
})
+ sources."interpret-1.4.0"
sources."ip-1.1.5"
- sources."is-accessor-descriptor-1.0.0"
sources."is-arrayish-0.2.1"
- sources."is-buffer-1.1.6"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-ci-2.0.0"
sources."is-core-module-2.2.0"
- sources."is-data-descriptor-1.0.0"
sources."is-date-object-1.0.2"
- sources."is-descriptor-1.0.2"
- sources."is-directory-0.3.1"
- sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
sources."is-finite-1.1.0"
- sources."is-fullwidth-code-point-2.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.1"
+ sources."is-lambda-1.0.1"
sources."is-negative-zero-2.0.1"
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-obj-1.0.1"
+ sources."is-number-7.0.0"
+ sources."is-number-object-1.0.4"
+ sources."is-obj-2.0.0"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
sources."is-regex-1.1.2"
sources."is-ssh-1.3.2"
- sources."is-stream-1.1.0"
+ sources."is-stream-2.0.0"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."is-text-path-1.0.1"
sources."is-typedarray-1.0.0"
sources."is-utf8-0.2.1"
- sources."is-windows-1.0.2"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-3.0.1"
sources."isstream-0.1.2"
sources."js-tokens-4.0.0"
- sources."js-yaml-3.14.1"
sources."jsbn-0.1.1"
sources."json-parse-better-errors-1.0.2"
sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
- sources."jsonfile-4.0.0"
+ sources."jsonfile-6.1.0"
sources."jsonparse-1.3.1"
sources."jsprim-1.4.1"
sources."kind-of-6.0.3"
- sources."lines-and-columns-1.1.6"
- (sources."load-json-file-5.3.0" // {
+ sources."libnpmaccess-4.0.1"
+ (sources."libnpmpublish-4.0.0" // {
dependencies = [
- sources."pify-4.0.1"
+ sources."normalize-package-data-3.0.0"
];
})
- sources."locate-path-3.0.0"
+ sources."lines-and-columns-1.1.6"
+ (sources."load-json-file-6.2.0" // {
+ dependencies = [
+ sources."type-fest-0.6.0"
+ ];
+ })
+ sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
- sources."lodash.clonedeep-4.5.0"
- sources."lodash.get-4.4.2"
sources."lodash.ismatch-4.4.0"
- sources."lodash.set-4.3.2"
sources."lodash.sortby-4.7.0"
sources."lodash.template-4.5.0"
sources."lodash.templatesettings-4.2.0"
- sources."lodash.uniq-4.5.0"
sources."loud-rejection-1.6.0"
- sources."lru-cache-5.1.1"
- sources."macos-release-2.4.1"
- sources."make-dir-1.3.0"
- sources."make-fetch-happen-5.0.2"
- sources."map-cache-0.2.2"
+ sources."lru-cache-6.0.0"
+ (sources."make-dir-2.1.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ sources."make-fetch-happen-8.0.14"
sources."map-obj-4.1.0"
- sources."map-visit-1.0.0"
(sources."meow-8.1.2" // {
dependencies = [
- sources."find-up-4.1.0"
- sources."hosted-git-info-3.0.8"
- sources."locate-path-5.0.0"
- sources."lru-cache-6.0.0"
+ sources."hosted-git-info-2.8.8"
sources."normalize-package-data-3.0.0"
- sources."p-locate-4.1.0"
- sources."parse-json-5.2.0"
- sources."path-exists-4.0.0"
(sources."read-pkg-5.2.0" // {
dependencies = [
- sources."hosted-git-info-2.8.8"
sources."normalize-package-data-2.5.0"
- sources."semver-5.7.1"
sources."type-fest-0.6.0"
];
})
@@ -85780,157 +86854,145 @@ in
sources."type-fest-0.8.1"
];
})
- sources."semver-7.3.4"
+ sources."semver-5.7.1"
sources."type-fest-0.18.1"
- sources."yallist-4.0.0"
- sources."yargs-parser-20.2.5"
];
})
+ sources."merge-stream-2.0.0"
sources."merge2-1.4.1"
- sources."micromatch-3.1.10"
+ sources."micromatch-4.0.2"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
- sources."mimic-fn-1.2.0"
+ sources."mimic-fn-2.1.0"
sources."min-indent-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."minimist-options-4.1.0"
- sources."minipass-2.9.0"
- sources."minizlib-1.3.3"
- sources."mississippi-3.0.0"
- (sources."mixin-deep-1.3.2" // {
+ (sources."minimist-options-4.1.0" // {
dependencies = [
- sources."is-extendable-1.0.1"
+ sources."arrify-1.0.1"
];
})
- sources."mkdirp-0.5.5"
- sources."mkdirp-promise-5.0.1"
+ sources."minipass-3.1.3"
+ sources."minipass-collect-1.0.2"
+ sources."minipass-fetch-1.3.3"
+ sources."minipass-flush-1.0.5"
+ sources."minipass-json-stream-1.0.1"
+ sources."minipass-pipeline-1.2.4"
+ sources."minipass-sized-1.0.3"
+ sources."minizlib-2.1.2"
+ sources."mkdirp-1.0.4"
+ sources."mkdirp-infer-owner-2.0.0"
sources."modify-values-1.0.1"
- sources."move-concurrently-1.0.1"
- sources."ms-2.1.3"
- sources."multimatch-3.0.0"
- sources."mute-stream-0.0.7"
- sources."mz-2.7.0"
- sources."nanomatch-1.2.13"
+ sources."ms-2.1.2"
+ sources."multimatch-5.0.0"
+ sources."mute-stream-0.0.8"
sources."neo-async-2.6.2"
- sources."nice-try-1.0.5"
sources."node-fetch-2.6.1"
- sources."node-fetch-npm-2.0.4"
- (sources."node-gyp-5.1.1" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."nopt-4.0.3"
+ sources."node-gyp-7.1.2"
+ sources."nopt-5.0.0"
(sources."normalize-package-data-2.5.0" // {
dependencies = [
+ sources."hosted-git-info-2.8.8"
sources."semver-5.7.1"
];
})
sources."normalize-url-3.3.0"
sources."npm-bundled-1.1.1"
- sources."npm-lifecycle-3.1.5"
+ sources."npm-install-checks-4.0.0"
+ (sources."npm-lifecycle-3.1.5" // {
+ dependencies = [
+ sources."chownr-1.1.4"
+ sources."fs-minipass-1.2.7"
+ sources."minipass-2.9.0"
+ sources."minizlib-1.3.3"
+ sources."mkdirp-0.5.5"
+ sources."node-gyp-5.1.1"
+ sources."nopt-4.0.3"
+ sources."resolve-from-4.0.0"
+ sources."rimraf-2.7.1"
+ sources."semver-5.7.1"
+ sources."tar-4.4.13"
+ sources."which-1.3.1"
+ sources."yallist-3.1.1"
+ ];
+ })
sources."npm-normalize-package-bin-1.0.1"
- (sources."npm-package-arg-6.1.1" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."npm-packlist-1.4.8"
- (sources."npm-pick-manifest-3.0.2" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."npm-run-path-2.0.2"
+ sources."npm-package-arg-8.1.1"
+ sources."npm-packlist-2.1.4"
+ sources."npm-pick-manifest-6.1.0"
+ sources."npm-registry-fetch-9.0.0"
+ sources."npm-run-path-4.0.1"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
- (sources."object-copy-0.1.0" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."is-accessor-descriptor-0.1.6"
- sources."is-data-descriptor-0.1.4"
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- sources."kind-of-3.2.2"
- ];
- })
sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
- sources."object-visit-1.0.1"
sources."object.assign-4.1.2"
sources."object.getownpropertydescriptors-2.1.2"
- sources."object.pick-1.3.0"
- sources."octokit-pagination-methods-1.1.0"
sources."once-1.4.0"
- sources."onetime-2.0.1"
+ sources."onetime-5.1.2"
sources."os-homedir-1.0.2"
- sources."os-name-3.1.0"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."p-finally-1.0.0"
sources."p-limit-2.3.0"
- sources."p-locate-3.0.0"
- sources."p-map-2.1.0"
- sources."p-map-series-1.0.0"
- sources."p-pipe-1.2.0"
- sources."p-queue-4.0.0"
- sources."p-reduce-1.0.0"
+ sources."p-locate-4.1.0"
+ sources."p-map-4.0.0"
+ sources."p-map-series-2.1.0"
+ sources."p-pipe-3.1.0"
+ sources."p-queue-6.6.2"
+ sources."p-reduce-2.1.0"
+ sources."p-timeout-3.2.0"
sources."p-try-2.2.0"
- sources."p-waterfall-1.0.0"
- sources."parallel-transform-1.2.0"
+ sources."p-waterfall-2.1.1"
+ sources."pacote-11.2.7"
+ sources."parent-module-1.0.1"
sources."parse-github-repo-url-1.4.1"
- sources."parse-json-4.0.0"
+ sources."parse-json-5.2.0"
(sources."parse-path-4.0.3" // {
dependencies = [
sources."qs-6.9.6"
];
})
sources."parse-url-5.0.2"
- sources."pascalcase-0.1.1"
- sources."path-dirname-1.0.2"
- sources."path-exists-3.0.0"
+ sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
- sources."path-key-2.0.1"
+ sources."path-key-3.1.1"
sources."path-parse-1.0.6"
- sources."path-type-3.0.0"
+ sources."path-type-4.0.0"
sources."performance-now-2.1.0"
- sources."pify-3.0.0"
+ sources."picomatch-2.2.2"
+ sources."pify-4.0.1"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
- sources."pkg-dir-3.0.0"
- sources."posix-character-classes-0.1.1"
+ sources."pkg-dir-4.2.0"
sources."process-nextick-args-2.0.1"
sources."promise-inflight-1.0.1"
- sources."promise-retry-1.1.1"
+ sources."promise-retry-2.0.1"
sources."promzard-0.3.0"
sources."proto-list-1.2.4"
sources."protocols-1.4.8"
- sources."protoduck-5.0.1"
sources."psl-1.8.0"
- sources."pump-3.0.0"
- (sources."pumpify-1.5.1" // {
- dependencies = [
- sources."pump-2.0.1"
- ];
- })
+ sources."puka-1.0.1"
sources."punycode-2.1.1"
sources."q-1.5.1"
sources."qs-6.5.2"
- sources."query-string-6.14.0"
+ sources."query-string-6.14.1"
+ sources."queue-microtask-1.2.2"
sources."quick-lru-4.0.1"
sources."read-1.0.7"
- sources."read-cmd-shim-1.0.5"
+ sources."read-cmd-shim-2.0.0"
sources."read-package-json-2.1.2"
+ sources."read-package-json-fast-2.0.2"
sources."read-package-tree-5.3.1"
(sources."read-pkg-3.0.0" // {
dependencies = [
sources."load-json-file-4.0.0"
+ sources."parse-json-4.0.0"
+ sources."path-type-3.0.0"
+ sources."pify-3.0.0"
+ sources."strip-bom-3.0.0"
];
})
(sources."read-pkg-up-3.0.0" // {
@@ -85940,195 +87002,100 @@ in
sources."p-limit-1.3.0"
sources."p-locate-2.0.0"
sources."p-try-1.0.0"
+ sources."path-exists-3.0.0"
];
})
- (sources."readable-stream-2.3.7" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
- ];
- })
+ sources."readable-stream-3.6.0"
sources."readdir-scoped-modules-1.1.0"
+ sources."rechoir-0.6.2"
sources."redent-3.0.0"
- sources."regex-not-1.0.2"
- sources."repeat-element-1.1.3"
- sources."repeat-string-1.6.1"
sources."repeating-2.0.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."require-main-filename-2.0.0"
sources."resolve-1.20.0"
- (sources."resolve-cwd-2.0.0" // {
- dependencies = [
- sources."resolve-from-3.0.0"
- ];
- })
- sources."resolve-from-4.0.0"
- sources."resolve-url-0.2.1"
- sources."restore-cursor-2.0.0"
- sources."ret-0.1.15"
- sources."retry-0.10.1"
- sources."rimraf-2.7.1"
+ sources."resolve-cwd-3.0.0"
+ sources."resolve-from-5.0.0"
+ sources."restore-cursor-3.1.0"
+ sources."retry-0.12.0"
+ sources."reusify-1.0.4"
+ sources."rimraf-3.0.2"
sources."run-async-2.4.1"
- sources."run-queue-1.0.3"
- sources."rxjs-6.6.3"
+ sources."run-parallel-1.2.0"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
- sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
- sources."semver-6.3.0"
+ sources."semver-7.3.4"
sources."set-blocking-2.0.0"
- (sources."set-value-2.0.1" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
sources."shallow-clone-3.0.1"
- sources."shebang-command-1.2.0"
- sources."shebang-regex-1.0.0"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
+ sources."shelljs-0.8.4"
sources."signal-exit-3.0.3"
- sources."slash-2.0.0"
+ sources."slash-3.0.0"
sources."slide-1.1.6"
sources."smart-buffer-4.1.0"
- (sources."snapdragon-0.8.2" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- sources."ms-2.0.0"
- ];
- })
- (sources."snapdragon-node-2.1.1" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
- (sources."snapdragon-util-3.0.1" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."socks-2.3.3"
- (sources."socks-proxy-agent-4.0.2" // {
- dependencies = [
- sources."agent-base-4.2.1"
- ];
- })
+ sources."socks-2.5.1"
+ sources."socks-proxy-agent-5.0.0"
sources."sort-keys-2.0.0"
- sources."source-map-0.5.7"
- sources."source-map-resolve-0.5.3"
- sources."source-map-url-0.4.1"
+ sources."source-map-0.6.1"
sources."spdx-correct-3.1.1"
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
sources."split-1.0.1"
sources."split-on-first-1.1.0"
- sources."split-string-3.1.0"
- (sources."split2-3.2.2" // {
- dependencies = [
- sources."readable-stream-3.6.0"
- ];
- })
- sources."sprintf-js-1.0.3"
+ sources."split2-3.2.2"
sources."sshpk-1.16.1"
- sources."ssri-6.0.1"
- (sources."static-extend-0.1.2" // {
- dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
- sources."stream-each-1.2.3"
- sources."stream-shift-1.0.1"
+ sources."ssri-8.0.1"
sources."strict-uri-encode-2.0.0"
- (sources."string-width-2.1.1" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
- sources."ansi-regex-3.0.0"
- sources."strip-ansi-4.0.0"
- ];
- })
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
- (sources."string_decoder-1.1.1" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
+ sources."ansi-regex-5.0.0"
+ sources."strip-ansi-6.0.0"
];
})
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
+ sources."string_decoder-1.3.0"
sources."strip-ansi-3.0.1"
- sources."strip-bom-3.0.0"
- sources."strip-eof-1.0.0"
+ sources."strip-bom-4.0.0"
+ sources."strip-final-newline-2.0.0"
sources."strip-indent-3.0.0"
sources."strong-log-transformer-2.1.0"
- sources."supports-color-5.5.0"
- sources."tar-4.4.13"
+ sources."supports-color-7.2.0"
+ sources."tar-6.1.0"
sources."temp-dir-1.0.0"
- sources."temp-write-3.4.0"
- sources."text-extensions-1.9.0"
- sources."thenify-3.3.1"
- sources."thenify-all-1.6.0"
- sources."through-2.3.8"
- sources."through2-2.0.5"
- sources."tmp-0.0.33"
- (sources."to-object-path-0.3.0" // {
+ (sources."temp-write-4.0.0" // {
dependencies = [
- sources."kind-of-3.2.2"
+ sources."make-dir-3.1.0"
+ sources."semver-6.3.0"
];
})
- sources."to-regex-3.0.2"
- sources."to-regex-range-2.1.1"
+ sources."text-extensions-1.9.0"
+ sources."through-2.3.8"
+ sources."through2-4.0.2"
+ sources."tmp-0.0.33"
+ sources."to-regex-range-5.0.1"
sources."tough-cookie-2.5.0"
- sources."tr46-1.0.1"
+ sources."tr46-2.0.2"
sources."trim-newlines-3.0.0"
sources."trim-off-newlines-1.0.1"
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-fest-0.3.1"
+ sources."type-fest-0.4.1"
sources."typedarray-0.0.6"
- sources."uglify-js-3.12.8"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."uglify-js-3.13.0"
sources."uid-number-0.0.6"
sources."umask-1.1.0"
- sources."union-value-1.0.1"
+ sources."unbox-primitive-1.0.0"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
- sources."universal-user-agent-4.0.1"
- sources."universalify-0.1.2"
- (sources."unset-value-1.0.0" // {
- dependencies = [
- (sources."has-value-0.3.1" // {
- dependencies = [
- sources."isobject-2.1.0"
- ];
- })
- sources."has-values-0.1.4"
- ];
- })
- sources."upath-1.2.0"
+ sources."universal-user-agent-6.0.0"
+ sources."universalify-2.0.0"
+ sources."upath-2.0.1"
sources."uri-js-4.4.1"
- sources."urix-0.1.0"
- sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."util-promisify-2.1.0"
sources."uuid-3.4.0"
@@ -86136,45 +87103,48 @@ in
sources."validate-npm-package-name-3.0.0"
sources."verror-1.10.0"
sources."wcwidth-1.0.1"
- sources."webidl-conversions-4.0.2"
- sources."whatwg-url-7.1.0"
- sources."which-1.3.1"
- sources."which-module-2.0.0"
- sources."wide-align-1.1.3"
- sources."windows-release-3.3.3"
- sources."wordwrap-1.0.0"
- (sources."wrap-ansi-5.1.0" // {
+ sources."webidl-conversions-6.1.0"
+ sources."whatwg-url-8.4.0"
+ sources."which-2.0.2"
+ sources."which-boxed-primitive-1.0.2"
+ (sources."wide-align-1.1.3" // {
dependencies = [
- sources."ansi-regex-4.1.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
+ sources."ansi-regex-3.0.0"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."string-width-2.1.1"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ sources."wordwrap-1.0.0"
+ (sources."wrap-ansi-7.0.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ sources."strip-ansi-6.0.0"
];
})
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
- (sources."write-json-file-3.2.0" // {
+ (sources."write-json-file-4.3.0" // {
dependencies = [
- sources."make-dir-2.1.0"
- sources."pify-4.0.1"
- sources."semver-5.7.1"
+ sources."detect-indent-6.0.0"
+ sources."is-plain-obj-2.1.0"
+ sources."make-dir-3.1.0"
+ sources."semver-6.3.0"
+ sources."sort-keys-4.2.0"
+ sources."write-file-atomic-3.0.3"
];
})
- (sources."write-pkg-3.2.0" // {
+ (sources."write-pkg-4.0.0" // {
dependencies = [
- sources."write-json-file-2.3.0"
+ sources."write-json-file-3.2.0"
];
})
sources."xtend-4.0.2"
- sources."y18n-4.0.1"
- sources."yallist-3.1.1"
- (sources."yargs-14.2.3" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
- sources."yargs-parser-15.0.1"
+ sources."y18n-5.0.5"
+ sources."yallist-4.0.0"
+ sources."yaml-1.10.0"
+ sources."yargs-16.2.0"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -86201,7 +87171,7 @@ in
sources."graceful-fs-4.2.6"
sources."iconv-lite-0.4.24"
sources."image-size-0.5.5"
- sources."is-what-3.13.0"
+ sources."is-what-3.14.1"
sources."make-dir-2.1.0"
sources."mime-1.6.0"
sources."ms-2.1.3"
@@ -86682,7 +87652,7 @@ in
sources."ms-2.1.3"
];
})
- (sources."engine.io-client-3.5.0" // {
+ (sources."engine.io-client-3.5.1" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -87063,7 +88033,7 @@ in
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xmlhttprequest-ssl-1.5.5"
sources."yeast-0.1.2"
];
@@ -87084,51 +88054,52 @@ in
src = ../interpreters/clojurescript/lumo;
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
- sources."@babel/core-7.12.17"
- sources."@babel/generator-7.12.17"
+ sources."@babel/compat-data-7.13.8"
+ sources."@babel/core-7.13.8"
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- sources."@babel/helper-compilation-targets-7.12.17"
- sources."@babel/helper-create-class-features-plugin-7.12.17"
+ sources."@babel/helper-compilation-targets-7.13.8"
+ sources."@babel/helper-create-class-features-plugin-7.13.8"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
- sources."@babel/helper-explode-assignable-expression-7.12.13"
+ sources."@babel/helper-define-polyfill-provider-0.1.5"
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-hoist-variables-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-remap-async-to-generator-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helper-wrap-function-7.12.13"
- sources."@babel/helpers-7.12.17"
- (sources."@babel/highlight-7.12.13" // {
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.0"
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.12.17"
+ sources."@babel/parser-7.13.9"
sources."@babel/plugin-external-helpers-7.8.3"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
- sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.17"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
+ sources."@babel/plugin-proposal-class-properties-7.13.0"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.17"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-bigint-7.8.3"
@@ -87144,46 +88115,46 @@ in
sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
- sources."@babel/plugin-transform-runtime-7.12.17"
+ sources."@babel/plugin-transform-runtime-7.13.9"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- sources."@babel/preset-env-7.12.17"
+ sources."@babel/preset-env-7.13.9"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-stage-2-7.8.3"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@cnakazawa/watch-1.0.4"
sources."@comandeer/babel-plugin-banner-5.0.0"
sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -87204,7 +88175,7 @@ in
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.7"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/normalize-package-data-2.4.0"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.13"
@@ -87250,7 +88221,7 @@ in
sources."asn1-0.2.4"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -87293,6 +88264,9 @@ in
sources."babel-plugin-minify-replace-0.5.0"
sources."babel-plugin-minify-simplify-0.5.1"
sources."babel-plugin-minify-type-constructors-0.4.3"
+ sources."babel-plugin-polyfill-corejs2-0.1.10"
+ sources."babel-plugin-polyfill-corejs3-0.1.7"
+ sources."babel-plugin-polyfill-regenerator-0.1.6"
sources."babel-plugin-syntax-flow-6.18.0"
sources."babel-plugin-transform-flow-strip-types-6.22.0"
sources."babel-plugin-transform-inline-consecutive-adds-0.4.3"
@@ -87332,7 +88306,7 @@ in
];
})
sources."bluebird-3.7.2"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."brace-expansion-1.1.11"
(sources."braces-2.3.2" // {
dependencies = [
@@ -87374,7 +88348,7 @@ in
sources."cached-path-relative-1.0.2"
sources."call-bind-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -87423,7 +88397,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
(sources."combine-source-map-0.8.0" // {
dependencies = [
@@ -87446,7 +88420,7 @@ in
})
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.12"
- (sources."core-js-compat-3.9.0" // {
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -87454,7 +88428,7 @@ in
sources."core-util-is-1.0.2"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -87469,6 +88443,7 @@ in
})
(sources."cross-spawn-6.0.5" // {
dependencies = [
+ sources."semver-5.7.1"
sources."which-1.3.1"
];
})
@@ -87490,17 +88465,17 @@ in
sources."detective-5.2.0"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."domain-browser-1.2.0"
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."emoji-regex-7.0.3"
@@ -87603,7 +88578,7 @@ in
sources."get-value-2.0.6"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
(sources."global-modules-2.0.0" // {
dependencies = [
sources."global-prefix-3.0.0"
@@ -87628,7 +88603,7 @@ in
sources."har-validator-5.1.5"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -87698,11 +88673,7 @@ in
sources."isobject-3.0.1"
sources."isstream-0.1.2"
sources."istanbul-lib-coverage-3.0.0"
- (sources."istanbul-lib-instrument-4.0.3" // {
- dependencies = [
- sources."semver-6.3.0"
- ];
- })
+ sources."istanbul-lib-instrument-4.0.3"
sources."jest-haste-map-25.5.1"
sources."jest-regex-util-25.2.6"
sources."jest-serializer-25.5.0"
@@ -87739,14 +88710,11 @@ in
})
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
+ sources."lodash.debounce-4.0.8"
sources."lodash.memoize-3.0.4"
sources."lru-cache-5.1.1"
sources."magic-string-0.25.7"
- (sources."make-dir-3.1.0" // {
- dependencies = [
- sources."semver-6.3.0"
- ];
- })
+ sources."make-dir-3.1.0"
sources."makeerror-1.0.11"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
@@ -87763,7 +88731,7 @@ in
})
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-db-1.46.0"
@@ -87797,7 +88765,7 @@ in
(sources."node-libs-browser-2.2.1" // {
dependencies = [
sources."buffer-4.9.2"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."inherits-2.0.3"
sources."punycode-1.4.1"
sources."stream-http-2.8.3"
@@ -87807,8 +88775,12 @@ in
];
})
sources."node-modules-regexp-1.0.0"
- sources."node-releases-1.1.70"
- sources."normalize-package-data-2.5.0"
+ sources."node-releases-1.1.71"
+ (sources."normalize-package-data-2.5.0" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
sources."normalize-path-3.0.0"
sources."npm-run-path-2.0.2"
sources."oauth-sign-0.9.0"
@@ -87871,7 +88843,7 @@ in
sources."psl-1.8.0"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."pump-3.0.0"
@@ -87951,7 +88923,7 @@ in
];
})
sources."schema-utils-2.7.1"
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
sources."serialize-javascript-4.0.0"
sources."set-blocking-2.0.0"
(sources."set-value-2.0.1" // {
@@ -88076,6 +89048,7 @@ in
sources."path-exists-3.0.0"
sources."pkg-dir-3.0.0"
sources."schema-utils-1.0.0"
+ sources."semver-5.7.1"
sources."source-map-0.6.1"
];
})
@@ -88136,7 +89109,7 @@ in
})
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."validate-npm-package-license-3.0.4"
sources."verror-1.10.0"
sources."vinyl-2.2.1"
@@ -88689,16 +89662,16 @@ in
"@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage {
name = "_at_mermaid-js_slash_mermaid-cli";
packageName = "@mermaid-js/mermaid-cli";
- version = "8.9.0";
+ version = "8.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.0.tgz";
- sha512 = "DF3nwcCi2ihM3OXIcCn4cNKUxSSU9UeyVuH9bNpgtymjpwAFU45jJXCK9RHtNhLtdjuXz+tcE/sYop3tnBGSuw==";
+ url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.1.tgz";
+ sha512 = "I/p3LzJv6gOAgHWdx0QMVbLVBN/xolqi5elACsbEWAnKuLPC+bjELsWDj35AYWBJalX01u8q1LdV0uhcCIJlMg==";
};
dependencies = [
sources."@braintree/sanitize-url-3.1.0"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/yauzl-2.9.1"
- sources."agent-base-5.1.1"
+ sources."agent-base-6.0.2"
sources."ansi-styles-4.3.0"
sources."balanced-match-1.0.0"
sources."base64-js-1.5.1"
@@ -88755,7 +89728,7 @@ in
sources."dagre-0.8.5"
sources."dagre-d3-0.6.4"
sources."debug-4.3.2"
- sources."devtools-protocol-0.0.818844"
+ sources."devtools-protocol-0.0.847576"
sources."end-of-stream-1.4.4"
sources."entity-decode-2.0.2"
sources."extract-zip-2.0.1"
@@ -88773,7 +89746,7 @@ in
sources."commander-2.20.3"
];
})
- sources."https-proxy-agent-4.0.0"
+ sources."https-proxy-agent-5.0.0"
sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
sources."inflight-1.0.6"
@@ -88802,7 +89775,7 @@ in
sources."progress-2.0.3"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."puppeteer-5.5.0"
+ sources."puppeteer-7.1.0"
sources."readable-stream-3.6.0"
sources."relateurl-0.2.7"
sources."rimraf-3.0.2"
@@ -88824,12 +89797,12 @@ in
sources."through-2.3.8"
sources."try-catch-2.0.1"
sources."try-to-catch-1.1.1"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."unbzip2-stream-1.4.3"
sources."upper-case-1.1.3"
sources."util-deprecate-1.0.2"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."yauzl-2.10.0"
];
buildInputs = globalBuildInputs;
@@ -88851,23 +89824,23 @@ in
sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg==";
};
dependencies = [
- sources."@fluentui/date-time-utilities-7.9.0"
- sources."@fluentui/dom-utilities-1.1.1"
- sources."@fluentui/keyboard-key-0.2.13"
- sources."@fluentui/react-7.161.0"
- sources."@fluentui/react-focus-7.17.4"
- sources."@fluentui/react-window-provider-1.0.1"
- sources."@fluentui/theme-1.7.3"
- sources."@microsoft/load-themed-styles-1.10.147"
+ sources."@fluentui/date-time-utilities-7.9.1"
+ sources."@fluentui/dom-utilities-1.1.2"
+ sources."@fluentui/keyboard-key-0.2.14"
+ sources."@fluentui/react-7.162.1"
+ sources."@fluentui/react-focus-7.17.5"
+ sources."@fluentui/react-window-provider-1.0.2"
+ sources."@fluentui/theme-1.7.4"
+ sources."@microsoft/load-themed-styles-1.10.149"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@uifabric/foundation-7.9.24"
- sources."@uifabric/icons-7.5.21"
- sources."@uifabric/merge-styles-7.19.1"
- sources."@uifabric/react-hooks-7.13.11"
- sources."@uifabric/set-version-7.0.23"
- sources."@uifabric/styling-7.18.0"
- sources."@uifabric/utilities-7.33.4"
+ sources."@uifabric/foundation-7.9.25"
+ sources."@uifabric/icons-7.5.22"
+ sources."@uifabric/merge-styles-7.19.2"
+ sources."@uifabric/react-hooks-7.13.12"
+ sources."@uifabric/set-version-7.0.24"
+ sources."@uifabric/styling-7.18.1"
+ sources."@uifabric/utilities-7.33.5"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
sources."ansi-escapes-1.4.0"
@@ -88934,7 +89907,7 @@ in
sources."eventemitter3-4.0.7"
sources."express-4.17.1"
sources."express-normalize-query-params-middleware-0.5.1"
- sources."express-openapi-7.3.0"
+ sources."express-openapi-7.5.0"
sources."external-editor-2.2.0"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
@@ -88994,17 +89967,17 @@ in
sources."node-fetch-1.6.3"
sources."normalize-url-4.5.0"
sources."object-assign-4.1.1"
- sources."office-ui-fabric-react-7.161.0"
+ sources."office-ui-fabric-react-7.162.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
sources."onetime-2.0.1"
sources."openapi-default-setter-7.2.3"
- sources."openapi-framework-7.3.0"
+ sources."openapi-framework-7.5.0"
sources."openapi-jsonschema-parameters-7.2.3"
- sources."openapi-request-coercer-7.2.3"
- sources."openapi-request-validator-7.3.0"
- sources."openapi-response-validator-7.2.3"
+ sources."openapi-request-coercer-7.5.0"
+ sources."openapi-request-validator-7.4.0"
+ sources."openapi-response-validator-7.4.0"
sources."openapi-schema-validator-7.2.3"
sources."openapi-security-handler-7.2.3"
sources."openapi-types-7.2.3"
@@ -89085,7 +90058,7 @@ in
sources."strip-json-comments-2.0.1"
sources."supports-color-2.0.0"
sources."swagger-schema-official-2.0.0-bab6bed"
- sources."swagger-ui-dist-3.43.0"
+ sources."swagger-ui-dist-3.44.1"
sources."tail-2.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
@@ -89117,10 +90090,10 @@ in
mocha = nodeEnv.buildNodePackage {
name = "mocha";
packageName = "mocha";
- version = "8.3.0";
+ version = "8.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz";
- sha512 = "TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-8.3.1.tgz";
+ sha512 = "5SBMxANWqOv5bw3Hx+HVgaWlcWcFEQDUdaUAr1AUU+qwtx6cowhn7gEDT/DwQP7uYxnvShdUOVLbTYAHOEGfDQ==";
};
dependencies = [
sources."@ungap/promise-all-settled-1.1.2"
@@ -89145,7 +90118,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -89169,7 +90142,7 @@ in
sources."fsevents-2.3.2"
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."growl-1.10.5"
sources."has-flag-4.0.0"
sources."he-1.2.0"
@@ -89212,7 +90185,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -89222,7 +90195,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -89314,7 +90287,7 @@ in
sources."color-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."colornames-1.1.1"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
@@ -89369,61 +90342,66 @@ in
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";
- version = "3.8.5";
+ version = "3.10.6";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.5.tgz";
- sha512 = "W0/Kp1QSJ+CKGc5fmtuikXMtQ1GSPtbtonaQ9+wjRuUp/hM/swSqeMcD1Nl7lylfPsTDbkMYBxyU/e4xsssMnw==";
+ url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.10.6.tgz";
+ sha512 = "z/TQ+ehXvNhYQkJXNwxOSYq1jFP3rt1yvD2pILnbCrRZavzYc+GoIEKhKj+gPRgezwzXN9LnGiNQES4zyNcJJA==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
- (sources."@babel/core-7.12.17" // {
+ sources."@babel/compat-data-7.13.8"
+ (sources."@babel/core-7.13.8" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
];
})
- sources."@babel/generator-7.12.17"
+ sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- (sources."@babel/helper-compilation-targets-7.12.17" // {
+ (sources."@babel/helper-compilation-targets-7.13.8" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.12.17"
+ sources."@babel/helper-create-class-features-plugin-7.13.8"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
- sources."@babel/helper-explode-assignable-expression-7.12.13"
+ (sources."@babel/helper-define-polyfill-provider-0.1.5" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-hoist-variables-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-remap-async-to-generator-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helper-wrap-function-7.12.13"
- sources."@babel/helpers-7.12.17"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
- sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.17"
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.0"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
+ sources."@babel/plugin-proposal-class-properties-7.13.0"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.17"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -89437,58 +90415,58 @@ in
sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.12.17" // {
+ (sources."@babel/preset-env-7.13.9" // {
dependencies = [
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@bugsnag/browser-7.7.0"
sources."@bugsnag/core-7.7.0"
sources."@bugsnag/cuid-3.0.0"
- sources."@bugsnag/js-7.7.0"
- sources."@bugsnag/node-7.7.0"
+ sources."@bugsnag/js-7.8.0"
+ sources."@bugsnag/node-7.8.0"
sources."@bugsnag/safe-json-stringify-6.0.0"
sources."@dabh/diagnostics-2.0.2"
sources."@jest/types-24.9.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
- (sources."@netlify/build-9.1.3" // {
+ (sources."@netlify/build-9.8.5" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
@@ -89502,7 +90480,7 @@ in
sources."locate-path-5.0.0"
];
})
- (sources."@netlify/config-4.0.2" // {
+ (sources."@netlify/config-4.0.4" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
@@ -89514,7 +90492,7 @@ in
sources."locate-path-5.0.0"
];
})
- sources."@netlify/functions-utils-1.3.13"
+ sources."@netlify/functions-utils-1.3.17"
(sources."@netlify/git-utils-1.0.8" // {
dependencies = [
sources."braces-3.0.2"
@@ -89535,7 +90513,7 @@ in
sources."dir-glob-3.0.1"
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
@@ -89545,7 +90523,7 @@ in
sources."to-regex-range-5.0.1"
];
})
- sources."@netlify/plugins-list-2.2.0"
+ sources."@netlify/plugins-list-2.4.0"
(sources."@netlify/run-utils-1.0.6" // {
dependencies = [
sources."execa-3.4.0"
@@ -89555,7 +90533,7 @@ in
sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10"
sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10"
sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10"
- (sources."@netlify/zip-it-and-ship-it-2.3.0" // {
+ (sources."@netlify/zip-it-and-ship-it-2.5.0" // {
dependencies = [
sources."locate-path-5.0.0"
sources."resolve-2.0.0-next.3"
@@ -89612,7 +90590,7 @@ in
sources."dir-glob-3.0.1"
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
@@ -89671,7 +90649,7 @@ in
sources."supports-color-5.5.0"
];
})
- (sources."@oclif/plugin-plugins-1.9.5" // {
+ (sources."@oclif/plugin-plugins-1.10.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -89689,7 +90667,7 @@ in
sources."universal-user-agent-6.0.0"
];
})
- sources."@octokit/openapi-types-5.1.0"
+ sources."@octokit/openapi-types-5.3.1"
(sources."@octokit/plugin-paginate-rest-1.1.2" // {
dependencies = [
sources."@octokit/types-2.16.2"
@@ -89714,7 +90692,7 @@ in
];
})
sources."@octokit/rest-16.43.2"
- sources."@octokit/types-6.10.0"
+ sources."@octokit/types-6.12.1"
sources."@rollup/plugin-babel-5.3.0"
(sources."@rollup/plugin-commonjs-17.1.0" // {
dependencies = [
@@ -89750,7 +90728,7 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/minimatch-3.0.3"
sources."@types/mkdirp-0.5.2"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/node-fetch-2.5.8"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse5-5.0.3"
@@ -89764,7 +90742,7 @@ in
sources."accepts-1.3.7"
sources."agent-base-6.0.2"
sources."aggregate-error-3.1.0"
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."emoji-regex-7.0.3"
@@ -89809,7 +90787,7 @@ in
sources."at-least-node-1.0.0"
sources."atob-2.1.2"
sources."atob-lite-2.0.0"
- (sources."aws-sdk-2.848.0" // {
+ (sources."aws-sdk-2.858.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -89817,6 +90795,13 @@ in
];
})
sources."babel-plugin-dynamic-import-node-2.3.3"
+ (sources."babel-plugin-polyfill-corejs2-0.1.10" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."babel-plugin-polyfill-corejs3-0.1.7"
+ sources."babel-plugin-polyfill-regenerator-0.1.6"
sources."backoff-2.5.0"
sources."bail-1.0.5"
sources."balanced-match-1.0.0"
@@ -89826,7 +90811,7 @@ in
];
})
sources."base64-js-1.5.1"
- sources."before-after-hook-2.1.1"
+ sources."before-after-hook-2.2.0"
sources."binary-extensions-2.2.0"
sources."bl-4.1.0"
(sources."body-parser-1.19.0" // {
@@ -89870,7 +90855,7 @@ in
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."cardinal-2.1.1"
sources."caw-2.0.1"
sources."ccount-1.1.0"
@@ -89890,7 +90875,7 @@ in
dependencies = [
sources."braces-3.0.2"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."is-number-7.0.0"
sources."to-regex-range-5.0.1"
];
@@ -89956,8 +90941,8 @@ in
})
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."color-string-1.5.4"
- sources."colorette-1.2.1"
+ sources."color-string-1.5.5"
+ sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."combined-stream-1.0.8"
@@ -90002,14 +90987,14 @@ in
sources."safe-buffer-5.1.2"
];
})
- (sources."core-js-compat-3.9.0" // {
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
})
sources."core-util-is-1.0.2"
sources."cp-file-7.0.0"
- (sources."cpy-8.1.1" // {
+ (sources."cpy-8.1.2" // {
dependencies = [
sources."globby-9.2.0"
];
@@ -90127,7 +91112,7 @@ in
})
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."elegant-spinner-1.0.1"
sources."elf-cam-0.1.1"
sources."emoji-regex-8.0.0"
@@ -90138,7 +91123,7 @@ in
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
sources."error-stack-parser-2.0.6"
- sources."esbuild-0.8.50"
+ sources."esbuild-0.8.57"
sources."escalade-3.1.1"
sources."escape-goat-2.1.1"
sources."escape-html-1.0.3"
@@ -90216,7 +91201,7 @@ in
sources."fast-levenshtein-2.0.6"
sources."fast-safe-stringify-2.0.7"
sources."fast-stringify-1.1.2"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
sources."fecha-4.2.0"
sources."figures-3.2.0"
@@ -90244,7 +91229,7 @@ in
sources."flush-write-stream-2.0.0"
sources."fn.name-1.1.0"
sources."folder-walker-3.2.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."for-in-1.0.2"
sources."form-data-3.0.1"
sources."forwarded-0.1.2"
@@ -90300,7 +91285,7 @@ in
sources."dir-glob-3.0.1"
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."micromatch-4.0.2"
@@ -90329,7 +91314,7 @@ in
];
})
sources."has-symbol-support-x-1.4.2"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-to-string-tag-x-1.4.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -90417,7 +91402,11 @@ in
sources."is-arrayish-0.2.1"
sources."is-binary-path-2.1.0"
sources."is-buffer-1.1.6"
- sources."is-ci-2.0.0"
+ (sources."is-ci-3.0.0" // {
+ dependencies = [
+ sources."ci-info-3.1.1"
+ ];
+ })
sources."is-core-module-2.2.0"
sources."is-data-descriptor-1.0.0"
sources."is-descriptor-1.0.2"
@@ -90440,7 +91429,7 @@ in
sources."is-object-1.0.2"
sources."is-observable-1.1.0"
sources."is-path-cwd-2.2.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-obj-2.1.0"
sources."is-plain-object-2.0.4"
sources."is-promise-2.2.2"
@@ -90536,6 +91525,7 @@ in
sources."lodash._reinterpolate-3.0.0"
sources."lodash.camelcase-4.3.0"
sources."lodash.clonedeep-4.5.0"
+ sources."lodash.debounce-4.0.8"
sources."lodash.deburr-4.1.0"
sources."lodash.defaults-4.2.0"
sources."lodash.difference-4.5.0"
@@ -90643,17 +91633,17 @@ in
sources."natural-orderby-2.0.3"
sources."negotiator-0.6.2"
sources."nested-error-stacks-2.1.0"
- (sources."netlify-6.1.9" // {
+ (sources."netlify-6.1.13" // {
dependencies = [
sources."qs-6.9.6"
];
})
sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16"
- sources."netlify-redirect-parser-3.0.3"
+ sources."netlify-redirect-parser-3.0.4"
sources."netlify-redirector-0.2.1"
sources."nice-try-1.0.5"
sources."node-fetch-2.6.1"
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."node-source-walk-4.2.0"
sources."noop2-2.0.0"
(sources."normalize-package-data-2.5.0" // {
@@ -90871,7 +91861,7 @@ in
sources."ret-0.1.15"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.39.0"
+ sources."rollup-2.40.0"
(sources."rollup-plugin-inject-3.0.2" // {
dependencies = [
sources."estree-walker-0.6.1"
@@ -90886,7 +91876,7 @@ in
})
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safe-join-0.1.3"
sources."safe-json-stringify-1.2.0"
@@ -91014,7 +92004,7 @@ in
sources."statsd-client-0.4.5"
sources."statuses-1.5.0"
sources."strict-uri-encode-1.1.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -91092,20 +92082,20 @@ in
sources."triple-beam-1.3.0"
sources."trough-1.0.5"
sources."tslib-1.14.1"
- sources."tsutils-3.20.0"
+ sources."tsutils-3.21.0"
sources."tunnel-agent-0.6.0"
sources."type-check-0.3.2"
sources."type-fest-0.8.1"
sources."type-is-1.6.18"
sources."typedarray-to-buffer-3.1.5"
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
sources."uid-safe-2.1.5"
sources."unbzip2-stream-1.4.3"
sources."unicode-canonical-property-names-ecmascript-1.0.4"
sources."unicode-match-property-ecmascript-1.0.4"
sources."unicode-match-property-value-ecmascript-1.2.0"
sources."unicode-property-aliases-ecmascript-1.1.0"
- (sources."unified-9.2.0" // {
+ (sources."unified-9.2.1" // {
dependencies = [
sources."is-buffer-2.0.5"
];
@@ -91113,7 +92103,7 @@ in
sources."union-value-1.0.1"
sources."uniq-1.0.1"
sources."unique-string-2.0.0"
- sources."unist-util-is-4.0.4"
+ sources."unist-util-is-4.1.0"
sources."unist-util-stringify-position-2.0.3"
sources."unist-util-visit-2.0.3"
sources."unist-util-visit-parents-3.1.1"
@@ -91139,6 +92129,7 @@ in
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
+ sources."is-ci-2.0.0"
];
})
sources."uri-js-4.4.1"
@@ -91776,7 +92767,7 @@ in
sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ==";
};
dependencies = [
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
sources."@node-red/editor-api-1.2.9"
sources."@node-red/editor-client-1.2.9"
(sources."@node-red/nodes-1.2.9" // {
@@ -91943,7 +92934,7 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."finalhandler-1.1.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."forwarded-0.1.2"
@@ -92062,10 +93053,10 @@ in
sources."ms-2.1.2"
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
];
})
- (sources."mqtt-packet-6.8.1" // {
+ (sources."mqtt-packet-6.9.0" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -92506,7 +93497,7 @@ in
sources."fill-range-7.0.1"
sources."fsevents-2.3.2"
sources."get-stream-4.1.0"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
sources."got-9.6.0"
sources."graceful-fs-4.2.6"
@@ -92526,7 +93517,7 @@ in
sources."is-npm-4.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-typedarray-1.0.0"
sources."is-yarn-global-0.3.0"
sources."json-buffer-3.0.0"
@@ -92569,7 +93560,7 @@ in
];
})
sources."signal-exit-3.0.3"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
@@ -92621,7 +93612,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -92646,7 +93637,7 @@ in
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/minimist-1.2.1"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/responselike-1.0.0"
@@ -92728,7 +93719,7 @@ in
})
sources."decompress-response-5.0.0"
sources."deep-extend-0.6.0"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."del-6.0.0"
sources."dir-glob-3.0.1"
sources."dot-prop-6.0.1"
@@ -92742,7 +93733,7 @@ in
sources."execa-5.0.0"
sources."external-editor-3.1.0"
sources."fast-glob-3.2.5"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
(sources."figures-3.2.0" // {
dependencies = [
sources."escape-string-regexp-1.0.5"
@@ -92755,7 +93746,7 @@ in
sources."get-stream-6.0.0"
sources."github-url-from-git-1.5.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
sources."globby-11.0.2"
(sources."got-10.7.0" // {
@@ -92842,7 +93833,7 @@ in
];
})
sources."is-path-cwd-2.2.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-obj-1.1.0"
sources."is-promise-2.2.2"
sources."is-scoped-2.1.0"
@@ -93065,7 +94056,7 @@ in
sources."rimraf-3.0.2"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
sources."scoped-regex-2.1.0"
sources."semver-7.3.4"
@@ -93084,7 +94075,7 @@ in
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
sources."split-1.0.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."strip-final-newline-2.0.0"
sources."strip-indent-3.0.0"
@@ -93128,7 +94119,7 @@ in
sources."xdg-basedir-4.0.0"
sources."yallist-4.0.0"
sources."yaml-1.10.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
@@ -93144,10 +94135,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "7.5.4";
+ version = "7.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-7.5.4.tgz";
- sha512 = "p04kiYgTn8ncpqZbBjdRQ8uUisXStILIH+zppnRHfUKAgNyIXn3Aq/Pf0B1SIC6WCNVDA6Gn9NmHXvU4feLnWg==";
+ url = "https://registry.npmjs.org/npm/-/npm-7.6.1.tgz";
+ sha512 = "L9xChb/o6XOYqTEBK+5+T3ph5Q7eCDYuY6Wz5a0s+I+hfMy5L2Kj8t4P5zsP2qJVts0etAx9MHD1meiApvtb9A==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -93162,10 +94153,10 @@ in
npm-check-updates = nodeEnv.buildNodePackage {
name = "npm-check-updates";
packageName = "npm-check-updates";
- version = "11.1.4";
+ version = "11.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.4.tgz";
- sha512 = "jq1KAfYcbeFWBLyRj7YT5rwQ3paInsqukeawlwfUdnvmgxKb5uFpd7km/ghPjxAQWVvIecvsYJX0FCHWk4j/iA==";
+ url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.2.0.tgz";
+ sha512 = "JCQHyn3/kxaWHbxefb8JKNZTZgFySnGcPZQbhx33rZEW55VoCjS3/GRNCN5ITIIR/aHNobDtwM1MX7MF31jC2A==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -93212,7 +94203,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -93270,7 +94261,7 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."figgy-pudding-3.5.2"
sources."fill-range-7.0.1"
sources."find-up-5.0.0"
@@ -93284,7 +94275,7 @@ in
sources."get-stream-4.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
(sources."global-dirs-3.0.0" // {
dependencies = [
sources."ini-2.0.0"
@@ -93324,7 +94315,7 @@ in
sources."is-npm-5.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-typedarray-1.0.0"
sources."is-yarn-global-0.3.0"
sources."isarray-1.0.0"
@@ -93433,7 +94424,7 @@ in
sources."queue-microtask-1.2.2"
sources."rc-1.2.8"
sources."rc-config-loader-4.0.0"
- sources."read-package-json-fast-2.0.1"
+ sources."read-package-json-fast-2.0.2"
sources."readable-stream-2.3.7"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
@@ -93494,7 +94485,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -93503,7 +94494,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -93748,55 +94739,65 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.12.13"
- (sources."@babel/core-7.12.17" // {
+ sources."@babel/compat-data-7.13.8"
+ (sources."@babel/core-7.13.8" // {
dependencies = [
sources."json5-2.2.0"
+ sources."semver-6.3.0"
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.12.17" // {
+ (sources."@babel/generator-7.13.9" // {
dependencies = [
sources."source-map-0.5.7"
];
})
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13"
- sources."@babel/helper-compilation-targets-7.12.17"
- sources."@babel/helper-create-class-features-plugin-7.12.17"
+ (sources."@babel/helper-compilation-targets-7.13.8" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/helper-create-class-features-plugin-7.13.8"
sources."@babel/helper-create-regexp-features-plugin-7.12.17"
- sources."@babel/helper-explode-assignable-expression-7.12.13"
+ (sources."@babel/helper-define-polyfill-provider-0.1.5" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/helper-explode-assignable-expression-7.13.0"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-hoist-variables-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-hoist-variables-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-plugin-utils-7.12.13"
- sources."@babel/helper-remap-async-to-generator-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-plugin-utils-7.13.0"
+ sources."@babel/helper-remap-async-to-generator-7.13.0"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
- sources."@babel/helper-wrap-function-7.12.13"
- sources."@babel/helpers-7.12.17"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
- sources."@babel/plugin-proposal-async-generator-functions-7.12.13"
- sources."@babel/plugin-proposal-class-properties-7.12.13"
- sources."@babel/plugin-proposal-dynamic-import-7.12.17"
+ sources."@babel/helper-wrap-function-7.13.0"
+ sources."@babel/helpers-7.13.0"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
+ sources."@babel/plugin-proposal-class-properties-7.13.0"
+ sources."@babel/plugin-proposal-dynamic-import-7.13.8"
sources."@babel/plugin-proposal-export-namespace-from-7.12.13"
- sources."@babel/plugin-proposal-json-strings-7.12.13"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13"
- sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13"
+ sources."@babel/plugin-proposal-json-strings-7.13.8"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8"
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
- sources."@babel/plugin-proposal-object-rest-spread-7.12.13"
- sources."@babel/plugin-proposal-optional-catch-binding-7.12.13"
- sources."@babel/plugin-proposal-optional-chaining-7.12.17"
- sources."@babel/plugin-proposal-private-methods-7.12.13"
+ sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -93812,46 +94813,50 @@ in
sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-top-level-await-7.12.13"
- sources."@babel/plugin-transform-arrow-functions-7.12.13"
- sources."@babel/plugin-transform-async-to-generator-7.12.13"
+ sources."@babel/plugin-transform-arrow-functions-7.13.0"
+ sources."@babel/plugin-transform-async-to-generator-7.13.0"
sources."@babel/plugin-transform-block-scoped-functions-7.12.13"
sources."@babel/plugin-transform-block-scoping-7.12.13"
- sources."@babel/plugin-transform-classes-7.12.13"
- sources."@babel/plugin-transform-computed-properties-7.12.13"
- sources."@babel/plugin-transform-destructuring-7.12.13"
+ sources."@babel/plugin-transform-classes-7.13.0"
+ sources."@babel/plugin-transform-computed-properties-7.13.0"
+ sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-dotall-regex-7.12.13"
sources."@babel/plugin-transform-duplicate-keys-7.12.13"
sources."@babel/plugin-transform-exponentiation-operator-7.12.13"
- sources."@babel/plugin-transform-flow-strip-types-7.12.13"
- sources."@babel/plugin-transform-for-of-7.12.13"
+ sources."@babel/plugin-transform-flow-strip-types-7.13.0"
+ sources."@babel/plugin-transform-for-of-7.13.0"
sources."@babel/plugin-transform-function-name-7.12.13"
sources."@babel/plugin-transform-literals-7.12.13"
sources."@babel/plugin-transform-member-expression-literals-7.12.13"
- sources."@babel/plugin-transform-modules-amd-7.12.13"
- sources."@babel/plugin-transform-modules-commonjs-7.12.13"
- sources."@babel/plugin-transform-modules-systemjs-7.12.13"
- sources."@babel/plugin-transform-modules-umd-7.12.13"
+ sources."@babel/plugin-transform-modules-amd-7.13.0"
+ sources."@babel/plugin-transform-modules-commonjs-7.13.8"
+ sources."@babel/plugin-transform-modules-systemjs-7.13.8"
+ sources."@babel/plugin-transform-modules-umd-7.13.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13"
sources."@babel/plugin-transform-new-target-7.12.13"
sources."@babel/plugin-transform-object-super-7.12.13"
- sources."@babel/plugin-transform-parameters-7.12.13"
+ sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-react-jsx-7.12.17"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
- sources."@babel/plugin-transform-spread-7.12.13"
+ sources."@babel/plugin-transform-spread-7.13.0"
sources."@babel/plugin-transform-sticky-regex-7.12.13"
- sources."@babel/plugin-transform-template-literals-7.12.13"
+ sources."@babel/plugin-transform-template-literals-7.13.0"
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- sources."@babel/preset-env-7.12.17"
+ (sources."@babel/preset-env-7.13.9" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/runtime-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -93888,7 +94893,7 @@ in
sources."asn1-0.2.4"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -93906,6 +94911,13 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."babel-plugin-dynamic-import-node-2.3.3"
+ (sources."babel-plugin-polyfill-corejs2-0.1.10" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."babel-plugin-polyfill-corejs3-0.1.7"
+ sources."babel-plugin-polyfill-regenerator-0.1.6"
(sources."babel-runtime-6.26.0" // {
dependencies = [
sources."regenerator-runtime-0.11.1"
@@ -93927,7 +94939,7 @@ in
sources."bcrypt-pbkdf-1.0.2"
sources."binary-extensions-1.13.1"
sources."bindings-1.5.0"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."boolbase-1.0.0"
sources."brace-expansion-1.1.11"
sources."braces-2.3.2"
@@ -93966,7 +94978,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -93980,8 +94992,8 @@ in
sources."color-3.1.3"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
- sources."colorette-1.2.1"
+ sources."color-string-1.5.5"
+ sources."colorette-1.2.2"
sources."combined-stream-1.0.8"
sources."command-exists-1.2.9"
sources."commander-2.20.3"
@@ -93993,7 +95005,7 @@ in
sources."convert-source-map-1.7.0"
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.12"
- (sources."core-js-compat-3.9.0" // {
+ (sources."core-js-compat-3.9.1" // {
dependencies = [
sources."semver-7.0.0"
];
@@ -94002,7 +95014,7 @@ in
sources."cosmiconfig-5.2.1"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -94081,7 +95093,7 @@ in
sources."destroy-1.0.4"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."dom-serializer-0.2.2" // {
@@ -94101,17 +95113,17 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."encodeurl-1.0.2"
sources."entities-1.1.2"
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
- (sources."es-abstract-1.18.0-next.2" // {
+ (sources."es-abstract-1.18.0" // {
dependencies = [
sources."object-inspect-1.9.0"
];
@@ -94125,7 +95137,7 @@ in
sources."estraverse-4.3.0"
sources."esutils-2.0.3"
sources."etag-1.8.1"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."evp_bytestokey-1.0.3"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -94182,8 +95194,9 @@ in
sources."ansi-regex-2.1.1"
];
})
+ sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -94233,7 +95246,9 @@ in
];
})
sources."is-arrayish-0.2.1"
+ sources."is-bigint-1.0.1"
sources."is-binary-path-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-buffer-1.1.6"
sources."is-callable-1.2.3"
sources."is-color-stop-1.1.0"
@@ -94256,10 +95271,12 @@ in
sources."is-html-1.1.0"
sources."is-negative-zero-2.0.1"
sources."is-number-3.0.0"
+ sources."is-number-object-1.0.4"
sources."is-obj-2.0.0"
sources."is-plain-object-2.0.4"
sources."is-regex-1.1.2"
sources."is-resolvable-1.1.0"
+ sources."is-string-1.0.5"
sources."is-svg-3.0.0"
sources."is-symbol-1.0.3"
sources."is-typedarray-1.0.0"
@@ -94296,6 +95313,7 @@ in
sources."levn-0.3.0"
sources."lodash-4.17.21"
sources."lodash.clone-4.5.0"
+ sources."lodash.debounce-4.0.8"
sources."lodash.memoize-4.1.2"
sources."lodash.sortby-4.7.0"
sources."lodash.uniq-4.5.0"
@@ -94321,7 +95339,7 @@ in
})
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-1.6.0"
@@ -94356,7 +95374,7 @@ in
sources."punycode-1.4.1"
];
})
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."normalize-path-3.0.0"
sources."normalize-url-3.3.0"
sources."nth-check-1.0.2"
@@ -94370,7 +95388,7 @@ in
sources."object.assign-4.1.2"
sources."object.getownpropertydescriptors-2.1.2"
sources."object.pick-1.3.0"
- sources."object.values-1.1.2"
+ sources."object.values-1.1.3"
sources."on-finished-2.3.0"
sources."once-1.4.0"
sources."onetime-2.0.1"
@@ -94469,7 +95487,7 @@ in
sources."psl-1.8.0"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."punycode-2.1.1"
@@ -94597,8 +95615,8 @@ in
sources."stealthy-require-1.1.1"
sources."stream-browserify-2.0.2"
sources."stream-http-2.8.3"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
sources."strip-ansi-4.0.0"
(sources."stylehacks-4.0.3" // {
@@ -94633,6 +95651,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
sources."typedarray-0.0.6"
+ sources."unbox-primitive-1.0.0"
(sources."uncss-0.17.3" // {
dependencies = [
sources."is-absolute-url-3.0.3"
@@ -94674,14 +95693,9 @@ in
];
})
sources."util-deprecate-1.0.2"
- (sources."util.promisify-1.0.1" // {
- dependencies = [
- sources."es-abstract-1.17.7"
- sources."object-inspect-1.9.0"
- ];
- })
+ sources."util.promisify-1.0.1"
sources."uuid-3.4.0"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."vendors-1.0.4"
sources."verror-1.10.0"
sources."vlq-0.2.3"
@@ -94694,6 +95708,7 @@ in
sources."whatwg-mimetype-2.3.0"
sources."whatwg-url-7.1.0"
sources."which-1.3.1"
+ sources."which-boxed-primitive-1.0.2"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
sources."ws-5.2.2"
@@ -94826,7 +95841,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.5"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."hat-0.0.3"
sources."heapdump-0.3.15"
sources."hot-shots-6.8.7"
@@ -94962,7 +95977,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."unix-dgram-2.0.4"
sources."unpipe-1.0.0"
sources."uri-js-4.4.1"
@@ -95000,259 +96015,59 @@ in
patch-package = nodeEnv.buildNodePackage {
name = "patch-package";
packageName = "patch-package";
- version = "6.2.2";
+ version = "6.4.6";
src = fetchurl {
- url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz";
- sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==";
+ url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.6.tgz";
+ sha512 = "AO2bh42z8AQL+0OUdcRpS5Z/0X8k9IQ1uc1HzlVye+2RQrtDeNgTk5SbS4rdbLJKtUWRpvPISrYZeyh+OK4AKw==";
};
dependencies = [
sources."@yarnpkg/lockfile-1.1.0"
sources."ansi-styles-3.2.1"
- sources."arr-diff-4.0.0"
- sources."arr-flatten-1.1.0"
- sources."arr-union-3.1.0"
- sources."array-unique-0.3.2"
- sources."assign-symbols-1.0.0"
- sources."atob-2.1.2"
sources."balanced-match-1.0.0"
- (sources."base-0.11.2" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
sources."brace-expansion-1.1.11"
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."cache-base-1.0.1"
+ sources."braces-3.0.2"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
- (sources."class-utils-0.3.6" // {
- dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
- sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
- sources."copy-descriptor-0.1.1"
sources."cross-spawn-6.0.5"
- sources."debug-2.6.9"
- sources."decode-uri-component-0.2.0"
- sources."define-property-2.0.2"
sources."escape-string-regexp-1.0.5"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
- (sources."extend-shallow-3.0.2" // {
- dependencies = [
- sources."is-extendable-1.0.1"
- ];
- })
- (sources."extglob-2.0.4" // {
- dependencies = [
- sources."define-property-1.0.0"
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."find-yarn-workspace-root-1.2.1" // {
- dependencies = [
- sources."fs-extra-4.0.3"
- ];
- })
- sources."for-in-1.0.2"
- sources."fragment-cache-0.2.1"
+ sources."fill-range-7.0.1"
+ sources."find-yarn-workspace-root-2.0.0"
sources."fs-extra-7.0.1"
sources."fs.realpath-1.0.0"
- sources."get-value-2.0.6"
sources."glob-7.1.6"
sources."graceful-fs-4.2.6"
sources."has-flag-3.0.0"
- sources."has-value-1.0.0"
- (sources."has-values-1.0.0" // {
- dependencies = [
- sources."kind-of-4.0.0"
- ];
- })
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- sources."is-accessor-descriptor-1.0.0"
- sources."is-buffer-1.1.6"
sources."is-ci-2.0.0"
- sources."is-data-descriptor-1.0.0"
- sources."is-descriptor-1.0.2"
- sources."is-extendable-0.1.1"
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-plain-object-2.0.4"
- sources."is-windows-1.0.2"
- sources."isarray-1.0.0"
+ sources."is-docker-2.1.1"
+ sources."is-number-7.0.0"
+ sources."is-wsl-2.2.0"
sources."isexe-2.0.0"
- sources."isobject-3.0.1"
sources."jsonfile-4.0.0"
- sources."kind-of-6.0.3"
sources."klaw-sync-6.0.0"
- sources."map-cache-0.2.2"
- sources."map-visit-1.0.0"
- sources."micromatch-3.1.10"
+ sources."micromatch-4.0.2"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- (sources."mixin-deep-1.3.2" // {
- dependencies = [
- sources."is-extendable-1.0.1"
- ];
- })
- sources."ms-2.0.0"
- sources."nanomatch-1.2.13"
sources."nice-try-1.0.5"
- (sources."object-copy-0.1.0" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."is-accessor-descriptor-0.1.6"
- sources."is-data-descriptor-0.1.4"
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- sources."kind-of-3.2.2"
- ];
- })
- sources."object-visit-1.0.1"
- sources."object.pick-1.3.0"
sources."once-1.4.0"
+ sources."open-7.4.2"
sources."os-tmpdir-1.0.2"
- sources."pascalcase-0.1.1"
sources."path-is-absolute-1.0.1"
sources."path-key-2.0.1"
- sources."posix-character-classes-0.1.1"
- sources."regex-not-1.0.2"
- sources."repeat-element-1.1.3"
- sources."repeat-string-1.6.1"
- sources."resolve-url-0.2.1"
- sources."ret-0.1.15"
+ sources."picomatch-2.2.2"
sources."rimraf-2.7.1"
- sources."safe-regex-1.1.0"
sources."semver-5.7.1"
- (sources."set-value-2.0.1" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."slash-2.0.0"
- (sources."snapdragon-0.8.2" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
- (sources."snapdragon-node-2.1.1" // {
- dependencies = [
- sources."define-property-1.0.0"
- ];
- })
- (sources."snapdragon-util-3.0.1" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."source-map-0.5.7"
- sources."source-map-resolve-0.5.3"
- sources."source-map-url-0.4.1"
- sources."split-string-3.1.0"
- (sources."static-extend-0.1.2" // {
- dependencies = [
- sources."define-property-0.2.5"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."is-descriptor-0.1.6"
- sources."kind-of-5.1.0"
- ];
- })
sources."supports-color-5.5.0"
sources."tmp-0.0.33"
- (sources."to-object-path-0.3.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."to-regex-3.0.2"
- sources."to-regex-range-2.1.1"
- sources."union-value-1.0.1"
+ sources."to-regex-range-5.0.1"
sources."universalify-0.1.2"
- (sources."unset-value-1.0.0" // {
- dependencies = [
- (sources."has-value-0.3.1" // {
- dependencies = [
- sources."isobject-2.1.0"
- ];
- })
- sources."has-values-0.1.4"
- ];
- })
- sources."urix-0.1.0"
- sources."use-3.1.1"
sources."which-1.3.1"
sources."wrappy-1.0.2"
];
@@ -95304,7 +96119,7 @@ in
];
})
sources."blob-to-buffer-1.2.9"
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."bncode-0.5.3"
sources."bonjour-3.5.0"
sources."bplist-creator-0.0.6"
@@ -95371,7 +96186,7 @@ in
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."hat-0.0.3"
sources."hosted-git-info-2.8.8"
sources."http-headers-3.0.2"
@@ -95481,7 +96296,7 @@ in
sources."process-nextick-args-2.0.1"
sources."pump-2.0.1"
sources."queue-microtask-1.2.2"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
sources."randombytes-2.1.0"
@@ -95628,7 +96443,7 @@ in
})
sources."bl-4.1.0"
sources."blob-0.0.5"
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."bncode-0.5.3"
sources."body-parser-1.19.0"
sources."brace-expansion-1.1.11"
@@ -95686,7 +96501,7 @@ in
sources."ms-2.1.3"
];
})
- (sources."engine.io-client-3.5.0" // {
+ (sources."engine.io-client-3.5.1" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -95830,7 +96645,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.7.0"
sources."queue-microtask-1.2.2"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-bytes-1.0.0"
sources."random-iterate-1.0.1"
@@ -95931,7 +96746,7 @@ in
sources."verror-1.10.0"
sources."which-1.3.1"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xmlhttprequest-ssl-1.5.5"
sources."xtend-4.0.2"
sources."yeast-0.1.2"
@@ -95950,10 +96765,10 @@ in
pm2 = nodeEnv.buildNodePackage {
name = "pm2";
packageName = "pm2";
- version = "4.5.4";
+ version = "4.5.5";
src = fetchurl {
- url = "https://registry.npmjs.org/pm2/-/pm2-4.5.4.tgz";
- sha512 = "2xKXrKz21i1R3BK2XxVIPq5Iy9fKHBVgZ+KMfRrx72mc7bq84SG/D+iTO32ihLf2Qe+N1o8rDskAt4M30JWyiA==";
+ url = "https://registry.npmjs.org/pm2/-/pm2-4.5.5.tgz";
+ sha512 = "feLYWAq8liDsM2IV0ViZ4TSnEUoOtpuICakzFnhh2bb51BUnpJMOjO1sojR1jDuNHvhrYGWqneOUglxE6slKwg==";
};
dependencies = [
(sources."@opencensus/core-0.0.9" // {
@@ -95993,7 +96808,7 @@ in
dependencies = [
sources."async-2.6.3"
sources."debug-4.1.1"
- sources."eventemitter2-6.4.3"
+ sources."eventemitter2-6.4.4"
sources."semver-6.3.0"
sources."tslib-1.9.3"
];
@@ -96001,7 +96816,7 @@ in
(sources."@pm2/js-api-0.6.7" // {
dependencies = [
sources."async-2.6.3"
- sources."eventemitter2-6.4.3"
+ sources."eventemitter2-6.4.4"
];
})
sources."@pm2/pm2-version-check-1.0.3"
@@ -96076,7 +96891,7 @@ in
sources."fclone-1.0.11"
sources."file-uri-to-path-1.0.0"
sources."fill-range-7.0.1"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."fs.realpath-1.0.0"
sources."fsevents-2.3.2"
(sources."ftp-0.3.10" // {
@@ -96094,7 +96909,7 @@ in
sources."git-node-fs-1.0.0"
sources."git-sha1-0.1.2"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."http-errors-1.7.3"
@@ -96209,7 +97024,6 @@ in
sources."statuses-1.5.0"
sources."string_decoder-0.10.31"
sources."supports-color-7.2.0"
- sources."systeminformation-4.34.14"
sources."thunkify-2.1.2"
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
@@ -96244,10 +97058,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "5.17.3";
+ version = "5.18.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.3.tgz";
- sha512 = "Dy2MkOEYsE/9xRNEc6JdiA5HXRo0hxtBOKiYbnbU2BPtBmUt7FVwhnJI4oPW5LrbP1p6lXt/RpPFWl3WmwRH9A==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.3.tgz";
+ sha512 = "2PJ6eY+qq/4WUBX6uxkyuCJzRT18uIUF9QOZJBBjhOamLsB3mE1mIyNP/dc9n9pt4MT3/ZJDdKpKG7h5rLvzqQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -96298,7 +97112,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -96325,7 +97139,7 @@ in
sources."cliui-7.0.4"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."cosmiconfig-7.0.0"
sources."dependency-graph-0.9.0"
sources."dir-glob-3.0.1"
@@ -96334,13 +97148,13 @@ in
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
sources."fast-glob-3.2.5"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fill-range-7.0.1"
sources."fs-extra-9.1.0"
sources."fsevents-2.3.2"
sources."get-caller-file-2.0.5"
sources."get-stdin-8.0.0"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."graceful-fs-4.2.6"
sources."has-flag-4.0.0"
@@ -96386,7 +97200,7 @@ in
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
sources."slash-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."supports-color-7.2.0"
sources."to-regex-range-5.0.1"
@@ -96395,7 +97209,7 @@ in
sources."y18n-5.0.5"
sources."yaml-1.10.0"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -96477,7 +97291,7 @@ in
sources."acorn-walk-7.2.0"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -96489,7 +97303,7 @@ in
sources."async-1.5.2"
sources."balanced-match-1.0.0"
sources."base64-js-1.5.1"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."brace-expansion-1.1.11"
sources."brorand-1.1.0"
sources."browser-pack-6.1.0"
@@ -96537,7 +97351,7 @@ in
sources."core-util-is-1.0.2"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -96550,14 +97364,14 @@ in
sources."detective-5.2.0"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."domain-browser-1.2.0"
sources."duplexer2-0.1.4"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."es6-promise-3.3.1"
@@ -96603,7 +97417,7 @@ in
sources."md5.js-1.3.5"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-1.6.0"
@@ -96646,7 +97460,7 @@ in
sources."process-nextick-args-2.0.1"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."punycode-1.4.1"
@@ -96730,10 +97544,10 @@ in
purescript-language-server = nodeEnv.buildNodePackage {
name = "purescript-language-server";
packageName = "purescript-language-server";
- version = "0.14.4";
+ version = "0.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.4.tgz";
- sha512 = "qsyk0PNStUQJnoxZKPAO0QTRBsZ2fu/PZwfMIAv6b1lHbdi5fsyC7BdCtZxzwAO2hF0OxCIANEeRkbUi+e55Fg==";
+ url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.0.tgz";
+ sha512 = "zzVqn7EnHdFYVrXhIVQ5LJqQ1ysZb7leo6kdNnxwkBgvmdrdi68OQBPG3QlmJ+LULnEyKhhWyAdb5lc+W2Ha1Q==";
};
dependencies = [
sources."isexe-2.0.0"
@@ -96778,10 +97592,10 @@ in
purty = nodeEnv.buildNodePackage {
name = "purty";
packageName = "purty";
- version = "6.3.1";
+ version = "7.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/purty/-/purty-6.3.1.tgz";
- sha512 = "KfOSejzz4PExqRwhRuLIJoggKY+cCVLGt+fB4csiyEv3ATX0IB93udl66UW4ZVj/zNJ4Ds+FK9nLfEXcNwBo5A==";
+ url = "https://registry.npmjs.org/purty/-/purty-7.0.0.tgz";
+ sha512 = "gHHghPEjRY39GUJ8KnOMRfPArJILGCXwEhX6BmEdNiLgZuCjLLBLyawGiKFjYMfy8H5Dsk5NbgwIGslrPrernA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -96796,10 +97610,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.113";
+ version = "1.1.118";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz";
- sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.118.tgz";
+ sha512 = "nUBcMqJqzcXbNmXPA3BLa5E77lG+APARhBbY0d4q2KGs3Od9FR6YTABK6sUq3O1rVQf4MScz8ji4KbEBsD8FNg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -96814,10 +97628,10 @@ in
quicktype = nodeEnv.buildNodePackage {
name = "quicktype";
packageName = "quicktype";
- version = "15.0.258";
+ version = "15.0.260";
src = fetchurl {
- url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.258.tgz";
- sha512 = "nTDC6LmwsFNJU1qY9+t09e4k1J1PosVDhZKRizkRinQzRVITFOzKSMuFBD3UJ1yaO9Irn7QKBlm9rae+9p+Cdg==";
+ url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.260.tgz";
+ sha512 = "OYP77enVz2UkcdDqVFc2AcFGYjk5/ENGYZHmSEY5Oy6Y2xVatlHUnrScddEkI+xJxSfYS6UXSH8oOTW7mEOiEw==";
};
dependencies = [
sources."@mark.probst/typescript-json-schema-0.32.0"
@@ -96885,7 +97699,11 @@ in
sources."is-url-1.2.4"
sources."isarray-2.0.5"
sources."isexe-2.0.0"
- sources."isomorphic-fetch-2.2.1"
+ (sources."isomorphic-fetch-2.2.1" // {
+ dependencies = [
+ sources."node-fetch-1.7.3"
+ ];
+ })
sources."iterall-1.1.3"
sources."js-base64-2.6.4"
sources."json-stable-stringify-1.0.1"
@@ -96908,7 +97726,7 @@ in
sources."minimist-1.2.5"
sources."moment-2.29.1"
sources."nice-try-1.0.5"
- sources."node-fetch-1.7.3"
+ sources."node-fetch-2.6.1"
sources."npm-run-path-2.0.2"
sources."number-is-nan-1.0.1"
sources."object-inspect-1.4.1"
@@ -97002,7 +97820,7 @@ in
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."vlq-0.2.3"
- sources."whatwg-fetch-3.6.1"
+ sources."whatwg-fetch-3.6.2"
sources."which-1.3.1"
sources."which-module-2.0.0"
sources."word-wrap-1.2.3"
@@ -97055,7 +97873,7 @@ in
sources."cycle-1.0.3"
sources."deep-equal-2.0.5"
sources."define-properties-1.1.3"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-get-iterator-1.1.2"
sources."es-to-primitive-1.2.1"
sources."escape-string-regexp-1.0.5"
@@ -97067,7 +97885,8 @@ in
sources."glob-7.1.6"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
sources."i-0.3.6"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -97108,10 +97927,11 @@ in
sources."semver-5.7.1"
sources."side-channel-1.0.4"
sources."stack-trace-0.0.10"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."strip-ansi-3.0.1"
sources."supports-color-2.0.0"
+ sources."unbox-primitive-1.0.0"
sources."utile-0.2.1"
sources."which-boxed-primitive-1.0.2"
sources."which-collection-1.0.1"
@@ -97199,8 +98019,12 @@ in
sources."@gardenapple/yargs-17.0.0-candidate.0"
sources."@mozilla/readability-0.4.1"
sources."abab-2.0.5"
- sources."acorn-7.4.1"
- sources."acorn-globals-6.0.0"
+ sources."acorn-8.0.5"
+ (sources."acorn-globals-6.0.0" // {
+ dependencies = [
+ sources."acorn-7.4.1"
+ ];
+ })
sources."acorn-walk-7.2.0"
sources."ajv-6.12.6"
sources."ansi-regex-5.0.0"
@@ -97238,9 +98062,9 @@ in
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-8.0.0"
sources."escalade-3.1.1"
- sources."escodegen-1.14.3"
+ sources."escodegen-2.0.0"
sources."esprima-4.0.1"
- sources."estraverse-4.3.0"
+ sources."estraverse-5.2.0"
sources."esutils-2.0.3"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
@@ -97256,13 +98080,12 @@ in
sources."html-encoding-sniffer-2.0.1"
sources."http-signature-1.2.0"
sources."iconv-lite-0.4.24"
- sources."ip-regex-2.1.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-potential-custom-element-name-1.0.0"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
- sources."jsdom-16.4.0"
+ sources."jsdom-16.5.0"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
@@ -97275,7 +98098,7 @@ in
sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
sources."optionator-0.8.3"
- sources."parse5-5.1.1"
+ sources."parse5-6.0.1"
sources."performance-now-2.1.0"
sources."prelude-ls-1.1.2"
sources."psl-1.8.0"
@@ -97299,14 +98122,15 @@ in
sources."source-map-0.6.1"
sources."sshpk-1.16.1"
sources."stealthy-require-1.1.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."symbol-tree-3.2.4"
- sources."tough-cookie-3.0.1"
+ sources."tough-cookie-4.0.0"
sources."tr46-2.0.2"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
+ sources."universalify-0.1.2"
sources."uri-js-4.4.1"
sources."uuid-3.4.0"
sources."verror-1.10.0"
@@ -97318,11 +98142,11 @@ in
sources."whatwg-url-8.4.0"
sources."word-wrap-1.2.3"
sources."wrap-ansi-7.0.0"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xml-name-validator-3.0.0"
sources."xmlchars-2.2.0"
sources."y18n-5.0.5"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -97344,7 +98168,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- (sources."@babel/generator-7.12.17" // {
+ (sources."@babel/generator-7.13.9" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -97355,12 +98179,12 @@ in
sources."@babel/helper-module-imports-7.12.13"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
- sources."@babel/parser-7.12.17"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/parser-7.13.9"
+ sources."@babel/runtime-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@emotion/is-prop-valid-0.8.8"
sources."@emotion/memoize-0.7.4"
sources."@emotion/stylis-0.8.5"
@@ -97375,7 +98199,7 @@ in
sources."argparse-1.0.10"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -97388,7 +98212,7 @@ in
sources."base64-js-1.5.1"
sources."better-ajv-errors-0.6.7"
sources."binary-extensions-2.2.0"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."braces-3.0.2"
sources."brorand-1.1.0"
sources."browserify-aes-1.2.0"
@@ -97416,7 +98240,7 @@ in
sources."chokidar-3.5.1"
sources."cipher-base-1.0.4"
sources."classnames-2.2.6"
- sources."clipboard-2.0.6"
+ sources."clipboard-2.0.7"
sources."cliui-7.0.4"
sources."clsx-1.1.1"
sources."co-4.6.0"
@@ -97425,11 +98249,11 @@ in
sources."color-name-1.1.3"
sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
- sources."core-js-3.9.0"
+ sources."core-js-3.9.1"
sources."core-util-is-1.0.2"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -97444,14 +98268,14 @@ in
sources."des.js-1.0.1"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."domain-browser-1.2.0"
sources."dompurify-2.2.6"
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."inherits-2.0.4"
];
})
@@ -97461,7 +98285,7 @@ in
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
sources."eventemitter3-4.0.7"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."evp_bytestokey-1.0.3"
sources."fast-deep-equal-1.1.0"
sources."fast-json-stable-stringify-2.1.0"
@@ -97472,7 +98296,7 @@ in
sources."format-util-1.0.5"
sources."fsevents-2.3.2"
sources."get-caller-file-2.0.5"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globals-11.12.0"
sources."good-listener-1.2.2"
sources."grapheme-splitter-1.0.4"
@@ -97520,14 +98344,14 @@ in
sources."memoize-one-5.1.1"
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."minimalistic-assert-1.0.1"
sources."minimalistic-crypto-utils-1.0.1"
sources."minimist-1.2.5"
sources."mkdirp-1.0.4"
- sources."mobx-6.1.7"
+ sources."mobx-6.1.8"
sources."mobx-react-7.1.0"
sources."mobx-react-lite-3.2.0"
sources."ms-2.1.2"
@@ -97567,7 +98391,7 @@ in
sources."prop-types-15.7.2"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."punycode-1.4.1"
@@ -97614,7 +98438,7 @@ in
sources."stickyfill-1.1.1"
sources."stream-browserify-2.0.2"
sources."stream-http-2.8.3"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."string_decoder-1.3.0"
sources."strip-ansi-6.0.0"
sources."styled-components-5.2.1"
@@ -97627,7 +98451,7 @@ in
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
sources."tty-browserify-0.0.0"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
(sources."url-0.11.0" // {
dependencies = [
sources."punycode-1.3.2"
@@ -97664,7 +98488,7 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -97694,13 +98518,44 @@ in
bypassCache = true;
reconstructLock = true;
};
+ rimraf = nodeEnv.buildNodePackage {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
+ sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
+ };
+ dependencies = [
+ sources."balanced-match-1.0.0"
+ sources."brace-expansion-1.1.11"
+ sources."concat-map-0.0.1"
+ sources."fs.realpath-1.0.0"
+ sources."glob-7.1.6"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."minimatch-3.0.4"
+ sources."once-1.4.0"
+ sources."path-is-absolute-1.0.1"
+ sources."wrappy-1.0.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "A deep deletion module for node (like `rm -rf`)";
+ homepage = "https://github.com/isaacs/rimraf#readme";
+ license = "ISC";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.39.0";
+ version = "2.40.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.39.0.tgz";
- sha512 = "+WR3bttcq7zE+BntH09UxaW3bQo3vItuYeLsyk4dL2tuwbeSKJuvwiawyhEnvRdRgrII0Uzk00FpctHO/zB1kw==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz";
+ sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -97723,12 +98578,12 @@ in
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- (sources."@eslint/eslintrc-0.3.0" // {
+ (sources."@eslint/eslintrc-0.4.0" // {
dependencies = [
sources."ignore-4.0.6"
];
@@ -97752,14 +98607,14 @@ in
sources."@types/node-12.12.70"
sources."@types/node-fetch-2.5.8"
sources."@types/resolve-1.17.1"
- sources."@types/vscode-1.53.0"
- sources."@typescript-eslint/eslint-plugin-4.15.1"
- sources."@typescript-eslint/experimental-utils-4.15.1"
- sources."@typescript-eslint/parser-4.15.1"
- sources."@typescript-eslint/scope-manager-4.15.1"
- sources."@typescript-eslint/types-4.15.1"
- sources."@typescript-eslint/typescript-estree-4.15.1"
- sources."@typescript-eslint/visitor-keys-4.15.1"
+ sources."@types/vscode-1.54.0"
+ sources."@typescript-eslint/eslint-plugin-4.16.1"
+ sources."@typescript-eslint/experimental-utils-4.16.1"
+ sources."@typescript-eslint/parser-4.16.1"
+ sources."@typescript-eslint/scope-manager-4.16.1"
+ sources."@typescript-eslint/types-4.16.1"
+ sources."@typescript-eslint/typescript-estree-4.16.1"
+ sources."@typescript-eslint/visitor-keys-4.16.1"
sources."@ungap/promise-all-settled-1.1.2"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
@@ -97840,7 +98695,7 @@ in
sources."entities-2.1.0"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-7.20.0" // {
+ (sources."eslint-7.21.0" // {
dependencies = [
sources."ignore-4.0.6"
];
@@ -97875,7 +98730,7 @@ in
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
sources."file-entry-cache-6.0.1"
sources."fill-range-7.0.1"
@@ -97895,7 +98750,7 @@ in
sources."functional-red-black-tree-1.0.1"
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globals-12.4.0"
sources."globby-11.0.2"
sources."graceful-fs-4.2.6"
@@ -97903,7 +98758,7 @@ in
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."he-1.2.0"
- sources."htmlparser2-6.0.0"
+ sources."htmlparser2-6.0.1"
sources."http-proxy-agent-4.0.1"
sources."https-proxy-agent-5.0.0"
sources."ignore-5.1.8"
@@ -97949,7 +98804,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
- (sources."mocha-8.3.0" // {
+ (sources."mocha-8.3.1" // {
dependencies = [
sources."argparse-2.0.1"
(sources."debug-4.3.1" // {
@@ -98015,7 +98870,7 @@ in
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.39.0"
+ sources."rollup-2.40.0"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.2.1"
sources."semver-7.3.4"
@@ -98034,7 +98889,7 @@ in
})
sources."sourcemap-codec-1.4.8"
sources."sprintf-js-1.0.3"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -98045,7 +98900,7 @@ in
sources."supports-color-5.5.0"
(sources."table-6.0.7" // {
dependencies = [
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."json-schema-traverse-1.0.0"
];
})
@@ -98054,7 +98909,7 @@ in
sources."to-regex-range-5.0.1"
sources."traverse-0.3.9"
sources."tslib-2.1.0"
- (sources."tsutils-3.20.0" // {
+ (sources."tsutils-3.21.0" // {
dependencies = [
sources."tslib-1.14.1"
];
@@ -98063,7 +98918,7 @@ in
sources."type-check-0.4.0"
sources."type-fest-0.8.1"
sources."typed-rest-client-1.2.0"
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
sources."typescript-formatter-7.2.2"
sources."uc.micro-1.0.6"
sources."underscore-1.8.3"
@@ -98071,8 +98926,8 @@ in
sources."uri-js-4.4.1"
sources."url-join-1.1.0"
sources."util-deprecate-1.0.2"
- sources."v8-compile-cache-2.2.0"
- (sources."vsce-1.85.0" // {
+ sources."v8-compile-cache-2.3.0"
+ (sources."vsce-1.85.1" // {
dependencies = [
sources."chalk-2.4.2"
sources."commander-6.2.1"
@@ -98266,7 +99121,7 @@ in
sources."chokidar-3.5.1"
sources."fill-range-7.0.1"
sources."fsevents-2.3.2"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."is-binary-path-2.1.0"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
@@ -98417,10 +99272,10 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "2.25.2";
+ version = "2.28.7";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-2.25.2.tgz";
- sha512 = "TjFQLW2Nfx3C323rIkHhuFcDyfGwe+z2TGpOYIyNWHGG8uZ1Q4AJs8jJGEhvuXzWSvXcANX8tSztloNuIaaY3Q==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-2.28.7.tgz";
+ sha512 = "WNHY7DGi5cIskeby/pKa81mHZp3p/+xBIdig/lHD+0++vf9nHhwGVVTyqPvjx4cX9t+rfh09Y8OFvjaCLDR3VA==";
};
dependencies = [
sources."2-thenable-1.0.0"
@@ -98452,7 +99307,7 @@ in
];
})
sources."@serverless/component-metrics-1.0.8"
- (sources."@serverless/components-3.7.0" // {
+ (sources."@serverless/components-3.7.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."js-yaml-3.14.1"
@@ -98474,14 +99329,14 @@ in
];
})
sources."@serverless/event-mocks-1.1.1"
- (sources."@serverless/platform-client-4.1.0" // {
+ (sources."@serverless/platform-client-4.2.0" // {
dependencies = [
sources."js-yaml-3.14.1"
];
})
- (sources."@serverless/platform-client-china-2.1.4" // {
+ (sources."@serverless/platform-client-china-2.1.7" // {
dependencies = [
- sources."adm-zip-0.5.3"
+ sources."adm-zip-0.5.4"
sources."js-yaml-3.14.1"
];
})
@@ -98514,7 +99369,7 @@ in
sources."@types/keyv-3.1.1"
sources."@types/lodash-4.14.168"
sources."@types/long-4.0.1"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/request-2.48.5"
sources."@types/request-promise-native-1.0.17"
sources."@types/responselike-1.0.0"
@@ -98541,7 +99396,7 @@ in
sources."file-type-4.4.0"
];
})
- (sources."archiver-5.2.0" // {
+ (sources."archiver-5.3.0" // {
dependencies = [
sources."async-3.2.0"
sources."bl-4.1.0"
@@ -98571,7 +99426,7 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.848.0" // {
+ (sources."aws-sdk-2.858.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -98610,7 +99465,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."type-fest-0.20.2"
];
@@ -98667,7 +99522,7 @@ in
sources."color-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."colornames-1.1.1"
sources."colors-1.3.3"
sources."colorspace-1.1.2"
@@ -98676,7 +99531,7 @@ in
sources."component-bind-1.0.0"
sources."component-emitter-1.3.0"
sources."component-inherit-0.0.3"
- sources."compress-commons-4.0.2"
+ sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
(sources."content-disposition-0.5.3" // {
@@ -98762,7 +99617,7 @@ in
sources."emoji-regex-8.0.0"
sources."enabled-1.0.2"
sources."end-of-stream-1.4.4"
- (sources."engine.io-client-3.5.0" // {
+ (sources."engine.io-client-3.5.1" // {
dependencies = [
sources."debug-3.1.0"
];
@@ -98798,7 +99653,7 @@ in
sources."fast-json-stable-stringify-2.1.0"
sources."fast-safe-stringify-2.0.7"
sources."fastest-levenshtein-1.0.12"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fd-slicer-1.1.0"
sources."fecha-4.2.0"
sources."figures-3.2.0"
@@ -98810,7 +99665,7 @@ in
sources."fill-range-7.0.1"
sources."find-requires-1.0.0"
sources."flat-5.0.2"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."forever-agent-0.6.1"
sources."form-data-2.5.1"
sources."formidable-1.2.2"
@@ -98843,15 +99698,15 @@ in
sources."getpass-0.1.7"
sources."github-from-package-0.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
- (sources."got-11.8.1" // {
+ (sources."got-11.8.2" // {
dependencies = [
sources."@sindresorhus/is-4.0.0"
sources."@szmarczak/http-timer-4.0.5"
sources."cacheable-request-7.0.1"
sources."decompress-response-6.0.0"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."get-stream-5.2.0"
sources."json-buffer-3.0.1"
sources."keyv-4.0.3"
@@ -98877,7 +99732,7 @@ in
sources."has-unicode-2.0.1"
sources."http-cache-semantics-4.1.0"
sources."http-signature-1.2.0"
- sources."http2-wrapper-1.0.0-beta.5.2"
+ sources."http2-wrapper-1.0.3"
(sources."https-proxy-agent-5.0.0" // {
dependencies = [
sources."agent-base-6.0.2"
@@ -98898,7 +99753,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -99021,7 +99876,7 @@ in
sources."nested-error-stacks-2.1.0"
sources."next-tick-1.0.0"
sources."nice-try-1.0.5"
- (sources."node-abi-2.19.3" // {
+ (sources."node-abi-2.21.0" // {
dependencies = [
sources."semver-5.7.1"
];
@@ -99123,7 +99978,7 @@ in
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
sources."run-parallel-limit-1.1.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
@@ -99137,7 +99992,7 @@ in
sources."signal-exit-3.0.3"
sources."simple-concat-1.0.1"
sources."simple-get-2.8.1"
- (sources."simple-git-2.35.1" // {
+ (sources."simple-git-2.36.1" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -99274,7 +100129,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -99293,13 +100148,13 @@ in
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
sources."xmlhttprequest-ssl-1.5.5"
@@ -99310,7 +100165,7 @@ in
sources."yauzl-2.10.0"
sources."yeast-0.1.2"
sources."yocto-queue-0.1.0"
- sources."zip-stream-4.0.4"
+ sources."zip-stream-4.1.0"
];
buildInputs = globalBuildInputs;
meta = {
@@ -99949,20 +100804,32 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.458.0";
+ version = "1.476.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.458.0.tgz";
- sha512 = "w/ZCb8rOyFDn09OmoyuLDQcmW63rSfbVsXINM+bvT9UJ4ML4JRWA2qKURcaMy9RnkXEK3gPYstly7ezb9iF82g==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.476.0.tgz";
+ sha512 = "GLOZC1EQ9mcA38WF+6a6z4rZtvHTGUiokXYp66DVf70OoNDPwM00nL3AwWtFc39bLb04TSl8INgL87LIXiYLUg==";
};
dependencies = [
+ sources."@deepcode/dcignore-1.0.2"
+ sources."@nodelib/fs.scandir-2.1.4"
+ sources."@nodelib/fs.stat-2.0.4"
+ sources."@nodelib/fs.walk-1.2.6"
+ sources."@octetstream/promisify-2.0.2"
sources."@open-policy-agent/opa-wasm-1.2.0"
sources."@sindresorhus/is-2.1.1"
sources."@snyk/cli-interface-2.11.0"
sources."@snyk/cocoapods-lockfile-parser-3.6.2"
+ (sources."@snyk/code-client-3.1.4" // {
+ dependencies = [
+ sources."uuid-8.3.2"
+ ];
+ })
sources."@snyk/composer-lockfile-parser-1.4.1"
sources."@snyk/dep-graph-1.23.1"
sources."@snyk/docker-registry-v2-client-1.13.9"
+ sources."@snyk/fast-glob-3.2.6-patch"
sources."@snyk/gemfile-1.2.0"
+ sources."@snyk/glob-parent-5.1.2-patch.1"
sources."@snyk/graphlib-2.1.9-patch.3"
(sources."@snyk/inquirer-7.3.3-patch" // {
dependencies = [
@@ -99989,15 +100856,23 @@ in
];
})
sources."@szmarczak/http-timer-4.0.5"
+ sources."@types/braces-3.0.0"
sources."@types/cacheable-request-6.0.1"
sources."@types/debug-4.1.5"
+ sources."@types/flat-cache-2.0.0"
sources."@types/graphlib-2.1.7"
- sources."@types/hosted-git-info-2.7.0"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/js-yaml-3.12.6"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.14.31"
+ sources."@types/lodash-4.14.168"
+ sources."@types/lodash.chunk-4.2.6"
+ sources."@types/lodash.omit-4.5.6"
+ sources."@types/lodash.union-4.6.6"
+ sources."@types/micromatch-4.0.1"
+ sources."@types/node-14.14.32"
sources."@types/responselike-1.0.0"
+ sources."@types/sarif-2.1.3"
+ sources."@types/uuid-8.3.0"
sources."@yarnpkg/lockfile-1.1.0"
sources."abbrev-1.1.1"
sources."agent-base-4.3.0"
@@ -100026,6 +100901,7 @@ in
];
})
sources."async-3.2.0"
+ sources."axios-0.21.1"
sources."balanced-match-1.0.0"
sources."base64-js-1.5.1"
sources."bcrypt-pbkdf-1.0.2"
@@ -100093,7 +100969,7 @@ in
})
sources."deep-extend-0.6.0"
sources."deep-is-0.1.3"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
(sources."degenerator-1.0.4" // {
dependencies = [
sources."esprima-3.1.3"
@@ -100126,14 +101002,20 @@ in
sources."esprima-4.0.1"
sources."estraverse-4.3.0"
sources."esutils-2.0.3"
- sources."event-loop-spinner-2.0.0"
+ (sources."event-loop-spinner-2.1.0" // {
+ dependencies = [
+ sources."tslib-2.1.0"
+ ];
+ })
sources."execa-1.0.0"
sources."extend-3.0.2"
sources."external-editor-3.1.0"
sources."fast-levenshtein-2.0.6"
+ sources."fastq-1.11.0"
sources."figures-3.2.0"
sources."file-uri-to-path-1.0.0"
sources."fill-range-7.0.1"
+ sources."follow-redirects-1.13.3"
sources."fs-constants-1.0.0"
sources."fs.realpath-1.0.0"
(sources."ftp-0.3.10" // {
@@ -100155,6 +101037,11 @@ in
sources."gunzip-maybe-1.4.2"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
+ (sources."hcl-to-json-0.1.1" // {
+ dependencies = [
+ sources."debug-3.2.7"
+ ];
+ })
(sources."hosted-git-info-3.0.8" // {
dependencies = [
sources."lru-cache-6.0.0"
@@ -100169,7 +101056,7 @@ in
sources."ms-2.0.0"
];
})
- sources."http2-wrapper-1.0.0-beta.5.2"
+ sources."http2-wrapper-1.0.3"
(sources."https-proxy-agent-3.0.1" // {
dependencies = [
sources."debug-3.2.7"
@@ -100177,6 +101064,7 @@ in
})
sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
+ sources."ignore-5.1.8"
sources."immediate-3.0.6"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
@@ -100187,13 +101075,15 @@ in
sources."is-ci-2.0.0"
sources."is-deflate-1.0.0"
sources."is-docker-2.1.1"
+ sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
+ sources."is-glob-4.0.1"
sources."is-gzip-1.0.0"
sources."is-installed-globally-0.3.2"
sources."is-npm-4.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
sources."is-wsl-2.2.0"
@@ -100214,6 +101104,7 @@ in
sources."lodash.assign-4.2.0"
sources."lodash.assignin-4.2.0"
sources."lodash.camelcase-4.3.0"
+ sources."lodash.chunk-4.2.0"
sources."lodash.clone-4.5.0"
sources."lodash.clonedeep-4.5.0"
sources."lodash.constant-3.0.0"
@@ -100261,6 +101152,7 @@ in
sources."lru-cache-5.1.1"
sources."macos-release-2.4.1"
sources."make-dir-3.1.0"
+ sources."merge2-1.4.1"
sources."micromatch-4.0.2"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
@@ -100269,7 +101161,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
- (sources."needle-2.5.0" // {
+ (sources."needle-2.6.0" // {
dependencies = [
sources."debug-3.2.7"
];
@@ -100321,6 +101213,7 @@ in
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."promise-7.3.1"
+ sources."promise-fs-2.1.1"
sources."promise-queue-2.2.5"
sources."proxy-agent-3.1.1"
sources."proxy-from-env-1.1.0"
@@ -100332,6 +101225,8 @@ in
];
})
sources."pupa-2.1.1"
+ sources."queue-6.0.2"
+ sources."queue-microtask-1.2.2"
sources."quick-lru-5.1.1"
sources."raw-body-2.4.1"
sources."rc-1.2.8"
@@ -100346,9 +101241,11 @@ in
sources."resolve-alpn-1.0.0"
sources."responselike-2.0.0"
sources."restore-cursor-3.1.0"
+ sources."reusify-1.0.4"
sources."rimraf-2.7.1"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."run-parallel-1.2.0"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
@@ -100360,28 +101257,29 @@ in
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.3"
sources."smart-buffer-4.1.0"
- sources."snyk-config-4.0.0-rc.2"
+ sources."snyk-config-4.0.0"
(sources."snyk-cpp-plugin-2.2.1" // {
dependencies = [
sources."chalk-4.1.0"
sources."tslib-2.1.0"
];
})
- (sources."snyk-docker-plugin-4.17.2" // {
+ (sources."snyk-docker-plugin-4.17.3" // {
dependencies = [
sources."rimraf-3.0.2"
+ sources."snyk-nodejs-lockfile-parser-1.30.2"
sources."tmp-0.2.1"
sources."uuid-8.3.2"
];
})
sources."snyk-go-parser-1.4.1"
- (sources."snyk-go-plugin-1.16.5" // {
+ (sources."snyk-go-plugin-1.17.0" // {
dependencies = [
sources."rimraf-3.0.2"
sources."tmp-0.2.1"
];
})
- (sources."snyk-gradle-plugin-3.13.0" // {
+ (sources."snyk-gradle-plugin-3.13.2" // {
dependencies = [
sources."chalk-3.0.0"
sources."rimraf-3.0.2"
@@ -100406,7 +101304,7 @@ in
sources."tslib-1.11.1"
];
})
- (sources."snyk-nodejs-lockfile-parser-1.30.2" // {
+ (sources."snyk-nodejs-lockfile-parser-1.31.1" // {
dependencies = [
sources."uuid-8.3.2"
];
@@ -100428,23 +101326,13 @@ in
sources."tslib-2.1.0"
];
})
- (sources."snyk-policy-1.14.1" // {
+ (sources."snyk-policy-1.19.0" // {
dependencies = [
- sources."@types/node-6.14.13"
- sources."hosted-git-info-2.8.8"
- (sources."snyk-module-2.1.0" // {
- dependencies = [
- sources."debug-3.2.7"
- ];
- })
- ];
- })
- sources."snyk-python-plugin-1.19.4"
- (sources."snyk-resolve-1.0.1" // {
- dependencies = [
- sources."debug-3.2.7"
+ sources."snyk-try-require-2.0.1"
];
})
+ sources."snyk-python-plugin-1.19.5"
+ sources."snyk-resolve-1.1.0"
(sources."snyk-resolve-deps-4.7.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -100480,7 +101368,7 @@ in
sources."statuses-1.5.0"
sources."stream-shift-1.0.1"
sources."streamsearch-0.1.2"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."strip-ansi-6.0.0"
];
@@ -100573,16 +101461,16 @@ in
"socket.io" = nodeEnv.buildNodePackage {
name = "socket.io";
packageName = "socket.io";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz";
- sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA==";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz";
+ sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==";
};
dependencies = [
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."accepts-1.3.7"
sources."base64-arraybuffer-0.1.4"
sources."base64id-2.0.0"
@@ -100600,7 +101488,7 @@ in
sources."socket.io-adapter-2.1.0"
sources."socket.io-parser-4.0.4"
sources."vary-1.1.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
];
buildInputs = globalBuildInputs;
meta = {
@@ -100956,7 +101844,7 @@ in
sources."end-of-stream-1.4.4"
sources."epidemic-broadcast-trees-7.0.0"
sources."errno-0.1.8"
- (sources."es-abstract-1.18.0-next.2" // {
+ (sources."es-abstract-1.18.0" // {
dependencies = [
sources."object-inspect-1.9.0"
];
@@ -101051,9 +101939,10 @@ in
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
+ sources."has-bigints-1.0.1"
sources."has-flag-4.0.0"
sources."has-network-0.0.1"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
(sources."has-value-1.0.0" // {
dependencies = [
sources."isobject-3.0.1"
@@ -101144,7 +102033,7 @@ in
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-2.1.0"
- (sources."jitdb-2.3.1" // {
+ (sources."jitdb-2.3.3" // {
dependencies = [
sources."mkdirp-1.0.4"
sources."push-stream-11.0.0"
@@ -101395,7 +102284,7 @@ in
sources."railroad-diagrams-1.0.0"
sources."randexp-0.4.6"
sources."random-access-chrome-file-1.1.4"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
(sources."random-access-idb-1.2.1" // {
dependencies = [
sources."buffer-from-0.1.2"
@@ -101569,7 +102458,7 @@ in
sources."ssb-client-4.9.0"
sources."ssb-config-3.4.5"
sources."ssb-db-19.2.0"
- (sources."ssb-db2-1.17.1" // {
+ (sources."ssb-db2-1.18.2" // {
dependencies = [
sources."abstract-leveldown-6.2.3"
(sources."flumecodec-0.0.1" // {
@@ -101577,10 +102466,12 @@ in
sources."level-codec-6.2.0"
];
})
+ sources."glob-7.1.6"
sources."level-6.0.1"
sources."level-js-5.0.2"
sources."mkdirp-1.0.4"
sources."push-stream-11.0.0"
+ sources."rimraf-3.0.2"
(sources."ssb-keys-8.0.2" // {
dependencies = [
sources."mkdirp-0.5.5"
@@ -101651,9 +102542,9 @@ in
];
})
sources."string-width-1.0.2"
- sources."string.prototype.trim-1.2.3"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trim-1.2.4"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
sources."stringify-entities-1.3.2"
sources."strip-ansi-3.0.1"
@@ -101693,6 +102584,7 @@ in
sources."typewiselite-1.0.0"
sources."uint48be-2.0.1"
sources."ultron-1.0.2"
+ sources."unbox-primitive-1.0.0"
sources."unherit-1.1.3"
sources."unified-2.1.4"
sources."union-value-1.0.1"
@@ -101830,7 +102722,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.848.0" // {
+ (sources."aws-sdk-2.858.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -101969,14 +102861,14 @@ in
dependencies = [
sources."cookie-0.4.1"
sources."debug-4.1.1"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
];
})
- (sources."engine.io-client-3.5.0" // {
+ (sources."engine.io-client-3.5.1" // {
dependencies = [
sources."debug-3.1.0"
sources."ms-2.0.0"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
];
})
sources."engine.io-parser-2.2.1"
@@ -102014,7 +102906,7 @@ in
sources."fd-slicer-1.1.0"
sources."finalhandler-1.1.2"
sources."find-up-3.0.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."forever-agent-0.6.1"
sources."form-data-2.1.4"
sources."formidable-1.2.2"
@@ -102050,7 +102942,7 @@ in
];
})
sources."has-cors-1.1.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."hawk-3.1.3"
sources."highlight.js-8.2.0"
(sources."hipchatter-0.3.2" // {
@@ -102270,7 +103162,7 @@ in
sources."psl-1.8.0"
sources."pug-2.0.4"
sources."pug-attrs-2.0.4"
- sources."pug-code-gen-2.0.2"
+ sources."pug-code-gen-2.0.3"
sources."pug-error-1.3.3"
sources."pug-filters-3.1.1"
sources."pug-lexer-4.1.0"
@@ -102598,35 +103490,38 @@ in
stylelint = nodeEnv.buildNodePackage {
name = "stylelint";
packageName = "stylelint";
- version = "13.11.0";
+ version = "13.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz";
- sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==";
+ url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz";
+ sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/core-7.12.17"
- sources."@babel/generator-7.12.17"
+ sources."@babel/compat-data-7.13.8"
+ sources."@babel/core-7.13.8"
+ sources."@babel/generator-7.13.9"
+ sources."@babel/helper-compilation-targets-7.13.8"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.12.17"
+ sources."@babel/helper-member-expression-to-functions-7.13.0"
sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.12.17"
+ sources."@babel/helper-module-transforms-7.13.0"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.0"
sources."@babel/helper-simple-access-7.12.13"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/helpers-7.12.17"
- (sources."@babel/highlight-7.12.13" // {
+ sources."@babel/helper-validator-option-7.12.17"
+ sources."@babel/helpers-7.13.0"
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.12.17"
+ sources."@babel/parser-7.13.9"
sources."@babel/template-7.12.13"
- sources."@babel/traverse-7.12.17"
- sources."@babel/types-7.12.17"
+ sources."@babel/traverse-7.13.0"
+ sources."@babel/types-7.13.0"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -102637,7 +103532,7 @@ in
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/unist-2.0.3"
- sources."ajv-7.1.1"
+ sources."ajv-7.2.1"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
sources."array-union-2.1.0"
@@ -102652,7 +103547,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -102668,7 +103563,7 @@ in
sources."clone-regexp-2.2.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."concat-map-0.0.1"
sources."convert-source-map-1.7.0"
sources."cosmiconfig-7.0.0"
@@ -102690,7 +103585,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -102701,7 +103596,7 @@ in
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.5"
sources."fastest-levenshtein-1.0.12"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."file-entry-cache-6.0.1"
sources."fill-range-7.0.1"
sources."find-up-4.1.0"
@@ -102712,7 +103607,7 @@ in
sources."gensync-1.0.0-beta.2"
sources."get-stdin-8.0.0"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
@@ -102784,7 +103679,7 @@ in
];
})
sources."ms-2.1.2"
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
(sources."normalize-package-data-3.0.0" // {
dependencies = [
sources."semver-7.3.4"
@@ -102833,6 +103728,7 @@ in
dependencies = [
sources."hosted-git-info-2.8.8"
sources."normalize-package-data-2.5.0"
+ sources."semver-5.7.1"
sources."type-fest-0.6.0"
];
})
@@ -102854,7 +103750,7 @@ in
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.1.2"
- sources."semver-5.7.1"
+ sources."semver-6.3.0"
sources."signal-exit-3.0.3"
sources."slash-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -102870,7 +103766,7 @@ in
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
sources."specificity-0.4.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.3.0" // {
dependencies = [
sources."safe-buffer-5.2.1"
@@ -102889,14 +103785,14 @@ in
sources."trough-1.0.5"
sources."type-fest-0.18.1"
sources."typedarray-to-buffer-3.1.5"
- sources."unified-9.2.0"
+ sources."unified-9.2.1"
sources."uniq-1.0.1"
sources."unist-util-find-all-after-3.0.2"
- sources."unist-util-is-4.0.4"
+ sources."unist-util-is-4.1.0"
sources."unist-util-stringify-position-2.0.3"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."validate-npm-package-license-3.0.4"
sources."vfile-4.2.1"
sources."vfile-message-2.0.4"
@@ -102905,7 +103801,7 @@ in
sources."write-file-atomic-3.0.3"
sources."yallist-4.0.0"
sources."yaml-1.10.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
sources."zwitch-1.0.5"
];
buildInputs = globalBuildInputs;
@@ -102921,19 +103817,19 @@ in
svelte-language-server = nodeEnv.buildNodePackage {
name = "svelte-language-server";
packageName = "svelte-language-server";
- version = "0.12.14";
+ version = "0.12.19";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.14.tgz";
- sha512 = "pf569M9VeeyyPrRbmmQlndYO2nr8/Q2OMC1TlrCf7SBzqyqkCV1XirRRX5w2/RVq+T5tJC6k2tKTrNyhVF1mqQ==";
+ url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.19.tgz";
+ sha512 = "u4f5Zn1UvOTeNSTH83z/v8fifhU+kNEpbMff07kMkZFBFxTXdMEh2/qS9VFjJu/0Ala646HnapgZgnakVvnZuQ==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ sources."@babel/highlight-7.13.8"
sources."@emmetio/abbreviation-2.2.1"
sources."@emmetio/css-abbreviation-2.1.2"
sources."@emmetio/scanner-1.0.0"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/parse-json-4.0.0"
sources."@types/pug-2.0.4"
sources."@types/sass-1.16.0"
@@ -102949,13 +103845,13 @@ in
sources."cosmiconfig-7.0.0"
sources."dedent-js-1.0.1"
sources."detect-indent-6.0.0"
- sources."emmet-2.3.1"
+ sources."emmet-2.3.2"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."estree-walker-2.0.2"
sources."fill-range-7.0.1"
sources."fsevents-2.3.2"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."has-flag-3.0.0"
sources."import-fresh-3.3.0"
sources."is-arrayish-0.2.1"
@@ -102978,18 +103874,18 @@ in
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
sources."prettier-2.2.1"
- sources."prettier-plugin-svelte-2.1.6"
+ sources."prettier-plugin-svelte-2.2.0"
sources."readdirp-3.5.0"
sources."resolve-from-4.0.0"
sources."source-map-0.7.3"
sources."strip-indent-3.0.0"
sources."supports-color-5.5.0"
- sources."svelte-3.32.3"
+ sources."svelte-3.35.0"
sources."svelte-preprocess-4.6.9"
- sources."svelte2tsx-0.1.174"
+ sources."svelte2tsx-0.1.179"
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
- sources."typescript-4.1.5"
+ sources."typescript-4.2.3"
sources."vscode-css-languageservice-5.0.0"
sources."vscode-emmet-helper-2.1.2"
sources."vscode-html-languageservice-4.0.0"
@@ -103015,12 +103911,13 @@ in
svgo = nodeEnv.buildNodePackage {
name = "svgo";
packageName = "svgo";
- version = "2.0.3";
+ version = "2.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/svgo/-/svgo-2.0.3.tgz";
- sha512 = "q6YtEaLXkPN1ARaifoENYPPweAbBV8YoqWg+8DFQ3xsImfyRIdBbr42Cqz4NZwCftmVJjh+m1rEK7ItRdLTxdg==";
+ url = "https://registry.npmjs.org/svgo/-/svgo-2.2.1.tgz";
+ sha512 = "WrKhe5CMm/O5gchTQKGogKYXGbOC0JBZnHqvaCTEbsMuq4prxQHB/AZgif8WwD4+9Nim4EECObmyjvkdC43iNg==";
};
dependencies = [
+ sources."@trysound/sax-0.1.1"
sources."ansi-styles-4.3.0"
sources."boolbase-1.0.0"
sources."chalk-4.1.0"
@@ -103028,7 +103925,6 @@ in
sources."color-name-1.1.4"
sources."commander-7.1.0"
sources."css-select-3.1.2"
- sources."css-select-base-adapter-0.1.1"
sources."css-tree-1.1.2"
sources."css-what-4.0.0"
sources."csso-4.2.0"
@@ -103040,7 +103936,6 @@ in
sources."has-flag-4.0.0"
sources."mdn-data-2.0.14"
sources."nth-check-2.0.0"
- sources."sax-1.2.4"
sources."source-map-0.6.1"
sources."stable-0.1.8"
sources."supports-color-7.2.0"
@@ -103627,7 +104522,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."undefsafe-2.0.3"
(sources."union-value-1.0.1" // {
dependencies = [
@@ -103933,7 +104828,7 @@ in
sources."graceful-fs-4.2.6"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."hosted-git-info-2.8.8"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -104119,7 +105014,7 @@ in
sources."function-bind-1.1.1"
sources."get-intrinsic-1.1.1"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."match-index-1.0.3"
sources."object-keys-1.1.1"
sources."regexp.prototype.flags-1.3.1"
@@ -104145,7 +105040,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ sources."@babel/highlight-7.13.8"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@textlint/ast-node-types-4.4.1"
@@ -104298,7 +105193,7 @@ in
sources."is-installed-globally-0.3.2"
sources."is-npm-4.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-obj-1.1.0"
sources."is-typedarray-1.0.0"
sources."is-whitespace-character-1.0.4"
@@ -104445,7 +105340,7 @@ in
sources."sprintf-js-1.0.3"
sources."state-toggle-1.0.3"
sources."stream-combiner-0.0.4"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
@@ -104485,7 +105380,7 @@ in
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
sources."unherit-1.1.3"
- (sources."unified-9.2.0" // {
+ (sources."unified-9.2.1" // {
dependencies = [
sources."is-plain-obj-2.1.0"
];
@@ -104499,7 +105394,7 @@ in
sources."unified-message-control-3.0.3"
sources."unique-string-2.0.0"
sources."unist-util-inspect-5.0.1"
- sources."unist-util-is-4.0.4"
+ sources."unist-util-is-4.1.0"
sources."unist-util-modify-children-2.0.0"
sources."unist-util-position-3.1.0"
sources."unist-util-remove-position-2.0.1"
@@ -104686,36 +105581,43 @@ in
sources."call-bind-1.0.2"
sources."concat-stream-2.0.0"
sources."define-properties-1.1.3"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."function-bind-1.1.1"
sources."get-intrinsic-1.1.1"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
sources."inherits-2.0.4"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-date-object-1.0.2"
sources."is-negative-zero-2.0.1"
+ sources."is-number-object-1.0.4"
sources."is-regex-1.1.2"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."object-assign-4.1.1"
sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."object.values-1.1.2"
+ sources."object.values-1.1.3"
sources."readable-stream-3.6.0"
sources."safe-buffer-5.2.1"
sources."sentence-splitter-3.2.0"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.3.0"
sources."structured-source-3.0.2"
sources."textlint-rule-helper-2.1.1"
sources."typedarray-0.0.6"
+ sources."unbox-primitive-1.0.0"
sources."unist-util-is-3.0.0"
sources."unist-util-visit-1.4.1"
sources."unist-util-visit-parents-2.1.2"
sources."util-deprecate-1.0.2"
+ sources."which-boxed-primitive-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -104742,21 +105644,29 @@ in
sources."define-properties-1.1.3"
sources."emoji-regex-6.5.1"
sources."end-with-1.0.2"
- sources."es-abstract-1.17.7"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."function-bind-1.1.1"
sources."get-intrinsic-1.1.1"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-date-object-1.0.2"
+ sources."is-negative-zero-2.0.1"
+ sources."is-number-object-1.0.4"
sources."is-regex-1.1.2"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
+ sources."unbox-primitive-1.0.0"
+ sources."which-boxed-primitive-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -104840,24 +105750,30 @@ in
sources."array-includes-3.1.3"
sources."call-bind-1.0.2"
sources."define-properties-1.1.3"
- sources."es-abstract-1.18.0-next.2"
+ sources."es-abstract-1.18.0"
sources."es-to-primitive-1.2.1"
sources."function-bind-1.1.1"
sources."get-intrinsic-1.1.1"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-bigints-1.0.1"
+ sources."has-symbols-1.0.2"
+ sources."is-bigint-1.0.1"
+ sources."is-boolean-object-1.1.0"
sources."is-callable-1.2.3"
sources."is-capitalized-1.0.0"
sources."is-date-object-1.0.2"
sources."is-negative-zero-2.0.1"
+ sources."is-number-object-1.0.4"
sources."is-regex-1.1.2"
sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."object-inspect-1.9.0"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
+ sources."unbox-primitive-1.0.0"
+ sources."which-boxed-primitive-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -104888,7 +105804,7 @@ in
sources."function-bind-1.1.1"
sources."get-intrinsic-1.1.1"
sources."has-1.0.3"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."no-cliches-0.1.1"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
@@ -104928,7 +105844,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-2.0.1"
@@ -104971,7 +105887,7 @@ in
sources."better-assert-1.0.2"
sources."blob-0.0.5"
sources."block-stream-0.0.9"
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
sources."body-parser-1.19.0"
sources."boolbase-1.0.0"
sources."brace-expansion-1.1.11"
@@ -105004,7 +105920,7 @@ in
sources."content-type-1.0.4"
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
- sources."core-js-3.9.0"
+ sources."core-js-3.9.1"
sources."core-util-is-1.0.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
@@ -105016,7 +105932,7 @@ in
];
})
sources."deep-extend-0.6.0"
- sources."defer-to-connect-2.0.0"
+ sources."defer-to-connect-2.0.1"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."depd-1.1.2"
@@ -105097,7 +106013,7 @@ in
];
})
sources."http-signature-1.2.0"
- sources."http2-wrapper-1.0.0-beta.5.2"
+ sources."http2-wrapper-1.0.3"
sources."http_ece-1.1.0"
(sources."https-proxy-agent-5.0.0" // {
dependencies = [
@@ -105343,7 +106259,7 @@ in
sources."wide-align-1.1.3"
sources."with-open-file-0.1.7"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xmlhttprequest-ssl-1.5.5"
sources."yallist-3.1.1"
sources."yarn-1.22.4"
@@ -105362,10 +106278,10 @@ in
three = nodeEnv.buildNodePackage {
name = "three";
packageName = "three";
- version = "0.125.2";
+ version = "0.126.1";
src = fetchurl {
- url = "https://registry.npmjs.org/three/-/three-0.125.2.tgz";
- sha512 = "7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA==";
+ url = "https://registry.npmjs.org/three/-/three-0.126.1.tgz";
+ sha512 = "eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -105524,10 +106440,10 @@ in
triton = nodeEnv.buildNodePackage {
name = "triton";
packageName = "triton";
- version = "7.12.2";
+ version = "7.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/triton/-/triton-7.12.2.tgz";
- sha512 = "xzGDHq2Jt6THs+/Kz1XiTEaco67KmeBzUFqCROPIaMS4BL8UNXoY0cU2ZyH1/4Brrzn70muAOgl7PYDokNb4Pw==";
+ url = "https://registry.npmjs.org/triton/-/triton-7.14.0.tgz";
+ sha512 = "2oIu0p1QjDYdNp3fI0gTxJvwOmzcP76hMwCn4KlqfFxDihBghwDmvWhGU3PPn4zNf3yBDJ1xlsxY14WHqgcV7g==";
};
dependencies = [
sources."asn1-0.2.4"
@@ -105794,10 +106710,10 @@ in
typescript = nodeEnv.buildNodePackage {
name = "typescript";
packageName = "typescript";
- version = "4.1.5";
+ version = "4.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz";
- sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==";
+ url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz";
+ sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -105849,10 +106765,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.12.8";
+ version = "3.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.8.tgz";
- sha512 = "fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz";
+ sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -105898,7 +106814,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.10"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.0"
@@ -105930,7 +106846,7 @@ in
sources."color-3.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."color-string-1.5.4"
+ sources."color-string-1.5.5"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."component-emitter-1.3.0"
@@ -106027,7 +106943,7 @@ in
sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.5"
sources."media-typer-0.3.0"
- (sources."memorystore-1.6.4" // {
+ (sources."memorystore-1.6.5" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@@ -106118,7 +107034,7 @@ in
})
sources."stack-trace-0.0.10"
sources."statuses-1.5.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
(sources."string_decoder-1.3.0" // {
dependencies = [
sources."safe-buffer-5.2.1"
@@ -106152,11 +107068,11 @@ in
})
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."y18n-5.0.5"
sources."yallist-2.1.2"
sources."yargs-16.2.0"
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -106184,13 +107100,13 @@ in
sources."are-we-there-yet-1.1.5"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
- sources."canvas-2.6.1"
+ sources."canvas-2.7.0"
sources."chownr-1.1.4"
(sources."cliui-7.0.4" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -106254,7 +107170,7 @@ in
sources."nan-2.14.2"
sources."needle-2.6.0"
sources."node-fetch-2.6.1"
- sources."node-pre-gyp-0.11.0"
+ sources."node-pre-gyp-0.15.0"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
@@ -106325,7 +107241,7 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
@@ -106336,11 +107252,11 @@ in
dependencies = [
sources."ansi-regex-5.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
];
})
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -106355,10 +107271,10 @@ in
vega-lite = nodeEnv.buildNodePackage {
name = "vega-lite";
packageName = "vega-lite";
- version = "4.17.0";
+ version = "5.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.17.0.tgz";
- sha512 = "MO2XsaVZqx6iWWmVA5vwYFamvhRUsKfVp7n0pNlkZ2/21cuxelSl92EePZ2YGmzL6z4/3K7r/45zaG8p+qNHeg==";
+ url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.0.0.tgz";
+ sha512 = "CrMAy3D2E662qtShrOeGttwwthRxUOZUfdu39THyxkOfLNJBCLkNjfQpFekEidxwbtFTO1zMZzyFIP3AE2I8kQ==";
};
dependencies = [
sources."@types/clone-2.1.0"
@@ -106376,18 +107292,18 @@ in
sources."fast-json-stable-stringify-2.1.0"
sources."get-caller-file-2.0.5"
sources."is-fullwidth-code-point-3.0.0"
- sources."json-stringify-pretty-compact-2.0.0"
+ sources."json-stringify-pretty-compact-3.0.0"
sources."require-directory-2.1.1"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
- sources."tslib-2.0.3"
+ sources."tslib-2.1.0"
sources."vega-event-selector-2.0.6"
- sources."vega-expression-3.0.1"
+ sources."vega-expression-4.0.1"
sources."vega-util-1.16.0"
sources."wrap-ansi-7.0.0"
sources."y18n-5.0.5"
- sources."yargs-16.0.3"
- sources."yargs-parser-20.2.5"
+ sources."yargs-16.2.0"
+ sources."yargs-parser-20.2.6"
];
buildInputs = globalBuildInputs;
meta = {
@@ -106402,10 +107318,10 @@ in
vim-language-server = nodeEnv.buildNodePackage {
name = "vim-language-server";
packageName = "vim-language-server";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.2.tgz";
- sha512 = "i+IVvvla+7oyXU3Mb1Vc4hCymCEUbRRhJE7/So+wZNZZgtVH4SNWwhtjzNV2l9egYAyCqJnJKKtErwgJnfAHsA==";
+ url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.3.tgz";
+ sha512 = "BZAMbgNXq9GFg0HrXbQoPs+VLzJasM/UyN34v0wEMOo8jj/h8K1LUKHuHJkGhAEhyq80BwDbByDLrbcu7Sn6Zg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -106486,10 +107402,10 @@ in
vscode-json-languageserver = nodeEnv.buildNodePackage {
name = "vscode-json-languageserver";
packageName = "vscode-json-languageserver";
- version = "1.3.1";
+ version = "1.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.1.tgz";
- sha512 = "yP75lCPSZVkFUfA0pUA9yKu2OumueIIaht5i9c7XVwwm08PMt1GMDI8RNv/fPkUjU9uBnb5bJW20BHxWBATgrA==";
+ url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.4.tgz";
+ sha512 = "+ghebnslXk6fVDySBrT0BVqozLDdmKY/qxgkDD4JtOQcU2vXc3e7jh7YyMxvuvE93E9OLvBqUrvajttj8xf3BA==";
};
dependencies = [
sources."agent-base-4.3.0"
@@ -106498,22 +107414,21 @@ in
sources."es6-promisify-5.0.0"
sources."http-proxy-agent-2.1.0"
sources."https-proxy-agent-2.2.4"
- sources."jsonc-parser-2.3.1"
+ sources."jsonc-parser-3.0.0"
sources."ms-2.0.0"
- sources."request-light-0.3.0"
- (sources."vscode-json-languageservice-3.11.0" // {
+ sources."request-light-0.4.0"
+ (sources."vscode-json-languageservice-4.0.2" // {
dependencies = [
- sources."jsonc-parser-3.0.0"
sources."vscode-nls-5.0.0"
];
})
- sources."vscode-jsonrpc-6.0.0-next.2"
- sources."vscode-languageserver-7.0.0-next.3"
- sources."vscode-languageserver-protocol-3.16.0-next.4"
+ sources."vscode-jsonrpc-6.0.0"
+ sources."vscode-languageserver-7.0.0"
+ sources."vscode-languageserver-protocol-3.16.0"
sources."vscode-languageserver-textdocument-1.0.1"
- sources."vscode-languageserver-types-3.16.0-next.2"
+ sources."vscode-languageserver-types-3.16.0"
sources."vscode-nls-4.1.2"
- sources."vscode-uri-2.1.2"
+ sources."vscode-uri-3.0.2"
];
buildInputs = globalBuildInputs;
meta = {
@@ -106584,7 +107499,7 @@ in
sources."@types/json5-0.0.30"
sources."@types/mocha-7.0.2"
sources."@types/node-8.10.66"
- sources."@types/vscode-1.53.0"
+ sources."@types/vscode-1.54.0"
sources."@types/yauzl-2.9.1"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
@@ -106622,7 +107537,7 @@ in
sources."array-unique-0.3.2"
(sources."asn1.js-5.4.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
(sources."assert-1.5.0" // {
@@ -106646,7 +107561,7 @@ in
sources."binary-extensions-2.2.0"
sources."bindings-1.5.0"
sources."bluebird-3.7.2"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."boolbase-1.0.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
@@ -106738,7 +107653,7 @@ in
sources."core-util-is-1.0.2"
(sources."create-ecdh-4.0.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."create-hash-1.2.0"
@@ -106759,7 +107674,7 @@ in
sources."diff-3.5.0"
(sources."diffie-hellman-5.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."dom-serializer-1.2.0"
@@ -106776,7 +107691,7 @@ in
})
(sources."elliptic-6.5.4" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."emoji-regex-7.0.3"
@@ -106792,7 +107707,7 @@ in
})
sources."entities-2.1.0"
sources."errno-0.1.8"
- (sources."es-abstract-1.18.0-next.2" // {
+ (sources."es-abstract-1.18.0" // {
dependencies = [
sources."object.assign-4.1.2"
];
@@ -106807,7 +107722,7 @@ in
];
})
sources."estraverse-4.3.0"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."evp_bytestokey-1.0.3"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -106876,7 +107791,7 @@ in
sources."get-intrinsic-1.1.1"
sources."get-value-2.0.6"
sources."glob-7.1.3"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
(sources."global-modules-2.0.0" // {
dependencies = [
sources."global-prefix-3.0.0"
@@ -106886,8 +107801,9 @@ in
sources."graceful-fs-4.2.6"
sources."growl-1.10.5"
sources."has-1.0.3"
+ sources."has-bigints-1.0.1"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -106911,7 +107827,7 @@ in
sources."he-1.2.0"
sources."hmac-drbg-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."htmlparser2-6.0.0"
+ sources."htmlparser2-6.0.1"
sources."https-browserify-1.0.0"
sources."ieee754-1.2.1"
sources."iferr-0.1.5"
@@ -106923,7 +107839,9 @@ in
sources."ini-1.3.8"
sources."interpret-1.4.0"
sources."is-accessor-descriptor-1.0.0"
+ sources."is-bigint-1.0.1"
sources."is-binary-path-2.1.0"
+ sources."is-boolean-object-1.1.0"
sources."is-buffer-2.0.5"
sources."is-callable-1.2.3"
sources."is-data-descriptor-1.0.0"
@@ -106935,8 +107853,10 @@ in
sources."is-glob-4.0.1"
sources."is-negative-zero-2.0.1"
sources."is-number-7.0.0"
+ sources."is-number-object-1.0.4"
sources."is-plain-object-2.0.4"
sources."is-regex-1.1.2"
+ sources."is-string-1.0.5"
sources."is-symbol-1.0.3"
sources."is-windows-1.0.2"
sources."is-wsl-1.1.0"
@@ -106997,7 +107917,7 @@ in
})
(sources."miller-rabin-4.0.1" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."mime-1.6.0"
@@ -107097,7 +108017,7 @@ in
sources."prr-1.0.1"
(sources."public-encrypt-4.0.3" // {
dependencies = [
- sources."bn.js-4.11.9"
+ sources."bn.js-4.12.0"
];
})
sources."pump-3.0.0"
@@ -107225,8 +108145,8 @@ in
sources."stream-shift-1.0.1"
sources."string-argv-0.3.1"
sources."string-width-2.1.1"
- sources."string.prototype.trimend-1.0.3"
- sources."string.prototype.trimstart-1.0.3"
+ sources."string.prototype.trimend-1.0.4"
+ sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-0.10.31"
sources."strip-ansi-4.0.0"
sources."strip-json-comments-2.0.1"
@@ -107269,6 +108189,7 @@ in
sources."typedarray-0.0.6"
sources."typescript-3.9.9"
sources."uc.micro-1.0.6"
+ sources."unbox-primitive-1.0.0"
sources."underscore-1.8.3"
sources."union-value-1.0.1"
sources."unique-filename-1.1.1"
@@ -107300,11 +108221,11 @@ in
];
})
sources."util-deprecate-1.0.2"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."vm-browserify-1.1.2"
- sources."vsce-1.85.0"
- sources."vscode-debugadapter-testsupport-1.44.0"
- sources."vscode-debugprotocol-1.44.0"
+ sources."vsce-1.85.1"
+ sources."vscode-debugadapter-testsupport-1.45.0"
+ sources."vscode-debugprotocol-1.45.0"
(sources."watchpack-1.7.5" // {
dependencies = [
sources."chokidar-3.5.1"
@@ -107343,6 +108264,7 @@ in
})
sources."webpack-sources-1.4.3"
sources."which-1.3.1"
+ sources."which-boxed-primitive-1.0.2"
sources."which-module-2.0.0"
sources."wide-align-1.1.3"
sources."worker-farm-1.7.0"
@@ -107588,7 +108510,7 @@ in
sources."restore-cursor-2.0.0"
sources."rimraf-2.7.1"
sources."run-async-2.4.1"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."seek-bzip-1.0.6"
@@ -107630,7 +108552,7 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.12.8"
+ sources."uglify-js-3.13.0"
sources."uid-0.0.2"
sources."unbzip2-stream-1.4.3"
sources."unyield-0.0.1"
@@ -107673,7 +108595,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
+ sources."@babel/highlight-7.13.8"
sources."@emmetio/extract-abbreviation-0.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -107689,7 +108611,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -107785,7 +108707,7 @@ in
dependencies = [
sources."braces-3.0.2"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."is-number-7.0.0"
sources."to-regex-range-5.0.1"
];
@@ -107889,7 +108811,7 @@ in
sources."eslint-scope-5.1.1"
sources."espree-6.2.1"
sources."ms-2.1.2"
- sources."vue-eslint-parser-7.5.0"
+ sources."vue-eslint-parser-7.6.0"
];
})
sources."eslint-scope-4.0.3"
@@ -108304,7 +109226,7 @@ in
sources."run-async-2.4.1"
sources."rx-lite-4.0.8"
sources."rx-lite-aggregates-4.0.8"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
@@ -108528,7 +109450,7 @@ in
sources."ansi-regex-5.0.0"
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
- sources."string-width-4.2.0"
+ sources."string-width-4.2.2"
sources."strip-ansi-6.0.0"
sources."supports-color-6.1.0"
];
@@ -108608,7 +109530,7 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- (sources."@babel/highlight-7.12.13" // {
+ (sources."@babel/highlight-7.13.8" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
@@ -108635,7 +109557,7 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/yauzl-2.9.1"
sources."JSONSelect-0.2.1"
sources."acorn-7.4.1"
@@ -108777,14 +109699,14 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."colors-0.5.1"
sources."columnify-1.5.4"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
sources."common-tags-1.8.0"
sources."component-emitter-1.3.0"
- sources."compress-commons-4.0.2"
+ sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
(sources."concat-stream-1.6.2" // {
dependencies = [
@@ -108972,7 +109894,7 @@ in
sources."get-value-2.0.6"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
(sources."global-dirs-2.1.0" // {
dependencies = [
sources."ini-1.3.7"
@@ -108991,7 +109913,7 @@ in
sources."har-validator-5.1.5"
sources."has-1.0.3"
sources."has-flag-4.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -109037,7 +109959,7 @@ in
sources."is-npm-5.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.2"
+ sources."is-path-inside-3.0.3"
sources."is-plain-object-2.0.4"
sources."is-regex-1.1.2"
sources."is-relative-0.1.3"
@@ -109371,7 +110293,7 @@ in
sources."stream-parser-0.3.1"
sources."stream-to-array-2.3.0"
sources."stream-to-promise-3.0.0"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."strip-ansi-6.0.0"
@@ -109445,7 +110367,7 @@ in
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."verror-1.10.0"
sources."vfile-location-3.2.0"
sources."watchpack-1.7.5"
@@ -109511,14 +110433,14 @@ in
sources."yargs-parser-18.1.3"
];
})
- sources."yargs-parser-20.2.5"
+ sources."yargs-parser-20.2.6"
sources."yauzl-2.10.0"
(sources."zip-dir-1.0.2" // {
dependencies = [
sources."async-1.5.2"
];
})
- sources."zip-stream-4.0.4"
+ sources."zip-stream-4.1.0"
];
buildInputs = globalBuildInputs;
meta = {
@@ -109533,17 +110455,17 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
- version = "5.23.0";
+ version = "5.24.4";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.23.0.tgz";
- sha512 = "RC6dwDuRxiU75F8XC4H08NtzUrMfufw5LDnO8dTtaKU2+fszEdySCgZhNwSBBn516iNaJbQI7T7OPHIgCwcJmg==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.24.4.tgz";
+ sha512 = "RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA==";
};
dependencies = [
- sources."@types/eslint-7.2.6"
+ sources."@types/eslint-7.2.7"
sources."@types/eslint-scope-3.7.0"
sources."@types/estree-0.0.46"
sources."@types/json-schema-7.0.7"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@webassemblyjs/ast-1.11.0"
sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
sources."@webassemblyjs/helper-api-error-1.11.0"
@@ -109566,13 +110488,13 @@ in
sources."ajv-keywords-3.5.2"
sources."browserslist-4.16.3"
sources."buffer-from-1.1.1"
- sources."caniuse-lite-1.0.30001190"
+ sources."caniuse-lite-1.0.30001197"
sources."chrome-trace-event-1.0.2"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.3.671"
+ sources."electron-to-chromium-1.3.682"
sources."enhanced-resolve-5.7.0"
- sources."es-module-lexer-0.3.26"
+ sources."es-module-lexer-0.4.1"
sources."escalade-3.1.1"
sources."eslint-scope-5.1.1"
(sources."esrecurse-4.3.0" // {
@@ -109581,7 +110503,7 @@ in
];
})
sources."estraverse-4.3.0"
- sources."events-3.2.0"
+ sources."events-3.3.0"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."glob-to-regexp-0.4.1"
@@ -109595,7 +110517,7 @@ in
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."neo-async-2.6.2"
- sources."node-releases-1.1.70"
+ sources."node-releases-1.1.71"
sources."p-limit-3.1.0"
sources."punycode-2.1.1"
sources."randombytes-2.1.0"
@@ -109644,7 +110566,7 @@ in
sources."@webpack-cli/serve-1.3.0"
sources."ansi-colors-4.1.1"
sources."clone-deep-4.0.1"
- sources."colorette-1.2.1"
+ sources."colorette-1.2.2"
sources."commander-7.1.0"
sources."cross-spawn-7.0.3"
sources."enquirer-2.3.6"
@@ -109685,7 +110607,7 @@ in
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
sources."strip-final-newline-2.0.0"
- sources."v8-compile-cache-2.2.0"
+ sources."v8-compile-cache-2.3.0"
sources."webpack-merge-5.7.3"
sources."which-2.0.2"
sources."wildcard-2.0.0"
@@ -109711,7 +110633,7 @@ in
dependencies = [
sources."@types/glob-7.1.3"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
sources."ajv-errors-1.0.1"
@@ -109896,7 +110818,7 @@ in
];
})
sources."find-up-3.0.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."for-in-1.0.2"
sources."forwarded-0.1.2"
sources."fragment-cache-0.2.1"
@@ -109923,7 +110845,7 @@ in
sources."handle-thing-2.0.1"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
+ sources."has-symbols-1.0.2"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -110284,10 +111206,10 @@ in
copy-webpack-plugin = nodeEnv.buildNodePackage {
name = "copy-webpack-plugin";
packageName = "copy-webpack-plugin";
- version = "7.0.0";
+ version = "8.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-7.0.0.tgz";
- sha512 = "SLjQNa5iE3BoCP76ESU9qYo9ZkEWtXoZxDurHoqPchAFRblJ9g96xTeC560UXBMre1Nx6ixIIUfiY3VcjpJw3g==";
+ url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.0.0.tgz";
+ sha512 = "sqGe2FsB67wV/De+sz5azQklADe4thN016od6m7iK9KbjrSc1SEgg5QZ0LN+jGx5aZR52CbuXbqOhoIbqzzXlA==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -110297,27 +111219,22 @@ in
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."array-union-2.1.0"
- sources."big.js-5.2.2"
sources."braces-3.0.2"
sources."dir-glob-3.0.1"
- sources."emojis-list-3.0.0"
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.2.5"
sources."fast-json-stable-stringify-2.1.0"
- sources."fastq-1.10.1"
+ sources."fastq-1.11.0"
sources."fill-range-7.0.1"
- sources."glob-parent-5.1.1"
+ sources."glob-parent-5.1.2"
sources."globby-11.0.2"
sources."ignore-5.1.8"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
sources."is-number-7.0.0"
sources."json-schema-traverse-0.4.1"
- sources."json5-2.2.0"
- sources."loader-utils-2.0.0"
sources."merge2-1.4.1"
sources."micromatch-4.0.2"
- sources."minimist-1.2.5"
sources."normalize-path-3.0.0"
sources."p-limit-3.1.0"
sources."path-type-4.0.0"
@@ -110404,7 +111321,7 @@ in
})
sources."blob-to-buffer-1.2.9"
sources."block-stream2-2.1.0"
- sources."bn.js-5.1.3"
+ sources."bn.js-5.2.0"
sources."brace-expansion-1.1.11"
sources."browserify-package-json-1.0.1"
sources."buffer-6.0.3"
@@ -110513,7 +111430,7 @@ in
sources."mkdirp-classic-0.5.3"
sources."moment-2.29.1"
sources."mp4-box-encoding-1.4.1"
- sources."mp4-stream-3.1.2"
+ sources."mp4-stream-3.1.3"
sources."ms-2.0.0"
(sources."multicast-dns-6.2.3" // {
dependencies = [
@@ -110553,7 +111470,7 @@ in
sources."pump-3.0.0"
sources."qap-3.3.1"
sources."queue-microtask-1.2.2"
- sources."random-access-file-2.1.5"
+ sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
sources."randombytes-2.1.0"
@@ -110583,7 +111500,7 @@ in
sources."ms-2.1.2"
];
})
- sources."simple-sha1-3.0.1"
+ sources."simple-sha1-3.1.0"
(sources."simple-websocket-9.1.0" // {
dependencies = [
sources."debug-4.3.2"
@@ -110633,7 +111550,7 @@ in
sources."utp-native-2.3.0"
sources."videostream-3.2.2"
sources."vlc-command-1.2.0"
- (sources."webtorrent-0.114.1" // {
+ (sources."webtorrent-0.115.2" // {
dependencies = [
sources."debug-4.3.2"
sources."decompress-response-6.0.0"
@@ -110647,7 +111564,7 @@ in
})
sources."winreg-1.2.4"
sources."wrappy-1.0.2"
- sources."ws-7.4.3"
+ sources."ws-7.4.4"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
sources."xmldom-0.1.31"
@@ -110710,10 +111627,10 @@ in
yaml-language-server = nodeEnv.buildNodePackage {
name = "yaml-language-server";
packageName = "yaml-language-server";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.15.0.tgz";
- sha512 = "idaCYstdGoV5Pi7PKxbUkGHt6jAI3l+nxNWrsVCetxrEgfH6T7qytfT0pF3n4NdfDNPHPHcqnl69FzCFDVfHnQ==";
+ url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.16.0.tgz";
+ sha512 = "W+SIUfHRJI97ZGAQZs1uo4keuaRpJip/r5fFPu44ycpY5hZA+yWw1UNzqftApC1QmFH6lwGwQyTZFyDYxGotbw==";
};
dependencies = [
sources."agent-base-4.3.0"
@@ -110729,24 +111646,16 @@ in
sources."ms-2.0.0"
sources."request-light-0.2.5"
sources."sprintf-js-1.0.3"
- (sources."vscode-json-languageservice-3.11.0" // {
+ (sources."vscode-json-languageservice-4.0.2" // {
dependencies = [
sources."jsonc-parser-3.0.0"
- sources."vscode-languageserver-types-3.16.0-next.2"
sources."vscode-nls-5.0.0"
+ sources."vscode-uri-3.0.2"
];
})
- sources."vscode-jsonrpc-4.0.0"
- (sources."vscode-languageserver-5.2.1" // {
- dependencies = [
- sources."vscode-uri-1.0.8"
- ];
- })
- (sources."vscode-languageserver-protocol-3.14.1" // {
- dependencies = [
- sources."vscode-languageserver-types-3.14.0"
- ];
- })
+ sources."vscode-jsonrpc-6.0.0"
+ sources."vscode-languageserver-7.0.0"
+ sources."vscode-languageserver-protocol-3.16.0"
sources."vscode-languageserver-textdocument-1.0.1"
sources."vscode-languageserver-types-3.16.0"
sources."vscode-nls-4.1.2"
@@ -110791,14 +111700,14 @@ in
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
- sources."@babel/highlight-7.12.13"
- sources."@babel/runtime-7.12.18"
+ sources."@babel/highlight-7.13.8"
+ sources."@babel/runtime-7.13.9"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@sindresorhus/is-0.7.0"
sources."@types/glob-7.1.3"
sources."@types/minimatch-3.0.3"
- sources."@types/node-14.14.31"
+ sources."@types/node-14.14.32"
sources."@types/normalize-package-data-2.4.0"
sources."JSONStream-1.3.5"
sources."aggregate-error-3.1.0"
@@ -110914,7 +111823,7 @@ in
sources."config-chain-1.1.12"
sources."configstore-3.1.5"
sources."copy-descriptor-0.1.1"
- sources."core-js-3.9.0"
+ sources."core-js-3.9.1"
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
sources."cross-spawn-6.0.5"
@@ -111016,7 +111925,7 @@ in
sources."find-up-2.1.0"
sources."find-versions-2.0.0"
sources."first-chunk-stream-2.0.0"
- sources."follow-redirects-1.13.2"
+ sources."follow-redirects-1.13.3"
sources."for-in-1.0.2"
sources."foreachasync-3.0.0"
sources."forever-agent-0.6.1"
@@ -111054,7 +111963,7 @@ in
})
sources."global-dirs-0.1.1"
sources."global-tunnel-ng-2.7.1"
- sources."globalthis-1.0.1"
+ sources."globalthis-1.0.2"
sources."globby-8.0.2"
(sources."got-8.3.2" // {
dependencies = [
@@ -111398,7 +112307,7 @@ in
sources."root-check-1.0.0"
sources."run-async-2.4.1"
sources."rx-4.1.0"
- sources."rxjs-6.6.3"
+ sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
@@ -111667,7 +112576,7 @@ in
sources."semver-7.3.4"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
- (sources."string-width-4.2.0" // {
+ (sources."string-width-4.2.2" // {
dependencies = [
sources."strip-ansi-6.0.0"
];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index ddc181a499..289f6a6cba 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -6,13 +6,13 @@ buildDunePackage rec {
minimumOCamlVersion = "4.05";
pname = "asn1-combinators";
- version = "0.2.4";
+ version = "0.2.5";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz";
- sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r";
+ sha256 = "1pbcdwm12hnfpd1jv2b7cjfkj5r7h61xp2gr8dysb8waa455kwln";
};
propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
index e4edac5fdc..2f85221e53 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix
@@ -1,22 +1,22 @@
-{ lib, menhir, easy-format, fetchFromGitHub, buildDunePackage, which, biniou, yojson }:
+{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }:
buildDunePackage rec {
pname = "atd";
- version = "2.0.0";
+ version = "2.2.1";
+
+ useDune2 = true;
minimumOCamlVersion = "4.02";
- src = fetchFromGitHub {
- owner = "mjambon";
- repo = pname;
- rev = version;
- sha256 = "0alzmk97rxg7s6irs9lvf89dy9n3r769my5n4j9p9qyigcdgjaia";
+ src = fetchurl {
+ url = "https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz";
+ sha256 = "17jm79np69ixp53a4njxnlb1pg8sd1g47nm3nyki9clkc8d4qsyv";
};
- createFindlibDestdir = true;
-
buildInputs = [ which menhir ];
- propagatedBuildInputs = [ easy-format biniou yojson ];
+ propagatedBuildInputs = [ easy-format re ];
+
+ doCheck = true;
meta = with lib; {
homepage = "https://github.com/mjambon/atd";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix
index d8ef2fec99..2537c92d97 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -3,7 +3,7 @@
let runtime =
buildDunePackage {
pname = "atdgen-runtime";
- inherit (atd) version src;
+ inherit (atd) version useDune2 src;
propagatedBuildInputs = [ biniou yojson ];
@@ -13,7 +13,7 @@ let runtime =
buildDunePackage {
pname = "atdgen";
- inherit (atd) version src;
+ inherit (atd) version useDune2 src;
buildInputs = [ atd ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
index 9284bbaf9c..94f254a2ed 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix
@@ -2,28 +2,26 @@
, ocaml, findlib, ocamlbuild, ocaml_oasis
, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp
, utop, libxml2, ncurses
+, linenoise
+, ppx_bap
, ppx_bitstring
-, ppx_tools_versioned
+, yojson
, which, makeWrapper, writeText
, z3
}:
-if !lib.versionAtLeast ocaml.version "4.07"
+if !lib.versionAtLeast ocaml.version "4.08"
then throw "BAP is not available for OCaml ${ocaml.version}"
else
-if lib.versionAtLeast core_kernel.version "0.13"
-then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)"
-else
-
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bap-${version}";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap";
rev = "v${version}";
- sha256 = "10fkr6p798ad18j4h9bvp9dg4pmjdpv3hmj7k389i0vhqniwi5xq";
+ sha256 = "0c53sps6ba9n5cjdmapi8ylzlpcc11pksijp9swzlwgxyz5d276f";
};
sigs = fetchurl {
@@ -41,12 +39,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
- llvm ppx_bitstring ppx_tools_versioned
+ linenoise
+ ounit
+ ppx_bitstring
z3
utop libxml2 ncurses ];
- propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
- piqi-ocaml uuidm frontc ounit ];
+ propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_bap core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp
+ piqi-ocaml uuidm frontc yojson ];
installPhase = ''
export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
patches = [ ./curses_is_ncurses.patch ];
preConfigure = ''
- substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring
+ substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring
'';
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix
index 6d833b48f2..487249ce5a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-compat/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "bigarray-compat";
version = "1.0.0";
+ useDune2 = true;
+
src = fetchFromGitHub {
owner = "mirage";
repo = pname;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
index 8e0780ae6c..535b34b03d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "biniou";
version = "1.2.1";
+ useDune2 = true;
+
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix
index 65b411c52d..dacc181f75 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "ca-certs";
- version = "0.1.3";
+ version = "0.2.0";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
- sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn";
+ sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868";
};
useDune2 = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index 6bae728caf..ec20eedd76 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "camomile";
version = "1.0.2";
+ useDune2 = true;
+
src = fetchFromGitHub {
owner = "yoriyuki";
repo = pname;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix
index dd8a0f5716..e2501c60f5 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix
@@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "digestif";
- version = "0.9.0";
+ version = "1.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
- sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4";
+ sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99";
};
propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/directories/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/directories/default.nix
new file mode 100644
index 0000000000..eae1195311
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/directories/default.nix
@@ -0,0 +1,33 @@
+{ lib, fetchFromGitHub, buildDunePackage }:
+
+buildDunePackage rec {
+ pname = "directories";
+ version = "0.2";
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.07";
+
+ src = fetchFromGitHub {
+ owner = "ocamlpro";
+ repo = pname;
+ rev = version;
+ sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff";
+ };
+
+ meta = {
+ homepage = "https://github.com/ocamlpro/directories";
+ description = "An OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows";
+ longDescription = ''
+ directories is an OCaml library that provides configuration, cache and
+ data paths (and more!) following the suitable conventions on Linux, macOS
+ and Windows. It is inspired by similar libraries for other languages such
+ as directories-jvm.
+
+ The following conventions are used: XDG Base Directory Specification and
+ xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
+ macOS.
+ '';
+ license = lib.licenses.isc;
+ maintainers = with lib.maintainers; [ bcc32 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
index ad6f1f9f81..97443bf570 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchzip, buildDunePackage }:
+{ lib, fetchzip, buildDunePackage, ocaml }:
buildDunePackage rec {
pname = "integers";
version = "0.4.0";
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
index 5632cfbb7c..c46b87e92f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -158,7 +158,8 @@ rec {
base = janePackage {
pname = "base";
- hash = "1d5ynzzq58g9qammhba5dasrg734p9vndq28a7kg80bdxb8gh3kp";
+ version = "0.14.1";
+ hash = "1hizjxmiqlj2zzkwplzjamw9rbnl0kh44sxgjpzdij99qnfkzylf";
minimumOCamlVersion = "4.07";
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
index dd5504dda5..eaeb053239 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "linenoise";
version = "1.3.0";
+ useDune2 = true;
+
minimumOCamlVersion = "4.02";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix
index ed3e5999b4..2c3c7c423a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildOasisPackage
+{ lib, fetchFromGitHub, buildOasisPackage
, ctypes, mariadb, libmysqlclient }:
buildOasisPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix
index 77d6b4ef77..d0d8661dd7 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mirage-clock";
version = "3.1.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz";
sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix
index 5918d89221..355cffaaa1 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/unix.nix
@@ -1,9 +1,11 @@
-{ buildDunePackage, mirage-clock }:
+{ buildDunePackage, mirage-clock, dune-configurator }:
buildDunePackage {
pname = "mirage-clock-unix";
- inherit (mirage-clock) version src;
+ inherit (mirage-clock) version useDune2 src;
+
+ buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ mirage-clock ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix
index 8ae1f4a9d4..b13639150b 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mmap/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mmap";
version = "1.1.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz";
sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix
index afe3d34963..ca88fe3241 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "ocaml-migrate-parsetree";
version = "2.1.0";
+ useDune2 = true;
+
minimumOCamlVersion = "4.02";
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
index 2814c6c528..2fda6f1440 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -1,9 +1,11 @@
-{ lib, buildDunePackage, fetchurl }:
+{ lib, buildDunePackage, fetchurl, ocaml }:
buildDunePackage rec {
pname = "result";
version = "1.5";
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
src = fetchurl {
url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz";
sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index b4842da12d..cf869b6e5e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -29,9 +29,8 @@ stdenv.mkDerivation rec {
sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7";
}) ];
- buildInputs = [ which makeWrapper ocaml findlib
- lwt_react pgocaml camlzip ocaml_sqlite3
- ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ];
propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet
ocaml_pcre tyxml xml-light
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
index 18e4bd1ae8..7f8ded5feb 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
@@ -9,6 +9,8 @@ buildDunePackage rec {
sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";
};
+ useDune2 = true;
+
meta = {
homepage = "https://github.com/mirage/optint";
description = "Abstract type of integer between x64 and x86 architecture";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix
index 5127dc3b1e..37006bf30d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix
@@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "parmap";
- version = "1.1.1";
+ version = "1.2";
src = fetchurl {
url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";
- sha256 = "1pci7b1jqxkgmrbhr0p5j98i4van5nfmmb3sak8cyvxhwgna93j4";
+ sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8=";
};
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_bap/default.nix
new file mode 100644
index 0000000000..f0a223c3db
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_bap/default.nix
@@ -0,0 +1,51 @@
+{ lib, buildDunePackage
+, fetchFromGitHub
+, ppx_assert
+, ppx_bench
+, ppx_bin_prot
+, ppx_compare
+, ppx_enumerate
+, ppx_hash
+, ppx_here
+, ppx_optcomp
+, ppx_sexp_conv
+, ppx_sexp_value
+}:
+
+buildDunePackage rec {
+ pname = "ppx_bap";
+ version = "0.14";
+ useDune2 = true;
+
+ minimumOCamlVersion = "4.07";
+
+ src = fetchFromGitHub {
+ owner = "BinaryAnalysisPlatform";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248";
+ };
+
+ buildInputs = [
+ ppx_optcomp
+ ppx_sexp_value
+ ];
+
+ propagatedBuildInputs = [
+ ppx_assert
+ ppx_bench
+ ppx_bin_prot
+ ppx_compare
+ ppx_enumerate
+ ppx_hash
+ ppx_here
+ ppx_sexp_conv
+ ];
+
+ meta = {
+ description = "The set of ppx rewriters for BAP";
+ license = lib.licenses.mit;
+ inherit (src.meta) homepage;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index 3d4675ed90..84dda38846 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchFromGitHub, buildDunePackage }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
buildDunePackage rec {
pname = "ppx_derivers";
version = "1.2.1";
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
minimumOCamlVersion = "4.02";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
index 442a4126a8..07d817d229 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "ppx_yojson_conv_lib";
version = "0.14.0";
+ useDune2 = true;
+
minimumOCamlVersion = "4.02.3";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix
index d5829127a8..5e9a89a837 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix
@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "qtest";
- version = "2.11.1";
+ version = "2.11.2";
useDune2 = true;
@@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "vincent-hugot";
repo = pname;
rev = "v${version}";
- sha256 = "01aaqnblpkrkv1b2iy5cwn92vxdj4yjiav9s2nvvrqz5m8b9hi1f";
+ sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
};
propagatedBuildInputs = [ qcheck ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
index 481342e98c..f29219e30c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, dune_2, benchmark }:
let param =
if lib.versionAtLeast ocaml.version "4.03"
@@ -6,7 +6,7 @@ let param =
version = "0.6.2";
url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz";
sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i";
- buildInputs = [ dune ];
+ buildInputs = [ dune_2 ];
extra = {
buildPhase = "dune build -p rope";
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix
index d76ec29e63..470a2a5bd0 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdlib-shims/default.nix
@@ -2,11 +2,12 @@
buildDunePackage rec {
pname = "stdlib-shims";
- version = "0.1.0";
+ version = "0.3.0";
src = fetchurl {
url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz";
- sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk";
+ sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
};
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
minimumOCamlVersion = "4.02";
doCheck = true;
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
index c9bf285b7b..07025be296 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }:
+{ lib, stdenv, fetchzip, ocaml, findlib, dune_2, cppo, easy-format, biniou }:
let
pname = "yojson";
param =
@@ -6,7 +6,7 @@ let
version = "1.7.0";
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
- nativeBuildInputs = [ dune ];
+ nativeBuildInputs = [ dune_2 ];
extra = {
installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/arduino/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/arduino/default.nix
new file mode 100644
index 0000000000..f6536108e6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/arduino/default.nix
@@ -0,0 +1,33 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, instrument-control
+, arduino
+}:
+
+buildOctavePackage rec {
+ pname = "arduino";
+ version = "0.6.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0fnfk206n31s7diijaylmqhxnr88z6l3l3vsxq4z8gcp9ylm9nkj";
+ };
+
+ requiredOctavePackages = [
+ instrument-control
+ ];
+
+ # Might be able to use pkgs.arduino-core
+ propagatedBuildInputs = [
+ arduino
+ ];
+
+ meta = with lib; {
+ name = "Octave Arduino Toolkit";
+ homepage = "https://octave.sourceforge.io/arduino/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Basic Octave implementation of the matlab arduino extension, allowing communication to a programmed arduino board to control its hardware";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/audio/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/audio/default.nix
new file mode 100644
index 0000000000..4fafefd6f7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/audio/default.nix
@@ -0,0 +1,36 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, jack2
+, alsaLib
+, rtmidi
+, pkg-config
+}:
+
+buildOctavePackage rec {
+ pname = "audio";
+ version = "2.0.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "18lyvwmdy4b9pcv5sm7g17n3is32q23daw8fcsalkf4rj6cc6qdk";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [
+ jack2
+ alsaLib
+ rtmidi
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/audio/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Audio and MIDI Toolbox for GNU Octave";
+ platforms = platforms.linux; # Because of run-time dependency on jack2 and alsaLib
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/bim/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/bim/default.nix
new file mode 100644
index 0000000000..5dc8ca8871
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/bim/default.nix
@@ -0,0 +1,28 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, fpl
+, msh
+}:
+
+buildOctavePackage rec {
+ pname = "bim";
+ version = "1.1.5";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0y70w8mj80c5yns1j7nwngwwrxp1pa87kyz2n2yvmc3zdigcd6g8";
+ };
+
+ requiredOctavePackages = [
+ fpl
+ msh
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/bim/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Package for solving Diffusion Advection Reaction (DAR) Partial Differential Equations";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/bsltl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/bsltl/default.nix
new file mode 100644
index 0000000000..aefe543b09
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/bsltl/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "bsltl";
+ version = "1.3.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0i8ry347y5f5db3702nhpsmfys9v18ks2fsmpdqpy3fcvrwaxdsb";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/bsltl/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Free collection of OCTAVE/MATLAB routines for working with the biospeckle laser technique";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/cgi/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/cgi/default.nix
new file mode 100644
index 0000000000..4686881251
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/cgi/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "cgi";
+ version = "0.1.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0hygj7cpwrs2w9bfb7qrvv7gq410bfiddqvza8smg766pqmfp1s1";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/cgi/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Common Gateway Interface for Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix
new file mode 100644
index 0000000000..492c837255
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, signal
+, hdf5
+}:
+
+buildOctavePackage rec {
+ pname = "communications";
+ version = "1.2.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1xay2vjyadv3ja8dmqqzm2his8s0rvidz23nq1c2yl3xh1gavyck";
+ };
+
+ buildInputs = [
+ hdf5
+ ];
+
+ requiredOctavePackages = [
+ signal
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/communications/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = " Digital Communications, Error Correcting Codes (Channel Code), Source Code functions, Modulation and Galois Fields";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix
new file mode 100644
index 0000000000..2d61e30cc6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, gfortran
+, lapack, blas
+}:
+
+buildOctavePackage rec {
+ pname = "control";
+ version = "3.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0gjyjsxs01x0nyc4cgn3d5af17l3lzs8h4hsm57nxd3as48dbwgs";
+ };
+
+ nativeBuildInputs = [
+ gfortran
+ ];
+
+ buildInputs = [
+ lapack blas
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/control/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/data-smoothing/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/data-smoothing/default.nix
new file mode 100644
index 0000000000..551582a777
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/data-smoothing/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, optim
+}:
+
+buildOctavePackage rec {
+ pname = "data-smoothing";
+ version = "1.3.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0q0vqdmp8ygyfhk296xbxcpsh5wvpa2kfgv4v0rys68nd2lxfaq1";
+ };
+
+ requiredOctavePackages = [
+ optim
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/data-smoothing/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Algorithms for smoothing noisy data";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix
new file mode 100644
index 0000000000..3e1fe86327
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, struct
+, postgresql
+}:
+
+buildOctavePackage rec {
+ pname = "database";
+ version = "2.4.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p";
+ };
+
+ propagatedBuildInputs = [
+ postgresql
+ ];
+
+ requiredOctavePackages = [
+ struct
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/database/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Interface to SQL databases, currently only postgresql using libpq";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/dataframe/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/dataframe/default.nix
new file mode 100644
index 0000000000..8f145f0d51
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/dataframe/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "dataframe";
+ version = "1.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "10ara084gkb7d5vxv9qv7zpj8b4mm5y06nccrdy3skw5nfbb4djx";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/dataframe/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Data manipulation toolbox similar to R data.frame";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/dicom/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/dicom/default.nix
new file mode 100644
index 0000000000..e16b644780
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/dicom/default.nix
@@ -0,0 +1,33 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, gdcm
+, cmake
+}:
+
+buildOctavePackage rec {
+ pname = "dicom";
+ version = "0.4.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "131wn6mrv20np10plirvqia8dlpz3g0aqi3mmn2wyl7r95p3dnza";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ dontUseCmakeConfigure = true;
+
+ propagatedBuildInputs = [
+ gdcm
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/dicom/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Digital communications in medicine (DICOM) file io";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/divand/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/divand/default.nix
new file mode 100644
index 0000000000..ac8de90606
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/divand/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "divand";
+ version = "1.1.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0nmaz5j37dflz7p4a4lmwzkh7g1gghdh7ccvkbyy0fpgv9lr1amg";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/divand/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Performs an n-dimensional variational analysis (interpolation) of arbitrarily located observations";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix
new file mode 100644
index 0000000000..3c02a20cda
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix
@@ -0,0 +1,28 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "doctest";
+ version = "0.7.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/doctest/index.html";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Find and run example code within documentation";
+ longDescription = ''
+ Find and run example code within documentation. Formatted blocks
+ of example code are extracted from documentation files and executed
+ to confirm their output is correct. This can be part of a testing
+ framework or simply to ensure that documentation stays up-to-date
+ during software development.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/econometrics/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/econometrics/default.nix
new file mode 100644
index 0000000000..0aa795959a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/econometrics/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, optim
+}:
+
+buildOctavePackage rec {
+ pname = "econometrics";
+ version = "1.1.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1srx78k90ycla7yisa9h593n9l8br31lsdxlspra8sxiyq0sbk72";
+ };
+
+ requiredOctavePackages = [
+ optim
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/econometrics/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Econometrics functions including MLE and GMM based techniques";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/fem-fenics/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/fem-fenics/default.nix
new file mode 100644
index 0000000000..300dfd7587
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/fem-fenics/default.nix
@@ -0,0 +1,35 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, dolfin
+, ffc
+, pkg-config
+}:
+
+buildOctavePackage rec {
+ pname = "fem-fenics";
+ version = "0.0.5";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1xd80nnkschldvrqx0wvrg3fzbf8sck8bvq24phr5x49xs7b8x78";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [
+ dolfin
+ ffc
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/fem-fenics/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Package for the resolution of partial differential equations based on fenics";
+ # Lots of compilation errors for newer octave versions and syntax errors
+ broken = true;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/financial/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/financial/default.nix
new file mode 100644
index 0000000000..5fb6a00df7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/financial/default.nix
@@ -0,0 +1,23 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, io
+, statistics
+}:
+
+buildOctavePackage rec {
+ pname = "financial";
+ version = "0.5.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0f963yg6pwvrdk5fg7b71ny47gzy48nqxdzj2ngcfrvmb5az4vmf";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/financial/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Monte Carlo simulation, options pricing routines, financial manipulation, plotting functions and additional date manipulation tools";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/fits/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/fits/default.nix
new file mode 100644
index 0000000000..9d236cb9f1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/fits/default.nix
@@ -0,0 +1,41 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, cfitsio
+, hdf5
+, pkg-config
+}:
+
+buildOctavePackage rec {
+ pname = "fits";
+ version = "1.0.7";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0jab5wmrpifqphmrfkqcyrlpc0h4y4m735yc3avqqjajz1rl24lm";
+ };
+
+ # Found here: https://build.opensuse.org/package/view_file/science/octave-forge-fits/octave-forge-fits.spec?expand=1
+ patchPhase = ''
+ sed -i -s -e 's/D_NINT/octave::math::x_nint/g' src/*.cc
+ '';
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ hdf5
+ ];
+
+ propagatedBuildInputs = [
+ cfitsio
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/fits/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Functions for reading, and writing FITS (Flexible Image Transport System) files using cfitsio";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/fpl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/fpl/default.nix
new file mode 100644
index 0000000000..e5b276c0c2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/fpl/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "fpl";
+ version = "1.3.5";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0cbpahn9flrv9ppp5xakhwh8vyyy7wzlsz22i3s93yqg9q2bh4ys";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/fpl/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Collection of routines to export data produced by Finite Elements or Finite Volume Simulations in formats used by some visualization programs";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
new file mode 100644
index 0000000000..5cb567b2bb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "fuzzy-logic-toolkit";
+ version = "0.4.5";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0cs1xh594h1psdinicxrsvm27gzax5jja7bjk4sl3kk2hv24mhml";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/fuzzy-logic-toolkit/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "A mostly MATLAB-compatible fuzzy logic toolkit for Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix
new file mode 100644
index 0000000000..a5265a4ce4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "ga";
+ version = "0.10.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0s5azn4n174avlmh5gw21zfqfkyxkzn4v09q4l9swv7ldmg3mirv";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/ga/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Genetic optimization code";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix
new file mode 100644
index 0000000000..52ad9af93b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, pkg-config
+, nettle
+}:
+
+buildOctavePackage rec {
+ pname = "general";
+ version = "2.1.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0jmvczssqz1aa665v9h8k9cchb7mg3n9af6b5kh9b2qcjl4r9l7v";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ nettle
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/general/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "General tools for Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/generate_html/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/generate_html/default.nix
new file mode 100644
index 0000000000..83f3a65bed
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/generate_html/default.nix
@@ -0,0 +1,27 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "generate_html";
+ version = "0.3.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1ai4h7jf9fqi7w565iprzylsh94pg4rhyf51hfj9kfdgdpb1abfs";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/generate_html/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Provides functions for generating HTML pages that contain the help texts for a set of functions";
+ longDescription = ''
+ This package provides functions for generating HTML pages that contain
+ the help texts for a set of functions. The package is designed to be as
+ general as possible, but also contains convenience functions for generating
+ a set of pages for entire packages.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/geometry/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/geometry/default.nix
new file mode 100644
index 0000000000..b4bf57262f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/geometry/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, matgeom
+}:
+
+buildOctavePackage rec {
+ pname = "geometry";
+ version = "4.0.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1zmd97xir62fr5v57xifh2cvna5fg67h9yb7bp2vm3ll04y41lhs";
+ };
+
+ requiredOctavePackages = [
+ matgeom
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/geometry/index.html";
+ license = with licenses; [ gpl3Plus boost ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Library for extending MatGeom functionality";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix
new file mode 100644
index 0000000000..5922c015db
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/gsl/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, gsl
+}:
+
+buildOctavePackage rec {
+ pname = "gsl";
+ version = "2.1.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1lvfxbqmw8h1nlrxmvrl6j4xffmbzxfhdpxz3vrc6lg2g4jwaa6h";
+ };
+
+ buildInputs = [
+ gsl
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/gsl/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Octave bindings to the GNU Scientific Library";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix
new file mode 100644
index 0000000000..08c4305999
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix
@@ -0,0 +1,32 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, libv4l
+, fltk
+}:
+
+buildOctavePackage rec {
+ pname = "image-acquisition";
+ version = "0.2.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1amp6npkddnnz2i5rm6gvn65qrbn0nxzl2cja3dvc2xqg396wrhh";
+ };
+
+ buildInputs = [
+ libv4l
+ fltk
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/image-acquisition/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Functions to capture images from connected devices";
+ longDescription = ''
+ The Octave-forge Image Aquisition package provides functions to
+ capture images from connected devices. Currently only v4l2 is supported.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/image/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/image/default.nix
new file mode 100644
index 0000000000..8bff55fadc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/image/default.nix
@@ -0,0 +1,27 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "image";
+ version = "2.12.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1d3kqhbkq9acc29k42fcilfmykk9a0r321mvk46l5iibc7nqrmg7";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/image/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Functions for processing images";
+ longDescription = ''
+ The Octave-forge Image package provides functions for processing
+ images. The package also provides functions for feature extraction,
+ image statistics, spatial and geometric transformations, morphological
+ operations, linear filtering, and much more.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix
new file mode 100644
index 0000000000..51c8f300cc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "instrument-control";
+ version = "0.6.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0vckax6rx5v3fq5j6kb6n39a5zas9i24x4wvmjlhc8xbykkg5nkk";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/instrument-control/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Low level I/O functions for serial, i2c, spi, parallel, tcp, gpib, vxi11, udp and usbtmc interfaces";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/interval/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/interval/default.nix
new file mode 100644
index 0000000000..0891a61438
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/interval/default.nix
@@ -0,0 +1,39 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, mpfr
+}:
+
+buildOctavePackage rec {
+ pname = "interval";
+ version = "3.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0a0sz7b4y53qgk1xr4pannn4w7xiin2pf74x7r54hrr1wf4abp20";
+ };
+
+ propagatedBuildInputs = [
+ mpfr
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/interval/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Interval arithmetic to evaluate functions over subsets of their domain";
+ longDescription = ''
+ The interval package for real-valued interval arithmetic allows one to
+ evaluate functions over subsets of their domain. All results are verified,
+ because interval computations automatically keep track of any errors.
+
+ These concepts can be used to handle uncertainties, estimate arithmetic
+ errors and produce reliable results. Also it can be applied to
+ computer-assisted proofs, constraint programming, and verified computing.
+
+ The implementation is based on interval boundaries represented by
+ binary64 numbers and is conforming to IEEE Std 1788-2015, IEEE standard
+ for interval arithmetic.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/io/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/io/default.nix
new file mode 100644
index 0000000000..57058c5f95
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/io/default.nix
@@ -0,0 +1,32 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, enableJava
+, jdk
+, unzip
+}:
+
+buildOctavePackage rec {
+ pname = "io";
+ version = "2.6.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "044y8lfp93fx0592mv6x2ss0nvjkjgvlci3c3ahav76pk1j3rikb";
+ };
+
+ buildInputs = [
+ (lib.optional enableJava jdk)
+ ];
+
+ propagatedBuildInputs = [
+ unzip
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/io/index.html";
+ license = with licenses; [ gpl3Plus bsd2 ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Input/Output in external formats";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix
new file mode 100644
index 0000000000..d1f882904d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix
@@ -0,0 +1,54 @@
+{ buildOctavePackage
+, lib
+, fetchgit
+, automake
+, autoconf
+, autoconf-archive
+, parallel
+}:
+
+buildOctavePackage rec {
+ pname = "level-set";
+ version = "2019-04-13";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/octave/${pname}";
+ rev = "dbf46228a7582eef4fe5470fd00bc5b421dd33a5";
+ sha256 = "14qwa4j24m2j7njw8gbagkgmp040h6k0h7kyrrzgb9y0jm087qkl";
+ fetchSubmodules = false;
+ };
+
+ # The monstrosity of a regex below is to ensure that only error() calls are
+ # corrected to have a %s format specifier. However, logic_error() also
+ # exists, (a simple regex also matches that), but logic_error() doesn't
+ # require a format specifier. So, this regex was born to handle that...
+ patchPhase = ''
+ substituteInPlace build.sh --replace "level-set-0.3.1" "${pname}-${version}" \
+ --replace "\`pwd\`" '/build'
+ sed -i -E 's#[^[:graph:]]error \(# error \(\"%s\", #g' src/*.cpp
+ '';
+
+ nativeBuildInputs = [
+ automake
+ autoconf
+ autoconf-archive
+ ];
+
+ requiredOctavePackages = [
+ parallel
+ ];
+
+ preBuild = ''
+ mkdir -p $out
+ source ./build.sh
+ cd -
+ '';
+
+ meta = with lib; {
+ name = "Level Set";
+ homepage = "https://octave.sourceforge.io/level-set/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/linear-algebra/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/linear-algebra/default.nix
new file mode 100644
index 0000000000..18818c1db6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/linear-algebra/default.nix
@@ -0,0 +1,22 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "linear-algebra";
+ version = "2.2.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/linear-algebra/index.html";
+ license = with licenses; [ gpl3Plus lgpl3Plus ];
+ # They claim to have a FreeBSD license, but none of their code seems to have it.
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Additional linear algebra code, including matrix functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/lssa/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/lssa/default.nix
new file mode 100644
index 0000000000..f737c104f3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/lssa/default.nix
@@ -0,0 +1,27 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "lssa";
+ version = "0.1.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "10h9lzsi7pqh93i7y50b618g05fnbw9n0i505bz5kz4avfa990zh";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/lssa/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Tools to compute spectral decompositions of irregularly-spaced time series";
+ longDescription = ''
+ A package implementing tools to compute spectral decompositions of
+ irregularly-spaced time series. Currently includes functions based off
+ the Lomb-Scargle periodogram and Adolf Mathias' implementation for R
+ and C.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix
new file mode 100644
index 0000000000..505670f629
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix
@@ -0,0 +1,54 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, fftw
+, fftwSinglePrec
+, fftwFloat
+, fftwLongDouble
+, lapack
+, blas
+, portaudio
+, jdk
+}:
+
+buildOctavePackage rec {
+ pname = "ltfat";
+ version = "2.3.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0gghh5a4w649ff776wvidfvqas87m0n7rqs960pid1d11bnyqqrh";
+ };
+
+ patches = [
+ # Fixes a syntax error with performing multiplication.
+ ./syntax-error.patch
+ ];
+
+ buildInputs = [
+ fftw
+ fftwSinglePrec
+ fftwFloat
+ fftwLongDouble
+ lapack
+ blas
+ portaudio
+ jdk
+ ];
+
+ meta = with lib; {
+ name = "The Large Time-Frequency Analysis Toolbox";
+ homepage = "https://octave.sourceforge.io/ltfat/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Toolbox for working with time-frequency analysis, wavelets and signal processing";
+ longDescription = ''
+ The Large Time/Frequency Analysis Toolbox (LTFAT) is a Matlab/Octave
+ toolbox for working with time-frequency analysis, wavelets and signal
+ processing. It is intended both as an educational and a computational
+ tool. The toolbox provides a large number of linear transforms including
+ Gabor and wavelet transforms along with routines for constructing windows
+ (filter prototypes) and routines for manipulating coefficients.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/syntax-error.patch b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/syntax-error.patch
new file mode 100644
index 0000000000..732030b704
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/syntax-error.patch
@@ -0,0 +1,15 @@
+diff --git a/inst/nonstatgab/nsdgt.m b/inst/nonstatgab/nsdgt.m
+index ac53963..81656cb 100644
+--- a/inst/nonstatgab/nsdgt.m
++++ b/inst/nonstatgab/nsdgt.m
+@@ -149,8 +149,8 @@ for ii = 1:N
+ col = ceil(Lg/M(ii));
+
+ temp = zeros(col*M(ii),W,assert_classname(f,g{1}));
+- temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@ ...
+- times,f(win_range,:),g{ii}(idx));
++ temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@times, ...
++ f(win_range,:),g{ii}(idx));
+
+ temp = reshape(temp,M(ii),col,W);
+ X = squeeze(fft(sum(temp,2)));
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/mapping/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/mapping/default.nix
new file mode 100644
index 0000000000..26cea27a72
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/mapping/default.nix
@@ -0,0 +1,28 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, io # >= 2.2.7
+, geometry # >= 4.0.0
+}:
+
+buildOctavePackage rec {
+ pname = "mapping";
+ version = "1.4.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0wj0q1rkrqs4qgpjh4vn9kcpdh94pzr6v4jc1vcrjwkp87yjv8c0";
+ };
+
+ requiredOctavePackages = [
+ io
+ geometry
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/mapping/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Simple mapping and GIS .shp .dxf and raster file functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix
new file mode 100644
index 0000000000..b8607cf5df
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "matgeom";
+ version = "1.2.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "05xfmlh1k3mhq8yag7gr8q1ysl1s43vm46fr1i3gcg9b1kkwi8by";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/matgeom/index.html";
+ license = with licenses; [ bsd2 gpl3Plus ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Geometry toolbox for 2D/3D geometric computing";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix
new file mode 100644
index 0000000000..74c3879aa9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/miscellaneous/default.nix
@@ -0,0 +1,34 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+# Build-time dependencies
+, mlterm
+, ncurses # >= 5
+, units
+}:
+
+buildOctavePackage rec {
+ pname = "miscellaneous";
+ version = "1.3.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "10n107njz24ln7v9a1l3dkh7s7vd6qwgbinrj1nl4wflxsir4l9k";
+ };
+
+ buildInputs = [
+ mlterm
+ ncurses
+ ];
+
+ propagatedBuildInputs = [
+ units
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/miscellaneous/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Miscellaneous tools that don't fit somewhere else";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/msh/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/msh/default.nix
new file mode 100644
index 0000000000..a4e876c812
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/msh/default.nix
@@ -0,0 +1,56 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+# Octave Dependencies
+, splines
+# Other Dependencies
+, gmsh
+, gawk
+, pkg-config
+, dolfin
+, autoconf, automake
+}:
+
+buildOctavePackage rec {
+ pname = "msh";
+ version = "1.0.10";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1mb5qrp9y1w1cbzrd9v84430ldy57ca843yspnrgbcqpxyyxbgfz";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ autoconf automake
+ dolfin
+ ];
+
+ buildInputs = [
+ dolfin
+ ];
+
+ propagatedBuildInputs = [
+ gmsh
+ gawk
+ dolfin
+ ];
+
+ requiredOctavePackages = [
+ splines
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/msh/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Create and manage triangular and tetrahedral meshes for Finite Element or Finite Volume PDE solvers";
+ longDescription = ''
+ Create and manage triangular and tetrahedral meshes for Finite Element or
+ Finite Volume PDE solvers. Use a mesh data structure compatible with
+ PDEtool. Rely on gmsh for unstructured mesh generation.
+ '';
+ # Not technically broken, but missing some functionality.
+ # dolfin needs to be its own stand-alone library for the last tests to pass.
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/mvn/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/mvn/default.nix
new file mode 100644
index 0000000000..06fd190560
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/mvn/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "mvn";
+ version = "1.1.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "00w69hxqnqdm3744z6p7gvzci44a3gy228x6bgq3xf5n3jwicnmg";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/mvn/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Multivariate normal distribution clustering and utility functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/nan/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/nan/default.nix
new file mode 100644
index 0000000000..a0517db714
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/nan/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, blas
+}:
+
+buildOctavePackage rec {
+ pname = "nan";
+ version = "3.5.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0bp8zl50f8qj5sivl88kjdswm035v4li33fiq3v1gmh0pvgbcw7a";
+ };
+
+ buildInputs = [
+ blas
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/nan/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "A statistics and machine learning toolbox for data with and w/o missing values";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ncarray/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ncarray/default.nix
new file mode 100644
index 0000000000..10db554c87
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/ncarray/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, netcdf
+, statistics
+}:
+
+buildOctavePackage rec {
+ pname = "ncarray";
+ version = "1.0.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0v96iziikvq2v7hczhbfs9zmk49v99kn6z3lgibqqpwam175yqgd";
+ };
+
+ buildInputs = [
+ netcdf
+ ];
+
+ requiredOctavePackages = [
+ statistics
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/ncarray/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Access a single or a collection of NetCDF files as a multi-dimensional array";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/netcdf/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/netcdf/default.nix
new file mode 100644
index 0000000000..9292da6918
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/netcdf/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, netcdf
+}:
+
+buildOctavePackage rec {
+ pname = "netcdf";
+ version = "1.0.14";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1wdwl76zgcg7kkdxjfjgf23ylzb0x4dyfliffylyl40g6cjym9lf";
+ };
+
+ buildInputs = [
+ netcdf
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/netcdf/index.html";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "A NetCDF interface for Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix
new file mode 100644
index 0000000000..e5e26d7bb9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix
@@ -0,0 +1,30 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "nurbs";
+ version = "1.3.13";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0zkyldm63pc3pcal3yvj6af24cvpjvv9qfhf0ihhwcsh4w3yggyv";
+ };
+
+ # Has been fixed in more recent commits, but has not been pushed out as a
+ # new version yet.
+ # The sed changes allow nurbs to compile.
+ patchPhase = ''
+ sed -i s/feval/octave::feval/g src/*.cc
+ sed -i s/is_real_type/isreal/g src/*.cc
+ sed -i s/is_cell/iscell/g src/*.cc
+ '';
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/nurbs/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Collection of routines for the creation, and manipulation of Non-Uniform Rational B-Splines (NURBS), based on the NURBS toolbox by Mark Spink";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix
new file mode 100644
index 0000000000..0e47160ad0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "ocl";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0ayi5x9zk9p4zm0qsr3i94lyp5468c9d1a7mqrqjqpdvkhrw0xnm";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/ocl/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Use OpenCL for parallelization";
+ longDescription = ''
+ Package using OpenCL for parallelization, mostly suitable to
+ Single-Instruction-Multiple-Data (SIMD) computations, selectively
+ using available OpenCL hardware and drivers.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/octclip/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/octclip/default.nix
new file mode 100644
index 0000000000..43bcfcd7d8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/octclip/default.nix
@@ -0,0 +1,29 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "octclip";
+ version = "2.0.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "05ijh3izgfaan84n6zp690nap9vnz0zicjd0cgvd1c6askm7vxql";
+ };
+
+ # The only compilation problem is that no formatting specifier was provided
+ # for the error function. Because errorText is a string, I provide such a
+ # formatting specifier.
+ patchPhase = ''
+ sed -i s/"error(errorText)"/"error(\"%s\", errorText)"/g src/*.cc
+ '';
+
+ meta = with lib; {
+ name = "GNU Octave Clipping Polygons Tool";
+ homepage = "https://octave.sourceforge.io/octclip/index.html";
+ license = with licenses; [ gpl3Plus ]; # modified BSD?
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Perform boolean operations with polygons using the Greiner-Hormann algorithm";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/octproj/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/octproj/default.nix
new file mode 100644
index 0000000000..74596c015f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/octproj/default.nix
@@ -0,0 +1,32 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, proj # >= 6.3.0
+}:
+
+buildOctavePackage rec {
+ pname = "octproj";
+ version = "2.0.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1mb8gb0r8kky47ap85h9qqdvs40mjp3ya0nkh45gqhy67ml06paq";
+ };
+
+ # The sed changes below allow for the package to be compiled.
+ patchPhase = ''
+ sed -i s/"error(errorText)"/"error(\"%s\", errorText)"/g src/*.cc
+ sed -i s/"warning(errorText)"/"warning(\"%s\", errorText)"/g src/*.cc
+ '';
+
+ propagatedBuildInputs = [
+ proj
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/octproj/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/optics/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/optics/default.nix
new file mode 100644
index 0000000000..1324c6cd4b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/optics/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "optics";
+ version = "0.1.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1d9z82241a1zmr8m1vgw10pyk81vn0q4dcyx7d05pigfn5gykrgc";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/optics/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Functions covering various aspects of optics";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/optim/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/optim/default.nix
new file mode 100644
index 0000000000..b9561faafb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/optim/default.nix
@@ -0,0 +1,36 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, struct
+, statistics
+, lapack
+, blas
+}:
+
+buildOctavePackage rec {
+ pname = "optim";
+ version = "1.6.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1z2h8gy99glxh5qi3r22am2vdirlbklkq0lx4r8jrx1ak7awh47r";
+ };
+
+ buildInputs = [
+ lapack
+ blas
+ ];
+
+ requiredOctavePackages = [
+ struct
+ statistics
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/optim/index.html";
+ license = with licenses; [ gpl3Plus publicDomain ];
+ # Modified BSD code seems removed
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Non-linear optimization toolkit";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/optiminterp/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/optiminterp/default.nix
new file mode 100644
index 0000000000..8409a10104
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/optiminterp/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, gfortran
+}:
+
+buildOctavePackage rec {
+ pname = "optiminterp";
+ version = "0.3.6";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "05nzj2jmrczbnsr64w2a7kww19s6yialdqnsbg797v11ii7aiylc";
+ };
+
+ nativeBuildInputs = [
+ gfortran
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/optiminterp/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "An optimal interpolation toolbox for octave";
+ longDescription = ''
+ An optimal interpolation toolbox for octave. This package provides
+ functions to perform a n-dimensional optimal interpolations of
+ arbitrarily distributed data points.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix
new file mode 100644
index 0000000000..0ea1d4d9df
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix
@@ -0,0 +1,36 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, struct
+, gnutls
+, pkg-config
+}:
+
+buildOctavePackage rec {
+ pname = "parallel";
+ version = "4.0.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0wmpak01rsccrnb8is7fsjdlxw15157sqyf9s2fabr16yykfmvi8";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ gnutls
+ ];
+
+ requiredOctavePackages = [
+ struct
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/parallel/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Parallel execution package";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/quaternion/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/quaternion/default.nix
new file mode 100644
index 0000000000..4681b69968
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/quaternion/default.nix
@@ -0,0 +1,29 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "quaternion";
+ version = "2.4.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "040ncksf0xz32qmi4484xs3q01nappxrsvwwa60g04yjy7c4sbac";
+ };
+
+ # Octave replaced many of the is_thing_type check function with isthing.
+ # The patch changes the occurrences of the old functions.
+ patchPhase = ''
+ sed -i s/is_numeric_type/isnumeric/g src/*.cc
+ sed -i s/is_real_type/isreal/g src/*.cc
+ sed -i s/is_bool_type/islogical/g src/*.cc
+ '';
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/quaternion/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Quaternion package for GNU Octave, includes a quaternion class with overloaded operators";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/queueing/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/queueing/default.nix
new file mode 100644
index 0000000000..75b3e67e35
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/queueing/default.nix
@@ -0,0 +1,32 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "queueing";
+ version = "1.2.7";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1yhw277i1qgmddf6wbfb6a4zrfhvplkmfr20q1l15z4xi8afnm6d";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/queueing/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Provides functions for queueing networks and Markov chains analysis";
+ longDescription = ''
+ The queueing package provides functions for queueing networks and Markov
+ chains analysis. This package can be used to compute steady-state
+ performance measures for open, closed and mixed networks with single or
+ multiple job classes. Mean Value Analysis (MVA), convolution, and various
+ bounding techniques are implemented. Furthermore, several transient and
+ steady-state performance measures for Markov chains can be computed, such
+ as state occupancy probabilities, mean time to absorption, time-averaged
+ sojourn times and so forth. Discrete- and continuous-time Markov chains
+ are supported.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/signal/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/signal/default.nix
new file mode 100644
index 0000000000..ae1339ca27
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/signal/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, control
+}:
+
+buildOctavePackage rec {
+ pname = "signal";
+ version = "1.4.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1amfh7ifjqxz2kr34hgq2mq8ygmd5j3cjdk1k2dk6qcgic7n0y6r";
+ };
+
+ requiredOctavePackages = [
+ control
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/signal/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Signal processing tools, including filtering, windowing and display functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix
new file mode 100644
index 0000000000..688bd6a0e9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "sockets";
+ version = "1.2.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "18f1zpqcf6h9b4fb0x2c5nvc3mvgj1141f1s8d9gnlhlrjlq8vqg";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/sockets/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Socket functions for networking from within octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix
new file mode 100644
index 0000000000..b8147f8d28
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix
@@ -0,0 +1,28 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, librsb
+}:
+
+buildOctavePackage rec {
+ pname = "sparsersb";
+ version = "1.0.8";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
+ };
+
+ buildInputs = [
+ librsb
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/sparsersb/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
+ # Mark this way until KarlJoad builds librsb specifically for this package.
+ broken = true;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix
new file mode 100644
index 0000000000..69d5e46147
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "splines";
+ version = "1.3.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "16wisph8axc5xci0h51zj0y0x2wj6c9zybi2sjpb9v8z9dagjjqa";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/splines/index.html";
+ license = with licenses; [ gpl3Plus publicDomain ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Additional spline functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix
new file mode 100644
index 0000000000..61133ec49e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, io
+}:
+
+buildOctavePackage rec {
+ pname = "statistics";
+ version = "1.4.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0iv2hw3zp7h69n8ncfjfgm29xaihdl5gp2slcw1yf23mhd7q2xkr";
+ };
+
+ requiredOctavePackages = [
+ io
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/statistics/index.html";
+ license = with licenses; [ gpl3Plus publicDomain ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Additional statistics functions for Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix
new file mode 100644
index 0000000000..16ac7b7d03
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix
@@ -0,0 +1,32 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "stk";
+ version = "2.6.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1rqndfankwlwm4igw3xqpnrrl749zz1d5pjzh1qbfns7ixwrm19a";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/stk/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "STK is a (not so) Small Toolbox for Kriging";
+ longDescription = ''
+ The STK is a (not so) Small Toolbox for Kriging. Its primary focus is on
+ the interpolation/regression technique known as kriging, which is very
+ closely related to Splines and Radial Basis Functions, and can be
+ interpreted as a non-parametric Bayesian method using a Gaussian Process
+ (GP) prior. The STK also provides tools for the sequential and non-sequential
+ design of experiments. Even though it is, currently, mostly geared towards
+ the Design and Analysis of Computer Experiments (DACE), the STK can be
+ useful for other applications areas (such as Geostatistics, Machine
+ Learning, Non-parametric Regression, etc.).
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix
new file mode 100644
index 0000000000..7b556272f5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix
@@ -0,0 +1,37 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, pcre
+}:
+
+buildOctavePackage rec {
+ pname = "strings";
+ version = "1.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1b0ravfvq3bxd0w3axjfsx13mmmkifmqz6pfdgyf2s8vkqnp1qng";
+ };
+
+ buildInputs = [
+ pcre
+ ];
+
+ # The gripes library no longer exists.
+ # https://build.opensuse.org/package/view_file/openSUSE:Backports:SLE-15-SP3/octave-forge-strings/octave-forge-strings.spec
+ # toascii is a deprecated function. Has been fixed in recent commits, but has
+ # not been released yet.
+ # https://sourceforge.net/p/octave/strings/ci/2db1dbb75557eef94605cb4ac682783ab78ac8d8/
+ patchPhase = ''
+ sed -i -s -e 's/gripes.h/errwarn.h/' -e 's/gripe_/err_/g' src/*.cc
+ sed -i s/toascii/double/g inst/*.m
+ '';
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/strings/index.html";
+ license = licenses.gpl3Plus;
+ # Claims to have a freebsd license, but I found none.
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Additional functions for manipulation and analysis of strings";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/struct/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/struct/default.nix
new file mode 100644
index 0000000000..a69a8e4b6e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/struct/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "struct";
+ version = "1.0.16";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0gx20r126f0ccl4yflp823xi77p8fh4acx1fv0mmcsglmx4c4vgm";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/struct/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Additional structure manipulation functions";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix
new file mode 100644
index 0000000000..e40d27e7c3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix
@@ -0,0 +1,46 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+# Octave's Python (Python 3)
+, python
+# Needed only to get the correct version of sympy needed
+, python2Packages
+}:
+
+let
+ # Need to use sympy 1.5.1 for https://github.com/cbm755/octsympy/issues/1023
+ # It has been addressed, but not merged yet.
+ # In the meantime, we create a Python environment with Python 3, its mpmath
+ # version and sympy 1.5 from python2Packages.
+ pythonEnv = (let
+ overridenPython = let
+ packageOverrides = self: super: {
+ sympy = super.sympy.overridePythonAttrs (old: rec {
+ version = python2Packages.sympy.version;
+ src = python2Packages.sympy.src;
+ });
+ };
+ in python.override {inherit packageOverrides; self = overridenPython; };
+ in overridenPython.withPackages (ps: [
+ ps.sympy
+ ps.mpmath
+ ]));
+
+in buildOctavePackage rec {
+ pname = "symbolic";
+ version = "2.9.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1jr3kg9q6r4r4h3hiwq9fli6wsns73rqfzkrg25plha9195c97h8";
+ };
+
+ propagatedBuildInputs = [ pythonEnv ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/symbolic/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Adds symbolic calculation features to GNU Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix
new file mode 100644
index 0000000000..b21ef0a5f5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix
@@ -0,0 +1,33 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+# Octave dependencies
+, signal # >= 1.3.0
+# Build dependencies
+, gfortran
+}:
+
+buildOctavePackage rec {
+ pname = "tisean";
+ version = "0.2.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0nc2d9h91glxzmpizxdrc2dablw4bqhqhzs37a394c36myk4xjdv";
+ };
+
+ nativeBuildInputs = [
+ gfortran
+ ];
+
+ requiredOctavePackages = [
+ signal
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/tisean/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Port of TISEAN 3.0.1";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/tsa/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/tsa/default.nix
new file mode 100644
index 0000000000..a6320f0fc0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/tsa/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, nan # > 3.0.0
+}:
+
+buildOctavePackage rec {
+ pname = "tsa";
+ version = "4.6.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0p2cjszzjwhp4ih3q3r67qnikgxc0fwxc12p3727jbdvzq2h10mn";
+ };
+
+ requiredOctavePackages = [
+ nan
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/tsa/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Stochastic concepts and maximum entropy methods for time series analysis";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/vibes/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/vibes/default.nix
new file mode 100644
index 0000000000..f60a5d7339
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/vibes/default.nix
@@ -0,0 +1,39 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, vibes
+}:
+
+buildOctavePackage rec {
+ pname = "vibes";
+ version = "0.2.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1zn86rcsjkqg67hphz5inxc5xkgr18sby8za68zhppc2z7pd91ng";
+ };
+
+ buildInputs = [
+ vibes
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/vibes/index.html";
+ license = with licenses; [ gpl3Plus mit ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Easily display results (boxes, pavings) from interval methods";
+ longDescription = ''
+ The VIBes API allows one to easily display results (boxes, pavings) from
+ interval methods. VIBes consists in two parts: (1) the VIBes application
+ that features viewing, annotating and exporting figures, and (2) the
+ VIBes API that enables your program to communicate with the viewer in order
+ to draw figures. This package integrates the VIBes API into Octave. The
+ VIBes application is required for operation and must be installed
+ seperately. Data types from third-party interval arithmetic libraries for
+ Octave are also supported.
+ '';
+ # Marked this way until KarlJoad gets around to packaging the vibes program.
+ # https://github.com/ENSTABretagneRobotics/VIBES
+ broken = true;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix
new file mode 100644
index 0000000000..8467da98be
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/video/default.nix
@@ -0,0 +1,31 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, pkg-config
+, ffmpeg
+}:
+
+buildOctavePackage rec {
+ pname = "video";
+ version = "2.0.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "0s6j3c4dh5nsbh84s7vnd2ajcayy1gn07b4fcyrcynch3wl28mrv";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [
+ ffmpeg
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/video/index.html";
+ license = with licenses; [ gpl3Plus bsd3 ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/vrml/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/vrml/default.nix
new file mode 100644
index 0000000000..e46e621b80
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/vrml/default.nix
@@ -0,0 +1,41 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+# Octave dependencies
+, linear-algebra
+, miscellaneous
+, struct
+, statistics
+# Runtime dependencies
+, freewrl
+}:
+
+buildOctavePackage rec {
+ pname = "vrml";
+ version = "1.0.13";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "1mx93k150agd27mbzvds13v9z0x36j68hwpdvlvjmcl2fga5fly4";
+ };
+
+ propagatedBuildInputs = [
+ freewrl
+ ];
+
+ requiredOctavePackages = [
+ linear-algebra
+ miscellaneous
+ struct
+ statistics
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/vrml/index.html";
+ license = with licenses; [ gpl3Plus fdl12Plus ];
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "3D graphics using VRML";
+ # Marked this way until KarlJoad gets freewrl as a runtime dependency.
+ broken = true;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix
new file mode 100644
index 0000000000..274ba1e3b7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix
@@ -0,0 +1,21 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+}:
+
+buildOctavePackage rec {
+ pname = "windows";
+ version = "1.5.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "05bsf3q816b9vwgmjdm761ybhmk8raq6dzxqvd11brma0granx3a";
+ };
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/windows/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "Provides COM interface and additional functionality on Windows";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/zeromq/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/zeromq/default.nix
new file mode 100644
index 0000000000..7a8f7f6d16
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/octave-modules/zeromq/default.nix
@@ -0,0 +1,26 @@
+{ buildOctavePackage
+, lib
+, fetchurl
+, zeromq
+}:
+
+buildOctavePackage rec {
+ pname = "zeromq";
+ version = "1.5.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+ sha256 = "18h1039ri7dr37jv20cvj5vhw7b57frrda0hhbvlgixinbqmn9j7";
+ };
+
+ propagatedBuildInputs = [
+ zeromq
+ ];
+
+ meta = with lib; {
+ homepage = "https://octave.sourceforge.io/zeromq/index.html";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ KarlJoad ];
+ description = "ZeroMQ bindings for GNU Octave";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix
index 4f6dc5d9dd..8b19c9404f 100644
--- a/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix
+++ b/third_party/nixpkgs/pkgs/development/perl-modules/ham/default.nix
@@ -13,7 +13,7 @@ buildPerlPackage {
outputs = [ "out" ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ openssh GitRepository URI XMLMini ];
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix
index 8d6bba3e46..8ff61920ac 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "box";
version = "2.7.5";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/1.x.nix
similarity index 69%
rename from third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix
rename to third_party/nixpkgs/pkgs/development/php-packages/composer/1.x.nix
index 5b0234fa7a..4660da9532 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/1.x.nix
@@ -1,29 +1,29 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
- version = "2.0.9";
+ version = "1.10.15";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
- sha256 = "sha256-JPqlvIB+OZ8y6aIaM/u1sGht+ciFDvq+LAR8LM+5+cw=";
+ sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6";
};
dontUnpack = true;
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
- --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+ --prefix PATH : ${lib.makeBinPath [ unzip ]}
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "Dependency Manager for PHP";
license = licenses.mit;
homepage = "https://getcomposer.org/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix
index 37c983507c..d704b5f9a2 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix
@@ -1,29 +1,29 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
- version = "1.10.15";
+ version = "2.0.11";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
- sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6";
+ sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc=";
};
dontUnpack = true;
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
- --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+ --prefix PATH : ${lib.makeBinPath [ unzip ]}
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "Dependency Manager for PHP";
license = licenses.mit;
homepage = "https://getcomposer.org/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix
index 4ec7184691..3566c7916e 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs, php }:
+{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }:
let
pname = "couchbase";
version = "2.6.2";
@@ -6,7 +6,7 @@ in
buildPecl {
inherit pname version;
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "couchbase";
repo = "php-couchbase";
rev = "v${version}";
@@ -16,12 +16,12 @@ buildPecl {
configureFlags = [ "--with-couchbase" ];
broken = lib.versionAtLeast php.version "8.0";
- buildInputs = with pkgs; [ libcouchbase zlib ];
+ buildInputs = [ libcouchbase zlib ];
internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
peclDeps = [ php.extensions.igbinary ];
patches = [
- (pkgs.writeText "php-couchbase.patch" ''
+ (writeText "php-couchbase.patch" ''
--- a/config.m4
+++ b/config.m4
@@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then
@@ -29,7 +29,7 @@ buildPecl {
else
AC_MSG_CHECKING(for libcouchbase in default path)
- for i in /usr/local /usr; do
- + for i in ${pkgs.libcouchbase}; do
+ + for i in ${libcouchbase}; do
if test -r $i/include/libcouchbase/couchbase.h; then
LIBCOUCHBASE_DIR=$i
AC_MSG_RESULT(found in $i)
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
index 940150ac98..420f2385e5 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs, php }:
+{ buildPecl, lib, php, pkg-config, openssl, libevent }:
buildPecl {
pname = "event";
@@ -6,7 +6,7 @@ buildPecl {
sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
configureFlags = [
- "--with-event-libevent-dir=${pkgs.libevent.dev}"
+ "--with-event-libevent-dir=${libevent.dev}"
"--with-event-core"
"--with-event-extra"
"--with-event-pthreads"
@@ -18,11 +18,11 @@ buildPecl {
':'
'';
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; [ openssl libevent ];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl libevent ];
internalDeps = [ php.extensions.sockets ];
- meta = with pkgs.lib; {
+ meta = with lib; {
description = ''
This is an extension to efficiently schedule I/O, time and signal based
events using the best I/O notification mechanism available for specific platform.
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
index f697b44aff..ebff9b00f0 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, fetchpatch, lib, pkgs, pcre' }:
+{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }:
buildPecl {
pname = "imagick";
@@ -19,8 +19,8 @@ buildPecl {
})
];
- configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ];
- nativeBuildInputs = [ pkgs.pkg-config ];
+ configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre' ];
meta.maintainers = lib.teams.php.members;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
index 11c6e50acc..9a5a96e15c 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs }:
+{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
let
pname = "maxminddb";
version = "1.10.0";
@@ -6,17 +6,17 @@ in
buildPecl {
inherit pname version;
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
};
- buildInputs = [ pkgs.libmaxminddb ];
+ buildInputs = [ libmaxminddb ];
sourceRoot = "source/ext";
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix
index 3eb1da463b..4880e08e06 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, fetchgit, php, pkgs }:
+{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }:
let
pname = "memcached";
version = "3.1.5";
@@ -19,12 +19,12 @@ buildPecl {
];
configureFlags = [
- "--with-zlib-dir=${pkgs.zlib.dev}"
- "--with-libmemcached-dir=${pkgs.libmemcached}"
+ "--with-zlib-dir=${zlib.dev}"
+ "--with-libmemcached-dir=${libmemcached}"
];
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; [ cyrus_sasl zlib ];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ cyrus_sasl zlib ];
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
index 18bb515d15..95e51892f0 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix
@@ -1,4 +1,5 @@
-{ buildPecl, lib, pkgs, pcre' }:
+{ stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64
+, openssl, snappy, zlib, darwin }:
buildPecl {
pname = "mongodb";
@@ -6,15 +7,15 @@ buildPecl {
version = "1.9.0";
sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; [
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
cyrus_sasl
icu64
openssl
snappy
zlib
pcre'
- ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security;
+ ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix
index 697ad67402..eeaffb4b7f 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix
@@ -1,14 +1,14 @@
-{ buildPecl, lib, pkgs, version, sha256 }:
+{ buildPecl, lib, version, sha256, oracle-instantclient }:
buildPecl {
pname = "oci8";
inherit version sha256;
- buildInputs = [ pkgs.oracle-instantclient ];
- configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
+ buildInputs = [ oracle-instantclient ];
+ configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ];
postPatch = ''
- sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
+ sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
'';
meta.maintainers = lib.teams.php.members;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix
index 8305194670..e217edd29e 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs }:
+{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }:
let
pname = "pdlib";
version = "1.0.2";
@@ -6,15 +6,15 @@ in
buildPecl {
inherit pname version;
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "goodspb";
repo = "pdlib";
rev = "v${version}";
sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
};
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ (dlib.override { guiSupport = true; }) ];
meta = with lib; {
description = "A PHP extension for Dlib";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix
index ae01594444..d80944ada0 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs, php }:
+{ stdenv, buildPecl, lib, libiconv, unixODBC, php }:
buildPecl {
pname = "pdo_sqlsrv";
@@ -8,7 +8,7 @@ buildPecl {
internalDeps = [ php.extensions.pdo ];
- buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
+ buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
index c855b975e5..a142c69512 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
version = "2.18.2";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "A tool to automatically fix PHP coding standards issues";
license = licenses.mit;
homepage = "http://cs.sensiolabs.org/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix
index f479581fb2..50fd23540e 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchFromGitHub, pkgs, lib, php }:
+{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php }:
let
pname = "php-parallel-lint";
version = "1.0.0";
@@ -14,7 +14,7 @@ mkDerivation {
};
nativeBuildInputs = [
- pkgs.makeWrapper
+ makeWrapper
php.packages.composer
php.packages.box
];
@@ -31,7 +31,7 @@ mkDerivation {
--add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
license = licenses.bsd2;
homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php_excel/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php_excel/default.nix
index ab6d193fcd..8b83f558a5 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php_excel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php_excel/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, fetchurl, lib, pkgs }:
+{ buildPecl, fetchurl, lib, libxl }:
let
pname = "php_excel";
phpVersion = "php7";
@@ -12,12 +12,12 @@ buildPecl {
sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n";
};
- buildInputs = with pkgs; [ libxl ];
+ buildInputs = [ libxl ];
configureFlags = [
"--with-excel"
- "--with-libxl-incdir=${pkgs.libxl}/include_c"
- "--with-libxl-libdir=${pkgs.libxl}/lib"
+ "--with-libxl-incdir=${libxl}/include_c"
+ "--with-libxl-libdir=${libxl}/lib"
];
meta.maintainers = lib.teams.php.members;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix
index b58ba42a5d..da114a4d34 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, lib, php, makeWrapper }:
let
pname = "phpcbf";
version = "3.5.8";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpcbf/phpcbf.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "PHP coding standard beautifier and fixer";
license = licenses.bsd3;
homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix
index 0e8557c04e..d2053dbe9c 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpcs";
version = "3.5.8";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpcs/phpcs.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "PHP coding standard tool";
license = licenses.bsd3;
homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix
index fd7390498b..fde674701e 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpmd";
version = "2.8.2";
@@ -8,13 +8,13 @@ in
mkDerivation {
inherit pname version;
- src = pkgs.fetchurl {
+ src = fetchurl {
url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar";
sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb";
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -23,7 +23,7 @@ mkDerivation {
--add-flags "$out/libexec/phpmd/phpmd.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "PHP code quality analyzer";
license = licenses.bsd3;
homepage = "https://phpmd.org/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
index 8fc15a7b0b..5a7a856f3a 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
@@ -1,18 +1,18 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
- version = "0.12.78";
+ version = "0.12.79";
in
mkDerivation {
inherit pname version;
- src = pkgs.fetchurl {
+ src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc=";
+ sha256 = "sha256-H6JmjdJtcCrNvad0ZbJ73OdRXimeTIJMVPuk8K6X6v8=";
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/phpstan/phpstan.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "PHP Static Analysis Tool";
longDescription = ''
PHPStan focuses on finding errors in your code without actually
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix
index a7b2de240e..01160fc35f 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psalm";
version = "4.6.1";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
--add-flags "$out/libexec/psalm/psalm.phar"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "A static analysis tool for finding errors in PHP applications";
license = licenses.mit;
homepage = "https://github.com/vimeo/psalm";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
index 4c5f703d02..514706dc17 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, pkgs, lib, php }:
+{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psysh";
version = "0.10.4";
@@ -12,7 +12,7 @@ mkDerivation {
};
phases = [ "installPhase" ];
- nativeBuildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
@@ -21,7 +21,7 @@ mkDerivation {
wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}"
'';
- meta = with pkgs.lib; {
+ meta = with lib; {
description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP.";
license = licenses.mit;
homepage = "https://psysh.org/";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
index e5bdc2a229..0e78d3bbc9 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs, pcre' }:
+{ buildPecl, lib, rdkafka, pcre' }:
buildPecl {
pname = "rdkafka";
@@ -6,11 +6,11 @@ buildPecl {
version = "5.0.0";
sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs=";
- buildInputs = [ pkgs.rdkafka pcre' ];
+ buildInputs = [ rdkafka pcre' ];
postPhpize = ''
substituteInPlace configure \
- --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}'
+ --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${rdkafka}'
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix
index cf3f9569d3..0486db82cc 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix
@@ -1,14 +1,14 @@
-{ buildPecl, lib, pkgs }:
+{ buildPecl, lib, samba, pkg-config }:
buildPecl {
pname = "smbclient";
version = "1.0.5";
sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0=";
# TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66
- LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0";
+ LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0";
- nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = [ pkgs.samba ];
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ samba ];
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix
index 939be27671..4522129b2a 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs }:
+{ stdenv, buildPecl, lib, unixODBC, libiconv }:
buildPecl {
pname = "sqlsrv";
@@ -7,10 +7,8 @@ buildPecl {
sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a";
buildInputs = [
- pkgs.unixODBC
- ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
- pkgs.libiconv
- ];
+ unixODBC
+ ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
index 780bb8c908..56341be436 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix
@@ -3,8 +3,8 @@
buildPecl {
pname = "xdebug";
- version = "3.0.2";
- sha256 = "05sfgkw55ym7mg0b54l9x3i9598kf2bkp4z3sdl1hd31q3g4cv89";
+ version = "3.0.3";
+ sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI=";
doCheck = true;
checkTarget = "test";
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix
index 40e5a859f9..9bd30ff4e3 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pkgs }:
+{ buildPecl, lib, pkg-config, libyaml }:
buildPecl {
pname = "yaml";
@@ -6,9 +6,9 @@ buildPecl {
version = "2.2.1";
sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk=";
- configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];
+ configureFlags = [ "--with-yaml=${libyaml}" ];
- nativeBuildInputs = [ pkgs.pkg-config ];
+ nativeBuildInputs = [ pkg-config ];
meta.maintainers = lib.teams.php.members;
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
index d1ac191489..32a9dda6c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
@@ -15,6 +15,7 @@
, tzlocal
, funcsigs
, futures
+, setuptools
, isPy3k
}:
@@ -47,12 +48,15 @@ buildPythonPackage rec {
pytz
tzlocal
funcsigs
+ setuptools
] ++ lib.optional (!isPy3k) futures;
checkPhase = ''
py.test
'';
+ pythonImportsCheck = [ "apscheduler" ];
+
# Somehow it cannot find pytestcov
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
index 3cd211db75..2e740fcc2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
@@ -1,41 +1,75 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, curve25519-donna, ed25519
-, cryptography, ecdsa, zeroconf, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, cryptography
+, curve25519-donna
+, ecdsa
+, ed25519
+, fetchFromGitHub
+, h11
+, pytest-asyncio
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, zeroconf
+}:
buildPythonPackage rec {
pname = "HAP-python";
- version = "3.1.0";
+ version = "3.3.2";
+ disabled = pythonOlder "3.5";
# pypi package does not include tests
src = fetchFromGitHub {
owner = "ikalchev";
repo = pname;
rev = "v${version}";
- sha256 = "1qg38lfjby2xfm09chzc40a7i3b84kgyfs7g4xq8f5m8s39hg6d7";
+ sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg=";
};
- disabled = !isPy3k;
-
propagatedBuildInputs = [
- curve25519-donna
- ed25519
cryptography
+ curve25519-donna
ecdsa
+ ed25519
+ h11
zeroconf
];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytest-asyncio
+ pytest-timeout
+ pytestCheckHook
+ ];
disabledTests = [
- #disable tests needing network
- "test_persist"
- "test_setup_endpoints"
+ # Disable tests needing network
+ "camera"
+ "pair"
+ "test_async_subscribe_client_topic"
"test_auto_add_aid_mac"
- "test_service_callbacks"
- "test_send_events"
- "test_not_standalone_aid"
- "test_start_stop_async_acc"
+ "test_connection_management"
+ "test_crypto_failure_closes_connection"
+ "test_empty_encrypted_data"
"test_external_zeroconf"
- "test_start_stop_sync_acc"
+ "test_get_accessories"
+ "test_get_characteristics"
+ "test_handle_set_handle_set"
+ "test_handle_snapshot_encrypted_non_existant_accessory"
+ "test_http_11_keep_alive"
+ "test_http10_close"
+ "test_mdns_service_info"
+ "test_mixing_service_char_callbacks_partial_failure"
+ "test_not_standalone_aid"
+ "test_persist"
+ "test_push_event"
+ "test_send_events"
+ "test_service_callbacks"
+ "test_set_characteristics_with_crypto"
+ "test_setup_endpoints"
+ "test_start"
+ "test_upgrade_to_encrypted"
+ "test_we_can_start_stop"
+ "test_xhm_uri"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
index c129e411a4..533e1317a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "Mako";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27";
+ sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab";
};
propagatedBuildInputs = [ markupsafe ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
index 02f39b3014..a879aef022 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Pygments";
- version = "2.7.2";
+ version = "2.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0";
+ sha256 = "df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337";
};
propagatedBuildInputs = [ docutils ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
index 82c8ced970..b5996a13d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Rtree";
- version = "0.9.4";
+ version = "0.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0i1zlyz6vczy3cgg7fan5hq9zzjm7s7zdzfh83ma8g9vq3i2gqya";
+ sha256 = "be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e";
};
propagatedBuildInputs = [ libspatialindex ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix
index e180f0cea3..054cce0ce5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, imagemagick7Big
+, imagemagickBig
}:
buildPythonPackage rec {
@@ -16,13 +16,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace wand/api.py --replace \
"magick_home = os.environ.get('MAGICK_HOME')" \
- "magick_home = '${imagemagick7Big}'"
+ "magick_home = '${imagemagickBig}'"
'';
# tests not included with pypi release
doCheck = false;
- passthru.imagemagick = imagemagick7Big;
+ passthru.imagemagick = imagemagickBig;
meta = with lib; {
description = "Ctypes-based simple MagickWand API binding for Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix
index 0d2cd2239b..67aba73421 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix
@@ -1,41 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
, mpmath
, numpy
-, pipdate
, pybind11
, pyfma
, eigen
+, importlib-metadata
, pytestCheckHook
, matplotlib
+, dufte
, isPy27
}:
buildPythonPackage rec {
pname = "accupy";
- version = "0.3.3";
+ version = "0.3.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "a234c9897a683a6ade44f0bafa71196f122a61e3ebeacb5b813e7d139d54f3c7";
+ sha256 = "36506aca53154528997ac22aee6292c83da0f4850bb375c149512b5284bd4948";
};
+ nativeBuildInputs = [
+ pybind11
+ ];
+
buildInputs = [
- pybind11 eigen
+ eigen
];
propagatedBuildInputs = [
mpmath
numpy
- pipdate
pyfma
- ];
+ ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
checkInputs = [
pytestCheckHook
matplotlib
+ dufte
];
postConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix
index ed6dcb5437..da2feef18c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix
@@ -1,22 +1,43 @@
-{ aiohttp, buildPythonPackage, fetchFromGitHub, lib, pytest, pytestCheckHook
-, pytestcov, pytestrunner, pytest-asyncio, python, pythonOlder }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestrunner
+, aiohttp
+, aioresponses
+, pytestCheckHook
+, pytestcov
+, pytest-asyncio
+}:
buildPythonPackage rec {
pname = "accuweather";
- version = "0.0.11";
+ version = "0.1.0";
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "1sgbw9yldf81phwx6pbvqg9sp767whxymyj0ca9pwx1r6ipr080h";
+ sha256 = "0jp2x7fgg1shgr1fx296rni00lmjjmjgg141giljzizgd04dwgy3";
};
+ postPatch = ''
+ # we don't have pytest-error-for-skips packaged
+ substituteInPlace pytest.ini --replace "--error-for-skips" ""
+ '';
+
nativeBuildInputs = [ pytestrunner ];
+
propagatedBuildInputs = [ aiohttp ];
- checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
+
+ checkInputs = [
+ aioresponses
+ pytestCheckHook
+ pytestcov
+ pytest-asyncio
+ ];
meta = with lib; {
description =
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 1b68cc7bb5..22d2bfda81 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Adafruit-PlatformDetect";
- version = "3.1.1";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-JcqDuTzR2sffEbmhJHRPJggLruc9lKQ4aO/Ab88yo/I=";
+ sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix
index 55dc21240e..fab4c0839e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "adal";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3";
+ sha256 = "08b94d30676ceb78df31bce9dd0f05f1bc2b6172e44c437cbf5b968a00ac6489";
};
propagatedBuildInputs = [ requests pyjwt dateutil ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix
new file mode 100644
index 0000000000..59eb468868
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-enhanced/default.nix
@@ -0,0 +1,34 @@
+{ lib, jdk11, fetchFromGitHub, buildPythonPackage, docopt, psutil, pythonOlder }:
+
+buildPythonPackage rec {
+ pname = "adb-enhanced";
+ version = "2.5.10";
+
+ disabled = pythonOlder "3.4";
+
+ src = fetchFromGitHub {
+ owner = "ashishb";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-JMbcOk9Yr4WbfVUMKe5zZZWvvjKwhpPMdBt9d7xE6ek=";
+ };
+
+ postPatch = ''
+ substituteInPlace adbe/adb_enhanced.py \
+ --replace "cmd = 'java" "cmd = '${jdk11}/bin/java"
+ '';
+
+ propagatedBuildInputs = [ psutil docopt ];
+
+ # Disable tests because they require a dedicated android emulator
+ doCheck = false;
+
+ pythonImportsCheck = [ "adbe" ];
+
+ meta = with lib; {
+ description = "Tool for Android testing and development";
+ homepage = "https://github.com/ashishb/adb-enhanced";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vtuan10 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix
index de6d72a61e..8fc697828f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix
@@ -1,10 +1,9 @@
{ stdenv
, lib
-, rustPlatform
, fetchFromGitHub
-, pipInstallHook
+, buildPythonPackage
+, rustPlatform
, pythonImportsCheckHook
-, maturin
, pkg-config
, openssl
, publicsuffix-list
@@ -13,7 +12,7 @@
, Security
}:
-rustPlatform.buildRustPackage rec {
+buildPythonPackage rec {
pname = "adblock";
version = "0.4.0";
disabled = isPy27;
@@ -25,39 +24,32 @@ rustPlatform.buildRustPackage rec {
rev = version;
sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg";
};
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY=";
+ };
+
format = "pyproject";
- cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0";
-
- nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ];
+ nativeBuildInputs = [ pkg-config pythonImportsCheckHook ]
+ ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]);
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat";
- buildPhase = ''
- runHook preBuild
- maturin build --release --manylinux off --strip
- runHook postBuild
- '';
-
# There are no rust tests
doCheck = false;
+
pythonImportsCheck = [ "adblock" ];
- installPhase = ''
- runHook preInstall
- install -Dm644 -t dist target/wheels/*.whl
- pipInstallPhase
- runHook postInstall
- '';
-
- passthru.meta = with lib; {
+ meta = with lib; {
description = "Python wrapper for Brave's adblocking library, which is written in Rust";
homepage = "https://github.com/ArniDagur/python-adblock/";
maintainers = with maintainers; [ petabyteboy ];
license = with licenses; [ asl20 mit ];
- platforms = with platforms; [ all ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix
index f3818c9318..12c86bfc8f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix
@@ -1,24 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
+, setuptools-scm
, alarmdecoder
}:
buildPythonPackage rec {
pname = "adext";
- version = "0.3";
+ version = "0.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "184qxw6i5ixnhgkjnby4zwn4jg90mxb8xy9vbg80x5w331p4z50f";
+ sha256 = "1yz1rpfvhbf7kfjck5vadbj9rd3bkx5248whaa3impdrjh7vs03x";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "alarmdecoder==1.13.2" "alarmdecoder>=1.13.2"
- '';
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- propagatedBuildInputs = [ alarmdecoder ];
+ propagatedBuildInputs = [
+ alarmdecoder
+ ];
# Tests are not published yet
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
index 4df6c5f6c4..f86151f2f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
@@ -17,14 +17,19 @@ buildPythonPackage rec {
sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw";
};
- # Skip date-dependent test. See
- # https://github.com/adobe-type-tools/afdko/pull/1232
- # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117
patches = [
+ # Skip date-dependent test. See
+ # https://github.com/adobe-type-tools/afdko/pull/1232
+ # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117
(fetchpatch {
url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch";
sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf";
})
+ # fix tests for fonttools 4.21.1
+ (fetchpatch {
+ url = "https://github.com/adobe-type-tools/afdko/commit/0919e7454a0a05a1b141c23bf8134c67e6b688fc.patch";
+ sha256 = "0glly85swyl1kcc0mi8i0w4bm148bb001jz1winz5drfrw3a63jp";
+ })
];
nativeBuildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
index 29bbfa81ed..7bbfc623d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
@@ -1,20 +1,41 @@
-{ lib, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }:
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, agate
+, sqlalchemy
+, crate
+, nose
+, geojson
+}:
buildPythonPackage rec {
- pname = "agate-sql";
- version = "0.5.5";
+ pname = "agate-sql";
+ version = "0.5.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7";
- };
+ disabled = isPy27;
- propagatedBuildInputs = [ agate sqlalchemy crate ];
+ src = fetchFromGitHub {
+ owner = "wireservice";
+ repo = "agate-sql";
+ rev = version;
+ sha256 = "16rijcnvxrvw9mmyk4228dalrr2qb74y649g1l6qifiabx5ij78s";
+ };
- meta = with lib; {
- description = "Adds SQL read/write support to agate.";
- homepage = "https://github.com/wireservice/agate-sql";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ vrthra ];
- };
+ propagatedBuildInputs = [ agate sqlalchemy ];
+
+ checkInputs = [ crate nose geojson ];
+
+ checkPhase = ''
+ nosetests
+ '';
+
+ pythonImportsCheck = [ "agatesql" ];
+
+ meta = with lib; {
+ description = "Adds SQL read/write support to agate.";
+ homepage = "https://github.com/wireservice/agate-sql";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ vrthra ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
index e23db23d15..13386eb12a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.0.5739";
+ version = "9.0.5903";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "1fjwksia6h7w7m5zhys65yr4zxvyfgp9hr1k5dn802p9kvz34bpc";
+ sha256 = "sha256-75Ul9JfMFYv3AfBlgmer6IDyfgOAS4AdXexznoxi35Y=";
};
propagatedBuildInputs = [ pyvex ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix
new file mode 100644
index 0000000000..0f1a297e6a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "aiolyric";
+ version = "1.0.5";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "timmo001";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "00kq3dsjcfhjzn585phb3g168dbg53wrqq7g8a4gljs49c2mf5qx";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ # AssertionError, https://github.com/timmo001/aiolyric/issues/5
+ "test_location"
+ ];
+ pythonImportsCheck = [ "aiolyric" ];
+
+ meta = with lib; {
+ description = "Python module for the Honeywell Lyric Platform";
+ homepage = "https://github.com/timmo001/aiolyric";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix
index 9b648d5953..7b84996a1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix
@@ -1,20 +1,26 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, flit-core
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "aiomultiprocess";
- version = "0.8.0";
+ version = "0.9.0";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "omnilib";
repo = pname;
rev = "v${version}";
- sha256 = "0vkj1vgvlv828pi3sn0hjzdy9f0j63gljs2ylibbsaixa7mbkpvy";
+ sha256 = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw=";
};
+ nativeBuildInputs = [ flit-core ];
+
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix
new file mode 100644
index 0000000000..200bc41b7a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pythonOlder
+, sqlitedict
+, websockets
+}:
+
+buildPythonPackage rec {
+ pname = "aiopylgtv";
+ version = "0.4.0";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bendavid";
+ repo = pname;
+ rev = version;
+ sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ sqlitedict
+ websockets
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "aiopylgtv" ];
+
+ meta = with lib; {
+ description = "Python library to control webOS based LG TV units";
+ homepage = "https://github.com/bendavid/aiopylgtv";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix
index f53877e03a..058282b4c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "aioshelly";
- version = "0.5.4";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
- sha256 = "sha256-EjzWx3wcmTfB3OmN0OB37K6wYKVO3HzGEIf+uihas8k=";
+ sha256 = "sha256-2igN5mmkXyYpQeAoPAYzhirictuionVMbqifNigEYdw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
index 44cae12cba..022e34e23c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "aiosqlite";
- version = "0.16.0";
+ version = "0.17.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1a0fjmlvadyzsml10g5p1qif7192k0swy5zwjp8v48y5zc3yy56h";
+ sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE=";
};
checkInputs = [
@@ -26,6 +26,8 @@ buildPythonPackage rec {
# tests are not pick-up automatically by the hook
pytestFlagsArray = [ "aiosqlite/tests/*.py" ];
+ pythonImportsCheck = [ "aiosqlite" ];
+
meta = with lib; {
description = "Asyncio bridge to the standard sqlite3 module";
homepage = "https://github.com/jreese/aiosqlite";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
index 10438d5408..ee07588b32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "alarmdecoder";
- version = "1.13.9";
+ version = "1.13.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nutechsoftware";
repo = "alarmdecoder";
rev = version;
- sha256 = "0plr2h1qn4ryawbaxf29cfna4wailghhaqy1jcm9kxq6q7b9xqqy";
+ sha256 = "05581j78181p6mwbfpbkp5irnrzsvps1lslgqrh7xbdcmz5b2nxd";
};
propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix
deleted file mode 100644
index e69503777d..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/alerta/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder
-}:
-
-buildPythonPackage rec {
- pname = "alerta";
- version = "8.3.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "83c7d751bad0cb9bd7886700da4cd83c5451b2e8eb8d4cc697966e02d6a565f8";
- };
-
- propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ];
-
- doCheck = false;
-
- postInstall = ''
- wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH"
- '';
-
- disabled = pythonOlder "3.5";
-
- meta = with lib; {
- homepage = "https://alerta.io";
- description = "Alerta Monitoring System command-line interface";
- license = licenses.asl20;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix
index 1f4617ce9c..1117557a8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/alot/default.nix
@@ -1,9 +1,7 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
+{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
-, service-identity
-, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
-, withManpage ? false }:
-
+, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
+}:
buildPythonPackage rec {
pname = "alot";
@@ -41,7 +39,7 @@ buildPythonPackage rec {
doCheck = false;
postBuild = lib.optionalString withManpage "make -C docs man";
- checkInputs = [ awk future mock gnupg procps ];
+ checkInputs = [ gawk future mock gnupg procps ];
postInstall = let
completionPython = python.withPackages (ps: [ ps.configobj ]);
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
index 538cb11db1..90d34951e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "aniso8601";
- version = "8.1.0";
+ version = "8.1.1";
meta = with lib; {
description = "Parses ISO 8601 strings.";
@@ -17,6 +17,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "246bf8d3611527030889e6df970878969d3a2f760ba3eb694fa1fb10e6ce53f9";
+ sha256 = "be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
index 7f29bb5695..ba11ef11e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "ansible-runner";
- version = "1.4.6";
+ version = "1.4.7";
src = fetchPypi {
inherit pname version;
- sha256 = "53605de32f7d3d3442a6deb8937bf1d9c1f91c785e3f71003d22c3e63f85c71d";
+ sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1";
};
checkInputs = [ pytest mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix
index 1c3c72a8e2..e6cc318248 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "anyio";
- version = "2.1.0";
+ version = "2.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
- sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf";
+ sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix
index 2380fb7d8a..e4f1262a6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "appnope";
- version = "0.1.0";
+ version = "0.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
+ sha256 = "dd83cd4b5b460958838f6eb3000c660b1f9caf2a5b1de4264e941512f603258a";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index c3f3185038..fad9e7d03f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
@@ -1,21 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, installShellFiles
-, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml
+, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography
, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp
}:
buildPythonPackage rec {
pname = "apprise";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bab3563bc1e0c64938c4c7700112797bd99f20eb5d4a3e6038338bc8f060e153";
+ sha256 = "sha256-FW5gt35yoXVr2+hiGBDJ/5jFFfIpn2Z9sDN8acoO4FI=";
};
nativeBuildInputs = [ Babel installShellFiles ];
propagatedBuildInputs = [
- requests requests_oauthlib six click markdown pyyaml
+ cryptography requests requests_oauthlib six click markdown pyyaml
];
checkInputs = [
@@ -28,6 +28,8 @@ buildPythonPackage rec {
installManPage packaging/man/apprise.1
'';
+ pythonImportsCheck = [ "apprise" ];
+
meta = with lib; {
homepage = "https://github.com/caronc/apprise";
description = "Push Notifications that work with just about every platform!";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
index 79f21a2762..b06e0320dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.0.5739";
+ version = "9.0.5903";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6qjX0r2vLYgJdrKBVKedplfa1yhWv9tBvTu5BsViXBc=";
+ sha256 = "sha256-4e+ZGIt/ouZj5rsmaVxUrz8gAq4Yq2+Qx4jdOojB4Sw=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix
index 0d4d41a547..a55aef99ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "asteval";
- version = "0.9.22";
+ version = "0.9.23";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "newville";
repo = pname;
rev = version;
- sha256 = "sha256-93IBv6beYE/VTKJCWUbA1QTRdmQdn2kg35KBw6kmDis=";
+ sha256 = "sha256-9Zxb2EzB6nxDQHdlryFiwyNW+76VvysLUB78bXKzfv0=";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
index 088681a198..bb2ead70d7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "asyncio_mqtt";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0hwfgww1ywhjvkpnvafbk2hxlqkrngfdz0sx5amzw68srzazvl6g";
+ sha256 = "c1b3bea68a35c83d290a89903079ffb311106195cd56867e201633a1ee1cad0c";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
index 5c42e53fde..7ce389f984 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncwhois";
- version = "0.2.4";
+ version = "0.3.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
- sha256 = "17w007hjnpggj6jvkv8wxwllxk6mir1q2nhw0dqg7glm4lfbx8kr";
+ sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix
index b5028e4beb..21a3ed2a8f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asysocks/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "asysocks";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw=";
+ sha256 = "sha256-7EzSALAJcx8BNHX44FeeiSPRcTe9UFHXQ4IoSKxMU8w=";
};
# Upstream hasn't release the tests yet
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
index 41353598f8..f217339910 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "atpublic";
- version = "2.1.1";
+ version = "2.1.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "fa1d48bcb85bbed90f6ffee6936578f65ff0e93aa607397bd88eaeb408bd96d8";
+ sha256 = "e0b274759bfbcb6eeb7c7b44a7a46391990a43ac77aa55359b075765b54d9f5d";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
index c748c0cb8c..fa3482c079 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "autopep8";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchPypi {
inherit pname version;
- sha256 = "d21d3901cb0da6ebd1e83fc9b0dfbde8b46afc2ede4fe32fbda0c7c6118ca094";
+ sha256 = "cae4bc0fb616408191af41d062d7ec7ef8679c7f27b068875ca3a9e2878d5443";
};
propagatedBuildInputs = [ pycodestyle toml ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix
index 2a532beca4..b3b794eb3a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "awesomeversion";
- version = "21.2.2";
+ version = "21.2.3";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31";
+ sha256 = "sha256-UQ77ot1JXZZAKD/ijw+FBYJnDLJyD7jLrKANksBIM2Y=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
index 298074f300..a343306a5b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
- version = "1.0.2";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3468cb80cab51252a1936e5e593c7df4588ea0e18dcb6fb31e3d2913ba883928";
+ sha256 = "4ae8371d9e6d5bd3e90f3686b433cebc0541c88072655d2c75ec58e79b5d6943";
};
nativeBuildInputs = [ cmake ];
@@ -25,6 +25,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook numba ];
dontUseSetuptoolsCheck = true;
+ disabledTestPaths = [ "tests-cuda" ];
meta = with lib; {
description = "Manipulate JSON-like data with NumPy-like idioms";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index bdba894988..5cbbee77ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
- version = "15.0.0";
+ version = "16.0.0";
pname = "azure-mgmt-resource";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "80ecb69aa21152b924edf481e4b26c641f11aa264120bc322a14284811df9c14";
+ sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
index f02bee6bef..9bd5371412 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-web";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1";
+ sha256 = "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
index 16b8f317a2..8706a31d57 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, isPy27
, fetchFromGitHub
-, fetchpatch
, pytestCheckHook
, unittest2
, future
@@ -16,7 +15,7 @@
buildPythonPackage rec {
pname = "batchgenerators";
- version = "0.20.1";
+ version = "0.21";
disabled = isPy27;
@@ -24,18 +23,10 @@ buildPythonPackage rec {
owner = "MIC-DKFZ";
repo = pname;
rev = "v${version}";
- sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m";
+ sha256 = "16bk4r0q3m2c9fawpmj4l7kz0x3fyv1spb92grf44gmyricq3jdb";
};
- patches = [
- # lift Pillow bound; should be merged in next release
- (fetchpatch {
- url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
- sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
- })
- ];
-
propagatedBuildInputs = [
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix
index 29d676ad62..2c4f495a7f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix
@@ -6,7 +6,7 @@
, bottle
, chardet
, dateutil
-, google_api_python_client
+, google-api-python-client
, lxml
, oauth2client
, ply
@@ -34,7 +34,7 @@ buildPythonPackage rec {
bottle
chardet
dateutil
- google_api_python_client
+ google-api-python-client
lxml
oauth2client
ply
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
index d47c5d716a..4371c8c8ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
@@ -1,21 +1,40 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, click, click-log, pure-pcapy3
-, pyserial-asyncio, voluptuous, zigpy
-, asynctest, pytestCheckHook, pytest-asyncio }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, click
+, click-log
+, pure-pcapy3
+, pyserial-asyncio
+, voluptuous
+, zigpy
+, asynctest
+, pytestCheckHook
+, pytest-asyncio
+}:
buildPythonPackage rec {
pname = "bellows";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = version;
- sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a";
+ sha256 = "0il2cwnrcvgxx9jkj1xr2caqyza3kqjys3fpmcx7avy04xbf5dbv";
};
+ prePatch = ''
+ substituteInPlace setup.py \
+ --replace "click-log==0.2.1" "click-log>=0.2.1"
+ '';
+
propagatedBuildInputs = [
- click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy
+ click
+ click-log
+ pure-pcapy3
+ pyserial-asyncio
+ voluptuous
+ zigpy
];
checkInputs = [
@@ -24,11 +43,6 @@ buildPythonPackage rec {
pytest-asyncio
];
- prePatch = ''
- substituteInPlace setup.py \
- --replace "click-log==0.2.0" "click-log>=0.2.0"
- '';
-
meta = with lib; {
description = "A Python 3 project to implement EZSP for EmberZNet devices";
homepage = "https://github.com/zigpy/bellows";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index 2f98f3917b..53633b041f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
@@ -2,13 +2,15 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "1.6.3";
+ version = "1.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ae27ce4bef4f35b4cc2c0b0d9cf02ed49eee567c23d70cb5066ad215f9b62b3c";
+ sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086";
};
+ pythonImportsCheck = [ "bitarray" ];
+
meta = with lib; {
description = "Efficient arrays of booleans";
homepage = "https://github.com/ilanschnell/bitarray";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
index ce62fd6dce..d57d4a6585 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitbox02";
- version = "5.2.0";
+ version = "5.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71";
+ sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26";
};
propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix
new file mode 100644
index 0000000000..ac8cf39cff
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, parts
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "bitlist";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "04dz64r21a39p8wph5qlhvs5y873qgk6xxjlzw8n695b8jm3ixir";
+ };
+
+ propagatedBuildInputs = [
+ parts
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ nose
+ ];
+
+ pythonImportsCheck = [ "bitlist" ];
+
+ meta = with lib; {
+ description = "Python library for working with little-endian list representation of bit strings";
+ homepage = "https://github.com/lapets/bitlist";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
index 1bdedde1cb..53319466d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "3.2.1";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080";
+ sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM=";
};
checkInputs = [ pytest pytestrunner ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix
index 5591113ab0..ca59a0d710 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, nose, pytestCheckHook }:
buildPythonPackage rec {
pname = "blinker";
@@ -9,6 +9,9 @@ buildPythonPackage rec {
sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7";
};
+ checkInputs = [ nose pytestCheckHook ];
+ pythonImportsCheck = [ "blinker" ];
+
meta = with lib; {
homepage = "https://pythonhosted.org/blinker/";
description = "Fast, simple object-to-object and broadcast signaling";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
index 091b020efc..67d5088bf7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
buildPythonPackage rec {
pname = "bokeh";
- version = "2.2.3";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17";
+ sha256 = "dd417708f90702190222b1068a645acae99e66d4b58d7a336d545aeaa04e9b40";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 2b256b07f8..32b3bfc4b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.12"; # N.B: if you change this, change botocore too
+ version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-YvBs0eenjYqqTlJ8MnZT6abBr0FbWYNgSKkMKKJ+Xwk=";
+ sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 635203f94c..29f00d87ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.12"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-OakjFaF6b4vBkU27Ag9S6SnxjluZpPocXYeF+RNCftg=";
+ sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index 6b27e8e5d4..30a7e5174a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
@@ -9,7 +9,7 @@ let
withPlugins = plugins: buildPythonPackage {
name = "${package.name}-with-plugins";
phases = [ "installPhase" "fixupPhase" ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
index 57ace67d3f..395978396a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.9";
+ version = "0.8.10";
disabled = isPy27;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "v${version}";
- sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq";
+ sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il";
};
nativeBuildInputs = [ cython ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
index 53f3ebc0c0..58b8c26730 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
@@ -1,25 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
-, cairocffi, cssselect2, defusedxml, pillow, tinycss2
-, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, cairocffi
+, cssselect2
+, defusedxml
+, pillow
+, tinycss2
+, pytestCheckHook
+, pytest-runner
+, pytest-flake8
+, pytest-isort
+}:
buildPythonPackage rec {
pname = "CairoSVG";
- version = "2.5.0";
-
+ version = "2.5.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3fc50d10f0cbef53b3ee376a97a88d81bbd9e2f190f7e63de08431a1a08e9afa";
+ sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
};
+ buildInputs = [ pytest-runner ];
+
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
- checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
+ checkInputs = [ pytestCheckHook pytest-flake8 pytest-isort ];
+
+ pytestFlagsArray = [
+ "cairosvg/test_api.py"
+ ];
+
+ pythonImportsCheck = [ "cairosvg" ];
meta = with lib; {
homepage = "https://cairosvg.org";
- license = licenses.lgpl3;
+ license = licenses.lgpl3Plus;
description = "SVG converter based on Cairo";
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
index f793ecfae3..776cc4d38e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
@@ -22,6 +23,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ # https://github.com/agronholm/cbor2/issues/99
+ disabledTests = lib.optionals stdenv.is32bit [
+ "test_huge_truncated_bytes"
+ "test_huge_truncated_string"
+ ];
+
pythonImportsCheck = [ "cbor2" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
index 3ba06c92a5..f0fe81f85e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
@@ -1,15 +1,15 @@
{ lib, buildPythonPackage, fetchPypi
-, billiard, click, click-didyoumean, click-repl, kombu, pytz, vine
+, billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine
, boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout
}:
buildPythonPackage rec {
pname = "celery";
- version = "5.0.2";
+ version = "5.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "012c814967fe89e3f5d2cf49df2dba3de5f29253a7f4f2270e8fce6b901b4ebf";
+ sha256 = "f4efebe6f8629b0da2b8e529424de376494f5b7a743c321c8a2ddc2b1414921c";
};
postPatch = ''
@@ -17,7 +17,7 @@ buildPythonPackage rec {
--replace "moto==1.3.7" moto
'';
- propagatedBuildInputs = [ billiard click click-didyoumean click-repl kombu pytz vine ];
+ propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ];
checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ];
@@ -38,5 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/celery/celery/";
description = "Distributed task queue";
license = licenses.bsd3;
+ maintainers = [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
index 561d9651fe..23c883a48a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "censys";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "censys";
repo = "censys-python";
- rev = "v${version}";
- sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476";
+ rev = version;
+ sha256 = "06jwk0ps80fjzbsy24qn5bsggfpgn4ccjzjz65cdh0ap1mfvh5jf";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix
new file mode 100644
index 0000000000..8f53bd9805
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, asn1crypto, oscrypto
+, cacert
+}:
+
+buildPythonPackage rec {
+ pname = "certvalidator";
+ version = "0.11.1";
+
+ src = fetchFromGitHub {
+ owner = "wbond";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY=";
+ };
+
+ propagatedBuildInputs = [ asn1crypto oscrypto ];
+
+ checkInputs = [ cacert ];
+ checkPhase = ''
+ # Tests are run with a custom executor/loader
+ # The regex to skip specific tests relies on negative lookahead of regular expressions
+ # We're skipping the few tests that rely on the network, fetching CRLs, OCSP or remote certificates
+ python -c 'import dev.tests; dev.tests.run("^(?!.*test_(basic_certificate_validator_tls|fetch|revocation|build_path)).*$")'
+ '';
+ pythonImportsCheck = [ "certvalidator" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/wbond/certvalidator";
+ description = "Validates X.509 certificates and paths";
+ license = licenses.mit;
+ maintainers = with maintainers; [ baloo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index 3dcd6a996c..afd9cfdc29 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec {
pname = "cffi";
- version = "1.14.4";
+ version = "1.14.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c";
+ sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index e5c7c23e2e..4d6c71a7e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
@@ -73,7 +73,7 @@ buildPythonPackage rec {
"bind_addr_unix"
];
- disabledTestFiles = [
+ disabledTestPaths = [
# avoid attempting to use 3 packages not available on nixpkgs
# (jaraco.apt, jaraco.context, yg.lockfile)
"cheroot/test/test_wsgi.py"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix
new file mode 100644
index 0000000000..a019dd6519
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, grpcio
+}:
+
+buildPythonPackage rec {
+ pname = "chirpstack-api";
+ version = "3.9.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08djidy3fyhghyzvndcjas3hb1s9d7719gvmgbl8bzxjm4h2c433";
+ };
+
+ propagatedBuildInputs = [
+ google-api-core
+ grpcio
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "chirpstack_api" ];
+
+ meta = with lib; {
+ description = "ChirpStack gRPC API message and service wrappers for Python";
+ homepage = "https://github.com/brocaar/chirpstack-api";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
index eaf89948e8..859fb091ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -11,24 +11,24 @@
buildPythonPackage rec {
pname = "ckcc-protocol";
- version = "1.0.2";
+ version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0zpn3miyapskw6s71v614pmga5zfain9j085axm9v50b8r71xh1i";
+ sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc";
};
- checkInputs = [
- pytest
- ];
-
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "ckcc" ];
+
meta = with lib; {
description = "Communicate with your Coldcard using Python";
homepage = "https://github.com/Coldcard/ckcc-protocol";
- license = licenses.gpl3;
+ license = licenses.mit;
maintainers = [ maintainers.hkjn ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
index 1812ddff95..61b72e8cf3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.0.5739";
+ version = "9.0.5903";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki";
+ sha256 = "sha256-NIKWUx1VT5TjnuqppuT6VzwNRwcBLc0xI5k3F2Nmj8A=";
};
# Use upstream z3 implementation
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
index b9ffd35bf9..96e6b86c15 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "clldutils";
- version = "3.6.0";
+ version = "3.7.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "clld";
repo = pname;
rev = "v${version}";
- sha256 = "10jcd2x99z5ym2aki92c54caw97b3xgrkjj83qpln26hbdwpaz99";
+ sha256 = "13shas7krf7j04gqxjn09ipy318hmrp1s3b5d576d5r1xfxakam4";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index 3c6342f659..5b94dc78cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cmarkgfm";
- version = "0.5.0";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "7a5131a78836e55dcdb1f2c5f17bbaa40e5f83c86a205de1b71a298928e1391f";
+ sha256 = "e7d65b90645faa55c28886d01f658235af08b4c4edbf9d959518a17007dd20b4";
};
propagatedBuildInputs = [ cffi ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix
index 924422bf7d..2e8cbf2922 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "codecov";
- version = "2.1.10";
+ version = "2.1.11";
src = fetchPypi {
inherit pname version;
- sha256 = "d30ad6084501224b1ba699cbf018a340bb9553eb2701301c14133995fdd84f33";
+ sha256 = "6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b";
};
checkInputs = [ unittest2 ]; # Tests only
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coinmarketcap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coinmarketcap/default.nix
deleted file mode 100644
index 168f75b7f4..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/coinmarketcap/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, requests-cache }:
-
-buildPythonPackage rec {
- pname = "coinmarketcap";
- version = "5.0.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f";
- };
-
- propagatedBuildInputs = [ requests-cache ];
-
- meta = with lib; {
- description = "A python wrapper around the https://coinmarketcap.com API.";
- homepage = "https://github.com/barnumbirr/coinmarketcap";
- license = licenses.asl20;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
index 6198e4e1b2..2076533751 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
@@ -24,7 +24,6 @@ buildPythonPackage rec {
];
checkInputs = [
- nbsmoke
pytest
flake8
pytest-mpl
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix
index a41d077f22..9f67aacf2d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "configshell";
- version = "1.1.28";
+ version = "1.1.29";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "${pname}-fb";
rev = "v${version}";
- sha256 = "1ym2hkvmmacgy21wnjwzyrcxyl3sx4bcx4hc51vf4lzcnj589l68";
+ sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9";
};
propagatedBuildInputs = [ pyparsing six urwid ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
index a6de8321dc..607057b73f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
@@ -1,13 +1,12 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
-, argcomplete, colorlog, pyvmomi, requests, verboselogs
+, colorlog, pyvmomi, requests, verboselogs
, psutil, pyopenssl, setuptools
-, mock, pytest, pytest-mock, pytestCheckHook, qemu
+, mock, pytest-mock, pytestCheckHook, qemu
}:
buildPythonPackage rec {
pname = "cot";
version = "2.2.1";
-
disabled = !isPy3k;
src = fetchPypi {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix
index 8823435e2f..b7bb3c8113 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "coverage";
- version = "5.3";
+ version = "5.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0";
+ sha256 = "38f16b1317b8dd82df67ed5daa5f5e7c959e46579840d77a67a4ceb9cef0a50b";
};
# No tests in archive
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
index a37160a01a..9be85ff4b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix
@@ -6,6 +6,7 @@
, isPy3k
, sqlalchemy
, pytestCheckHook
+, stdenv
}:
buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
+
meta = with lib; {
homepage = "https://github.com/crate/crate-python";
description = "A Python client library for CrateDB";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index eb4eba0f58..1038431d31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -2,8 +2,8 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
-, isPy27
-, ipaddress
+, rustPlatform
+, setuptools-rust
, openssl
, cryptography_vectors
, darwin
@@ -13,27 +13,38 @@
, isPyPy
, cffi
, pytest
+, pytest-subtests
, pretend
, iso8601
, pytz
, hypothesis
-, enum34
}:
buildPythonPackage rec {
pname = "cryptography";
- version = "3.3.2"; # Also update the hash in vectors.nix
+ version = "3.4.6"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
- sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s";
+ sha256 = "11wgsihfq72fav67c3igi0xbhbd6c5dj869byd1jkq0fbcz24cid";
};
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ sourceRoot = "${pname}-${version}/${cargoRoot}";
+ name = "${pname}-${version}";
+ sha256 = "1i0sd2y4a5g1yqwcpw2ycp6p4p8sk5v7clblq756i5864j52v6w1";
+ };
+
+ cargoRoot = "src/rust";
+
outputs = [ "out" "dev" ];
nativeBuildInputs = lib.optionals (!isPyPy) [
cffi
- ];
+ rustPlatform.cargoSetupHook
+ setuptools-rust
+ ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]);
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
@@ -42,8 +53,6 @@ buildPythonPackage rec {
six
] ++ lib.optionals (!isPyPy) [
cffi
- ] ++ lib.optionals isPy27 [
- ipaddress enum34
];
checkInputs = [
@@ -52,6 +61,7 @@ buildPythonPackage rec {
iso8601
pretend
pytest
+ pytest-subtests
pytz
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index f9b7c52523..a807be9c3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc";
+ sha256 = "1a1d5ix5b3ajhrqaf8rm6qmd6gkaidij0jgd1vrb8q1xn1gqmy75";
};
# No tests included
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix
index 410248b019..e4bd7ab2b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "csvw";
- version = "1.10.0";
+ version = "1.10.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "cldf";
repo = "csvw";
rev = "v${version}";
- sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis";
+ sha256 = "1764nfa4frjdd7v6wj35y7prnciaqz57wwygy5zfavl4laxn4nxd";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
index 9270effcaa..d3cbc94f71 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
@@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
buildPythonPackage rec {
pname = "cvxopt";
- version = "1.2.5";
+ version = "1.2.6";
disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi {
inherit pname version;
- sha256 = "0widrfxr0x0cyg72ibkv7fdzkvmf5mllchq1x4fs2a36plv8rv4l";
+ sha256 = "a4c433706fd0ad9d47e7f222773a7f7601766fb8e74b633524b3c3fce29aa73e";
};
buildInputs = [ blas lapack ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
index 9fdee6daca..eca28633aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "cvxpy";
- version = "1.1.10";
+ version = "1.1.11";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA=";
+ hash = "sha256-W4qly+g07Q1iYJ76/tGZNkBPa+oavhTDUYRQ3cZ+s1I=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
index 1c3ee68929..53f0ef656e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cx_Freeze";
- version = "6.4.1";
+ version = "6.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "043513b85e33038e38cc0571cea1f3ee8044ec083891c9a5dad1d436894424ea";
+ sha256 = "fe0af7c658442402bcd209f993219a6ab98a951459495b4a141eb03b552a1c68";
};
disabled = pythonOlder "3.5";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
index f4f5c03858..8a3174fff3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "0.7.1";
+ version = "0.7.2";
pname = "dask-jobqueue";
src = fetchPypi {
inherit pname version;
- sha256 = "d32ddf3e3c7db29ace102037fa5f61c8db2d945176454dc316a6ffdb8bbfe88b";
+ sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
index 7214634214..8f3e4d0858 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, fsspec
, pytestCheckHook
+, pytest-rerunfailures
, pythonOlder
, cloudpickle
, numpy
@@ -11,27 +12,23 @@
, dill
, pandas
, partd
+, pytest-xdist
+, withExtraComplete ? false
+, distributed
}:
buildPythonPackage rec {
pname = "dask";
- version = "2021.01.0";
-
+ version = "2021.03.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
- sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4=";
+ sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
};
- checkInputs = [
- pytestCheckHook
- ];
-
- dontUseSetuptoolsCheck = true;
-
propagatedBuildInputs = [
bokeh
cloudpickle
@@ -41,8 +38,20 @@ buildPythonPackage rec {
pandas
partd
toolz
+ ] ++ lib.optionals withExtraComplete [
+ distributed
];
+ doCheck = false;
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-rerunfailures
+ pytest-xdist
+ ];
+
+ dontUseSetuptoolsCheck = true;
+
postPatch = ''
# versioneer hack to set version of github package
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
@@ -52,21 +61,18 @@ buildPythonPackage rec {
--replace "cmdclass=versioneer.get_cmdclass()," ""
'';
- #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
+ pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTests = [
- "test_argwhere_str"
- "test_count_nonzero_str"
- "rolling_methods" # floating percision error ~0.1*10^8 small
- "num_workers_config" # flaky
- "test_2args_with_array[pandas1-darray1-ldexp]" # flaky
+ "test_annotation_pack_unpack"
+ "test_annotations_blockwise_unpack"
];
- meta = {
+ meta = with lib; {
description = "Minimal task scheduling abstraction";
homepage = "https://dask.org/";
changelog = "https://docs.dask.org/en/latest/changelog.html";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ fridh ];
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fridh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
index 483c565536..54cec0f98a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "databricks-cli";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchPypi {
inherit pname version;
- sha256 = "bf94dc5187fa3500a31d52d7225fbc1a4699aa6e3c321223e7088eb5b5c94b62";
+ sha256 = "9e956f0efb7aad100d9963f223db986392cf2dc3e9922f2f83e55d372e84ef16";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index a97d9bc0c9..cb72bef323 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "7.3.8";
+ version = "7.3.9";
src = fetchPypi {
inherit pname version;
- sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d";
+ sha256 = "f789515f3be1bd1f88043110d62859b01a9661e384a81f1768fca4e4bb49a358";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
index a8917c3965..4a1bddfe36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
@@ -1,6 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
-, decorator, requests, simplejson, pillow, typing
-, nose, mock, pytest, freezegun }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, decorator
+, requests
+, typing
+, configparser
+, click
+, freezegun
+, mock
+, pytestCheckHook
+, pytest-vcr
+, python-dateutil
+, vcrpy
+}:
buildPythonPackage rec {
pname = "datadog";
@@ -15,13 +28,30 @@ buildPythonPackage rec {
find . -name '*.pyc' -exec rm {} \;
'';
- propagatedBuildInputs = [ decorator requests simplejson pillow ]
- ++ lib.optionals (pythonOlder "3.5") [ typing ];
+ propagatedBuildInputs = [ decorator requests ]
+ ++ lib.optional (pythonOlder "3.5") typing
+ ++ lib.optional (pythonOlder "3.0") configparser;
- checkInputs = [ nose mock pytest freezegun ];
- checkPhase = ''
- pytest tests/unit
- '';
+ checkInputs = [
+ click
+ freezegun
+ mock
+ pytestCheckHook
+ pytest-vcr
+ python-dateutil
+ vcrpy
+ ];
+
+ disabledTestPaths = [
+ "tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox
+ ];
+
+ disabledTests = [
+ "test_default_settings_set"
+ "test_threadstats_thread_safety"
+ ];
+
+ pythonImportsCheck = [ "datadog" ];
meta = with lib; {
description = "The Datadog Python library";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index 2b11b1ea27..ad5cc8bfb0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
@@ -1,9 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, fetchpatch
, dask
-, distributed
, bokeh
, toolz
, datashape
@@ -15,38 +13,26 @@
, colorcet
, param
, pyct
-, pyyaml
-, requests
-, scikitimage
, scipy
-, pytest
-, pytest-benchmark
-, flake8
+, pytestCheckHook
, nbsmoke
, fastparquet
-, testpath
, nbconvert
-, pytest_xdist
+, pytest-xdist
+, netcdf4
}:
buildPythonPackage rec {
pname = "datashader";
- version = "0.11.1";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
+ sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
};
- patches = [ (fetchpatch {
- # Unpins pyct==0.46 (Sep. 11, 2020).
- # Will be incorporated into the next datashader release after 0.11.1
- url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch";
- sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x";
- })];
propagatedBuildInputs = [
dask
- distributed
bokeh
toolz
datashape
@@ -58,30 +44,29 @@ buildPythonPackage rec {
colorcet
param
pyct
- pyyaml
- requests
- scikitimage
scipy
- testpath
];
checkInputs = [
- pytest
- pytest-benchmark
- pytest_xdist # not needed
- flake8
+ pytestCheckHook
+ pytest-xdist # not needed
nbsmoke
fastparquet
- pandas
nbconvert
+ netcdf4
];
- # dask doesn't do well with large core counts
- checkPhase = ''
- pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array and not test_simple_nested'
- '';
+ pytestFlagsArray = [
+ "-n $NIX_BUILD_CORES"
+ "datashader"
+ ];
- meta = with lib; {
+ disabledTestPaths = [
+ # 31/50 tests fail with TypeErrors
+ "datashader/tests/test_datatypes.py"
+ ];
+
+ meta = with lib;{
description = "Data visualization toolchain based on aggregating into a grid";
homepage = "https://datashader.org";
license = licenses.bsd3;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix
index 581a6cce9b..797fee025b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/defusedxml/default.nix
@@ -1,11 +1,30 @@
-{ buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, python
+}:
buildPythonPackage rec {
pname = "defusedxml";
- version = "0.6.0";
+ version = "0.7.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5";
+ sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} tests.py
+ '';
+
+ pythonImportsCheck = [ "defusedxml" ];
+
+ meta = with lib; {
+ description = "Python module to defuse XML issues";
+ homepage = "https://github.com/tiran/defusedxml";
+ license = licenses.psfl;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/descartes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/descartes/default.nix
index b10526ff0f..a4df1fe20c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/descartes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/descartes/default.nix
@@ -21,5 +21,7 @@ buildPythonPackage rec {
homepage = "https://bitbucket.org/sgillies/descartes/";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp ];
+ # all tests are failing
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
index 2228919565..ab4189c8f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "desktop-notifier";
- version = "3.2.2";
+ version = "3.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0b333594af6e54677f9620480226dbc88ec6dd7c004352de9268d01aa49467f4";
+ sha256 = "cf359450efc0944ac4db3106e50faa9d49dcef072307c3531e6af2c8a10cd523";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
index 8b968c3272..ed6007f87e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
@@ -7,18 +7,17 @@
, pytest_xdist
, pytest-django
, mock
-, django
}:
buildPythonPackage rec {
pname = "diskcache";
- version = "5.1.0";
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "grantjenks";
repo = "python-diskcache";
rev = "v${version}";
- sha256 = "0xwqw60dbn1x2294galcs08vm6ydcr677lr8slqz8a3ry6sgkhn9";
+ sha256 = "sha256-dWtEyyWpg0rxEwyhBdPyApzgS9o60HVGbtY76ELHvX8=";
};
checkInputs = [
@@ -31,6 +30,7 @@ buildPythonPackage rec {
# Darwin sandbox causes most tests to fail.
doCheck = !stdenv.isDarwin;
+ pythonImportsCheck = [ "diskcache" ];
meta = with lib; {
description = "Disk and file backed persistent cache";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index 372b931bca..8ce554e6f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
@@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2.30.1";
+ version = "2021.3.0";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
+ sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s=";
};
propagatedBuildInputs = [
@@ -38,11 +38,11 @@ buildPythonPackage rec {
doCheck = false;
pythonImportsCheck = [ "distributed" ];
- meta = {
+ meta = with lib; {
description = "Distributed computation in Python.";
homepage = "https://distributed.readthedocs.io/en/latest/";
- license = lib.licenses.bsd3;
- platforms = lib.platforms.x86; # fails on aarch64
- maintainers = with lib.maintainers; [ teh costrouc ];
+ license = licenses.bsd3;
+ platforms = platforms.x86; # fails on aarch64
+ maintainers = with maintainers; [ teh costrouc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
index 11939b9b77..54cde59a4b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-mailman3";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7e37b68bb47e9ae196ca19018f576e2c8c90189c5bd82d4e549d0c2f2f3f35fb";
+ sha256 = "368595b3c2623edeaca5beea5f12887424c384edd6f7052cf442443075084313";
};
propagatedBuildInputs = [
@@ -21,10 +21,12 @@ buildPythonPackage rec {
PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test
'';
+ pythonImportsCheck = [ "django_mailman3" ];
+
meta = with lib; {
description = "Django library for Mailman UIs";
homepage = "https://gitlab.com/mailman/django-mailman3";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ globin peti ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix
index 7b447eb8d7..7f2db712f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "3.1.6";
+ version = "3.1.7";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7";
+ sha256 = "32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7";
};
patches = lib.optional withGdal
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
index 816442d6e2..16358c54c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "django_evolution";
- version = "2.1";
+ version = "2.1.2";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "997efdc7f27248fd3c5e9eeccae1cfee046dfead037b171d30cbe6e91c9ca3d7";
+ sha256 = "28bad07b5e29a0ea4bd9727c6927cbee25d349d21606a553a0c748fbee0c073c";
};
propagatedBuildInputs = [ django ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix
index 204c1a9854..58ceb16870 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix
@@ -1,4 +1,5 @@
{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools
+, sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport
}:
@@ -12,7 +13,10 @@ buildPythonPackage {
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
- setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS";
+ setupPyBuildFlags = [
+ "--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
+ "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}"
+ ];
patches = [ ./build-cores.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix
index 5b148a9d62..8a9e9c9080 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "docker";
- version = "4.4.1";
+ version = "4.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-BgSnRxnV0t5Dh1OTS3Vb/NpvYvSbjkswlppLCiqKEiA=";
+ sha256 = "de5753b7f6486dd541a98393e423e387579b8974a5068748b83f852cc76a89d6";
};
nativeBuildInputs = lib.optional isPy27 mock;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix
index cd1971234a..3e5d9f21a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "docrep";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ef6e7433716c0d2c59889aae8bff800b48e82d7e759dfd934b93100dc7bccaa1";
+ sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dopy/default.nix
index 538a861c9f..9bd32d1ba4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dopy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dopy/default.nix
@@ -5,18 +5,22 @@
}:
buildPythonPackage {
- version = "2016-01-04";
pname = "dopy";
+ version = "2016-01-04";
src = pkgs.fetchFromGitHub {
owner = "Wiredcraft";
repo = "dopy";
rev = "cb443214166a4e91b17c925f40009ac883336dc3";
- sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
+ sha256 = "0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
};
propagatedBuildInputs = [ requests six ];
+ # contains no tests
+ doCheck = false;
+ pythonImportsCheck = [ "dopy" ];
+
meta = with pkgs.lib; {
description = "Digital Ocean API python wrapper";
homepage = "https://github.com/Wiredcraft/dopy";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
index 52f4f42661..ebaa4c88b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dpkt/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dpkt";
- version = "1.9.4";
+ version = "1.9.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f4e579cbaf6e2285ebf3a9e84019459b4367636bac079ba169527e582fca48b4";
+ sha256 = "141cab4defcb4ead83e664765ebb045f55dbe73e17d617acafd6eaf368d7c55e";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
index f0d3bad7a0..9a09c7cc75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/0_19.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Simple Python implementation of the Git file formats and protocols";
- homepage = "https://samba.org/~jelmer/dulwich/";
+ homepage = "https://www.dulwich.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ koral ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index 4cc3f34929..a4c8cb7227 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -13,12 +13,12 @@
}:
buildPythonPackage rec {
- version = "0.20.18";
+ version = "0.20.20";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ=";
+ sha256 = "sha256-QmlZuXBfrcxsgg5a3zKR1xpIq6CvzPdBFCLjMI8RX4c=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix
index 322e6461e5..4a85e5b883 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "easygui";
- version = "0.98.1";
+ version = "0.98.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1zmvmwgxyzvm83818skhn8b4wrci4kmnixaax8q3ia5cn7xrmj6v";
+ sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2";
};
doCheck = false; # No tests available
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix
new file mode 100644
index 0000000000..01e59fdb04
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, cython
+}:
+
+buildPythonPackage rec {
+ pname = "editdistance";
+ version = "0.5.3";
+
+
+ src = fetchFromGitHub {
+ owner = "roy-ht";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vk8vz41p2cs7s7zbaw3cnw2jnvy5rhy525xral68dh14digpgsd";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ preBuild = ''
+ cythonize --inplace editdistance/bycython.pyx
+ '';
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "editdistance" ];
+
+ meta = with lib; {
+ description = "Python implementation of the edit distance (Levenshtein distance)";
+ homepage = "https://github.com/roy-ht/editdistance";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index a5a639484e..f675d90e93 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
- version = "2.1.3";
+ version = "2.1.4";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
- sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j";
+ sha256 = "00v6npm7d4bk4cnpzacxybn165x6vjqrydssznn0bxzv8aynm1vb";
};
# avoid circular dependency with xmlschema which directly depends on this
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix
new file mode 100644
index 0000000000..7ec3b8d1c1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, poetry-core
+, pythonOlder
+, yarl
+}:
+
+buildPythonPackage rec {
+ pname = "elmax";
+ version = "0.1.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-ecosystem";
+ repo = "python-elmax";
+ rev = version;
+ sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY=";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ httpx
+ yarl
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "elmax" ];
+
+ meta = with lib; {
+ description = "Python API client for the Elmax Cloud services";
+ homepage = "https://github.com/home-assistant-ecosystem/python-elmax";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix
index 2f0f80bcf7..ca6158bd5e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/entrance/default.nix
@@ -18,11 +18,11 @@ in
buildPythonPackage rec {
pname = "entrance";
- version = "1.1.14";
+ version = "1.1.15";
src = fetchPypi {
inherit pname version;
- sha256 = "d1fc9d128ce05837d7e149413fbec71bcf84d9ca510accea56761d3f4bd0a021";
+ sha256 = "5b354ecf03226edae567511c8a8db95038cc9c3da20fcfcf5546d1e197eb3aef";
};
# The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix
index 7832f6b478..14c93fc719 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix
@@ -1,56 +1,59 @@
-{ lib, stdenv
-, wheel
-, rustPlatform
-, pipInstallHook
-, setuptools-rust
-, python
-, msgpack
-, requests
-, openssl
-, perl
-, rustfmt
+{ lib
+, stdenv
, fetchFromGitHub
+, buildPythonPackage
+, rustPlatform
+, pkg-config
+, rustfmt
+, setuptools-rust
+, openssl
, Security
+, msgpack
}:
-rustPlatform.buildRustPackage rec {
+buildPythonPackage rec {
pname = "etebase";
- version = "0.31.1";
+ version = "0.31.2";
src = fetchFromGitHub {
owner = "etesync";
repo = "etebase-py";
rev = "v${version}";
- sha256 = "163iw64l8lwawf84qswcjsq9p8qddv9ysjrr3dzqpqxb2yb0sy39";
+ hash = "sha256-enGmfXW8eV6FgdHfJqXr1orAsGbxDz9xUY6T706sf5U=";
};
- cargoSha256 = "0w8ypl6kj1mf6ahbdiwbd4jw6ldxdaig47zwk91jjsww5lbyx4lf";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-4eJvFf6aY+DYkrYgam5Ok9941PX4uQOmtRznEY0+1TE=";
+ };
+
+ format = "pyproject";
nativeBuildInputs = [
+ pkg-config
rustfmt
- perl
- openssl
- pipInstallHook
setuptools-rust
- wheel
- ];
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
propagatedBuildInputs = [
- python
msgpack
];
- doCheck = true;
-
- buildPhase = ''
- ${python.interpreter} setup.py bdist_wheel
+ postPatch = ''
+ # Use system OpenSSL, which gets security updates.
+ substituteInPlace Cargo.toml \
+ --replace ', features = ["vendored"]' ""
'';
- installPhase = ''
- pipInstallPhase
- '';
+ pythonImportsCheck = [ "etebase" ];
+
meta = with lib; {
homepage = "https://www.etebase.com/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix
index 4d5c6173cd..32f531e4ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Eve";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e";
+ sha256 = "5647ee7dd6e063b967276e49f564cd4f96decdd0a218482bdf86c404a2be1fbf";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index 93b0588598..9966dd81d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "eventlet";
- version = "0.30.0";
+ version = "0.30.1";
src = fetchPypi {
inherit pname version;
- sha256 = "19d6f3aa9525221ba60d0ec31b570508021af7ad5497fb77f77501fe9a7c34d3";
+ sha256 = "d00649a7e17de0bcddff1a96311ed3baf1b295b3223d4b71aceafe7b45e6d6f8";
};
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix
index 17cab3fe55..946665add3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix
@@ -1,14 +1,16 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, isPy27, fetchPypi, pythonOlder
, importlib-metadata }:
buildPythonPackage rec {
pname = "exdown";
- version = "0.7.1";
+ version = "0.8.5";
format = "pyproject";
+ disabled = isPy27;
+
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI=";
+ sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix
index ec4bcca9f8..b66c8a2812 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix
@@ -2,22 +2,22 @@
, buildPythonPackage
, isPyPy
, fetchPypi
-, pytest
-, setuptools_scm
+, pytestCheckHook
+, setuptools-scm
, apipkg
}:
buildPythonPackage rec {
pname = "execnet";
- version = "1.7.1";
+ version = "1.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50";
+ sha256 = "sha256-tzxVZeUX8kti3qilzqwXjGYcQwnTqgw+QghWwHLEEbQ=";
};
- checkInputs = [ pytest ];
- nativeBuildInputs = [ setuptools_scm ];
+ checkInputs = [ pytestCheckHook ];
+ nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ apipkg ];
# remove vbox tests
@@ -29,15 +29,13 @@ buildPythonPackage rec {
${lib.optionalString isPyPy "rm -v testing/test_multi.py"}
'';
- checkPhase = ''
- py.test testing
- '';
+ pythonImportsCheck = [ "execnet" ];
__darwinAllowLocalNetworking = true;
meta = with lib; {
- description = "Rapid multi-Python deployment";
- license = licenses.gpl2;
+ description = "Distributed Python deployment and communication";
+ license = licenses.mit;
homepage = "https://execnet.readthedocs.io/";
maintainers = with maintainers; [ nand0p ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix
new file mode 100644
index 0000000000..8c980c8d00
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/exrex/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "exrex";
+ version = "0.10.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wq8nyycdprxl9q9y1pfhkbca4rvysj45h1xn7waybl3v67v3f1z";
+ };
+
+ # Projec thas no released tests
+ doCheck = false;
+ pythonImportsCheck = [ "exrex" ];
+
+ meta = with lib; {
+ description = "Irregular methods on regular expressions";
+ homepage = "https://github.com/asciimoo/exrex";
+ license = with licenses; [ agpl3Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix
new file mode 100644
index 0000000000..3175aabcae
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "faadelays";
+ version = "0.0.6";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02z8p0n9d6n4l6v1m969009gxwmy5v14z108r4f3swd6yrk0h2xd";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "faadelays" ];
+
+ meta = with lib; {
+ description = "Python package to retrieve FAA airport status";
+ homepage = "https://github.com/ntilley905/faadelays";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
new file mode 100644
index 0000000000..8513c168cf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aioredis
+, async_generator
+, buildPythonPackage
+, fetchPypi
+, hypothesis
+, lupa
+, pytest-asyncio
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+, redis
+, six
+, sortedcontainers
+}:
+
+buildPythonPackage rec {
+ pname = "fakeredis";
+ version = "1.4.5";
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0slb23zxn47a4z8b7jq7gq40g4zsn52y9h29zdqs29b85394gjq1";
+ };
+
+ propagatedBuildInputs = [
+ aioredis
+ lupa
+ redis
+ six
+ sortedcontainers
+ ];
+
+ checkInputs = [
+ async_generator
+ hypothesis
+ pytest-asyncio
+ pytest-mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "fakeredis" ];
+
+ meta = with lib; {
+ description = "Fake implementation of Redis API";
+ homepage = "https://github.com/jamesls/fakeredis";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix
new file mode 100644
index 0000000000..466de64453
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, bitlist
+, buildPythonPackage
+, fetchPypi
+, fountains
+, parts
+, nose
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "fe25519";
+ version = "0.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1m85qvw9dwxk81mv9k45c9n75pk8wqn70qkinqh56h5zv56vgq24";
+ };
+
+ propagatedBuildInputs = [
+ bitlist
+ fountains
+ parts
+ ];
+
+ checkInputs = [
+ nose
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "fe25519" ];
+
+ meta = with lib; {
+ description = "Python field operations for Curve25519's prime";
+ homepage = "https://github.com/BjoernMHaase/fe25519";
+ license = with licenses; [ cc0 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix
index 9f1549e98f..e802dbaa26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix
@@ -1,11 +1,12 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
+, pythonAtLeast
, pbr
, testtools
, mock
, python
-, isPy39
}:
buildPythonPackage rec {
@@ -17,7 +18,26 @@ buildPythonPackage rec {
sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef";
};
- propagatedBuildInputs = [ pbr testtools mock ];
+ patches = lib.optional (pythonAtLeast "3.9") [
+ # drop tests that try to monkeypatch a classmethod, which fails on python3.9
+ # https://github.com/testing-cabal/fixtures/issues/44
+ (fetchpatch {
+ url = "https://salsa.debian.org/openstack-team/python/python-fixtures/-/raw/debian/victoria/debian/patches/remove-broken-monkey-patch-test.patch";
+ sha256 = "1s3hg2zmqc4shmnf90kscphzj5qlqpxghzw2a59p8f88zrbsj97r";
+ })
+ ];
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ testtools
+ ];
+
+ checkInputs = [
+ mock
+ ];
checkPhase = ''
${python.interpreter} -m testtools.run fixtures.test_suite
@@ -27,6 +47,5 @@ buildPythonPackage rec {
description = "Reusable state for writing clean tests and more";
homepage = "https://pypi.python.org/pypi/fixtures";
license = lib.licenses.asl20;
- broken = isPy39; # see https://github.com/testing-cabal/fixtures/issues/44
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index 580cd1f89f..dd018d84a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-JWT-Extended";
- version = "3.25.0";
+ version = "3.25.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b2e4dba91661e4697b30269106386c2b29e416a00d9ff66b26c462edddc10078";
+ sha256 = "bbf4467f41c56cf1fd8a5870d2556f419c572aad2b4085757581c3f9b4d7767a";
};
propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
index dfa1a0fbd0..5297c83d64 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-Migrate";
- version = "2.6.0";
+ version = "2.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8626af845e6071ef80c70b0dc16d373f761c981f0ad61bb143a529cab649e725";
+ sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix
new file mode 100644
index 0000000000..ff1f97c421
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask }:
+
+buildPythonPackage rec {
+ pname = "Flask-SeaSurf";
+ version = "0.3.0";
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "maxcountryman";
+ repo = "flask-seasurf";
+ rev = version;
+ sha256 = "02hsvppsz1d93v641f14fdnd22gbc12ilc9k9kn7wl119n5s3pd8";
+ };
+
+ propagatedBuildInputs = [ flask ];
+
+ pythonImportsCheck = [ "flask_seasurf" ];
+
+ meta = with lib; {
+ description = "A Flask extension for preventing cross-site request forgery";
+ homepage = "https://github.com/maxcountryman/flask-seasurf";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix
new file mode 100644
index 0000000000..ad4bc4dc05
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchPypi, buildPythonPackage, flask }:
+
+buildPythonPackage rec {
+ pname = "Flask-SSLify";
+ version = "0.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0gjl1m828z5dm3c5dpc2qjgi4llf84cp72mafr0ib5fd14y1sgnk";
+ };
+
+ propagatedBuildInputs = [ flask ];
+
+ doCheck = false;
+ pythonImportsCheck = [ "flask_sslify" ];
+
+ meta = with lib; {
+ description = "A Flask extension that redirects all incoming requests to HTTPS";
+ homepage = "https://github.com/kennethreitz42/flask-sslify";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix
index 605d08d125..3662116bc2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "flower";
- version = "0.9.5";
+ version = "0.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "171zckhk9ni14f1d82wf62hhciy0gx13fd02sr9m9qlj50fnv4an";
+ sha256 = "cf27a254268bb06fd4972408d0518237fcd847f7da4b4cd8055e228150ace8f3";
};
postPatch = ''
@@ -35,11 +35,13 @@ buildPythonPackage rec {
checkInputs = [ mock ];
+ pythonImportsCheck = [ "flower" ];
+
meta = with lib; {
description = "Celery Flower";
homepage = "https://github.com/mher/flower";
license = licenses.bsdOriginal;
maintainers = [ maintainers.arnoldfarkas ];
- broken = (celery.version == "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021
+ broken = (celery.version >= "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
index d0ad132991..407b72c953 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "4.20.0";
+ version = "4.21.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0yj83vsjh23g7gkmq6svbgc898x3qgygkhvpcbpycvmpwxxqxh1v";
+ sha256 = "1x9qrg6ppqhm5214ymwvn0r34qdz8pqvyxd0sj7rkp06wa757z2i";
};
# all dependencies are optional, but
@@ -67,9 +67,10 @@ buildPythonPackage rec {
-k 'not ttcompile_timestamp_calcs and not recalc_timestamp'
'';
- meta = {
+ meta = with lib; {
homepage = "https://github.com/fonttools/fonttools";
description = "A library to manipulate font files from Python";
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
index 1bb3b17e9d..6ad99a1258 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "0.1.3";
+ version = "0.1.4";
pname = "forbiddenfruit";
src = fetchPypi {
inherit pname version;
- sha256 = "1188a07cc24a9bd2c529dad06490b80a6fc88cde968af4d7861da81686b2cc8c";
+ sha256 = "e3f7e66561a29ae129aac139a85d610dbf3dd896128187ed5454b6421f624253";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix
new file mode 100644
index 0000000000..b706930b3e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, bitlist
+}:
+
+buildPythonPackage rec {
+ pname = "fountains";
+ version = "0.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0jk5y099g6ggaq5lwp0jlg4asyhcdxnl3him3ibmzc1k9nnknp30";
+ };
+
+ propagatedBuildInputs = [
+ bitlist
+ ];
+
+ # Project has no test
+ doCheck = false;
+ pythonImportsCheck = [ "fountains" ];
+
+ meta = with lib; {
+ description = "Python library for generating and embedding data for unit testing";
+ homepage = "https://github.com/reity/fountains";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
index 760091e567..8e54cb6897 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "fritzconnection";
- version = "1.4.1";
+ version = "1.4.2";
# no tests on PyPI
src = fetchFromGitHub {
owner = "kbr";
repo = pname;
rev = version;
- sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s";
+ sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2";
};
disabled = pythonOlder "3.6";
@@ -18,9 +18,12 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "fritzconnection" ];
+
meta = with lib; {
- description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol";
+ description = "Python-Tool to communicate with the AVM Fritz!Box";
homepage = "https://github.com/kbr/fritzconnection";
+ changelog = "https://fritzconnection.readthedocs.io/en/${version}/sources/changes.html";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda valodim ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
index 1f784a06e2..aa6831441d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "fs";
- version = "2.4.11";
+ version = "2.4.12";
src = fetchPypi {
inherit pname version;
- sha256 = "cc99d476b500f993df8ef697b96dc70928ca2946a455c396a566efe021126767";
+ sha256 = "c10ba188b14d6213a1ca950efd004931abbfa64b294c80bbf1045753831bf42f";
};
buildInputs = [ glibcLocales ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix
index 72089da11e..da52bfb8fb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix
@@ -1,4 +1,12 @@
-{ lib, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, flake8
+, orderedmultidict
+, pytestCheckHook
+, six
+}:
buildPythonPackage rec {
pname = "furl";
@@ -9,17 +17,33 @@ buildPythonPackage rec {
sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60";
};
- checkInputs = [ flake8 pytest ];
+ patches = [
+ (fetchpatch {
+ name = "tests_overcome_bpo42967.patch";
+ url = "https://github.com/gruns/furl/files/6030371/tests_overcome_bpo42967.patch.txt";
+ sha256 = "1l0lxmcp9x73kxy0ky2bh7zxa4n1cf1qxyyax97n90d1s3dc7k2q";
+ })
+ ];
- propagatedBuildInputs = [ six orderedmultidict ];
+ propagatedBuildInputs = [
+ orderedmultidict
+ six
+ ];
- # see https://github.com/gruns/furl/issues/121
- checkPhase = ''
- pytest -k 'not join'
- '';
+ checkInputs = [
+ flake8
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # see https://github.com/gruns/furl/issues/121
+ "join"
+ ];
+
+ pythonImportsCheck = [ "furl" ];
meta = with lib; {
- description = "furl is a small Python library that makes parsing and manipulating URLs easy";
+ description = "Python library that makes parsing and manipulating URLs easy";
homepage = "https://github.com/gruns/furl";
license = licenses.unlicense;
maintainers = with maintainers; [ vanzef ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
index 6060dc3a5b..836fdee4be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix
@@ -8,7 +8,7 @@
, six
, dateutil
, fusepy
-, google_api_python_client
+, google-api-python-client
}:
buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
buildInputs = [ gipc greenlet httplib2 six ];
- propagatedBuildInputs = [ dateutil fusepy google_api_python_client ];
+ propagatedBuildInputs = [ dateutil fusepy google-api-python-client ];
patchPhase = ''
substituteInPlace gdrivefs/resources/requirements.txt \
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix
new file mode 100644
index 0000000000..0e8d3722fb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, bitlist
+, buildPythonPackage
+, fe25519
+, fetchPypi
+, fountains
+, nose
+, parts
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "ge25519";
+ version = "0.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wgv0vqg8iv9y5d7if14gmcgslwd5zzgk322w9jaxdfbndldddik";
+ };
+
+ propagatedBuildInputs = [
+ fe25519
+ parts
+ bitlist
+ fountains
+ ];
+
+ checkInputs = [
+ nose
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "ge25519" ];
+
+ meta = with lib; {
+ description = "Python implementation of Ed25519 group elements and operations";
+ homepage = "https://github.com/nthparty/ge25519";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
index 05a73c3167..c0e6580e8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
@@ -1,15 +1,16 @@
-{ buildPythonPackage, lib, fetchPypi, isPy27
+{ buildPythonPackage, lib, fetchPypi, pythonOlder
, aiohttp
, maxminddb
, mocket
, requests
, requests-mock
+, pytestCheckHook
}:
buildPythonPackage rec {
version = "4.1.0";
pname = "geoip2";
- disabled = isPy27;
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -22,11 +23,17 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp requests maxminddb ];
- checkInputs = [ mocket requests-mock ];
+ checkInputs = [
+ mocket
+ requests-mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "geoip2" ];
meta = with lib; {
- description = "MaxMind GeoIP2 API";
- homepage = "https://www.maxmind.com/en/home";
+ description = "Python client for GeoIP2 webservice client and database reader";
+ homepage = "https://github.com/maxmind/GeoIP2-python";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index c82da3c8a9..c6ccf88115 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "geventhttpclient";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f59e5153f22e4a0be27b48aece8e45e19c1da294f8c49442b1c9e4d152c5c4c3";
+ sha256 = "3f0ab18d84ef26ba0c9df73ae2a41ba30a46072b447f2e36c740400de4a63d44";
};
buildInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix
index 8df2808328..57db65268d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "gipc";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "06116628e9cb7b2c34c8f248d0e4859fa5943e1e07381ad2b234ae9c7ed6f4cc";
+ sha256 = "f9a9d557e65e17bab8d7ff727ee3f1935e25bd52b01e63c23c7b3b52415728a5";
};
propagatedBuildInputs = [ gevent ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix
index 6b1ea305d4..8a1eea40c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "github3.py";
- version = "1.3.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda";
+ sha256 = "8dd4ac612fd60cb277eaf6e2ce02f68dda54aba06870ca6fa2b28369bf39aa14";
};
checkInputs = [ betamax pytest betamax-matchers ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
index 8a63f78728..398ee8eedf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix
@@ -2,7 +2,8 @@
, buildPythonPackage
, fetchFromGitHub
, setuptools
-, setuptools_scm
+, setuptools-scm
+, pythonOlder
, sdcc
, nmigen
, fx2
@@ -18,18 +19,19 @@
buildPythonPackage rec {
pname = "glasgow";
- version = "unstable-2020-06-29";
+ version = "unstable-2021-03-02";
+ disabled = pythonOlder "3.7";
# python software/setup.py --version
- realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
+ realVersion = "0.1.dev1660+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
- rev = "f885790d7927b893e631c33744622d6ebc18b5e3";
- sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk=";
+ rev = "41c48bbcee284d024e4249a81419fbbae674cf40";
+ sha256 = "1fg8ps228930d70bczwmcwnrd1gvm02a58mxbpn8pyakwbwwa6hq";
};
- nativeBuildInputs = [ setuptools_scm sdcc ];
+ nativeBuildInputs = [ setuptools-scm sdcc ];
propagatedBuildInputs = [
setuptools
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
deleted file mode 100644
index c9fc464f06..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/gmusicapi/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, validictory
-, decorator
-, mutagen
-, protobuf
-, setuptools
-, requests
-, dateutil
-, proboscis
-, mock
-, appdirs
-, oauth2client
-, pyopenssl
-, gpsoauth
-, MechanicalSoup
-, future
-}:
-
-buildPythonPackage rec {
- pname = "gmusicapi";
- version = "13.0.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k";
- };
-
- propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
-
- doCheck = false;
- pythonImportsCheck = [ "gmusicapi" ];
-
- meta = with lib; {
- description = "An unofficial API for Google Play Music";
- homepage = "https://pypi.python.org/pypi/gmusicapi/";
- license = licenses.bsd3;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix
index 83175b6c86..42e2b84783 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, docutils, installShellFiles
-, google_api_python_client, simplejson, oauth2client, setuptools, xdg
+, google-api-python-client, simplejson, oauth2client, setuptools, xdg
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ docutils installShellFiles ];
propagatedBuildInputs = [
- google_api_python_client simplejson oauth2client setuptools xdg
+ google-api-python-client simplejson oauth2client setuptools xdg
];
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
index 74d74d51c4..5c684ca126 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, google-auth
-, googleapis_common_protos
+, googleapis-common-protos
, grpcio
, protobuf
, pytz
@@ -23,7 +23,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- googleapis_common_protos
+ googleapis-common-protos
google-auth
grpcio
protobuf
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index 854ec37a1e..39ed8d6834 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "1.12.8";
+ version = "2.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb";
+ sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28";
};
# No tests included in archive
@@ -34,6 +34,6 @@ buildPythonPackage rec {
homepage = "https://github.com/google/google-api-python-client";
changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}";
license = licenses.asl20;
- maintainers = with maintainers; [ primeos ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
index 22b02552cd..d583de9c07 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
@@ -12,6 +12,7 @@
, pytest-localserver
, responses
, rsa
+, six
}:
buildPythonPackage rec {
@@ -23,7 +24,7 @@ buildPythonPackage rec {
sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb";
};
- propagatedBuildInputs = [ pyasn1-modules cachetools rsa ];
+ propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ];
checkInputs = [
flask
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 644c7ef918..228f3b68b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "33fcbdf5567bdb7657fb3485f061e7f1b45361f65fdafc168ab9172117fd9a5a";
+ sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index f8fc079aa3..fb38954629 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx";
+ sha256 = "639408cac9660b6c7c2324bf1b2461c9c8e338518b9ebb7ebfac833a61d753eb";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 3bc5f185e4..cec1672b76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b19f0556c252b805a52c976e3317c53d91e36f56dc8d28192eea190627faf343";
+ sha256 = "ff9933573dadb02176dc514662354949d0ea784cc4588d22226c2bf7eb90e797";
};
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
index c57329eebc..65ad31af2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7";
+ sha256 = "4a77a79e990004af96e789565b174f9b971f00afa23142f6673722dae0910b0c";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 5911bfe615..c01c294ec3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx";
+ sha256 = "6be2f2bca14b4eb1c1bdb0f4ba1dadf791e79a2a3e1fae762e5631a3d9fe094e";
};
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
deleted file mode 100644
index a883f707bd..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-music-proto/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pythonOlder
-, attrs
-, audio-metadata
-, importlib-metadata
-, marshmallow
-, pendulum
-, protobuf
-}:
-
-buildPythonPackage rec {
- pname = "google-music-proto";
- version = "2.10.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "91b78c0de4f59b1e5503fd6d49cb3fec029d9199cca0794c87667e643342e987";
- };
-
- postPatch = ''
- sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py
- substituteInPlace setup.py \
- --replace "'attrs>=18.2,<19.4'" "'attrs'"
- '';
-
- propagatedBuildInputs = [
- attrs
- audio-metadata
- marshmallow
- pendulum
- protobuf
- ] ++ lib.optionals (pythonOlder "3.8") [
- importlib-metadata
- ];
-
- # No tests
- doCheck = false;
- pythonImportsCheck = [ "google_music_proto" ];
-
- meta = with lib; {
- homepage = "https://github.com/thebigmunch/google-music-proto";
- description = "Sans-I/O wrapper of Google Music API calls";
- license = licenses.mit;
- maintainers = with maintainers; [ jakewaksbaum ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
deleted file mode 100644
index 801b4b78a1..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-music-utils/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, audio-metadata
-, multidict
-, poetry
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
- pname = "google-music-utils";
- version = "2.5.0";
-
- # Pypi tarball doesn't contain tests
- src = fetchFromGitHub {
- owner = "thebigmunch";
- repo = "google-music-utils";
- rev = version;
- sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f";
- };
- format = "pyproject";
-
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'multidict = "^4.0"' 'multidict = ">4.0"'
- '';
-
- nativeBuildInputs = [ poetry ];
-
- propagatedBuildInputs = [ audio-metadata multidict ];
-
- checkInputs = [ pytestCheckHook ];
-
- meta = with lib; {
- homepage = "https://github.com/thebigmunch/google-music-utils";
- description = "A set of utility functionality for google-music and related projects";
- license = licenses.mit;
- maintainers = with maintainers; [ jakewaksbaum ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-music/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-music/default.nix
deleted file mode 100644
index 90978ad2cb..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-music/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, appdirs
-, audio-metadata
-, google-music-proto
-, httpx
-, protobuf
-, requests_oauthlib
-, tenacity
-}:
-
-buildPythonPackage rec {
- pname = "google-music";
- version = "3.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
- };
-
- propagatedBuildInputs = [
- appdirs
- audio-metadata
- google-music-proto
- httpx
- protobuf
- requests_oauthlib
- tenacity
- ];
-
- # No tests
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://github.com/thebigmunch/google-music";
- description = "A Google Music API wrapper";
- license = licenses.mit;
- maintainers = with maintainers; [ jakewaksbaum ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix
similarity index 97%
rename from third_party/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 898971629a..267e0e5f08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -3,7 +3,6 @@
, fetchPypi
, grpc
, protobuf
-, pytestCheckHook
}:
buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
index 3caa89d06f..b821c7e1f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gpsoauth/default.nix
@@ -16,12 +16,12 @@
}:
buildPythonPackage rec {
- version = "0.4.1";
+ version = "0.4.3";
pname = "gpsoauth";
src = fetchPypi {
inherit pname version;
- sha256 = "1c3f45824d45ac3d06b9d9a0c0eccafe1052505d31ac9a698aef8b00fb0dfc37";
+ sha256 = "b38f654450ec55f130c9414d457355d78030a2c29c5ad8f20b28304a9fc8fad7";
};
propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
index 14df3b882b..c4c6e3b356 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "gradient";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "15s21945hg342195ig7nchap5mdnsw931iis92pr7hy8ff0rks3n";
+ sha256 = "2ed10db306d4c8632b7d04d71d44a04331a6e80e5ebab7296a98e67e8a50fb71";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
index ada005d14f..180e20c9f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage
-, boto3, requests, datadog, configparser, python
+, requests, datadog, configparser, python
}:
buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
index fa6a9ec60a..08e27c1948 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
@@ -1,17 +1,32 @@
-{ lib, buildPythonPackage, fetchPypi, graphql-core, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, graphql-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, typing-extensions
+}:
buildPythonPackage rec {
pname = "graphql-relay";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0mjmpf4abrxfyln0ykxq4xa6lp7xwgqr8631qp011hv0nfl6jgxd";
+ sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ=";
};
- propagatedBuildInputs = [ graphql-core ];
+ propagatedBuildInputs = [
+ graphql-core
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ typing-extensions
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
pythonImportsCheck = [ "graphql_relay" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix
new file mode 100644
index 0000000000..c222ea521b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix
@@ -0,0 +1,48 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pytestCheckHook
+, pythonOlder
+ # Python dependencies
+, colorama
+, intervaltree
+, json5
+, pyyaml
+, scipy
+, tqdm
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+ pname = "graphtage";
+ version = "0.2.5";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "trailofbits";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs=";
+ };
+
+ propagatedBuildInputs = [
+ colorama
+ intervaltree
+ json5
+ pyyaml
+ scipy
+ tqdm
+ typing-extensions
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "graphtage" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/trailofbits/graphtage";
+ description = "A utility to diff tree-like files such as JSON and XML";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
index 7291cd4b65..9a74206f02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, grpcio
-, googleapis_common_protos
+, googleapis-common-protos
, pytest
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72";
};
- propagatedBuildInputs = [ grpcio googleapis_common_protos ];
+ propagatedBuildInputs = [ grpcio googleapis-common-protos ];
# non-standard test format, and python3 will load local google folder first
# but tests cannot be ran if google folder is removed or moved
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index 8ac1cd6f0d..d2d06450b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.35.0";
+ version = "1.36.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf";
+ sha256 = "80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
index 1b1ffb975f..0fe6b9343e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, buildPythonPackage
-, darwin
, grpc
, six
, protobuf
@@ -20,8 +19,7 @@ buildPythonPackage rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ cython pkg-config ]
- ++ lib.optional stdenv.isDarwin darwin.cctools;
+ nativeBuildInputs = [ cython pkg-config ];
buildInputs = [ c-ares openssl zlib ];
propagatedBuildInputs = [ six protobuf ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
index fabc2d147f..92f33abb59 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
@@ -8,8 +8,7 @@ buildPythonPackage rec {
format = "wheel";
src = fetchPypi {
- inherit pname version;
- format = "wheel";
+ inherit pname version format;
sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
index 6ee76e5271..6e381794cf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "hdbscan";
- version = "0.8.26";
+ version = "0.8.27";
src = fetchPypi {
inherit pname version;
- sha256 = "0zlj2y42f0hrklviv21j9m895259ad8273dxgh7b44702781r9l1";
+ sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
index 0806573d7b..036122f702 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
@@ -19,12 +19,12 @@
buildPythonPackage rec {
pname = "hickle";
- version = "4.0.1";
+ version = "4.0.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "fcf2c4f9e4b7f0d9dae7aa6c59a58473884017875d3b17898d56eaf8a9c1da96";
+ sha256 = "0d35030a76fe1c7fa6480088cde932689960ed354a2539ffaf5f3c90c578c06f";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index 4d9da17bd3..667da5aa64 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
@@ -11,18 +11,20 @@
, bokeh
, scipy
, panel
+, colorcet
}:
buildPythonPackage rec {
pname = "holoviews";
- version = "1.13.5";
+ version = "1.14.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01";
+ sha256 = "64f85cf2c99b083b96f26cd26452aec4b41ced6d9e57f56ae8d72b88defc61c9";
};
propagatedBuildInputs = [
+ colorcet
param
numpy
pyviz-comms
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
index e6323c951e..68b1090c35 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "howdoi";
- version = "2.0.10";
+ version = "2.0.12";
src = fetchPypi {
inherit pname version;
- sha256 = "e561e3c5d4f39ab1f86e9f24bb0b2803ee6e312de61e90907f739aa638f35215";
+ sha256 = "bab3eab349ec0b534cf1b05a563d45e4d301b914c53a7f2c3446fdcc60497c93";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
index d01fd38976..9d6e479595 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "hstspreload";
- version = "2021.2.1";
+ version = "2021.2.15";
disabled = isPy27;
src = fetchFromGitHub {
owner = "sethmlarson";
repo = pname;
rev = version;
- sha256 = "sha256-R6tqGxGd6JymFgQX+deDPOtlKlwUjL7uf+zGdNxUW/s=";
+ sha256 = "sha256-vHq4DjDh7hBNAK/h/KdzqaEgrG5bg7VQ8fVWuxV7vOg=";
};
# tests require network connection
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
index 2e711141fc..ace9a7041e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, fetchpatch
, flask
, flask-limiter
, markupsafe
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index aa15c2555e..dbbdf0bb38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -9,18 +9,20 @@
, pytestcov
, sniffio
, uvicorn
+, trustme
+, trio
}:
buildPythonPackage rec {
pname = "httpcore";
- version = "0.12.0";
+ version = "0.12.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j";
+ sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109";
};
propagatedBuildInputs = [
@@ -34,11 +36,15 @@ buildPythonPackage rec {
pytestCheckHook
pytestcov
uvicorn
+ trustme
+ trio
];
pytestFlagsArray = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
+ "--ignore=tests/test_threadsafety.py"
"--ignore=tests/sync_tests/test_interfaces.py"
+ "--ignore=tests/sync_tests/test_retries.py"
];
pythonImportsCheck = [ "httpcore" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
index b23d501f1e..ce3b3aa1f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
@@ -1,21 +1,53 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, mock
+, pyparsing
+, pytest-forked
+, pytest-randomly
+, pytest-timeout
+, pytest-xdist
+, pytestCheckHook
+, six
+}:
buildPythonPackage rec {
pname = "httplib2";
- version = "0.18.1";
+ version = "0.19.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "8af66c1c52c7ffe1aa5dc4bcd7c769885254b0756e6e69f953c7f0ab49a70ba3";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "04y2bc2yv3q84llxnafqrciqxjqpxbrd8glbnvvr16c20fwc3r4q";
};
- # Needs setting up
- doCheck = false;
+ postPatch = ''
+ sed -i "/--cov/d" setup.cfg
+ '';
+
+ propagatedBuildInputs = [ pyparsing ];
+
+ checkInputs = [
+ mock
+ pytest-forked
+ pytest-randomly
+ pytest-timeout
+ pytest-xdist
+ six
+ pytestCheckHook
+ ];
+
+ # Don't run tests for Python 2.7
+ doCheck = !isPy27;
+ pytestFlagsArray = [ "--ignore python2" ];
+ pythonImportsCheck = [ "httplib2" ];
meta = with lib; {
- homepage = "https://github.com/httplib2/httplib2";
description = "A comprehensive HTTP client library";
+ homepage = "https://httplib2.readthedocs.io";
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
index 8974672d0a..b4a82d04fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "httpretty";
- version = "1.0.3";
+ version = "1.0.5";
# drop this for version > 0.9.7
# Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "9335cbd8f38745e0e2dc4755d8932a77d378d93e15804969504b1e6b568d613c";
+ sha256 = "e53c927c4d3d781a0761727f1edfad64abef94e828718e12b672a678a8b3e0b5";
};
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 6e81cc9219..9fe636c359 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.16.1";
+ version = "0.17.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a";
+ sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix
index 49cb31b7d0..81ea4286c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "humanfriendly";
- version = "8.2";
+ version = "9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12";
+ sha256 = "sha256-BmVilWY5qyH/JnbR/aC1mH6YXFNPx2cAoZvVS8uBEh0=";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
index f7eb294841..f67b5de7ee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hvac";
- version = "0.10.7";
+ version = "0.10.8";
src = fetchPypi {
inherit pname version;
- sha256 = "6ee2ba6002f11151472fa873b6637d902fc6045a2193aea08b39ae8147c230ba";
+ sha256 = "cd74138994b1b99cdb75d34aadfd900352b3170bfc31c5e4cc0ff63eaa731cf9";
};
propagatedBuildInputs = [ requests six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
index aaad8f2b1d..c5fb601ea4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "hvplot";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1c709bebb737ebd71a0433f2333ed15f03dd3c431d4646c41c2b9fcbae4a29b7";
+ sha256 = "cdb61183d3cdb1296c7f63c6aab59ee72b7b79b9ddc18abce2ebd3214e8de9db";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
index dac4ca43fc..e956cb9cc4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
@@ -1,7 +1,14 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, isPy3k, attrs, coverage, enum34, pexpect
-, doCheck ? true, pytest, pytest_xdist, flaky, mock
+{ lib
+, buildPythonPackage
+, pythonAtLeast
+, fetchFromGitHub
+, attrs
+, pexpect
+, doCheck ? true
+, pytestCheckHook
+, pytest-xdist
, sortedcontainers
+, tzdata
}:
buildPythonPackage rec {
# https://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -10,36 +17,40 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment.
- version = "5.30.0";
pname = "hypothesis";
+ version = "5.49.0";
# Use github tarballs that includes tests
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
- sha256 = "0fmc4jfaksr285fjhp18ibj2rr8cxmbd0pwx370r5wf8jnhm6jb3";
+ sha256 = "1lr9a93vdx70s9i1zazazif5hy8fbqhvwqq402ygpf53yw4lgi2w";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
propagatedBuildInputs = [
attrs
- coverage
sortedcontainers
- ] ++ lib.optional (!isPy3k) enum34;
+ ];
+
+ checkInputs = [ pytestCheckHook pytest-xdist pexpect ]
+ ++ lib.optional (pythonAtLeast "3.9") tzdata;
- checkInputs = [ pytest pytest_xdist flaky mock pexpect ];
inherit doCheck;
- checkPhase = ''
- rm tox.ini # This file changes how py.test runs and breaks it
- py.test tests/cover
+ # This file changes how pytest runs and breaks it
+ preCheck = ''
+ rm tox.ini
'';
+ pytestFlagsArray = [ "tests/cover" ];
+
meta = with lib; {
description = "A Python library for property based testing";
homepage = "https://github.com/HypothesisWorks/hypothesis";
license = licenses.mpl20;
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix
new file mode 100644
index 0000000000..4bf1ca8d02
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }:
+
+buildPythonPackage rec {
+ pname = "hypothesmith";
+ version = "0.1.8";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-+f8EexXE7TEs49pX6idXD4bWtTzhKvnyXlnmV2oAQQo=";
+ };
+
+ propagatedBuildInputs = [ hypothesis lark-parser libcst ];
+
+ checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];
+
+ pythonImportsCheck = [ "hypothesmith" ];
+
+ meta = with lib; {
+ description = "Hypothesis strategies for generating Python programs, something like CSmith";
+ homepage = "https://github.com/Zac-HD/hypothesmith";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 110c28ee2f..cb4d538da3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix
@@ -1,22 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, editdistance
+}:
buildPythonPackage rec {
pname = "identify";
- version = "1.5.14";
+ version = "1.6.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "de7129142a5c86d75a52b96f394d94d96d497881d2aaf8eafe320cdbe8ac4bcc";
+
+ src = fetchFromGitHub {
+ owner = "pre-commit";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm";
};
- pythonImportsCheck = [ "identify" ];
+ checkInputs = [
+ editdistance
+ pytestCheckHook
+ ];
- # Tests not included in PyPI tarball
- doCheck = false;
+ pythonImportsCheck = [ "identify" ];
meta = with lib; {
description = "File identification library for Python";
homepage = "https://github.com/chriskuehl/identify";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
index 22c05e3319..ccb2190cf0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "importlib_resources";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592";
+ sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
index c0f6fe9205..130b6a49bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix
@@ -1,16 +1,32 @@
-{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, setuptools_scm
+, toml
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "inflect";
- version = "5.0.2";
+ version = "5.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0";
+ sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945";
};
nativeBuildInputs = [ setuptools_scm toml ];
- propagatedBuildInputs = [ six importlib-metadata ];
- checkInputs = [ nose ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "inflect" ];
+
+ meta = with lib; {
+ description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles";
+ homepage = "https://github.com/jaraco/inflect";
+ changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst";
+ license = licenses.mit;
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix
index 32a56c3e95..49cf660bf5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix
@@ -23,12 +23,12 @@
buildPythonPackage rec {
pname = "intake";
- version = "0.6.0";
+ version = "0.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0c284abeb74927a7366dcab6cefc010c4d050365b8af61c37326a2473a490a4e";
+ sha256 = "f09800203fcaf1512f9234e54dbd07ec2b5217aafd21716385725ec052f5a52e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
index c8539598fe..98944d2543 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
@@ -2,7 +2,6 @@
, stdenv
, buildPythonPackage
, fetchPypi
-, fetchpatch
, flaky
, ipython
, jupyter_client
@@ -15,23 +14,15 @@
buildPythonPackage rec {
pname = "ipykernel";
- version = "5.2.1";
+ version = "5.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9";
+ sha256 = "98321abefdf0505fb3dc7601f60fc4087364d394bd8fad53107eb1adee9ff475";
};
propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
- # https://github.com/ipython/ipykernel/pull/377
- patches = [
- (fetchpatch {
- url = "https://github.com/ipython/ipykernel/commit/a3bf849dbd368a1826deb9dfc94c2bd3e5ed04fe.patch";
- sha256 = "1yhpwqixlf98a3n620z92mfips3riw6psijqnc5jgs2p58fgs2yc";
- })
- ];
-
checkInputs = [ pytestCheckHook nose flaky ];
dontUseSetuptoolsCheck = true;
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
index dd9004aa0c..d9447e9138 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.19.0";
+ version = "7.21.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a";
+ sha256 = "04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70";
};
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix
index 41973e8058..947da75ce9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "ircrobots";
- version = "0.3.6";
+ version = "0.3.7";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
- sha256 = "1c8h8b78gmnfipppr9dxp7sl6wd9lx4l3pdwykaib1f49dqwavys";
+ sha256 = "0cm4hcmprca24d979ydbzwn9mfxw16jki6ld7yykxryf0983nqc7";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
index b83374fff3..783f6f1eb3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "iso8601";
- version = "0.1.13";
+ version = "0.1.14";
src = fetchPypi {
inherit pname version;
- sha256 = "f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1";
+ sha256 = "8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
index a3d19df765..9054f1f109 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
@@ -1,19 +1,34 @@
-{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, six, more-itertools }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
+, setuptools_scm, toml
+, more-itertools
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "jaraco.classes";
- version = "3.1.0";
+ version = "3.1.1";
disabled = isPy27;
- src = fetchPypi {
- inherit pname version;
- sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3";
+ src = fetchFromGitHub {
+ owner = "jaraco";
+ repo = "jaraco.classes";
+ rev = "v${version}";
+ sha256 = "0wzrcsxi9gb65inayg0drm08iaw37jm1lqxhz3860i6pwjh503pr";
};
pythonNamespaces = [ "jaraco" ];
- nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ six more-itertools ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
- doCheck = false;
+ nativeBuildInputs = [ setuptools_scm toml ];
+
+ propagatedBuildInputs = [ more-itertools ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Utility functions for Python class constructs";
+ homepage = "https://github.com/jaraco/jaraco.classes";
+ license = licenses.mit;
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
index 5dc3cbe105..dce93d33ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "Jinja2";
- version = "2.11.2";
+ version = "2.11.3";
src = fetchPypi {
inherit pname version;
- sha256 = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0";
+ sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix
index 16edf3c04e..9c54418baf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "joblib";
- version = "0.17.0";
- disabled = pythonOlder "3.6";
+ version = "1.0.0";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5";
+ sha256 = "092bnvr724cfvka8267z687bf086fvm7i1hwslkyrzf1g836dn3s";
};
checkInputs = [ sphinx numpydoc pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix
index 77789fa44d..460b0cddf6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -1,14 +1,12 @@
{ lib
, stdenv
-, rustPlatform
, fetchFromGitHub
-, pipInstallHook
+, buildPythonPackage
+, rustPlatform
, llvmPackages
, pkg-config
-, maturin
, pcsclite
, nettle
-, python
, requests
, vcrpy
, numpy
@@ -17,7 +15,7 @@
, PCSC
}:
-rustPlatform.buildRustPackage rec {
+buildPythonPackage rec {
pname = "johnnycanencrypt";
version = "0.5.0";
disabled = pythonOlder "3.7";
@@ -28,7 +26,16 @@ rustPlatform.buildRustPackage rec {
rev = "v${version}";
sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4";
};
- cargoPatches = [ ./Cargo.lock.patch ];
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit patches src;
+ name = "${pname}-${version}";
+ hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U=";
+ };
+
+ format = "pyproject";
+
+ patches = [ ./Cargo.lock.patch ];
cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r";
@@ -42,10 +49,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
llvmPackages.clang
pkg-config
- python
- maturin
- pipInstallHook
- ];
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ ]);
buildInputs = [
pcsclite
@@ -67,17 +74,6 @@ rustPlatform.buildRustPackage rec {
sed '/project-url = /d' -i Cargo.toml
'';
- buildPhase = ''
- runHook preBuild
- maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"
- runHook postBuild
- '';
-
- installPhase = ''
- install -Dm644 -t dist target/wheels/*.whl
- pipInstallPhase
- '';
-
preCheck = ''
export TESTDIR=$(mktemp -d)
cp -r tests/ $TESTDIR
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix
index 3d4097b071..efc1152678 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix
@@ -2,16 +2,21 @@
buildPythonPackage rec {
pname = "jq";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
+ sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";
};
+
patches = [ ./jq-py-setup.patch ];
buildInputs = [ jq ];
+ # no tests executed
+ doCheck = false;
+ pythonImportsCheck = [ "jq" ];
+
meta = {
description = "Python bindings for jq, the flexible JSON processor";
homepage = "https://github.com/mwilliamson/jq.py";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix
index a5468fa273..09eb45f964 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -2,14 +2,14 @@
buildPythonApplication rec {
pname = "jsbeautifier";
- version = "1.13.0";
+ version = "1.13.5";
propagatedBuildInputs = [ six editorconfig ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
- sha256 = "f5565fbcd95f79945e124324815e586ae0d2e43df5af82a4400390e6ea789e8b";
+ sha256 = "4532a6bc85ba91ffc542b55d65cd13cedc971a934f26f51ed56d4c680b3fbe66";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix
new file mode 100644
index 0000000000..cecce31e0e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, hypothesis
+, lib
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "json5";
+ version = "0.9.5";
+
+ src = fetchFromGitHub {
+ owner = "dpranke";
+ repo = "pyjson5";
+ rev = "v${version}";
+ sha256 = "sha256-VkJnZG1BuC49/jJuwObbqAF48CtbWU9rDEYW4Dg0w4U=";
+ };
+
+ checkInputs = [
+ hypothesis
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/dpranke/pyjson5";
+ description = "A Python implementation of the JSON5 data format";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ veehaitch ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix
index 66e7d62aa8..abf3c27e98 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "jsonpickle";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "e8d4b7cd0bd6826001a74377df1079a76ad8bae0f909282de2554164c837c8ba";
+ sha256 = "c9b99b28a9e6a3043ec993552db79f4389da11afcb1d0246d93c79f4b5e64062";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix
index 47d3bb6af0..456e82e75f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "jupyter_client";
- version = "6.1.7";
+ version = "6.1.11";
src = fetchPypi {
inherit pname version;
- sha256 = "49e390b36fe4b4226724704ea28d9fb903f1a3601b6882ce3105221cd09377a1";
+ sha256 = "649ca3aca1e28f27d73ef15868a7c7f10d6e70f761514582accec3ca6bb13085";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
index 54ea49c340..cff5dc194a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "jupyter_core";
- version = "4.7.0";
+ version = "4.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "aa1f9496ab3abe72da4efe0daab0cb2233997914581f9a071e07498c6add8ed3";
+ sha256 = "79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4";
};
checkInputs = [ pytest mock glibcLocales nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix
index c08bdab4cf..4bead99619 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix
@@ -4,7 +4,6 @@
, argcomplete
, colorama
, jmespath
-, knack
, pygments
, pyyaml
, six
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
index e3694bffe3..0d0c115933 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
@@ -8,25 +8,23 @@
, service-identity
, zope_interface
, isPy3k
-, pythonAtLeast
, python
}:
buildPythonPackage rec {
pname = "ldaptor";
- version = "20.1.1";
+ version = "21.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "778f45d68a0b5d63a892c804c05e57b464413a41d8ae52f92ae569321473ab67";
+ sha256 = "sha256-jEnrGTddSqs+W4NYYGFODLF+VrtaIOGHSAj6W+xno1g=";
};
propagatedBuildInputs = [
twisted passlib pyopenssl pyparsing service-identity zope_interface
];
- # https://github.com/twisted/ldaptor/pull/210
- disabled = !isPy3k || pythonAtLeast "3.9";
+ disabled = !isPy3k;
checkPhase = ''
${python.interpreter} -m twisted.trial ldaptor
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index fe94753f1a..a900c61d40 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ledgerblue";
- version = "0.1.34";
+ version = "0.1.35";
src = fetchPypi {
inherit pname version;
- sha256 = "f9553d496fbc6b612d98cc9db2f1648c1bcb63939c988ee1520e8fcb9bd77b24";
+ sha256 = "44fbd8fcf62430a6b84d4e826a9ef7fc21c77a7d8ff275f3952d6086ef06d076";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
index f064c34e15..00f8634e47 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
@@ -1,9 +1,22 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort
-, pytestCheckHook, pyyaml, typing-extensions, typing-inspect, dataclasses }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, hypothesis
+, doCheck ? true
+, dataclasses
+, hypothesmith
+, pytestCheckHook
+, pyyaml
+, typing-extensions
+, typing-inspect
+, black
+, isort
+}:
buildPythonPackage rec {
pname = "libcst";
- version = "0.3.13";
+ version = "0.3.17";
# Some files for tests missing from PyPi
# https://github.com/Instagram/LibCST/issues/331
@@ -11,25 +24,21 @@ buildPythonPackage rec {
owner = "instagram";
repo = pname;
rev = "v${version}";
- sha256 = "0pbddjrsqj641mr6zijk2phfn15dampbx268zcws4bhhhnrxlj65";
+ sha256 = "sha256-mlSeB9OjCiUVYwcPYNrQdlfcj9DV/+wqVWt91uFsQsU=";
};
disabled = pythonOlder "3.6";
- propagatedBuildInputs = [ pyyaml typing-inspect ]
+ propagatedBuildInputs = [ hypothesis typing-inspect pyyaml ]
++ lib.optional (pythonOlder "3.7") dataclasses;
- checkInputs = [ black isort pytestCheckHook ];
+ checkInputs = [ black hypothesmith isort pytestCheckHook ];
+
+ inherit doCheck;
- # https://github.com/Instagram/LibCST/issues/346
- # https://github.com/Instagram/LibCST/issues/347
preCheck = ''
python -m libcst.codegen.generate visitors
python -m libcst.codegen.generate return_types
- rm libcst/tests/test_fuzz.py
- rm libcst/tests/test_pyre_integration.py
- rm libcst/metadata/tests/test_full_repo_manager.py
- rm libcst/metadata/tests/test_type_inference_provider.py
'';
pythonImportsCheck = [ "libcst" ];
@@ -39,6 +48,6 @@ buildPythonPackage rec {
"A Concrete Syntax Tree (CST) parser and serializer library for Python.";
homepage = "https://github.com/Instagram/libcst";
license = with licenses; [ mit asl20 psfl ];
- maintainers = with maintainers; [ maintainers.ruuda ];
+ maintainers = with maintainers; [ ruuda SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix
index 2edc9211d9..4bc2dfa2ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libversion";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1";
+ sha256 = "cf9ef702d0bc750f0ad44a2cffe8ebd83cd356b92cc25f767846509f84ea7e73";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix
new file mode 100644
index 0000000000..16a5f01ed7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "lima";
+ version = "0.5";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qqj0053r77ppkcyyk2fhpaxjzsl1h98nf9clpny6cs66sdl241v";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Lightweight Marshalling of Python 3 Objects.";
+ homepage = "https://github.com/b6d/lima";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
index 184a215c40..98878c9064 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/livestreamer/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd";
};
- buildInputs = [ pkgs.makeWrapper ];
+ nativeBuildInputs = [ pkgs.makeWrapper ];
propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
++ lib.optionals isPy27 [ singledispatch futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
index 02ee088782..609dcb8223 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "llvmlite";
- version = "0.34.0";
+ version = "0.35.0";
disabled = isPyPy || !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63";
+ sha256 = "80e51d5aa02ad72da9870e89d21f9b152b0220ca551b4596a6c0614bcde336fc";
};
nativeBuildInputs = [ llvm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/locket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/locket/default.nix
index e0be7d8f94..fd75a965c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/locket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/locket/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "locket";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz";
+ sha256 = "3e1faba403619fe201552f083f1ecbf23f550941bc51985ac6ed4d02d25056dd";
};
buildInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix
new file mode 100644
index 0000000000..e50404e504
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, cython
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "lupa";
+ version = "1.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "13ifv0nxbf70xg69sp49j484m8cnid7rgh8f94pgfb50dj01vqd3";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ pythonImportsCheck = [ "lupa" ];
+
+ meta = with lib; {
+ description = "Lua in Python";
+ homepage = "https://github.com/scoder/lupa";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index aa009e0a3e..b583760310 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "lxml";
- version = "4.5.2";
+ version = "4.6.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${version}";
- sha256 = "1d0cpwdjxfzwjzmnz066ibzicyj2vhx15qxmm775l8hxqi65xps4";
+ sha256 = "1zidx62sxh2r4fmjfjzd4f6i4yxgzkpd20nafbyr0i0wnw9da3fd";
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
index e23c3621c2..8559339b01 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
@@ -1,26 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytestrunner
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "managesieve";
- version = "0.6";
+ version = "0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "ee70e298e9b68eb81f93d52a1320a034fdc182f3927fdd551836fc93b0ed2c5f";
+ sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6";
};
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "ManageSieve client library for remotely managing Sieve scripts";
- homepage = "https://managesieve.readthedocs.io/";
- # PSFL for the python module, GPLv3 for sieveshell
- license = with licenses; [ gpl3 psfl ];
+ homepage = "https://managesieve.readthedocs.io/";
+ # PSFL for the python module, GPLv3 only for sieveshell
+ license = with licenses; [ gpl3Only psfl ];
maintainers = with maintainers; [ dadada ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
index bf21422b77..4be4189f8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt5 != null;
buildPythonPackage rec {
- version = "3.3.3";
+ version = "3.3.4";
pname = "matplotlib";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b1b60c6476c4cfe9e5cf8ab0d3127476fd3d5f05de0f343a452badaad0e4bdec";
+ sha256 = "3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0";
};
XDG_RUNTIME_DIR = "/tmp";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index d46b505991..6632b88b72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.8.12";
+ version = "0.8.16";
src = fetchPypi {
inherit pname version;
- sha256 = "471684d40cbc2f7db345f2f809553b221a34d1c81e04bcdcb08a2832f140db1e";
+ sha256 = "ccaa1691affa5f257e13d61f7c46088ff0affdd782331b01bfdcbd0b3eb5e10e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix
new file mode 100644
index 0000000000..2c293b3b9c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, netcdf4
+, h5py
+, exdown
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "meshio";
+ version = "4.3.10";
+ format = "pyproject";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ netcdf4
+ h5py
+ ];
+
+ checkInputs = [
+ exdown
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = ["meshio"];
+
+ meta = with lib; {
+ homepage = "https://github.com/nschloe/meshio";
+ description = "I/O for mesh files.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ wd15 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
index dd351931e0..e9c1254826 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
@@ -1,21 +1,25 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, buildPythonPackage
-, isPy27
-, fetchpatch
-# Mitmproxy requirements
+, pythonOlder
+ # Mitmproxy requirements
+, asgiref
, blinker
, brotli
, certifi
, click
, cryptography
, flask
+, h11
, h2
, hyperframe
, kaitaistruct
, ldap3
+, msgpack
, passlib
, protobuf
+, publicsuffix2
, pyasn1
, pyopenssl
, pyparsing
@@ -26,45 +30,31 @@
, tornado
, urwid
, wsproto
-, publicsuffix2
, zstandard
-# Additional check requirements
+ # Additional check requirements
, beautifulsoup4
, glibcLocales
-, pytest
-, requests
-, asynctest
+, hypothesis
, parver
, pytest-asyncio
-, hypothesis
-, asgiref
-, msgpack
+, pytest-timeout
+, pytest-xdist
+, pytestCheckHook
+, requests
}:
buildPythonPackage rec {
pname = "mitmproxy";
- version = "5.3.0";
- disabled = isPy27;
+ version = "6.0.2";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-FyIZKFQtf6qvwo4+NzPa/KOmBCcdGJ3jCqxz26+S2e4=";
};
- postPatch = ''
- # remove dependency constraints
- sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
- '';
-
- doCheck = (!stdenv.isDarwin);
-
- checkPhase = ''
- export HOME=$(mktemp -d)
- pytest -k 'not test_get_version' # expects a Git repository
- '';
-
propagatedBuildInputs = [
setuptools
# setup.py
@@ -75,6 +65,7 @@ buildPythonPackage rec {
click
cryptography
flask
+ h11
h2
hyperframe
kaitaistruct
@@ -96,21 +87,39 @@ buildPythonPackage rec {
];
checkInputs = [
- asynctest
beautifulsoup4
- flask
glibcLocales
hypothesis
parver
- pytest
pytest-asyncio
+ pytest-timeout
+ pytest-xdist
+ pytestCheckHook
requests
];
+ doCheck = !stdenv.isDarwin;
+
+ postPatch = ''
+ # remove dependency constraints
+ sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
+ '';
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ disabledTests = [
+ # Tests require a git repository
+ "test_get_version"
+ ];
+
+ pythonImportsCheck = [ "mitmproxy" ];
+
meta = with lib; {
description = "Man-in-the-middle proxy";
- homepage = "https://mitmproxy.org/";
- license = licenses.mit;
+ homepage = "https://mitmproxy.org/";
+ license = licenses.mit;
maintainers = with maintainers; [ fpletz kamilchm ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix
index e905add00f..72e40d750e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "mock";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72";
+ sha256 = "7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc";
};
propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
index 2102718ab6..76b64be743 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
@@ -1,10 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, isPy3k
, decorator
, http-parser
-, importlib-metadata
-, python
, python_magic
-, six
, urllib3
, pytestCheckHook
, pytest-mock
@@ -13,15 +14,17 @@
, redis
, requests
, sure
+, pook
}:
buildPythonPackage rec {
pname = "mocket";
- version = "3.9.39";
+ version = "3.9.40";
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4";
+ sha256 = "061w3zqf4ir7hfj0vzl58lg8szsik1fxv126s32x03nk1sd39r6v";
};
propagatedBuildInputs = [
@@ -29,8 +32,7 @@ buildPythonPackage rec {
http-parser
python_magic
urllib3
- six
- ] ++ lib.optionals (isPy27) [ six ];
+ ];
checkInputs = [
pytestCheckHook
@@ -40,13 +42,14 @@ buildPythonPackage rec {
redis
requests
sure
+ pook
];
pytestFlagsArray = [
- "--ignore=tests/main/test_pook.py" # pook is not packaged
- "--ignore=tests/main/test_redis.py" # requires a live redis instance
+ # Requires a live Redis instance
+ "--ignore=tests/main/test_redis.py"
] ++ lib.optionals (pythonOlder "3.8") [
- # uses IsolatedAsyncioTestCase which is only available >= 3.8
+ # Uses IsolatedAsyncioTestCase which is only available >= 3.8
"--ignore=tests/tests38/test_http_aiohttp.py"
];
@@ -61,6 +64,7 @@ buildPythonPackage rec {
"test_truesendall_with_recording_https"
"test_truesendall_after_mocket_session"
"test_real_request_session"
+ "test_asyncio_record_replay"
];
pythonImportsCheck = [ "mocket" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
index d068380a7a..826a4fddae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "msldap";
- version = "0.3.25";
+ version = "0.3.27";
src = fetchPypi {
inherit pname version;
- sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea";
+ sha256 = "sha256-tAMl1Xkb04Vfh18uS30eKX/IfeXhwER3J1lHXHxHlXY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mullvad-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mullvad-api/default.nix
new file mode 100644
index 0000000000..22e6647b57
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mullvad-api/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "mullvad-api";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ pname = "mullvad_api";
+ inherit version;
+ sha256 = "0r0hc2d6vky52hxdqxn37w0y42ddh1zal6zz2cvqlxamc53wbiv1";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "mullvad_api" ];
+
+ meta = with lib; {
+ description = "Python client for the Mullvad API";
+ homepage = "https://github.com/meichthys/mullvad-api";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
index c2a7eb1933..ca2ffea183 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "murmurhash";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "422084ac1fe994cb7c893689c600923dee4e2c3fc74e832f7d9a8d6fdcc362d5";
+ sha256 = "98ec9d727bd998a35385abd56b062cf0cca216725ea7ec5068604ab566f7e97f";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix
new file mode 100644
index 0000000000..d80e66e07b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, click
+, colorama
+, cryptography
+, exrex
+, pyopenssl
+, pyperclip
+, questionary
+, requests
+, pytestCheckHook
+, pytest-mock
+, requests-mock
+}:
+
+buildPythonPackage rec {
+ pname = "myjwt";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "mBouamama";
+ repo = "MyJWT";
+ rev = version;
+ sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4";
+ };
+
+ patches = [ ./pinning.patch ];
+
+ propagatedBuildInputs = [
+ click
+ colorama
+ cryptography
+ exrex
+ pyopenssl
+ pyperclip
+ questionary
+ requests
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ requests-mock
+ ];
+
+ pythonImportsCheck = [ "myjwt" ];
+
+ meta = with lib; {
+ description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)";
+ homepage = "https://github.com/mBouamama/MyJWT";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ # Build failures
+ broken = stdenv.isDarwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch
new file mode 100644
index 0000000000..abae9d0e2e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/pinning.patch
@@ -0,0 +1,21 @@
+diff --git a/requirements.txt b/requirements.txt
+index 3017e02..2b465db 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,8 +1,8 @@
+-click==7.1.2
+-colorama==0.4.4
+-cryptography==3.3.1
+-exrex==0.10.5
+-pyOpenSSL==20.0.1
+-pyperclip==1.8.1
+-questionary==1.9.0
+-requests==2.25.1
++click
++colorama
++cryptography
++exrex
++pyOpenSSL
++pyperclip
++questionary
++requests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index 4bea992f6b..dbbcb30ffc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
@@ -1,22 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k
+{ lib, stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k
, mypy-extensions
, typing-extensions
-, fetchpatch
}:
buildPythonPackage rec {
pname = "mypy";
- version = "0.790";
+ version = "0.812";
disabled = !isPy3k;
- # Fetch 0.790 from GitHub temporarily because mypyc.analysis is missing from
- # the Pip package (see also https://github.com/python/mypy/issues/9584). It
- # should be possible to move back to Pypi for the next release.
- src = fetchFromGitHub {
- owner = "python";
- repo = pname;
- rev = "v${version}";
- sha256 = "0zq3lpdf9hphcklk40wz444h8w3dkhwa12mqba5j9lmg11klnhz7";
- fetchSubmodules = true;
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "069i9qnfanp7dn8df1vspnqb0flvsszzn22v00vj08nzlnd061yd";
};
propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];
@@ -34,23 +27,6 @@ buildPythonPackage rec {
"mypyc.analysis"
];
- # These three patches are required to make compilation with mypyc work for
- # 0.790, see also https://github.com/python/mypy/issues/9584.
- patches = [
- (fetchpatch {
- url = "https://github.com/python/mypy/commit/f6522ae646a8d87ce10549f29fcf961dc014f154.patch";
- sha256 = "0d3jp4d0b7vdc0prk07grhajsy7x3wcynn2xysnszawiww93bfrh";
- })
- (fetchpatch {
- url = "https://github.com/python/mypy/commit/acd603496237a78b109ca9d89991539633cbbb99.patch";
- sha256 = "0ry1rxpz2ws7zzrmq09pra9dlzxb84zhs8kxwf5xii1k1bgmrljr";
- })
- (fetchpatch {
- url = "https://github.com/python/mypy/commit/81818b23b5d53f31caf3515d6f0b54e3c018d790.patch";
- sha256 = "002y24kfscywkw4mz9lndsps543j4xhr2kcnfbrqr4i0yxlvdbca";
- })
- ];
-
# Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
# version is also the default in the wheels on Pypi that include binaries.
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index e4c4249659..d475f21fcb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "natsort";
- version = "7.1.0";
+ version = "7.1.1";
checkInputs = [
pytest
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "33f3f1003e2af4b4df20908fe62aa029999d136b966463746942efbfc821add3";
+ sha256 = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403";
};
# Does not support Python 2
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
index c320415e07..169b89f7b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "nbclient";
- version = "0.5.1";
+ version = "0.5.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "01e2d726d16eaf2cde6db74a87e2451453547e8832d142f73f72fddcd4fe0250";
+ sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c";
};
inherit doCheck;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
index 60f7dbe6c2..35e5e063bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
- version = "1.5.5.1";
+ version = "1.5.6";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "d957e55a667d1fc651ddef22fea10ded0f142b7d9dbbf4d08c0012d32f445abd";
+ sha256 = "7577f4656af8431b2fa6b6797acb45f81fa1890120e9123b3645e14765da5a7c";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 926dd3698c..bfc5d8c60c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
@@ -27,12 +27,12 @@
buildPythonPackage rec {
pname = "notebook";
- version = "6.1.5";
+ version = "6.2.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3db37ae834c5f3b6378381229d0e5dfcbfb558d08c8ce646b1ad355147f5e91d";
+ sha256 = "0464b28e18e7a06cec37e6177546c2322739be07962dd13bf712bcb88361f013";
};
LC_ALL = "en_US.utf8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
index 3f67c044de..48ed52499c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, pythonAtLeast
, pythonOlder
, fetchPypi
, python
@@ -11,14 +12,14 @@
}:
buildPythonPackage rec {
- version = "0.51.2";
+ version = "0.52.0";
pname = "numba";
- # uses f-strings
- disabled = pythonOlder "3.6";
+ # uses f-strings, python 3.9 is not yet supported
+ disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
- sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
+ sha256 = "44661c5bd85e3d3619be0a40eedee34e397e9ccb3d4c458b70e10bf95d1ce933";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix
index 3857e80bbd..89471207c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "numcodecs";
- version = "0.7.2";
+ version = "0.7.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "4a038064d5604e6181a64db668d7b700d9ae87e4041984c04cbf0042469664b0";
+ sha256 = "022b12ad83eb623ec53f154859d49f6ec43b15c36052fa864eaf2d9ee786dd85";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
index 51eeab3177..ed6f80b34a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
@@ -4,15 +4,15 @@
, buildPythonPackage
, gfortran
, hypothesis
-, pytest_5
+, pytest
, blas
, lapack
, writeTextFile
, isPyPy
, cython
, setuptoolsBuildHook
-, fetchpatch
- }:
+, pythonOlder
+}:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -40,31 +40,26 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.19.4";
+ version = "1.20.1";
format = "pyproject.toml";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512";
+ sha256 = "02m6sms6wb4flfg8y4h0msan4y7w7qgfqxhdk21lcabhm2339iiv";
};
- nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
- buildInputs = [ blas lapack ];
-
- patches = [
- # For compatibility with newer pytest
- (fetchpatch {
- url = "https://github.com/numpy/numpy/commit/ba315034759fbf91c61bb55390edc86e7b2627f3.patch";
- sha256 = "F2P5q61CyhqsZfwkLmxb7A9YdE+43FXLbQkSjop2rVY=";
- })
- ] ++ lib.optionals python.hasDistutilsCxxPatch [
+ patches = lib.optionals python.hasDistutilsCxxPatch [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585
# Patching of numpy.distutils is needed to prevent it from undoing the
# patch to distutils.
./numpy-distutils-C++.patch
];
+ nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
+ buildInputs = [ blas lapack ];
+
# we default openblas to build with 64 threads
# if a machine has more than 64 threads, it will segfault
# see https://github.com/xianyi/OpenBLAS/issues/2993
@@ -83,7 +78,7 @@ in buildPythonPackage rec {
doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
checkInputs = [
- pytest_5 # pytest 6 will error: "module is already imported: hypothesis"
+ pytest
hypothesis
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
index 63b5214b27..df831ab6b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "nunavut";
- version = "1.0.1";
+ version = "1.0.2";
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
src = fetchPypi {
inherit pname version;
- sha256 = "1gvs3fx2l15y5ffqsxxjfa4p1ydaqbq7qp5nsgb8jbz871358jxm";
+ sha256 = "c6fe0a1b92c44bb64b2427f944fee663fe1aaf3d4d4080d04ad9c212b40a8763";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
index 234c4edd1a..839582e87f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
-, google_api_python_client
+, google-api-python-client
, google-auth-oauthlib
, jupyterhub
, mwoauth
@@ -29,7 +29,7 @@ buildPythonPackage rec {
pytestFlagsArray = [ "oauthenticator/tests" ];
checkInputs = [
- google_api_python_client
+ google-api-python-client
google-auth-oauthlib
mwoauth
pyjwt
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
index 95e67c58d5..807b6cf5f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "onnx";
- version = "1.8.0";
+ version = "1.8.1";
# Due to Protobuf packaging issues this build of Onnx with Python 2 gives
# errors on import.
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "5f787fd3ce1290e12da335237b3b921152157e51aa09080b65631b3ce3fcc50c";
+ sha256 = "9d65c52009a90499f8c25fdfe5acda3ac88efe0788eb1d5f2575a989277145fb";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
index 5a7d2a6425..48941c8081 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "openpyxl";
- version = "3.0.5";
+ version = "3.0.6";
disabled = isPy27; # 2.6.4 was final python2 release
src = fetchPypi {
inherit pname version;
- sha256 = "18e11f9a650128a12580a58e3daba14e00a11d9e907c554a17ea016bf1a2c71b";
+ sha256 = "b229112b46e158b910a5d1b270b212c42773d39cab24e8db527f775b82afc041";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
new file mode 100644
index 0000000000..14d0909e65
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, urllib3
+}:
+
+buildPythonPackage rec {
+ pname = "openwrt-ubus-rpc";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "Noltari";
+ repo = "python-ubus-rpc";
+ rev = version;
+ sha256 = "19scncc1w9ar3pw4yrw24akjgm74n2m7y308hzl1i360daf5p21k";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ urllib3
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "openwrt.ubus" ];
+
+ meta = with lib; {
+ description = "Python API for OpenWrt ubus RPC";
+ homepage = "https://github.com/Noltari/python-ubus-rpc";
+ license = with licenses; [ gpl2Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index 689c2e4516..0a747a7576 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "packaging";
- version = "20.7";
+ version = "20.8";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "Ba87uF0yA3fbKBzyVKsFDhp+vL9UEGhamkB+GKH4EjY=";
+ sha256 = "sha256-eFmBhacAikcNZFJqgFnemqpEkjjygPyetrE7psQQkJM=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index 7ef78f9dfb..7fd551e192 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, python
@@ -8,35 +9,41 @@
, cython
, dateutil
, html5lib
+, jinja2
, lxml
, numexpr
, openpyxl
, pytz
-, sqlalchemy
, scipy
+, sqlalchemy
, tables
, xlrd
, xlwt
-# Test Inputs
+# Test inputs
, glibcLocales
, hypothesis
, pytestCheckHook
+, pytest-xdist
+, pytest-asyncio
+, XlsxWriter
# Darwin inputs
, runtimeShell
-, libcxx ? null
+, libcxx
}:
buildPythonPackage rec {
pname = "pandas";
- version = "1.1.5";
+ version = "1.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "06vhk75hmzgv1sfbjzgnsw9x10h7y6bd6s6z7d6lfnn7wcgc83zi";
+ sha256 = "078b4nncn6778ymmqn80j2q6n7fcs4d6bbaraar5nypgbaw10vyz";
};
nativeBuildInputs = [ cython ];
+
buildInputs = lib.optional stdenv.isDarwin libcxx;
+
propagatedBuildInputs = [
beautifulsoup4
bottleneck
@@ -53,9 +60,17 @@ buildPythonPackage rec {
xlwt
];
- checkInputs = [ pytestCheckHook glibcLocales hypothesis ];
+ checkInputs = [
+ glibcLocales
+ hypothesis
+ jinja2
+ pytest-asyncio
+ pytest-xdist
+ pytestCheckHook
+ XlsxWriter
+ ];
- # doesn't work with -Werror,-Wunused-command-line-argument
+ # Doesn't work with -Werror,-Wunused-command-line-argument
# https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
@@ -69,52 +84,33 @@ buildPythonPackage rec {
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
'';
- # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next
- # release. https://github.com/pandas-dev/pandas/pull/30862
- setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [
- # As suggested by
- # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment
- "--parallel=$NIX_BUILD_CORES"
- ];
-
doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
pytestFlagsArray = [
"--skip-slow"
"--skip-network"
+ "--numprocesses" "0"
];
+
disabledTests = [
- # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
- # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
- "test_fallback_plural"
- "test_ambiguous_flags"
- "test_ambiguous_compat"
# Locale-related
"test_names"
"test_dt_accessor_datetime_name_accessors"
"test_datetime_name_accessors"
- # Can't import from test folder
- "test_oo_optimizable"
# Disable IO related tests because IO data is no longer distributed
"io"
- # KeyError Timestamp
- "test_to_excel"
- # ordering logic has changed
- "numpy_ufuncs_other"
- "order_without_freq"
- # tries to import from pandas.tests post install
+ # Tries to import from pandas.tests post install
"util_in_top_level"
- # Fails with 1.0.5
- "test_constructor_list_frames"
- "test_constructor_with_embedded_frames"
- # tries to import compiled C extension locally
+ # Tries to import compiled C extension locally
"test_missing_required_dependency"
+ # AssertionError with 1.2.3
+ "test_from_coo"
] ++ lib.optionals stdenv.isDarwin [
"test_locale"
"test_clipboard"
];
- # tests have relative paths, and need to reference compiled C extensions
+ # Tests have relative paths, and need to reference compiled C extensions
# so change directory where `import .test` is able to be resolved
preCheck = ''
cd $out/${python.sitePackages}/pandas
@@ -131,6 +127,8 @@ buildPythonPackage rec {
export PATH=$(pwd):$PATH
'';
+ pythonImportsCheck = [ "pandas" ];
+
meta = with lib; {
# https://github.com/pandas-dev/pandas/issues/14866
# pandas devs are no longer testing i686 so safer to assume it's broken
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
index b05a525d91..3e7c6ae001 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml
-, python-doi, isPy3k, pythonOlder, pytestcov
+, python-doi, isPy3k, pytestcov
#, optional, dependencies
, whoosh, pytest
, stdenv
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix
index 9f6d78a8ec..8e090561ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "param";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a284c1b42aff6367e8eea2f649d4f3f70a9f16c6f17d8ad672a31ff36089f995";
+ sha256 = "1f0f1133fbadcd2c5138e579b9934e29fd00f803af01d9bf6f9e6b80ecf1999b";
};
checkInputs = [ flake8 nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
index 207a6a38bd..dbf5475bab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "parameterized";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchPypi {
inherit pname version;
- sha256 = "190f8cc7230eee0b56b30d7f074fd4d165f7c45e6077582d0813c8557e738490";
+ sha256 = "b5e6af67b9e49485e30125b1c8f031ffa81a265ca08bfa73f31551bf03cf68c4";
};
# Tests require some python3-isms but code works without.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
index f9a87fa5f6..6eebad4467 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "parso";
- version = "0.8.0";
+ version = "0.8.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64";
+ sha256 = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix
new file mode 100644
index 0000000000..1bf7f26adf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "parts";
+ version = "1.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ym238hxwsw15ivvf6gzmkmla08b9hwhdyc3v6rs55wga9j3a4db";
+ };
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "parts" ];
+
+ meta = with lib; {
+ description = "Python library for common list functions related to partitioning lists";
+ homepage = "https://github.com/lapets/parts";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
index e65f62c8ff..588a27159e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pex";
- version = "2.1.21";
+ version = "2.1.30";
src = fetchPypi {
inherit pname version;
- sha256 = "d580a26da1b342ab2ebbf675ba2bab04e98c4d1aaf2a6fea09f41d68dfc466ba";
+ sha256 = "ac170d656d2083d02048850005415d03d1767087e4f5037bc86defb6b23e712d";
};
nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index 9f9bb1702a..3cf843b864 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
@@ -1,29 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
-, scramp
-, isPy3k
, passlib
+, pythonOlder
+, scramp
}:
buildPythonPackage rec {
pname = "pg8000";
- version = "1.16.6";
-
- disabled = !isPy3k;
+ version = "1.18.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
+ sha256 = "1nkjxf95ldda41mkmahbikhd1fvxai5lfjb4a5gyhialpz4g5fim";
};
propagatedBuildInputs = [ passlib scramp ];
+ # Tests require a running PostgreSQL instance
+ doCheck = false;
+ pythonImportsCheck = [ "pg8000" ];
+
meta = with lib; {
+ description = "Python driver for PostgreSQL";
homepage = "https://github.com/tlocke/pg8000";
- description = "PostgreSQL interface library, for asyncio";
+ license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ domenkozar ];
platforms = platforms.unix;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
index 767140e6bf..3240b08099 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pglast";
- version = "1.14";
+ version = "1.17";
src = fetchPypi {
inherit pname version;
- sha256 = "72652b9edc7bdbfc9c3192235fb2fa1b2fb73a681613368fcaec747d7f5e479f";
+ sha256 = "2979b38ca5f72cfa0a5db78af2f62d04db6a7647ee7f03eac7a67f9e86e3f5f9";
};
disabled = !isPy3k;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch
index 1734addb0e..5f828aaaae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch
@@ -1,8 +1,8 @@
diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py
-index 387c11c..ceb5e7e 100644
+index b4712bf..5628fd5 100644
--- a/phonemizer/backend/espeak.py
+++ b/phonemizer/backend/espeak.py
-@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend):
+@@ -82,10 +82,7 @@ class BaseEspeakBackend(BaseBackend):
if _ESPEAK_DEFAULT_PATH:
return _ESPEAK_DEFAULT_PATH
@@ -15,10 +15,10 @@ index 387c11c..ceb5e7e 100644
@classmethod
def is_available(cls):
diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py
-index b5bc56d..0833160 100644
+index 3037be5..684ffff 100644
--- a/phonemizer/backend/festival.py
+++ b/phonemizer/backend/festival.py
-@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend):
+@@ -80,7 +80,7 @@ class FestivalBackend(BaseBackend):
if _FESTIVAL_DEFAULT_PATH:
return _FESTIVAL_DEFAULT_PATH
@@ -27,3 +27,16 @@ index b5bc56d..0833160 100644
@classmethod
def is_available(cls):
+diff --git a/test/test_punctuation.py b/test/test_punctuation.py
+index 6ed642a..08060df 100644
+--- a/test/test_punctuation.py
++++ b/test/test_punctuation.py
+@@ -28,7 +28,7 @@ ESPEAK_143 = (EspeakBackend.version(as_tuple=True) >= (1, 49, 3))
+ ESPEAK_150 = (EspeakBackend.version(as_tuple=True) >= (1, 50))
+
+ # True if we are using festival>=2.5
+-FESTIVAL_25 = (FestivalBackend.version(as_tuple=True) >= (2, 5))
++FESTIVAL_25 = False
+
+
+ @pytest.mark.parametrize(
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
index 80bc0737ca..43ce5f1e76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
@@ -12,11 +12,11 @@
buildPythonApplication rec {
pname = "phonemizer";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "127n4f10zxq60qd8xvlc1amji4wbghqb90rfp25rzdk716kvgwab";
+ sha256 = "ae252f0bc7633e172b08622f318e7e112cde847e9281d4675ea7210157325146";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
index 354ca2796e..72c61e08ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.12.13";
+ version = "8.12.18";
src = fetchPypi {
inherit pname version;
- sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562";
+ sha256 = "0aa0f5e1382d292a7ff2f8bc08673126521461c7f908e0220756449a734d8fef";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index 051e6ab8c6..02611c5a92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -5,13 +5,13 @@
import ./generic.nix (rec {
pname = "Pillow";
- version = "8.0.1";
+ version = "8.1.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e";
+ sha256 = "086g7nhv52wclrwnzbzs2x3nvyzs2hfq1bvgivsrp5f7r7wiiz7n";
};
meta = with lib; {
@@ -23,7 +23,7 @@ import ./generic.nix (rec {
supports many file formats, and provides powerful image
processing and graphics capabilities.
'';
- license = "http://www.pythonware.com/products/pil/license.htm";
+ license = licenses.hpnd;
maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ];
};
} // args )
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix
index f35ed6b3d1..6f859d365c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "pip";
- version = "20.3";
+ version = "20.3.4";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU=";
+ sha256 = "0hkhs9yc1cjdj1gn9wkycd3sy65c05q8k8rhqgsm5jbpksfssiwn";
name = "${pname}-${version}-source";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
index c29847c9f2..34a7bc6b31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
@@ -6,12 +6,13 @@
, argcomplete
, packaging
, importlib-metadata
+, colorama
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pipx";
- version = "0.16.0.0";
+ version = "0.16.1.0";
disabled = pythonOlder "3.6";
@@ -20,13 +21,14 @@ buildPythonPackage rec {
owner = "pipxproject";
repo = pname;
rev = version;
- sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn";
+ sha256 = "081raqsaq7i2x4yxhxppv930jhajdwmngin5wazy7vqhiy3xc669";
};
propagatedBuildInputs = [
userpath
argcomplete
packaging
+ colorama
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
index 1b03f720fb..098b79a15d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pkgconfig";
- version = "1.5.1";
+ version = "1.5.2";
inherit (pkg-config)
setupHooks
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f";
+ sha256 = "38d612488f0633755a2e7a8acab6c01d20d63dbc31af75e2a9ac98a6f638ca94";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix
new file mode 100644
index 0000000000..1dca45eca7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, requests-mock
+, oauthlib
+, requests_oauthlib
+, requests
+, pyaml
+}:
+
+buildPythonPackage rec {
+ pname = "pleroma-bot";
+ version = "0.8.6";
+
+ src = fetchFromGitHub {
+ owner = "robertoszek";
+ repo = "pleroma-bot";
+ rev = version;
+ sha256 = "1q0xhgqq41zbqiawpd4kbdx41zhwxxp5ipn1c2rc8d7pjyb5p75w";
+ };
+
+ propagatedBuildInputs = [ pyaml requests requests_oauthlib oauthlib ];
+ checkInputs = [ pytestCheckHook requests-mock ];
+
+ pythonImportsCheck = [ "pleroma_bot" ];
+
+ meta = with lib; {
+ homepage = "https://robertoszek.github.io/pleroma-bot/";
+ description = "Bot for mirroring one or multiple Twitter accounts in Pleroma/Mastodon";
+ license = licenses.mit;
+ maintainers = with maintainers; [ robertoszek ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
index 5251ff1de0..810bd1ffed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "PlexAPI";
- version = "4.3.1";
+ version = "4.4.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
- sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4=";
+ sha256 = "0wzdzi5afncinavz5g77ximdr9y2ndzwb0gl819n0l6pnvbxdwp2";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix
index b0936a50ba..d3042c92e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "plyfile";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "59a25845d00a51098e6c9147c3c96ce89ad97395e256a4fabb4aed7cf7db5541";
+ sha256 = "5ac55b685cfcb3e8f70f3c5c2660bd1f6431a892a5319a612792b1ec09aec0f0";
};
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix
new file mode 100644
index 0000000000..480dc7dcba
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, furl
+, jsonschema
+, nose
+, pytestCheckHook
+, pythonOlder
+, requests
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "pook";
+ version = "1.0.1";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "h2non";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0z48vswj07kr2sdvq5qzrwqyijpmj2rlnh2z2b32id1mckr6nnz8";
+ };
+
+ patches = [
+ (fetchpatch {
+ # Will be fixed with the new release, https://github.com/h2non/pook/issues/69
+ name = "use-match-keyword-in-pytest.patch";
+ url = "https://github.com/h2non/pook/commit/2071da27701c82ce02b015e01e2aa6fd203e7bb5.patch";
+ sha256 = "0i3qcpbdqqsnbygi46dyqamgkh9v8rhpbm4lkl75riw48j4n080k";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ furl
+ jsonschema
+ requests
+ xmltodict
+ ];
+
+ checkInputs = [
+ nose
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pook" ];
+
+ meta = with lib; {
+ description = "HTTP traffic mocking and testing made simple in Python";
+ homepage = "https://github.com/h2non/pook";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
index 1408f7ca90..0429519c20 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "portend";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ac0e57ae557f75dc47467579980af152e8f60bc2139547eff8469777d9110379";
+ sha256 = "986ed9a278e64a87b5b5f4c21e61c25bebdce9919a92238d9c14c37a7416482b";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix
index 1ad17d0459..63f5feada5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
-, python
, buildPythonPackage
, socat
, psutil
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
index de37c338bf..190e28e714 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "pplpy";
- version = "0.8.4";
+ version = "0.8.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0dk8l5r3f2jbkkasddvxwvhlq35pjsiirh801lrapv8lb16r2qmr";
+ sha256 = "500bd0f4ae1a76956fae7fcba77854f5ec3e64fce76803664983763c3f2bd8bd";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
index 758cd0a784..3c9bc5c7c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "prance";
- version = "0.20.0";
+ version = "0.20.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f7e98b0f7e8ef0dd581c40d8a3e869e15e74b08026b862c3212447f8aa2426a7";
+ sha256 = "4ffcddae6218cf6753a02af36ca9fb1c92eec4689441789ee2e9963230882388";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix
index 5ca1d3d83c..5047c1e88b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "praw";
- version = "7.1.4";
+ version = "7.2.0";
src = fetchFromGitHub {
owner = "praw-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A=";
+ sha256 = "sha256-/GV5ZhrJxeChcYwmH/9FsLceAYRSeTCDe4lMEwdTa8Y=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
index 2b6eff885f..1e38f401a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "prawcore";
- version = "1.5.0";
+ version = "2.0.0";
disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101
src = fetchPypi {
inherit pname version;
- sha256 = "1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b";
+ sha256 = "sha256-tJjZtvVJkQBecn1SNcj0nqW6DJpteT+3Q7QPoInNNtE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
index 767d5b867f..4fc1adfbf0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
@@ -9,11 +9,11 @@
}:
buildPythonPackage rec {
pname = "preshed";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "13a779205d55ce323976ac06df597f9ec2d6f0563ebcf5652176cf4520c7d540";
+ sha256 = "c6d3dba39ed5059aaf99767017b9568c75b2d0780c3481e204b1daecde00360e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
index 2fa885a69f..e43931d914 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "prompt_toolkit";
- version = "3.0.8";
+ version = "3.0.16";
src = fetchPypi {
inherit pname version;
- sha256 = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c";
+ sha256 = "0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974";
};
checkPhase = ''
py.test -k 'not test_pathcompleter_can_expanduser'
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
index cc9444098d..4784dcdfa2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, isPy3k
, protobuf
-, googleapis_common_protos
+, googleapis-common-protos
, pytestCheckHook
, pytz
}:
@@ -20,7 +20,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ protobuf ];
- checkInputs = [ pytestCheckHook pytz googleapis_common_protos ];
+ checkInputs = [ pytestCheckHook pytz googleapis-common-protos ];
pythonImportsCheck = [ "proto" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index aa4d00892d..60c6f33327 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
@@ -1,6 +1,5 @@
{ buildPackages
, lib
-, stdenv
, fetchpatch
, python
, buildPythonPackage
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
index 783905c702..92810ec6a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "psd-tools";
- version = "1.9.16";
+ version = "1.9.17";
src = fetchPypi {
inherit pname version;
- sha256 = "dece6327b5aa03b53163c63e2bf90b4a7b0ff6872ef743adab140a59cb2318ff";
+ sha256 = "d01e11581442dfcc1bd73ac3278bdf1f98e9df8f083a11e5989632ff97322b65";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
index 2758c3a582..51ad2e85ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ptpython/default.nix
@@ -1,18 +1,30 @@
-{ lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
-, pygments, importlib-metadata, isPy3k }:
+{ lib, buildPythonPackage, pythonOlder, fetchPypi
+, appdirs
+, black
+, importlib-metadata
+, isPy3k
+, jedi
+, prompt_toolkit
+, pygments
+}:
buildPythonPackage rec {
pname = "ptpython";
- version = "3.0.7";
+ version = "3.0.16";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "34814eb410f854c823be4c4a34124e1dc8ca696da1c1fa611f9da606c5a8a609";
+ sha256 = "4b0f6e381a8251ec8d6aa94fe12f3400bf6edf789f89c8a6099f8a91d4a5d2e1";
};
- propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]
- ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+ propagatedBuildInputs = [
+ appdirs
+ black # yes, this is in install_requires
+ jedi
+ prompt_toolkit
+ pygments
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# no tests to run
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix
new file mode 100644
index 0000000000..29905d72cf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, flake8 }:
+
+buildPythonPackage rec {
+ pname = "pure-cdb";
+ version = "3.1.1";
+ disabled = pythonOlder "3.4";
+
+ # Archive on pypi has no tests.
+ src = fetchFromGitHub {
+ owner = "bbayles";
+ repo = "python-pure-cdb";
+ rev = "v${version}";
+ hash = "sha256-/FAe4NkY5unt83BOnJ3QqBJFQCPdQnbMVl1fSZ511Fc=";
+ };
+
+ checkInputs = [ flake8 ];
+
+ pythonImportsCheck = [ "cdblib" ];
+
+ meta = with lib; {
+ description = "Python library for working with constant databases";
+ homepage = "https://python-pure-cdb.readthedocs.io/en/latest";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kaction ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
index ae2f5ae9d6..0afc75bf87 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -1,30 +1,33 @@
{ lib
+, stdenv
, fetchFromGitHub
, buildPythonPackage
-, pytest
+, pytestCheckHook
+, sysctl
}:
buildPythonPackage rec {
pname = "py-cpuinfo";
- version = "5.0.0";
+ version = "7.0.0";
src = fetchFromGitHub {
owner = "workhorsy";
repo = pname;
rev = "v${version}";
- sha256 = "0lxl9n6djaz5h1zrb2jca4qwl41c2plxy8chr7yhcxnzg0srddqi";
+ sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
};
- checkInputs = [
- pytest
- ];
-
- checkPhase = ''
- runHook preCheck
- pytest -k "not TestActual"
- runHook postCheck
+ # On Darwin sysctl is used to read CPU information.
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace cpuinfo/cpuinfo.py \
+ --replace "len(_program_paths('sysctl')) > 0" "True" \
+ --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
'';
+ checkInputs = [
+ pytestCheckHook
+ ];
+
meta = {
description = "Get CPU info with pure Python 2 & 3";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
index c35e650e18..dce8157da5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sonic/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "py-sonic";
- version = "0.7.8";
+ version = "0.7.9";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1nfpiry1jlgcyxcs5zamyfxwdvdiwg4yw0v8jysfc74hm362rg7d";
+ sha256 = "1677b7287914567b5123de90ad872b441628d8a7777cf4a5f41671b813facf75";
};
# package has no tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index ea5c93dbea..76e9954a02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
- version = "3.7.4";
+ version = "3.7.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9b95f441c390fd30a4452a984406310f60a7f4803df57860ccb6a79881506c46";
+ sha256 = "859136cbd50e99922e1ea495d4ebe8235b2cb10fe419a5421f28855249db4278";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix
index be54a38cd9..cb1764b23b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pyBigWig";
- version = "0.3.17";
+ version = "0.3.18";
src = fetchPypi {
inherit pname version;
- sha256 = "157x6v48y299zm382krf1dw08fdxg95im8lnabhp5vc94s04zxj1";
+ sha256 = "4c2a8c571b4100ad7c4c318c142eb48558646be52aaab28215a70426f5be31bc";
};
buildInputs = [ zlib ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix
new file mode 100644
index 0000000000..c65ea3a695
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, libcec
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pycec";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "konikvranik";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6";
+ };
+
+ propagatedBuildInputs = [
+ libcec
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pycec" ];
+
+ meta = with lib; {
+ description = "Python modules to access HDMI CEC devices";
+ homepage = "https://github.com/konikvranik/pycec/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
index d58821569e..fae49e7be0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -1,17 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
buildPythonPackage rec {
pname = "pycryptodomex";
- version = "3.9.9";
-
- meta = {
- description = "A self-contained cryptographic library for Python";
- homepage = "https://www.pycryptodome.org";
- license = lib.licenses.bsd2;
- };
+ version = "3.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51";
+ sha256 = "sha256-VBzT4+JS+xmntI9CC3mLU0gzArf+TZlUyUdgXQomPWI=";
+ };
+
+ pythonImportsCheck = [ "Cryptodome" ];
+
+ meta = with lib; {
+ description = "A self-contained cryptographic library for Python";
+ homepage = "https://www.pycryptodome.org";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
index 9bf4bede1f..d3c6e37bbe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
@@ -1,44 +1,45 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
-, ujson
, email_validator
-, typing-extensions
-, python
-, isPy3k
-, pytest
-, pytestcov
+, fetchFromGitHub
, pytest-mock
+, pytestCheckHook
+, python-dotenv
+, pythonOlder
+, typing-extensions
+, ujson
}:
buildPythonPackage rec {
pname = "pydantic";
- version = "1.7.3";
- disabled = !isPy3k;
+ version = "1.8";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
- sha256 = "xihEDmly0vprmA+VdeCoGXg9PjWRPmBWAwk/9f2DLts=";
+ sha256 = "sha256-+HfnM/IrFlUyQJdiOYyaJUNenh8dLtd8CUJWSbn6hwQ=";
};
propagatedBuildInputs = [
- ujson
email_validator
+ python-dotenv
typing-extensions
+ ujson
];
checkInputs = [
- pytest
- pytestcov
pytest-mock
+ pytestCheckHook
];
- checkPhase = ''
- pytest
+ preCheck = ''
+ export HOME=$(mktemp -d)
'';
+ pythonImportsCheck = [ "pydantic" ];
+
meta = with lib; {
homepage = "https://github.com/samuelcolvin/pydantic";
description = "Data validation and settings management using Python type hinting";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
index 0a637a48ba..00e36ec373 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pydot";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d49c9d4dd1913beec2a997f831543c8cbd53e535b1a739e921642fe416235f01";
+ sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrive/default.nix
index aa0515323e..5d1fc187c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydrive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrive/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, google_api_python_client
+, google-api-python-client
, oauth2client
, pyyaml
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- google_api_python_client
+ google-api-python-client
oauth2client
pyyaml
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
index 34d11830e5..7e09a21e36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyexcel-xls";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c4cc1fb4ac5d1682a44d9a368a43ec2e089ad6fc46884648ccfad46863e3da0a";
+ sha256 = "2fbf66e8df88051eaaa9745be433903d18db819ddd3a987c992ead1d68b7feb5";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
index 936f9c2a02..405098113a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
@@ -1,18 +1,22 @@
{ lib
, buildPythonPackage
+, isPy27
, fetchPypi
, pybind11
+, exdown
, numpy
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyfma";
- version = "0.1.1";
+ version = "0.1.2";
+
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "2c9ea44c5e30ca8318ca794ff1e3941d3dc7958901b1a9c430d38734bf7b6f8d";
+ sha256 = "3a9e2503fd01baa4978af5f491b79b7646d7872df9ecc7ab63ba10c250c50d8a";
};
buildInputs = [
@@ -20,17 +24,12 @@ buildPythonPackage rec {
];
checkInputs = [
+ exdown
numpy
- pytest
+ pytestCheckHook
];
- preBuild = ''
- export HOME=$(mktemp -d)
- '';
-
- checkPhase = ''
- pytest test
- '';
+ pythonImportsCheck = [ "pyfma" ];
meta = with lib; {
description = "Fused multiply-add for Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
index e9b66a9577..bac70be998 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
@@ -1,40 +1,48 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
-, pkg-config, doctest-ignore-unicode, mock, nose }:
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, substituteAll
+, graphviz
+, coreutils
+, pkg-config
+, pytest
+}:
buildPythonPackage rec {
pname = "pygraphviz";
- version = "1.6";
+ version = "1.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860";
+ sha256 = "a7bec6609f37cf1e64898c59f075afd659106cf9356c5f387cecaa2e0cdb2304";
extension = "zip";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ graphviz ];
- checkInputs = [ doctest-ignore-unicode mock nose ];
-
patches = [
- # pygraphviz depends on graphviz being in PATH. This patch always prepends
- # graphviz to PATH.
+ # pygraphviz depends on graphviz executables and wc being in PATH
(substituteAll {
- src = ./graphviz-path.patch;
- inherit graphviz;
+ src = ./path.patch;
+ path = lib.makeBinPath [ graphviz coreutils ];
})
];
- # The tests are currently failing because of a bug in graphviz 2.40.1.
- # Upstream does not want to skip the relevant tests:
- # https://github.com/pygraphviz/pygraphviz/pull/129
- doCheck = false;
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ graphviz ];
+
+ checkInputs = [ pytest ];
+
+ checkPhase = ''
+ pytest --pyargs pygraphviz
+ '';
meta = with lib; {
description = "Python interface to Graphviz graph drawing package";
homepage = "https://github.com/pygraphviz/pygraphviz";
license = licenses.bsd3;
- maintainers = with maintainers; [ matthiasbeyer ];
+ maintainers = with maintainers; [ matthiasbeyer dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
deleted file mode 100644
index e4ff925009..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/graphviz-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
-index 8f72024..2d8358e 100644
---- a/pygraphviz/agraph.py
-+++ b/pygraphviz/agraph.py
-@@ -1557,7 +1557,7 @@ class AGraph(object):
- import os
- import glob
-
-- paths = os.environ["PATH"]
-+ paths = '@graphviz@/bin:' + os.environ["PATH"]
- if os.name == "nt":
- exe = ".exe"
- else:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/path.patch
new file mode 100644
index 0000000000..a895eae775
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/path.patch
@@ -0,0 +1,13 @@
+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
+index d539ba0..f5bac3f 100644
+--- a/pygraphviz/agraph.py
++++ b/pygraphviz/agraph.py
+@@ -1792,7 +1792,7 @@ class AGraph:
+ if platform.system() == "Windows":
+ name += ".exe"
+
+- paths = os.environ["PATH"]
++ paths = '@path@'
+ for path in paths.split(os.pathsep):
+ match = glob.glob(os.path.join(path, name))
+ if match:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix
index e22af4b520..8ee176e80c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchPypi, buildPythonPackage, ... }:
buildPythonPackage rec {
pname = "pygtrie";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4367b87d92eaf475107421dce0295a9d4d72156702908c96c430a426b654aee7";
+ sha256 = "43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692";
};
meta = {
homepage = "https://github.com/mina86/pygtrie";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
index 8596883326..cd8c566c46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.8";
+ version = "1.0.9";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0d028fcqmdzxp0vsz7digx794s9l65ydsnsyvyx275z6577x7h4h";
+ sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix
new file mode 100644
index 0000000000..50260afab1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pykmtronic/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, lxml
+}:
+
+buildPythonPackage rec {
+ pname = "pykmtronic";
+ version = "0.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=";
+ };
+
+ propagatedBuildInputs = [ aiohttp lxml ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pykmtronic" ];
+
+ meta = with lib; {
+ description = "Python client to interface with KM-Tronic web relays";
+ homepage = "https://github.com/dgomes/pykmtronic";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
index 7e1fa06061..aa83253ed2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyls-spyder";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "07apxh12b8ybkx5izr7pg8kbg5g5wgzw7vh5iy2n8dhiqarzp7s1";
+ sha256 = "f2be1b05f2c7a72565b28de7289d2c2b16052b88e46914279a2d631e074ed158";
};
propagatedBuildInputs = [ python-language-server ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix
index 90a4564081..b9ed3cc20e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pylutron";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1q8qdy26s9hvfsh75pak7xiqjwrwsgq18p4d86dwf4dwmy5s4qj1";
+ sha256 = "sha256-wwVTDpoRT/TIJhoRap0T01a8gmYt+vfKc+ATRs6phB4=";
};
# Project has no tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
index 448b4c3c33..fdf6b08984 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "pymatgen";
- version = "2020.12.3";
+ version = "2020.12.31";
src = fetchPypi {
inherit pname version;
- sha256 = "a7ae7aba87e88965c3e1490f5b9742c95e06150f2fc73da69647a9366dd88018";
+ sha256 = "5002490facd47c55d2dae42c35712e061c1f5d881180485c0543a899589856d6";
};
nativeBuildInputs = [ glibcLocales ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
new file mode 100644
index 0000000000..145b405922
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, pycryptodome
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pymazda";
+ version = "0.0.9";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "15kygabjlxmy3g5kj48ixqdwaz8qrfzxj8ii27cidsp2fq8ph165";
+ };
+
+ propagatedBuildInputs = [ aiohttp pycryptodome ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pymazda" ];
+
+ meta = with lib; {
+ description = "Python client for interacting with the MyMazda API";
+ homepage = "https://github.com/bdr99/pymazda";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix
new file mode 100644
index 0000000000..e977cb23d7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "pymediaroom";
+ version = "0.6.4.1";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "dgomes";
+ repo = pname;
+ rev = version;
+ sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy";
+ };
+
+ propagatedBuildInputs = [
+ async-timeout
+ xmltodict
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pymediaroom" ];
+
+ meta = with lib; {
+ description = "Python Remote Control for Mediaroom STB";
+ homepage = "https://github.com/dgomes/pymediaroom";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
index 13e80a38e4..047b7d697c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyMeeus";
- version = "0.3.7";
+ version = "0.3.13";
src = fetchPypi {
inherit pname version;
- sha256 = "0qjnk9sc65i4by2x4zm6w941a4i31fmhgwbkpbqkk87rwq4h4hsn";
+ sha256 = "43b800a2571f3237e558d8d305e97f6ac4027977666e22af98448e0f1f86af86";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix
new file mode 100644
index 0000000000..32483eea7b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, httpretty
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests_oauthlib
+}:
+
+buildPythonPackage rec {
+ pname = "pymfy";
+ version = "0.9.4";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "tetienne";
+ repo = "somfy-open-api";
+ rev = "v${version}";
+ sha256 = "1ml536dvva2xd52jfgrd557h2sr5w6567sxnyq0blhkgpyz4m2av";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ requests
+ requests_oauthlib
+ ];
+
+ checkInputs = [
+ httpretty
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pymfy" ];
+
+ meta = with lib; {
+ description = "Python client for the Somfy Open API";
+ homepage = "https://github.com/tetienne/somfy-open-api";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
index 18c697fec4..c5cfa00499 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymongo";
- version = "3.11.1";
+ version = "3.11.3";
src = fetchPypi {
inherit pname version;
- sha256 = "a9c1a2538cd120283e7137ac97ce27ebdfcb675730c5055d6332b0043f4e5a55";
+ sha256 = "db5098587f58fbf8582d9bda2462762b367207246d3e19623782fb449c3c5fcc";
};
# Tests call a running mongodb instance
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix
index e93d0b602b..71788db45c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix
@@ -4,17 +4,19 @@
, buildPythonPackage
, fetchFromGitHub
, pkce
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pymyq";
- version = "3.0.3";
+ version = "3.0.4";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "arraylabs";
repo = pname;
rev = "v${version}";
- sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl";
+ sha256 = "sha256-jeoFlLBjD81Bt6E75rk4U1Ach53KGy23QGx+A6X2rpg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix
index 40e2783aa5..44e884dab8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynanoleaf";
- version = "0.0.5";
+ version = "0.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "2ced000e3c37f4e2ce0ea177d924af71c97007de9e4fd0ef37dcd7b4a6d1b622";
+ sha256 = "7d212f35eac9d94248858ec63ca63545ea7fce1cdda11ae5878f4d4d74f055d0";
};
disabled = !isPy3k;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix
index 49da01f8e7..4b7f85482a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynput";
- version = "1.7.1";
+ version = "1.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "5a5598bfb14322eff980ac6ca820635fce9028faa4f64a8e1581243aaf6785ee";
+ sha256 = "4e50b1a0ab86847e87e58f6d1993688b9a44f9f4c88d4712315ea8eb552ef828";
};
nativeBuildInputs = [ sphinx ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
index 4b27bea10b..541a733b3f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pyobjc";
- version = "7.0";
+ version = "7.0.1";
# Gives "No matching distribution found for
# pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0";
+ sha256 = "f4fd120683b19a2abeac351784204e6b092cf1fb94f597b6eb22f30c117b2ef0";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index c8b3bd4158..86a4c84768 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
@@ -65,11 +65,11 @@ in
buildPythonPackage rec {
pname = "pyOpenSSL";
- version = "20.0.0";
+ version = "20.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1i8ab5zn9i9iq2ksizp3rd42v157kacddzz88kviqw3kpp68xw4j";
+ sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
index a5414021b2..17976137f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix
@@ -1,7 +1,6 @@
{ lib
, aiohttp
, aresponses
-, async-timeout
, asynctest
, buildPythonPackage
, fetchFromGitHub
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix
index 423d38ab25..3cfb70e7b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix
@@ -1,30 +1,42 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, requests, geojson }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, geojson
+, pysocks
+, pythonOlder
+, requests
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pyowm";
- version = "3.1.1";
+ version = "3.2.0";
+ disabled = pythonOlder "3.7";
- disabled = pythonOlder "3.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a7b18297a9189dbe5f6b454b12d61a407e35c7eb9ca75bcabfe5e1c83245290d";
+ src = fetchFromGitHub {
+ owner = "csparpa";
+ repo = pname;
+ rev = version;
+ sha256 = "0sq8rxcgdiayl5gy4qhkvvsdq1d93sbzn0nfg8f1vr8qxh8qkfq4";
};
- propagatedBuildInputs = [ requests geojson ];
+ propagatedBuildInputs = [
+ geojson
+ pysocks
+ requests
+ ];
- # This may actually break the package.
- postPatch = ''
- substituteInPlace setup.py \
- --replace "requests>=2.18.2,<2.19" "requests"
- '';
+ checkInputs = [ pytestCheckHook ];
- # No tests in archive
- doCheck = false;
+ # Run only tests which don't require network access
+ pytestFlagsArray = [ "tests/unit" ];
+
+ pythonImportsCheck = [ "pyowm" ];
meta = with lib; {
- description = "A Python wrapper around the OpenWeatherMap web API";
+ description = "Python wrapper around the OpenWeatherMap web API";
homepage = "https://pyowm.readthedocs.io/";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyplaato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyplaato/default.nix
new file mode 100644
index 0000000000..d4e91a985e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyplaato/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, aiohttp
+, python-dateutil
+}:
+
+buildPythonPackage rec {
+ pname = "pyplaato";
+ version = "0.0.15";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1nykbkv2fg1x5min07cbi44x6am48f5gw3mnyj7x2kpmj6sqfpqp";
+ };
+
+ propagatedBuildInputs = [ aiohttp python-dateutil ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pyplaato" ];
+
+ meta = with lib; {
+ description = "Python API client for fetching Plaato data";
+ homepage = "https://github.com/JohNan/pyplaato";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
index a15f7aadb8..13f1794aeb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyppeteer";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "d1bcc61575ff788249d3bcaee696d856fa1153401a5428cb7376d826dd68dd9b";
+ sha256 = "c2974be1afa13b17f7ecd120d265d8b8cd324d536a231c3953ca872b68aba4af";
};
# tests want to write to /homeless-shelter
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
index 4e2bf164a3..77ca912db6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pypugjs";
- version = "5.9.8";
+ version = "5.9.9";
src = fetchPypi {
inherit pname version;
- sha256 = "1iy8k56rbslxcylhamdik2bd6gqqirrix55mrdn29zz9gl6vg1xi";
+ sha256 = "0s0a239940z6rsssa13yz6pfkjk4300j35hs7qysyz45f3ixq19j";
};
propagatedBuildInputs = [ six chardet ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
index 2e5f19e1d1..4b52d3b290 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pypykatz";
- version = "0.3.15";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "skelsec";
repo = pname;
rev = version;
- sha256 = "0bx2jdcfr1pdy3jgzg8fr5id9ffl2m1nc81dqhcplxdj8p214yri";
+ sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
index f43bfb9aaa..fbc4853ab6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyqtgraph";
- version = "0.11.0";
+ version = "0.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na";
+ sha256 = "7d1417f36b5b92d1365671633a91711513e5afbcc82f32475d0690317607714e";
};
propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix
new file mode 100644
index 0000000000..84bf62ff6d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pyrituals";
+ version = "0.0.2";
+ format = "pyproject";
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "milanmeu";
+ repo = pname;
+ rev = version;
+ sha256 = "0hrwhk3kpvdg78fgnvhmnnh3wprdv10j8jqjm4ly64chr8cdi6f2";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pyrituals" ];
+
+ meta = with lib; {
+ description = "Python wrapper for the Rituals Perfume Genie API";
+ homepage = "https://github.com/milanmeu/pyrituals";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
index 54c2155a51..1d5608ec77 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -2,12 +2,12 @@
, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }:
buildPythonPackage rec {
- version = "1.5.1";
+ version = "1.5.2";
pname = "pyro-ppl";
src = fetchPypi {
inherit version pname;
- sha256 = "00mprgf8pf9jq3kanxjldj00cg3nbfkb5yg0mdfbdi0b1rx3vnsa";
+ sha256 = "8a93af3a007ac507a8b50fd1165dbb355182d17df29d3b5bc498b02b479fdb27";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
index bddf241397..9fee5ec56c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyroma/default.nix
@@ -4,13 +4,18 @@
buildPythonPackage rec {
pname = "pyroma";
- version = "2.6";
+ version = "2.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "00j1j81kiipi5yppmk385cbfccf2ih0xyapl7pw6nqhrf8vh1764";
+ sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pygments < 2.6" "pygments"
+ '';
+
propagatedBuildInputs = [ docutils pygments setuptools ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
index 7f494e98ad..3cb56247b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
@@ -2,12 +2,12 @@
, setuptools }:
buildPythonPackage rec {
- version = "2.1.2";
+ version = "2.1.3";
pname = "pyshp";
src = fetchPypi {
inherit pname version;
- sha256 = "a0aa668cd0fc09b873f10facfe96971c0496b7fe4f795684d96cc7306ac5841c";
+ sha256 = "e32b4a6832a3b97986df442df63b4c4a7dcc846b326c903189530a5cc6df0260";
};
buildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
index 2690422932..21c79c6e9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
@@ -18,7 +18,6 @@ buildPythonPackage rec {
pname = "pyside-shiboken";
version = "1.2.4";
format = "other";
- disabled = !isPy3k;
src = fetchFromGitHub {
owner = "PySide";
@@ -49,11 +48,11 @@ buildPythonPackage rec {
"-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
];
- meta = {
+ meta = with lib; {
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
- license = lib.licenses.gpl2;
- homepage = "http://www.pyside.org/docs/shiboken/";
+ license = licenses.gpl2;
+ homepage = "http://www.pyside.org/";
maintainers = [ ];
- platforms = lib.platforms.all;
+ platforms = platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
index f8a7c09b40..2d09a0a0c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyspark";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479";
+ sha256 = "d4f2ced43394ad773f7b516a4bbcb5821a940462a17b1a25f175c83771b62ebc";
};
# pypandoc is broken with pandoc2, so we just lose docs.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
index 9e99486070..37e3490a54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
format = "other";
src = fetchurl {
- url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
+ url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
};
@@ -79,5 +79,7 @@ buildPythonPackage rec {
description = "Python bindings for Subversion";
homepage = "http://pysvn.tigris.org/";
license = licenses.asl20;
+ # g++: command not found
+ broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix
new file mode 100644
index 0000000000..69bf011418
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, bluepy
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "pyswitchbot";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "Danielhiversen";
+ repo = "pySwitchbot";
+ rev = version;
+ sha256 = "16p11fmyms4q93m3rna76nkp2la9m8lmfmaflbvga666vljwfw6v";
+ };
+
+ propagatedBuildInputs = [ bluepy ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "switchbot" ];
+
+ meta = with lib; {
+ description = "Python library to control Switchbot IoT devices";
+ homepage = "https://github.com/Danielhiversen/pySwitchbot";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytankerkoenig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytankerkoenig/default.nix
new file mode 100644
index 0000000000..0a6403107a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytankerkoenig/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "pytankerkoenig";
+ version = "0.0.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "021fg1a4n3527fz86zxfbsi0jrk0dnai1y92q6hwh5za68lrs710";
+ };
+
+ # Tests require an API key and network access
+ doCheck = false;
+ pythonImportsCheck = [ "pytankerkoenig" ];
+
+ meta = with lib; {
+ description = "Python module to get fuel data from tankerkoenig.de";
+ homepage = "https://github.com/ultrara1n/pytankerkoenig";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix
index e930f1d571..b907db2238 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-runner, wcwidth }:
buildPythonPackage rec {
pname = "pyte";
version = "0.8.0";
+
src = fetchPypi {
inherit pname version;
sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5";
};
+ nativeBuildInputs = [ pytest-runner ];
+
propagatedBuildInputs = [ wcwidth ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytestCheckHook ];
- # tries to write to os.path.dirname(__file__) in test_input_output
- checkPhase = ''
- py.test -k "not test_input_output"
- '';
+ disabledTests = [
+ "test_input_output"
+ ];
meta = with lib; {
description = "Simple VTXXX-compatible linux terminal emulator";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
index ac3bf6dbf5..a7af2d1db0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytesseract";
- version = "0.3.6";
+ version = "0.3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "b79641b7915ff039da22d5591cb2f5ca6cb0ed7c65194c9c750360dc6a1cc87f";
+ sha256 = "4ecfc898d00a70fcc38d2bce729de1597c67e7bc5d2fa26094714c9f5b573645";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix
new file mode 100644
index 0000000000..c1c918c4d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, py-cid
+, pytestCheckHook
+, pytest-cov
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-cid";
+ version = "1.1.1";
+ format = "flit";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "ntninja";
+ repo = pname;
+ rev = "1ff9ec43ac9eaf76352ea7e7a060cd081cb8b68a"; # Version has no git tag
+ sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U=";
+ };
+
+ propagatedBuildInputs = [
+ py-cid
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-cov
+ ];
+
+ pythonImportsCheck = [ "pytest_cid" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/ntninja/pytest-cid";
+ description = "A simple wrapper around py-cid for easily writing tests involving CIDs in datastructures";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ Luflosi ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
index a5ed447ace..9486875ff3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pytest-flake8";
- version = "1.0.6";
+ version = "1.0.7";
# although pytest is a runtime dependency, do not add it as
# propagatedBuildInputs in order to allow packages depend on another version
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1b82bb58c88eb1db40524018d3fcfd0424575029703b4e2d8e3ee873f2b17027";
+ sha256 = "f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b";
};
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
index d3b6654931..508b7b7781 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -1,20 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi, httpx, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, pytest
+, pytest-asyncio
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pytest-httpx";
- version = "0.10.1";
+ version = "0.11.0";
- src = fetchPypi {
- inherit version;
- pname = "pytest_httpx";
- extension = "tar.gz";
- sha256 = "13ld6nnsc3f7i4zl4qm1jh358z0awr6xfk05azwgngmjb7jmcz0a";
+ src = fetchFromGitHub {
+ owner = "Colin-b";
+ repo = "pytest_httpx";
+ rev = "v${version}";
+ sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi";
};
- propagatedBuildInputs = [ httpx pytest ];
+ propagatedBuildInputs = [
+ httpx
+ pytest
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
- # not in pypi tarball
- doCheck = false;
pythonImportsCheck = [ "pytest_httpx" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
index ad82b389be..3e044b4fe5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
@@ -1,41 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
-, fetchpatch
-, isPy3k
-, pytest
-, mock
+, pytest-asyncio
+, pytestCheckHook
, setuptools_scm
}:
buildPythonPackage rec {
pname = "pytest-mock";
- version = "3.3.1";
+ version = "3.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a4d6d37329e4a893e77d9ffa89e838dd2b45d5dc099984cf03c703ac8411bb82";
+ sha256 = "1z6r3n78bilfzkbxj083p0ib04ia1bhfgnj2qq9x6q4mmykapqm1";
};
- propagatedBuildInputs = lib.optional (!isPy3k) mock;
-
- nativeBuildInputs = [
- setuptools_scm
- ];
+ nativeBuildInputs = [ setuptools_scm ];
checkInputs = [
- pytest
+ pytest-asyncio
+ pytestCheckHook
];
- # ignore test which only works with pytest5 output structure
- checkPhase = ''
- pytest -k 'not detailed_introspection_async'
- '';
+ pythonImportsCheck = [ "pytest_mock" ];
meta = with lib; {
- description = "Thin-wrapper around the mock package for easier use with py.test.";
- homepage = "https://github.com/pytest-dev/pytest-mock";
- license = licenses.mit;
+ description = "Thin-wrapper around the mock package for easier use with pytest";
+ homepage = "https://github.com/pytest-dev/pytest-mock";
+ license = with licenses; [ mit ];
maintainers = with maintainers; [ nand0p ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix
index b07be1178c..cde0554d4b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytest-order";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0b7i8z6rywnkb3skyg8bnfqgkjrwvkn64b4q07wfl1q7x65ksd26";
+ sha256 = "9c9e4f1b060414c642e88ad98ca60f1fd37937debd704bd8f4a2ef8e08b9cb6d";
};
propagatedBuildInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix
index 3be2adc11a..c07832c0b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -1,22 +1,31 @@
-{ lib, buildPythonPackage, isPy27, fetchPypi, setuptools_scm, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+}:
buildPythonPackage rec {
pname = "pytest-subtests";
- version = "0.3.2";
- disabled = isPy27;
+ version = "0.4.0";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1mxg91mrn8672f8hwg0f31xkyarnq7q0hr4fvb9hcb09jshq2wk7";
+ sha256 = "sha256-jZ4sHR3OEfe30snQkgLr/HdXt/8MrJtyrTKO3+fuA3s=";
};
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "pytest_subtests" ];
+
meta = with lib; {
description = "pytest plugin for unittest subTest() support and subtests fixture";
homepage = "https://github.com/pytest-dev/pytest-subtests";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
index 6bf3483d40..5833790cf9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
disabledTests = [
"test_suppresses_timeout_when_pdb_is_entered"
+ # Remove until https://github.com/pytest-dev/pytest/pull/7207 or similar
+ "test_suppresses_timeout_when_debugger_is_entered"
];
pytestFlagsArray = [
"-ra"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix
index 9373c597b3..119f3021b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-vcr/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytestCheckHook
, pytest
, vcrpy
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index 94feb10299..a6f6ffd7dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pytest-xdist";
- version = "2.2.0";
+ version = "2.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf";
+ sha256 = "718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix
new file mode 100644
index 0000000000..8489247399
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-aiohttp
+, pytestCheckHook
+, pythonOlder
+, voluptuous
+, vcrpy
+}:
+
+buildPythonPackage rec {
+ pname = "python-awair";
+ version = "0.2.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "ahayworth";
+ repo = "python_awair";
+ rev = version;
+ sha256 = "1fqjigc1a0lr9q6bjjq3j8pa39wg1cbkb0l67w94a0i4dkdfri8r";
+ };
+
+ nativeBuildInputs = [ poetry ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ voluptuous
+ ];
+
+ checkInputs = [
+ pytest-aiohttp
+ pytestCheckHook
+ vcrpy
+ ];
+
+ pythonImportsCheck = [ "python_awair" ];
+
+ meta = with lib; {
+ description = "Python library for the Awair API";
+ homepage = "https://github.com/ahayworth/python_awair";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix
index 1ad3a5128b..aea47c7b9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix
@@ -3,12 +3,12 @@
, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }:
buildPythonPackage rec {
- version = "0.7.5";
+ version = "0.7.9";
pname = "python-binance";
src = fetchPypi {
inherit pname version;
- sha256 = "d6a96c0e55fc78d45279944515d385b3971300f35c2380ddb82689d676712053";
+ sha256 = "476459d91f6cfe0a37ccac38911643ea6cca632499ad8682e0957a075f73d239";
};
doCheck = false; # Tries to test multiple interpreters with tox
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
index e654826e0b..1d8a9a8545 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
@@ -1,29 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
+, buildPythonPackage
, click
+, fetchPypi
, ipython
-, pytest
-, sh
-, typing
, mock
+, pytestCheckHook
+, pythonOlder
+, sh
}:
buildPythonPackage rec {
pname = "python-dotenv";
version = "0.15.0";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0";
};
- propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];
+ propagatedBuildInputs = [ click ];
- checkInputs = [ ipython mock pytest sh ];
+ checkInputs = [
+ ipython
+ mock
+ pytestCheckHook
+ sh
+ ];
- # cli tests are impure
- checkPhase = ''
- pytest tests/ -k 'not cli'
- '';
+ disabledTests = [
+ "cli"
+ ];
+
+ pythonImportsCheck = [ "dotenv" ];
meta = with lib; {
description = "Add .env support to your django/flask apps in development and deployments";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix
new file mode 100644
index 0000000000..1548a13894
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gammu/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+ #, pytestCheckHook
+, pythonOlder
+, pkg-config
+, gammu
+}:
+
+buildPythonPackage rec {
+ pname = "python-gammu";
+ version = "3.1";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "gammu";
+ repo = pname;
+ rev = version;
+ sha256 = "1hw2mfrps6wqfyi40p5mp9r59n1ick6pj4hw5njz0k822pbb33p0";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ gammu ];
+
+ # Check with the next release if tests could be run with pytest
+ # checkInputs = [ pytestCheckHook ];
+ # Don't run tests for now
+ doCheck = false;
+ pythonImportsCheck = [ "gammu" ];
+
+ meta = with lib; {
+ description = "Python bindings for Gammu";
+ homepage = "https://github.com/gammu/python-gammu/";
+ license = with licenses; [ gpl2Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
index b4760cef62..d208f2c6bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-levenshtein/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "python-Levenshtein";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0489zzjlfgzpc7vggs7s7db13pld2nlnw7iwgdz1f386i0x2fkjm";
+ sha256 = "dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6";
};
# No tests included in archive
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
index cc38553a81..3b4a7ecc11 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-ly";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0s5hvsf17f4w1xszrf4pg29wfv9znkj195klq1v2qhlpxfp6772d";
+ sha256 = "d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8";
};
# tests not shipped on `pypi` and
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
index 61a7dd315d..6737f12607 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
@@ -1,25 +1,37 @@
-{ buildPythonPackage, lib, fetchPypi, file, stdenv }:
+{ lib
+, stdenv
+, python
+, buildPythonPackage
+, fetchFromGitHub
+, substituteAll
+, file
+, glibcLocales
+}:
buildPythonPackage rec {
pname = "python-magic";
- version = "0.4.18";
+ version = "0.4.22";
- src = fetchPypi {
- inherit pname version;
- sha256 = "b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce";
+ src = fetchFromGitHub {
+ owner = "ahupp";
+ repo = "python-magic";
+ rev = version;
+ sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6";
};
- postPatch = ''
- substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
+ patches = [
+ (substituteAll {
+ src = ./libmagic-path.patch;
+ libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}";
+ })
+ ];
+
+ checkInputs = [ glibcLocales ];
+
+ checkPhase = ''
+ LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py
'';
- doCheck = false;
-
- # TODO: tests are failing
- #checkPhase = ''
- # ${python}/bin/${python.executable} ./test.py
- #'';
-
meta = {
description = "A python interface to the libmagic file type identification library";
homepage = "https://github.com/ahupp/python-magic";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/libmagic-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/libmagic-path.patch
new file mode 100644
index 0000000000..5a1dbec7d5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/libmagic-path.patch
@@ -0,0 +1,17 @@
+diff --git a/magic/loader.py b/magic/loader.py
+index 6b2bfcb..69778af 100644
+--- a/magic/loader.py
++++ b/magic/loader.py
+@@ -5,11 +5,7 @@ import glob
+ def load_lib():
+ libmagic = None
+ # Let's try to find magic or magic1
+- dll = ctypes.util.find_library('magic') \
+- or ctypes.util.find_library('magic1') \
+- or ctypes.util.find_library('cygmagic-1') \
+- or ctypes.util.find_library('libmagic-1') \
+- or ctypes.util.find_library('msys-magic-1') # for MSYS2
++ dll = '@libmagic@'
+
+ # necessary because find_library returns None if it doesn't find the library
+ if dll:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix
new file mode 100644
index 0000000000..745d6c67ea
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nmap/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nmap
+}:
+
+buildPythonPackage rec {
+ pname = "python-nmap";
+ version = "0.6.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "013q2797d9sf6mrj7x1hqfcql5gqgg50zgiifp2yypfa4k8cwjsx";
+ };
+
+ propagatedBuildInputs = [ nmap ];
+
+ postPatch = ''
+ substituteInPlace setup.cfg --replace "universal=3" "universal=1"
+ '';
+
+ # Tests requires sudo and performs scans
+ doCheck = false;
+ pythonImportsCheck = [ "nmap" ];
+
+ meta = with lib; {
+ description = "Python library which helps in using nmap";
+ longDescription = ''
+ python-nmap is a Python library which helps in using nmap port scanner. It
+ allows to easily manipulate nmap scan results and will be a perfect tool
+ for systems administrators who want to automatize scanning task and reports.
+ It also supports nmap script outputs.
+ '';
+ homepage = "http://xael.org/pages/python-nmap-en.html";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
index 2b65a658f9..aadf75d59f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "python-rtmidi";
- version = "1.4.6";
+ version = "1.4.7";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1aqhsl9w3h0rwf3mhr8parjbxm2sb6sn5mac6725cvm535pqqyhz";
+ sha256 = "d7dbc2b174b09015dfbee449a672a072aa72b367be40b13e04ee35a2e2e399e3";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix
new file mode 100644
index 0000000000..3e5889b935
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, inflection
+, pyjwt
+, pytest-asyncio
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "python-smarttub";
+ version = "0.0.19";
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "mdz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "01i4pvgvpl7inwhy53c6b34pi5zvfiv2scn507j8jdg5cjs04g80";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ inflection
+ pyjwt
+ python-dateutil
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "smarttub" ];
+
+ meta = with lib; {
+ description = "Python API for SmartTub enabled hot tubs";
+ homepage = "https://github.com/mdz/python-smarttub";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
index b681fcf85a..27276e0619 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -7,25 +7,29 @@
, urllib3
, tornado
, pytest
+, APScheduler
, isPy3k
}:
buildPythonPackage rec {
pname = "python-telegram-bot";
- version = "13.0";
+ version = "13.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "ca78a41626d728a8f51affa792270e210fa503ed298d395bed2bd1281842dca3";
+ hash = "sha256-dw1sGfdeUw3n9qh4TsBpRdqEvNI0SnKTK4wqBaeM1CE=";
};
checkInputs = [ pytest ];
- propagatedBuildInputs = [ certifi future urllib3 tornado decorator ];
+ propagatedBuildInputs = [ certifi future urllib3 tornado decorator APScheduler ];
# --with-upstream-urllib3 is not working properly
postPatch = ''
- rm -rf telegram/vendor
+ rm -r telegram/vendor
+
+ substituteInPlace requirements.txt \
+ --replace 'APScheduler==3.6.3' 'APScheduler'
'';
setupPyGlobalFlags = "--with-upstream-urllib3";
@@ -36,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "This library provides a pure Python interface for the Telegram Bot API.";
homepage = "https://python-telegram-bot.org";
- license = licenses.lgpl3;
+ license = licenses.lgpl3Only;
maintainers = with maintainers; [ veprbl pingiun ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix
new file mode 100644
index 0000000000..00774cc40f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix
@@ -0,0 +1,40 @@
+{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k,
+isodate, lxml, xmlsec, freezegun }:
+
+buildPythonPackage rec {
+ pname = "python3-saml";
+ version = "1.10.1";
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "onelogin";
+ repo = "python3-saml";
+ rev = "v${version}";
+ sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k";
+ };
+
+ patches = [
+ # Remove the dependency on defusedxml
+ #
+ # This patch is already merged upstream and does not introduce any
+ # functionality changes.
+ (fetchurl {
+ url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch";
+ sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ isodate lxml xmlsec
+ ];
+
+ checkInputs = [ freezegun ];
+ pythonImportsCheck = [ "onelogin.saml2" ];
+
+ meta = with lib; {
+ description = "OneLogin's SAML Python Toolkit for Python 3";
+ homepage = "https://github.com/onelogin/python3-saml";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix
index 4add5ac5e8..5c7faf50ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pytools";
- version = "2020.4.3";
+ version = "2020.4.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "21aa1fd942bc3bc54c8ae3b5e60c1f771e6db0817b7402fd802aa5964f20e629";
+ sha256 = "3645ed839cf4d79cb4bf030f37ddaeecd7fe5e2d6698438cc36c24a1d5168809";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
index 0571269fa8..1880a0e2bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
@@ -16,10 +16,9 @@
let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
- platform = if stdenv.isDarwin then "darwin" else "linux";
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
- version = "1.7.1";
+ version = "1.8.0";
in buildPythonPackage {
inherit version;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
index a542233e15..bc83859703 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -1,14 +1,14 @@
version: {
x86_64-linux-37 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
- hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY=";
+ hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc=";
};
x86_64-linux-38 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
- hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4=";
+ hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c=";
};
x86_64-linux-39 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";
- hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc=";
+ hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ=";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
index db1914f4ee..98efb169df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
@@ -74,27 +74,35 @@ let
# (allowing FBGEMM to be built in pytorch-1.1), and may future proof this
# derivation.
brokenArchs = [ "3.0" ]; # this variable is only used as documentation.
- cuda9ArchList = [
- "3.5"
- "5.0"
- "5.2"
- "6.0"
- "6.1"
- "7.0"
- "7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9
- # which leads me to believe this is the final cuda-9-compatible architecture.
- ];
- cuda10ArchList = cuda9ArchList ++ [
- "7.5"
- "7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0
- ];
+
+ cudaCapabilities = rec {
+ cuda9 = [
+ "3.5"
+ "5.0"
+ "5.2"
+ "6.0"
+ "6.1"
+ "7.0"
+ "7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9
+ # which leads me to believe this is the final cuda-9-compatible architecture.
+ ];
+
+ cuda10 = cuda9 ++ [
+ "7.5"
+ "7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0
+ ];
+
+ cuda11 = cuda10 ++ [
+ "8.0"
+ "8.0+PTX" # < CUDA toolkit 11.0
+ "8.6"
+ "8.6+PTX" # < CUDA toolkit 11.1
+ ];
+ };
final_cudaArchList =
if !cudaSupport || cudaArchList != null
then cudaArchList
- else
- if lib.versions.major cudatoolkit.version == "9"
- then cuda9ArchList
- else cuda10ArchList; # the assert above removes any ambiguity here.
+ else cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}";
# Normally libcuda.so.1 is provided at runtime by nvidia-x11 via
# LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub
@@ -110,7 +118,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
- version = "1.7.1";
+ version = "1.8.0";
disabled = !isPy3k;
@@ -125,7 +133,7 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-udpbSL8xnzf20A1pYYNlYjdp8ME8AVaAkMMiw53K6CU=";
+ sha256 = "sha256-qdZUtlxHZjCYoGfTdp5Bq3MtfXolWZrvib0kuzF3uIc=";
};
patches = lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix
index dab8f479c0..1a1e1585d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix
@@ -2,17 +2,19 @@
buildPythonPackage rec {
pname = "pytz";
- version = "2020.5";
+ version = "2021.1";
src = fetchPypi {
inherit pname version;
- sha256 = "180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5";
+ sha256 = "sha256-g6SpCJS/OOJDzwUsi1jzgb/pp6SD9qnKsUC8f3AqxNo=";
};
checkPhase = ''
${python.interpreter} -m unittest discover -s pytz/tests
'';
+ pythonImportsCheck = [ "pytz" ];
+
meta = with lib; {
description = "World timezone definitions, modern and historical";
homepage = "https://pythonhosted.org/pytz";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix
new file mode 100644
index 0000000000..95aa57491c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, lib
+, pytestCheckHook
+, tokenize-rt
+}:
+
+buildPythonPackage rec {
+ pname = "pyupgrade";
+ version = "2.10.0";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "asottile";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-XYeqyyfwtS7dHLxeVvmcifW6UCOlnSMxqF1vxezBjT8=";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ propagatedBuildInputs = [ tokenize-rt ];
+
+ meta = with lib; {
+ description = "A tool to automatically upgrade syntax for newer versions of the language";
+ homepage = "https://github.com/asottile/pyupgrade";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lovesegfault ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
index 41207984e0..1ad312dd5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyusb";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d69ed64bff0e2102da11b3f49567256867853b861178689671a163d30865c298";
+ sha256 = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
index 0be0d61ed0..2d276c6dcc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix
@@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
-, isPyPy
-, pkgs
+, fetchFromGitHub
+, libuv
}:
buildPythonPackage rec {
pname = "pyuv";
- version = "1.2.0";
- disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49
+ version = "1.4.0";
- src = pkgs.fetchurl {
- url = "https://github.com/saghul/pyuv/archive/${pname}-${version}.tar.gz";
- sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx";
+ src = fetchFromGitHub {
+ owner = "saghul";
+ repo = "pyuv";
+ rev = "pyuv-${version}";
+ sha256 = "1wiwwdylz66lfsjh6p4iv7pfhzvnhwjk332625njizfhz3gq9fwr";
};
- patches = [ ./pyuv-external-libuv.patch ];
+ setupPyBuildFlags = [ "--use-system-libuv" ];
- buildInputs = [ pkgs.libuv ];
+ buildInputs = [ libuv ];
+
+ doCheck = false; # doesn't work in sandbox
+
+ pythonImportsCheck = [ "pyuv" ];
meta = with lib; {
description = "Python interface for libuv";
homepage = "https://github.com/saghul/pyuv";
- repositories.git = "git://github.com/saghul/pyuv.git";
license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch
deleted file mode 100644
index 41e169acd5..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5071c3b..4b4a176 100644
---- a/setup.py
-+++ b/setup.py
-@@ -7,7 +7,6 @@ try:
- from setuptools import setup, Extension
- except ImportError:
- from distutils.core import setup, Extension
--from setup_libuv import libuv_build_ext, libuv_sdist
-
-
- def get_version():
-@@ -35,11 +34,10 @@ setup(name = "pyuv",
- "Programming Language :: Python :: 3.3",
- "Programming Language :: Python :: 3.4"
- ],
-- cmdclass = {'build_ext': libuv_build_ext,
-- 'sdist' : libuv_sdist},
- packages = ['pyuv'],
- ext_modules = [Extension('pyuv._cpyuv',
- sources = ['src/pyuv.c'],
-+ libraries = ['uv']
- )]
- )
-
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix
index 4415ca7c37..2439bd4685 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, poetry-core
, pytest-cov
, pytest-asyncio
@@ -13,24 +12,16 @@
buildPythonPackage rec {
pname = "pyvera";
- version = "0.3.11";
+ version = "0.3.13";
format = "pyproject";
src = fetchFromGitHub {
owner = "pavoni";
repo = pname;
rev = version;
- sha256 = "0yi2cjd3jag95xa0k24f7d7agi26ywb3219a0j0k8l2nsx2sdi87";
+ sha256 = "0vh82bwgbq93jrwi9q4da534paknpak8hxi4wwlxh3qcvnpy1njv";
};
- patches = [
- (fetchpatch {
- # build-system section is missing https://github.com/pavoni/pyvera/pull/142
- url = "https://github.com/pavoni/pyvera/pull/142/commits/e90995a8d55107118d324e8cf189ddf1d9e3aa6c.patch";
- sha256 = "1psq3fiwg20kcwyybzh5g17dzn5fh29lhm238npyg846innbzgs7";
- })
- ];
-
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
index ddec4f0f23..13c54f6a41 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, archinfo
, bitstring
, fetchPypi
@@ -10,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.0.5739";
+ version = "9.0.5903";
src = fetchPypi {
inherit pname version;
- sha256 = "1jwxxw2kw7wkz7kh8m8vbavzw6m5k6xph7mazfn3k2qbsshh3lk3";
+ sha256 = "sha256-qhLlRlmb48zhjX2u9w6TVVv2gb0E9kSapabiv+u4J2s=";
};
propagatedBuildInputs = [
@@ -35,5 +36,7 @@ buildPythonPackage rec {
homepage = "https://github.com/angr/pyvex";
license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ];
maintainers = with maintainers; [ fab ];
+ # ERROR: pyvex-X-py3-none-manylinux1_aarch64.whl is not a supported wheel on this platform.
+ broken = stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix
new file mode 100644
index 0000000000..7c87431d80
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, requests_oauthlib
+, simplejson
+}:
+
+buildPythonPackage rec {
+ pname = "pyvicare";
+ version = "0.2.5";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ pname = "PyViCare";
+ inherit version;
+ sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk";
+ };
+
+ propagatedBuildInputs = [
+ requests_oauthlib
+ simplejson
+ ];
+
+ # The published tarball on PyPI is incomplete and there are GitHub releases
+ doCheck = false;
+ pythonImportsCheck = [ "PyViCare" ];
+
+ meta = with lib; {
+ description = "Python Library to access Viessmann ViCare API";
+ homepage = "https://github.com/somm15/PyViCare";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvizio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvizio/default.nix
new file mode 100644
index 0000000000..807278d967
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvizio/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, click
+, fetchPypi
+, jsonpickle
+, requests
+, tabulate
+, xmltodict
+, zeroconf
+}:
+
+buildPythonPackage rec {
+ pname = "pyvizio";
+ version = "0.1.59";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1j2zbziklx4az55m3997y7yp4xflk7i0gsbdfh7fp9k0qngb2053";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ click
+ jsonpickle
+ requests
+ tabulate
+ xmltodict
+ zeroconf
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "pyvizio" ];
+
+ meta = with lib; {
+ description = "Python client for Vizio SmartCast";
+ homepage = "https://github.com/vkorn/pyvizio";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
index 698e4ef94c..d6c389c22a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pywbem";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "9GpxbgNsXZJj2M5MvosNnEe+9pY+Qz64RD/7ZIDqmII=";
+ sha256 = "2abb6443f4debae56af7abefadb9fa5b8af9b53fc9bcf67f6c01a78db1064300";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix
index cba29c5cc9..35bfaecda9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxattr/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pyxattr";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "965388dd629334e850aa989a67d2360ec8257cfe8f67d07c29f980d3152f2882";
+ sha256 = "68477027e6d3310669f98aaef15393bfcd9b2823d7a7f00a6f1d91a3c971ae64";
};
# IOError: [Errno 95] Operation not supported (expected)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix
index 9b8b6eeac8..2fa840078d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxeoma/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pyxeoma";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0c9q6xdh2ciisv0crlz069haz01gfkhd5kasyr14jng4vjpzinc7";
+ sha256 = "c6a3ed855025662df9b35ae2d1cac3fa41775a7612655804bde7276a8cab8d1c";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxml/default.nix
index a528de8e0c..49796054b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxml/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildPhase = "${python.interpreter} ./setup.py build";
installPhase = ''
${python.interpreter} ./setup.py install --prefix="$out" || exit 1
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
index bb04309d1a..10a3b4482f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -27,7 +27,8 @@
buildPythonPackage rec {
pname = "qiskit-aer";
- version = "0.7.4";
+ version = "0.7.6";
+ format = "pyproject";
disabled = pythonOlder "3.6";
@@ -35,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
- sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
+ sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
};
nativeBuildInputs = [
@@ -64,6 +65,7 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
'';
+ # Disable using conan for build
preBuild = ''
export DISABLE_CONAN=1
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index 7374d7ce01..9346fae974 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -22,6 +22,7 @@
, nbconvert
, nbformat
, pproxy
+, qiskit-aer
, vcrpy
}:
@@ -38,7 +39,7 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
- version = "0.11.1";
+ version = "0.12.1";
disabled = pythonOlder "3.6";
@@ -46,7 +47,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h";
+ sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
};
propagatedBuildInputs = [
@@ -64,6 +65,7 @@ buildPythonPackage rec {
nbconvert
nbformat
pproxy
+ qiskit-aer
vcrpy
] ++ lib.optionals (!withVisualization) visualizationPackages;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
index 3c7a004420..5051c6541c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
- version = "0.23.5";
+ version = "0.24.0";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
- sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
+ sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
index 4945bead42..af9e724a9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtAwesome";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d612a313e531966d17f5a8fb7604faba961cf7ce3c77a9168c6f60e60140b767";
+ sha256 = "771dd95ac4f50d647d18b4e892fd310a580b56d258476554c7b3498593dfd887";
};
propagatedBuildInputs = [ qtpy six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
index f29d33d25a..da45b37bee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "qtconsole";
- version = "5.0.1";
+ version = "5.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4d7dd4eae8a90d0b2b19b31794b30f137238463998989734a3acb8a53b506bab";
+ sha256 = "404994edfe33c201d6bd0c4bd501b00c16125071573c938533224992bea0b30f";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix
new file mode 100644
index 0000000000..ecb33f6adb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, prompt_toolkit
+, pytest-cov
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "questionary";
+ version = "1.9.0";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "tmbo";
+ repo = pname;
+ rev = version;
+ sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf";
+ };
+
+ nativeBuildInputs = [ poetry ];
+
+ propagatedBuildInputs = [ prompt_toolkit ];
+
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "questionary" ];
+
+ meta = with lib; {
+ description = "Python library to build command line user prompts";
+ homepage = "https://github.com/bachya/regenmaschine";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
index 57a84e69d2..0d22a0c56c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
@@ -1,40 +1,45 @@
{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, mock
-, cmarkgfm
, bleach
+, buildPythonPackage
+, cmarkgfm
, docutils
+, fetchPypi
, future
+, mock
, pygments
-, six
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "readme_renderer";
- version = "28.0";
+ version = "29.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a";
+ sha256 = "sha256-kv1awr+Gd/MQ8zA6pLzludX58glKuYwp8TeR17gFo9s=";
};
- checkInputs = [ pytest mock ];
-
propagatedBuildInputs = [
- bleach cmarkgfm docutils future pygments six
+ bleach
+ cmarkgfm
+ docutils
+ future
+ pygments
];
- checkPhase = ''
- # disable one failing test case
- # fixtures test is failing for incorrect class name
- py.test -k "not test_invalid_link and not fixtures"
- '';
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
- meta = {
- description = "readme_renderer is a library for rendering readme descriptions for Warehouse";
+ pythonImportsCheck = [ "readme_renderer" ];
+
+ meta = with lib; {
+ description = "Python library for rendering readme descriptions";
homepage = "https://github.com/pypa/readme_renderer";
- license = lib.licenses.asl20;
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
index 1a97320dc3..ef6975b29d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "readthedocs-sphinx-ext";
- version = "2.1.1";
+ version = "2.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1d8343982cae238da82c809dcbd82d53f9560b50e17b1dd727123f576385139d";
+ sha256 = "209c4b5ecf233b8bb44fcb8b4548460b0806e347ce50fd8172adcb7d23969a4a";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
index 3a668077a3..ace36423c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.5.55";
+ version = "3.5.59";
src = fetchPypi {
inherit pname version;
- sha256 = "4f307accda32c9f17015ed77c7424f904514e349dff063f78d2462d715963e53";
+ sha256 = "a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536";
};
checkInputs = [ glibcLocales ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix
index e0dfb9a24a..5589ec683a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix
@@ -1,24 +1,63 @@
-{ lib, fetchPypi, buildPythonPackage
-, urllib3, idna, chardet, certifi
-, pytest }:
+{ lib
+, buildPythonPackage
+, certifi
+, chardet
+, fetchPypi
+, idna
+, pytest-mock
+, pytest-xdist
+, pytestCheckHook
+, urllib3
+, isPy27
+}:
buildPythonPackage rec {
pname = "requests";
- version = "2.25.0";
+ version = "2.25.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1y6mb8c0ipd64d5axq2p368yxndp3f966hmabjka2q2a5y9hn6kz";
+ sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ=";
};
- nativeBuildInputs = [ pytest ];
- propagatedBuildInputs = [ urllib3 idna chardet certifi ];
- # sadly, tests require networking
- doCheck = false;
+ propagatedBuildInputs = [
+ certifi
+ chardet
+ idna
+ urllib3
+ ];
+
+ checkInputs = [
+ pytest-mock
+ pytest-xdist
+ pytestCheckHook
+ ];
+
+ # AttributeError: 'KeywordMapping' object has no attribute 'get'
+ doCheck = !isPy27;
+
+ disabledTests = [
+ # Disable tests that require network access and use httpbin
+ "requests.api.request"
+ "requests.models.PreparedRequest"
+ "requests.sessions.Session"
+ "requests"
+ "test_redirecting_to_bad_url"
+ "test_requests_are_updated_each_time"
+ "test_should_bypass_proxies_pass_only_hostname"
+ "test_urllib3_pool_connection_closed"
+ "test_urllib3_retries"
+ "test_use_proxy_from_environment"
+ "TestRequests"
+ "TestTimeout"
+ ];
+
+ pythonImportsCheck = [ "requests" ];
meta = with lib; {
- description = "An Apache2 licensed HTTP library, written in Python, for human beings";
+ description = "Simple HTTP library for Python";
homepage = "http://docs.python-requests.org/en/latest/";
license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
index 947aa505f7..2c6123df5f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rethinkdb/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "rethinkdb";
- version = "2.4.7";
+ version = "2.4.8";
src = fetchPypi {
inherit pname version;
- sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d";
+ sha256 = "9f75a72bcd899ab0f6b0677873b89fba99c512bc7895eb5fbc1dc9a228b8aaee";
};
propagatedBuildInputs = [ six setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
index 02a3ef64c5..c4b7a6323e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
@@ -1,48 +1,41 @@
{ lib
+, buildPythonPackage
+, pythonOlder
, rustPlatform
-, python
, fetchFromGitHub
-, pipInstallHook
-, maturin
-, pip
+
# Check inputs
, pytestCheckHook
+, networkx
, numpy
}:
-rustPlatform.buildRustPackage rec {
+buildPythonPackage rec {
pname = "retworkx";
- version = "0.6.0";
+ version = "0.8.0";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Qiskit";
repo = "retworkx";
rev = version;
- sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
+ sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";
};
- cargoSha256 = "1vg4yf0k6yypqf9z46zz818mz7fdrgxj7zl6zjf7pnm2r8mq3qw5";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";
+ };
- propagatedBuildInputs = [ python ];
-
- nativeBuildInputs = [ pipInstallHook maturin pip ];
+ nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
doInstallCheck = true;
- installCheckInputs = [ pytestCheckHook numpy ];
-
- buildPhase = ''
- runHook preBuild
- maturin build --release --manylinux off --strip
- runHook postBuild
- '';
-
- installPhase = ''
- install -Dm644 -t dist target/wheels/*.whl
- pipInstallPhase
- '';
+ installCheckInputs = [ pytestCheckHook networkx numpy ];
preCheck = ''
export TESTDIR=$(mktemp -d)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix
new file mode 100644
index 0000000000..7bb390e79a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, ipython
+, numpy
+, pyserial
+, pyusb
+, hostPlatform
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "rfcat";
+ version = "1.9.5";
+
+ src = fetchFromGitHub {
+ owner = "atlas0fd00m";
+ repo = "rfcat";
+ rev = "v${version}";
+ sha256 = "1mmr7g7ma70sk6vl851430nqnd7zxsk7yb0xngwrdx9z7fbz2ck0";
+ };
+
+ propagatedBuildInputs = [
+ future
+ ipython
+ numpy
+ pyserial
+ pyusb
+ ];
+
+ postInstall = lib.optionalString hostPlatform.isLinux ''
+ mkdir -p $out/etc/udev/rules.d
+ cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "rflib" ];
+
+ meta = with lib; {
+ description = "Swiss Army knife of sub-GHz ISM band radio";
+ homepage = "https://github.com/atlas0fd00m/rfcat";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ trepetti ];
+ changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix
new file mode 100644
index 0000000000..f70e4921b9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, oauthlib
+, pytestCheckHook
+, pytz
+, requests
+, requests-mock
+, requests_oauthlib
+}:
+
+buildPythonPackage rec {
+ pname = "ring-doorbell";
+ version = "0.7.0";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ pname = "ring_doorbell";
+ inherit version;
+ sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg";
+ };
+
+ propagatedBuildInputs = [
+ oauthlib
+ pytz
+ requests
+ requests_oauthlib
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ requests-mock
+ ];
+
+ pythonImportsCheck = [ "ring_doorbell" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/tchellomello/python-ring-doorbell";
+ description = "A Python library to communicate with Ring Door Bell (https://ring.com/)";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ graham33 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix
index 8e42baf8ff..62cdb5bbf3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rnc2rng/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "rnc2rng";
- version = "2.6.4";
+ version = "2.6.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8";
+ sha256 = "d354afcf0bf8e3b1e8f8d37d71a8fe5b1c0cf75cbd4b71364a9d90b5108a16e5";
};
propagatedBuildInputs = [ rply ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix
index 5a472ceb18..1237fd09ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@
buildPythonApplication rec {
pname = "ropper";
- version = "1.13.3";
+ version = "1.13.6";
src = fetchPypi {
inherit pname version;
- sha256 = "dfc87477c0f53d3d2836a384c106373d761cc435eafc477f299523e5404dda43";
+ sha256 = "6e4226f5ef01951c7df87029535e051c6deb3f156f7511613fb69e8a7f4801fb";
};
# XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
# workaround: sudo chmod 777 /dev/shm
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
index cae84f8cbe..c913ab53b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
@@ -24,13 +24,13 @@
}:
buildPythonPackage rec {
- version = "3.4.1";
+ version = "3.4.2";
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
- sha256 = "1qnjjlgh6i31z45jykwd29n1336gq678fn9zw7gh0rv5d6sn0hv4";
+ sha256 = "8f7d1348b77bc45425b846a0d625f24a51a1c4f32ef2cd1c07a24222aa64e2e0";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
index 9bb2a51317..8670186586 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "7396943cbc1cf92eb6f7aa93be5f64a3bfa59d76908262e89bae06e3c87fa59d";
+ sha256 = "87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1";
};
buildInputs = [ docutils ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
index 6f816fc9bb..51d3f3ab14 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "s3transfer";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db";
+ sha256 = "7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2";
};
propagatedBuildInputs =
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
index 5df445f299..d6ed054624 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.25.1";
+ version = "2.29.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-xQ1nt8FcjuoilzM5PbU8KHgirPyj9us+ykyjfgEqZhg=";
+ sha256 = "sha256-xhm9KJiJdg8LD8Q33A61V6zXz1K9S4cROxy9iCxjK7M=";
};
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix
index 483a891f93..a29ae2da85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "schema";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "4cf529318cfd1e844ecbe02f41f7e5aa027463e7403666a52746f31f04f47a5e";
+ sha256 = "fbb6a52eb2d9facf292f233adcc6008cffd94343c63ccac9a1cb1f3e6de1db17";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
index e7307c9263..7e9e37831e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
@@ -3,25 +3,38 @@
, buildPythonPackage
, fetchPypi
, fetchpatch
-, gfortran, glibcLocales
-, numpy, scipy, pytest, pillow
+, gfortran
+, glibcLocales
+, numpy
+, scipy
+, pytest
+, pillow
, cython
, joblib
, llvmPackages
, threadpoolctl
+, pythonOlder
}:
buildPythonPackage rec {
pname = "scikit-learn";
version = "0.24.1";
- # UnboundLocalError: local variable 'message' referenced before assignment
- disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98=";
};
+ patches = [
+ # This patch fixes compatibility with numpy 1.20. It was merged before 0.24.1 was released,
+ # but for some reason was not included in the 0.24.1 release tarball.
+ (fetchpatch {
+ url = "https://github.com/scikit-learn/scikit-learn/commit/e7ef22c3ba2334cb3b476e95d7c083cf6b48ce56.patch";
+ sha256 = "174554k1pbf92bj7wgq0xjj16bkib32ailyhwavdxaknh4bd9nmv";
+ })
+ ];
+
buildInputs = [
pillow
gfortran
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 8d08e43bc7..0bc8499a37 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
});
in buildPythonPackage rec {
pname = "scipy";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb";
+ sha256 = "048vd4c843xaq45yk3kn491gvqnvhp2i9rxhg671ddlh923fpz64";
};
checkInputs = [ nose pytest ];
@@ -53,9 +53,10 @@ in buildPythonPackage rec {
SCIPY_USE_G77_ABI_WRAPPER = 1;
- meta = {
- description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
+ meta = with lib; {
+ description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering";
homepage = "https://www.scipy.org/";
- maintainers = with lib.maintainers; [ fridh ];
+ license = licenses.bsd3;
+ maintainers = [ maintainers.fridh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
index 7beefa4e89..dc57461d54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
@@ -1,16 +1,23 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
+{ lib
+, asn1crypto
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "scramp";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "tlocke";
repo = "scramp";
rev = version;
- sha256 = "15jb7z5l2lijxr60fb9v55i3f81h6d83c0b7fv5q0fv5q259nv0a";
+ sha256 = "sha256-d/kfrhvU96eH8TQX7n1hVRclEFWLseEvOxiR6VaOdrg=";
};
+ propagatedBuildInputs = [ asn1crypto ];
+
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "scramp" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
index 5f238a7e05..80933043b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
@@ -2,12 +2,12 @@
buildPythonApplication rec {
pname = "screeninfo";
- version = "0.6.6";
+ version = "0.6.7";
disabled = isPy27; # dataclasses isn't available for python2
src = fetchPypi {
inherit pname version;
- sha256 = "c93fcc3c9421cc2046e57468241c4c08c0c6cffd0e05a85cb0b18de8fe8b026f";
+ sha256 = "1c4bac1ca329da3f68cbc4d2fbc92256aa9bb8ff8583ee3e14f91f0a7baa69cb";
};
# dataclasses is a compatibility shim for python 3.6 ONLY
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
index 1578764767..5b7b7ea279 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "secretstorage";
- version = "3.3.0";
+ version = "3.3.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
pname = "SecretStorage";
inherit version;
- sha256 = "1aj669d5s8pmr6y2d286fxd13apnxzw0ivd1dr6xdni9i3rdxkrh";
+ sha256 = "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
index fb7913ce25..80fb7ab77f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "setproctitle";
- version = "1.2";
+ version = "1.2.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9b4e48722dd96cbd66d5bf2eab930fff8546cd551dd8d774c8a319448bd381a6";
+ sha256 = "7dfb472c8852403d34007e01d6e3c68c57eb66433fb8a5c77b13b89a160d97df";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
index ee4a3b5516..e24c771457 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -4,14 +4,13 @@
, isPy27
, semantic-version
, setuptools
-, setuptools_scm
+, setuptools-scm
, toml
}:
buildPythonPackage rec {
pname = "setuptools-rust";
version = "0.11.6";
-
disabled = isPy27;
src = fetchPypi {
@@ -19,10 +18,14 @@ buildPythonPackage rec {
sha256 = "a5b5954909cbc5d66b914ee6763f81fa2610916041c7266105a469f504a7c4ca";
};
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ semantic-version setuptools toml ];
+ # no tests
+ doCheck = false;
+ pythonImportsCheck = [ "setuptools_rust" ];
+
meta = with lib; {
description = "Setuptools plugin for Rust support";
homepage = "https://github.com/PyO3/setuptools-rust";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
index 8a37f41086..dacd589b12 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
@@ -9,15 +9,21 @@
, cython
, python
, sympy
+, meshio
+, mpi4py
+, psutil
+, openssh
+, pythonOlder
}:
buildPythonPackage rec {
- name = "sfepy_${version}";
- version = "2019.4";
+ name = "sfepy";
+ version = "2020.4";
+ disabled = pythonOlder "3.8";
src = fetchurl {
url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
- sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn";
+ sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz";
};
propagatedBuildInputs = [
@@ -28,12 +34,15 @@ buildPythonPackage rec {
pyparsing
tables
sympy
+ meshio
+ mpi4py
+ psutil
+ openssh
];
postPatch = ''
- # broken test
- rm tests/test_homogenization_perfusion.py
- rm tests/test_splinebox.py
+ # broken tests
+ rm tests/test_meshio.py
# slow tests
rm tests/test_input_*.py
@@ -47,6 +56,7 @@ buildPythonPackage rec {
'';
checkPhase = ''
+ export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh
export HOME=$TMPDIR
mv sfepy sfepy.hidden
mkdir -p $HOME/.matplotlib
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
index cfbd6f92b0..abc68709ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
@@ -66,5 +66,7 @@ buildPythonPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ evax ];
platforms = platforms.unix;
+ # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest'
+ broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index 91c34734a8..e8ea874e5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix
@@ -1,41 +1,59 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder
-, geos, pytestCheckHook, cython
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, substituteAll
+, pythonOlder
+, geos
+, pytestCheckHook
+, cython
, numpy
+, fetchpatch
}:
buildPythonPackage rec {
pname = "Shapely";
version = "1.7.1";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n";
};
- disabled = pythonOlder "3.5";
nativeBuildInputs = [
geos # for geos-config
cython
];
- propagatedBuildInputs = [ numpy ];
+ propagatedBuildInputs = [
+ numpy
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- # environment variable used in shapely/_buildcfg.py
+ # Environment variable used in shapely/_buildcfg.py
GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
patches = [
+ # Fix with geos 3.9. This patch will be part of the next release after 1.7.1
+ (fetchpatch {
+ url = "https://github.com/Toblerity/Shapely/commit/77879a954d24d1596f986d16ba3eff5e13861164.patch";
+ sha256 = "1w7ngjqbpf9vnvrfg4nyv34kckim9a60gvx20h6skc79xwihd4m5";
+ excludes = [
+ "tests/test_create_inconsistent_dimensionality.py"
+ "appveyor.yml"
+ ".travis.yml"
+ ];
+ })
+ # Patch to search form GOES .so/.dylib files in a Nix-aware way
(substituteAll {
src = ./library-paths.patch;
libgeos_c = GEOS_LIBRARY_PATH;
libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
})
- # included in next release.
- (fetchpatch {
- url = "https://github.com/Toblerity/Shapely/commit/ea5b05a0c87235d3d8f09930ad47c396a76c8b0c.patch";
- sha256 = "sha256-egdydlV+tpXosSQwQFHaXaeBhXEHAs+mn7vLUDpvybA=";
- })
];
preCheck = ''
@@ -46,9 +64,12 @@ buildPythonPackage rec {
"test_collection"
];
+ pythonImportsCheck = [ "shapely" ];
+
meta = with lib; {
description = "Geometric objects, predicates, and operations";
- maintainers = with maintainers; [ knedlsepp ];
homepage = "https://pypi.python.org/pypi/Shapely/";
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ knedlsepp ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sharkiqpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sharkiqpy/default.nix
new file mode 100644
index 0000000000..9d696bf0a2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sharkiqpy/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "sharkiqpy";
+ version = "0.1.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0nk1nbplyk28qadxc7rydjvdgbz3za0xjg6c95l95mhiz453q5sw";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ requests
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "sharkiqpy" ];
+
+ meta = with lib; {
+ description = "Python API for Shark IQ robot";
+ homepage = "https://github.com/ajmarks/sharkiq";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signify/certificate-expiration-date.patch b/third_party/nixpkgs/pkgs/development/python-modules/signify/certificate-expiration-date.patch
new file mode 100644
index 0000000000..6554211a4b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/signify/certificate-expiration-date.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/test_authenticode.py b/tests/test_authenticode.py
+index 7e2c709..2f27e09 100644
+--- a/tests/test_authenticode.py
++++ b/tests/test_authenticode.py
+@@ -153,10 +153,12 @@ class AuthenticodeParserTestCase(unittest.TestCase):
+ """this certificate is revoked"""
+ with open(str(root_dir / "test_data" / "jameslth"), "rb") as f:
+ pefile = SignedPEFile(f)
+- pefile.verify()
++ pefile.verify(verification_context_kwargs=
++ {'timestamp': datetime.datetime(2021, 1, 1, tzinfo=datetime.timezone.utc)})
+
+ def test_jameslth_revoked(self):
+ """this certificate is revoked"""
++ # TODO: this certificate is now expired, so it will not show up as valid anyway
+ with open(str(root_dir / "test_data" / "jameslth"), "rb") as f:
+ pefile = SignedPEFile(f)
+ with self.assertRaises(VerificationError):
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix
new file mode 100644
index 0000000000..be0623b1b7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook
+, certvalidator, pyasn1, pyasn1-modules
+}:
+
+buildPythonPackage rec {
+ pname = "signify";
+ version = "0.3.0";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "ralphje";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-JxQECpwHhPm8TCVW/bCnEpu5I/WETyZVBx29SQE4NmE=";
+ };
+ patches = [
+ # Upstream patch is available here:
+ # https://github.com/ralphje/signify/commit/8c345be954e898a317825bb450bed5ba0304b2b5.patch
+ # But update a couple other things and dont apply cleanly. This is an extract of the part
+ # we care about and breaks the tests after 2021-03-01
+ ./certificate-expiration-date.patch
+ ];
+
+ propagatedBuildInputs = [ certvalidator pyasn1 pyasn1-modules ];
+
+ checkInputs = [ pytestCheckHook ];
+ pytestFlagsArray = [ "-v" ];
+ pythonImportsCheck = [ "signify" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/ralphje/signify";
+ description = "library that verifies PE Authenticode-signed binaries";
+ license = licenses.mit;
+ maintainers = with maintainers; [ baloo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix
new file mode 100644
index 0000000000..1ecd446c5b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, requests
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests-mock
+}:
+
+buildPythonPackage rec {
+ pname = "simplehound";
+ version = "0.6";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "robmarkcole";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [
+ requests-mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "simplehound" ];
+
+ meta = with lib; {
+ description = "Python API for Sighthound";
+ homepage = "https://github.com/robmarkcole/simplehound";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix
new file mode 100644
index 0000000000..c94b03bcc6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, colorlog
+, fetchFromGitHub
+, pytest-sugar
+, pytest-timeout
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+}:
+
+buildPythonPackage rec {
+ pname = "skybellpy";
+ version = "0.6.3";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "MisterWil";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1ghvm0pcdyhq6xfjc2dkldd701x77w07077sx09xsk6q2milmvzz";
+ };
+
+ propagatedBuildInputs = [
+ colorlog
+ requests
+ ];
+
+ checkInputs = [
+ pytest-sugar
+ pytest-timeout
+ pytestCheckHook
+ requests-mock
+ ];
+
+ pythonImportsCheck = [ "skybellpy" ];
+
+ meta = with lib; {
+ description = "Python wrapper for the Skybell alarm API";
+ homepage = "https://github.com/MisterWil/skybellpy";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
index 2a2f3bf42f..cb491cf600 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.3.0";
+ version = "3.4.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
- sha256 = "0nr1avxycvjnvg1n8r09xi4sc5h6i4b64pzfgq14l55dgi5sv1rx";
+ sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix
index 08bdc18318..506fad5db4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, boto3
, diskcache
, enum34
@@ -10,7 +10,7 @@
, requests
, scikitimage
, six
-, pytest
+, pytestCheckHook
, isPy27
, tifffile
}:
@@ -19,9 +19,11 @@ buildPythonPackage rec {
pname = "slicedimage";
version = "4.1.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7369f1d7fa09f6c9969625c4b76a8a63d2507a94c6fc257183da1c10261703e9";
+ src = fetchFromGitHub {
+ owner = "spacetx";
+ repo = pname;
+ rev = version;
+ sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw";
};
propagatedBuildInputs = [
@@ -36,13 +38,13 @@ buildPythonPackage rec {
] ++ lib.optionals isPy27 [ pathlib enum34 ];
checkInputs = [
- pytest
+ pytestCheckHook
];
- # ignore tests which require setup
- checkPhase = ''
- pytest --ignore tests/io_
- '';
+ # Ignore tests which require setup, check again if disabledTestFiles can be used
+ pytestFlagsArray = [ "--ignore tests/io_" ];
+
+ pythonImportsCheck = [ "slicedimage" ];
meta = with lib; {
description = "Library to access sliced imaging data";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix
index 83f3e412dd..f8329dbab4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "slicer";
- version = "0.0.5";
+ version = "0.0.7";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "8c0fe9845056207d7344d5850e93551f9be20656178d443332aa02da9c71ba44";
+ sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec";
};
checkInputs = [ pytestCheckHook pandas pytorch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix
index 341f53cfe0..f648905251 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
# Exclude live tests
- disabledTestFiles = [ "tests/live_test.py" ];
+ disabledTestPaths = [ "tests/live_test.py" ];
pythonImportsCheck = [ "slixmpp" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
index 389feef2b4..99c9c28a16 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "smart_open";
- version = "4.1.0";
+ version = "4.1.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "26af5c1a3f2b76aab8c3200310f0fc783790ec5a231ffeec102e620acdd6262e";
+ sha256 = "4bbb6233364fc1173cc0af6b7a56ed76fce32509514f1978a995a5835f3177f1";
};
# moto>=1.0.0 is backwards-incompatible and some tests fail with it,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix
index 04b86ad5f6..1b0f310f42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix
@@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "smmap";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24";
+ sha256 = "84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50";
};
checkInputs = [ nosexcover ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index a2f6a7aae9..9cbbf8c2dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.3.8";
+ version = "2.3.10";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-zsS5+0UGDwZM65MILfgAvZ67AbXGcLsVmGacgoxX530=";
+ sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index e203dc1c7a..e86144dff0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -1,12 +1,15 @@
{ buildPythonPackage
-, coveralls
, fetchFromGitHub
-, flake8
+, fetchpatch
, graphviz
+, ifaddr
+, isPy27
, lib
, mock
+, nix-update-script
, pytestCheckHook
, requests
+, requests-mock
, sphinx
, sphinx_rtd_theme
, toml
@@ -15,7 +18,8 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.20";
+ version = "0.21.2";
+ disabled = isPy27;
# N.B. We fetch from GitHub because the PyPI tarball doesn't contain the
# required files to run the tests.
@@ -23,34 +27,46 @@ buildPythonPackage rec {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
- sha256 = "0p87aw7wxgdjz0m0nqqcfvbn24hlbq1hh1zxdq2c0k2jcbmaj8zc";
+ sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
};
+ patches = [(fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
+ sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
+ })];
+
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
# longer in nixpkgs.
# 2. There is no benefit for us to be running linting and coverage tests.
postPatch = ''
sed -i "/black/d" ./requirements-dev.txt
+ sed -i "/coveralls/d" ./requirements-dev.txt
+ sed -i "/flake8/d" ./requirements-dev.txt
sed -i "/pylint/d" ./requirements-dev.txt
sed -i "/pytest-cov/d" ./requirements-dev.txt
'';
propagatedBuildInputs = [
+ ifaddr
requests
toml
xmltodict
];
+
checkInputs = [
pytestCheckHook
- coveralls
- flake8
graphviz
mock
+ requests-mock
sphinx
sphinx_rtd_theme
];
+ passthru.updateScript = nix-update-script {
+ attrPath = "python3Packages.${pname}";
+ };
+
meta = with lib; {
homepage = "http://python-soco.com/";
description = "A CLI and library to control Sonos speakers";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix
index 54cd9beede..1f639d4f2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
- version = "2.1.2";
+ version = "2.1.3";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
- sha256 = "1c4g8nhlcc348w0axdswv69q8k3qxwbnvim1yf7vagd0adv83gsj";
+ sha256 = "07jkkg5ph5m47xf8w5asy5930qcpy6p11j0admll2y6yjynd2b47";
};
propagatedBuildInputs = [ regex ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix
index c541751bd2..b7569efadf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix
@@ -51,6 +51,8 @@ buildPythonPackage rec {
popd
'';
+ pythonImportsCheck = [ "sopel" ];
+
meta = with lib; {
description = "Simple and extensible IRC bot";
homepage = "http://sopel.chat";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix
index 88da35a0f9..a050aadb4b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "spglib";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchPypi {
inherit pname version;
- sha256 = "94d056e48e7e6fe2e6fe4161471e774ac03221a6225fd83d551d3184220c1edf";
+ sha256 = "9fd2fefbd83993b135877a69c498d8ddcf20a9980562b65b800cfb4cdadad003";
};
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
index 958c1a6b19..739ea2afa8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, buildPythonPackage
, fetchPypi
, sphinx
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
index 6b03c245eb..facd37e9c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-tikz";
- version = "0.4.9";
+ version = "0.4.11";
src = fetchPypi {
inherit pname version;
- sha256 = "054429a04ed253256a676ecc29f0bae2c644d5bd1150cd95d658990a07ebc8fe";
+ sha256 = "5c5194055d3219e2ed8d02b52b664d399674154f3db9724ae09e881d091b3d10";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
index 9533db6e4a..614f64a0fb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "spyder-kernels";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "588602b9f44961f4011a9ec83fe85f5d621126eee64835e407a7d41c54dccc74";
+ sha256 = "416534d7504c0f337e6e6e2cbd893d1866ad20d3bec99a94ad617d2fd60699ae";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
index c41ef74c5b..dd65079e6a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "spyder";
- version = "4.2.0";
+ version = "4.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "44f51473b81c1bfde76097bfb957ec14f580a262b229ae8e90d18f5b82104c95";
+ sha256 = "7f93bc5b8b119cc1e195ce3efcc1598386e082c4096334c1fa2b018938ac79b9";
};
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
index 83fd3e7b10..6f5fb55786 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,23 +1,35 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
+{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch
, mock
, pysqlite
, pytestCheckHook
+, pytest_xdist
}:
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.3.20";
+ version = "1.3.23";
src = fetchPypi {
inherit pname version;
- sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1";
+ sha256 = "6fca33672578666f657c131552c4ef8979c1606e494f78cd5199742dfb26918b";
};
+ patches = [
+ # fix test_pyodbc_extra_connect_azure test failure
+ (fetchpatch {
+ url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch";
+ sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db";
+ })
+ ];
+
checkInputs = [
pytestCheckHook
+ pytest_xdist
mock
] ++ lib.optional (!isPy3k) pysqlite;
+ pytestFlagsArray = [ "-n auto" ];
+
postInstall = ''
sed -e 's:--max-worker-restart=5::g' -i setup.cfg
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srp/default.nix
index c0d3a0a4ae..31f77b0ee0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/srp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/srp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "srp";
- version = "1.0.16";
+ version = "1.0.17";
src = fetchPypi {
inherit pname version;
- sha256 = "c943b7181322a2bdd50d20e1244536c404916e546131dc1fae10a7cb99a013e9";
+ sha256 = "f2e3fed4e5cbfd6b481edc9cdd51a8c39a609eae117210218556004bdc9016b2";
};
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix
index 94513e5d62..071bbcd306 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
typing-extensions
];
- disabledTestFiles = [ "tests/test_graphql.py" ];
+ disabledTestPaths = [ "tests/test_graphql.py" ];
# https://github.com/encode/starlette/issues/1131
disabledTests = [ "test_debug_html" ];
pythonImportsCheck = [ "starlette" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
index f538cdf0c0..9aebe88b79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "statsmodels";
- version = "0.12.1";
+ version = "0.12.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "a271b4ccec190148dccda25f0cbdcbf871f408fc1394a10a7dc1af4a62b91c8e";
+ sha256 = "8ad7a7ae7cdd929095684118e3b05836c0ccb08b6a01fe984159475d174a1b10";
};
nativeBuildInputs = [ cython ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix
index 3a62dd4ecf..62e71bd2fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "streamz";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "215703456479d24f524cdcd0365006250d4502d242f57e2f5db18e8638bc8694";
+ sha256 = "04446ece273c041506b1642bd3d8380367a8372196be4d6d6d03faafadc590b2";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index 8f383b60b1..ddc497a64a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.3.0";
+ version = "1.3.2";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "f640ae4e6fe761c3ae7138092c3dcb9b5050ec56e9cbac45d8a6b549d7ec973c";
+ sha256 = "637399fd80dccc95f5287b2606b74098b23c08031b7ec33c5afb314ccbf10948";
};
propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index b205f48cb6..96ac2d208b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.55.0";
+ version = "2.55.2";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "2eebf023595e8aa9d65d8b46ccc3c716185bb9625d0e39d3956282fd7525848d";
+ sha256 = "e32c68194a47522a10945eb893218e5cb5ee65e3a3c2c4df7efca117a6bf1902";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix
index 5b6362b76a..ac80be2fe0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "subarulink";
- version = "0.3.11";
+ version = "0.3.12";
src = fetchFromGitHub {
owner = "G-Two";
repo = pname;
rev = "subaru-v${version}";
- sha256 = "1ink9bhph6blidnfsqwq01grhp7ghacmkd4vzgb9hnhl9l52s1jq";
+ sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6";
};
propagatedBuildInputs = [ aiohttp stdiomask ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
index 6a455ce49e..3ad8b6fea1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
@@ -29,12 +29,12 @@
buildPythonPackage rec {
pname = "sunpy";
- version = "2.0.6";
+ version = "2.0.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "109flghca42yhsm2w5xicqhyx1mc8c3vlwvadbn65fz3lhysqj67";
+ sha256 = "d13ac67c14ea825652dc3e12c4c627e782e8e843e96a1d54440d39dd2ceb6a5c";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix
index 3bf6ed95ce..d46fc14cdf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix
@@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "sybil";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3e098ae96c4d3668cd5fb04c160334a4bc3ade9d29177e0206846b75f5ff3e91";
+ sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524";
};
checkInputs = [ pytest nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix
index 4686d02486..2d841918f1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "0.8.7";
+ version = "0.8.8";
pname = "tabulate";
src = fetchPypi {
inherit pname version;
- sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007";
+ sha256 = "26f2589d80d332fefd2371d396863dedeb806f51b54bdb4b264579270b621e92";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix
index 400751529a..0f02da4866 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "terminado";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3da72a155b807b01c9e8a5babd214e052a0a45a975751da3521a1c3381ce6d76";
+ sha256 = "89e6d94b19e4bc9dce0ffd908dfaf55cc78a9bf735934e915a4a96f65ac9704c";
};
propagatedBuildInputs = [ ptyprocess tornado ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix
new file mode 100644
index 0000000000..adccc99ac2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, exdown
+, numpy
+, gnuplot
+}:
+
+buildPythonPackage rec {
+ pname = "termplotlib";
+ version = "0.3.4";
+
+ src = fetchFromGitHub {
+ owner = "nschloe";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "17d2727bz6kqhxczixx6nxzz4hzyi2cssylzazjimk07syvycd6n";
+ };
+
+ format = "pyproject";
+ checkInputs = [ pytestCheckHook numpy exdown gnuplot ];
+ pythonImportsCheck = [ "termplotlib" ];
+
+ # there seems to be a newline in the very front of the output
+ # which causes the test to fail, since it apparently doesn't
+ # strip whitespace. might be a gnuplot choice? sigh...
+ disabledTests = [ "test_plot_lim" ];
+
+ meta = with lib; {
+ description = "matplotlib for your terminal";
+ homepage = "https://github.com/nschloe/termplotlib";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix
index 616db71a94..31b02e3f26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix
@@ -51,6 +51,9 @@ buildPythonPackage rec {
'';
meta = with lib; {
+ # scikit-learn in pythonPackages is too new for textacy
+ # remove as soon as textacy support scikit-learn >= 0.24
+ broken = true;
description = "Higher-level text processing, built on spaCy";
homepage = "https://textacy.readthedocs.io/";
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix
index 74f94aaf25..589ff573ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
{ fetchPypi, buildPythonPackage, lib }:
buildPythonPackage rec {
- version = "3.10.1";
+ version = "3.10.3";
pname = "thespian";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e00bba5b0b91f9d7ec3df0ac671136df7a7be0a14dfea38ca3850488bca73d8c";
+ sha256 = "d9152089f239c80339eb0431b9561966a841fb3ab0d043b36fa47934fc7956f2";
};
# Do not run the test suite: it takes a long time and uses
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
index 7be95b9708..fbe474166c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tlsh/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage {
pname = "tlsh";
- version = "3.4.5";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "trendmicro";
repo = "tlsh";
- rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930";
- sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll";
+ rev = "f2bb7a97cfb0f9418a750ba92c182d1091e6c159";
+ sha256 = "1kxfhdwqjd4pjdlr1gjh2am8mxpaqmfq7rrxkjfi0mbisl1krkwb";
};
nativeBuildInputs = [ cmake ];
@@ -26,7 +26,7 @@ buildPythonPackage {
meta = with lib; {
description = "Trend Micro Locality Sensitive Hash";
- homepage = "https://github.com/trendmicro/tlsh";
+ homepage = "http://tlsh.org/";
license = licenses.asl20;
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix
new file mode 100644
index 0000000000..7aee895c6c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix
@@ -0,0 +1,28 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+, isPy27
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "tokenize-rt";
+ version = "4.1.0";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "asottile";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-9qamHk2IZRmgGNFlYkSRks6mRVNlYfetpK/7rsfK9tc=";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "A wrapper around the stdlib `tokenize` which roundtrips";
+ homepage = "https://github.com/asottile/tokenize-rt";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lovesegfault ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
index cf122613f6..348302a59c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
@@ -1,12 +1,10 @@
{ lib
-, rustPlatform
, fetchFromGitHub
, fetchurl
-, pipInstallHook
+, buildPythonPackage
+, rustPlatform
, setuptools-rust
-, wheel
, numpy
-, python
, datasets
, pytestCheckHook
, requests
@@ -49,30 +47,33 @@ let
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt";
sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f";
};
-in rustPlatform.buildRustPackage rec {
+in buildPythonPackage rec {
pname = "tokenizers";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
- hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw=";
+ hash = "sha256-N/dKjQwHKmJnB76q8ISQ3cjuW0Z4GqGavnFFx/w9JRQ=";
};
- cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src sourceRoot;
+ name = "${pname}-${version}";
+ hash = "sha256-3ICSjtiRfLOj+PXu6mcuDoAtod5uXAcabYWTLxEgI18=";
+ };
sourceRoot = "source/bindings/python";
- nativeBuildInputs = [
- pipInstallHook
- setuptools-rust
- wheel
- ];
+ nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
propagatedBuildInputs = [
numpy
- python
];
installCheckInputs = [
@@ -99,14 +100,6 @@ in rustPlatform.buildRustPackage rec {
ln -s ${openaiMerges} openai-gpt-merges.txt )
'';
- buildPhase = ''
- ${python.interpreter} setup.py bdist_wheel
- '';
-
- installPhase = ''
- pipInstallPhase
- '';
-
preCheck = ''
HOME=$TMPDIR
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix
new file mode 100644
index 0000000000..544c1a3084
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, pkg-config, swig
+, tpm2-tss
+, cryptography, ibm-sw-tpm2
+}:
+
+buildPythonPackage rec {
+ pname = "tpm2-pytss";
+
+ # Last version on github is 0.2.4, but it looks
+ # like a mistake (it's missing commits from 0.1.9)
+ version = "0.1.9";
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-v5Xth0A3tFnLFg54nvWYL2TD201e/GWv+2y5Qc60CmU=";
+ };
+ postPatch = ''
+ substituteInPlace tpm2_pytss/config.py --replace \
+ 'SYSCONFDIR = CONFIG.get("sysconfdir", "/etc")' \
+ 'SYSCONFDIR = "${tpm2-tss}/etc"'
+ '';
+
+ nativeBuildInputs = [ pkg-config swig ];
+ # The TCTI is dynamically loaded from tpm2-tss, we have to provide the library to the end-user
+ propagatedBuildInputs = [ tpm2-tss ];
+
+ checkInputs = [
+ cryptography
+ # provide tpm_server used as simulator for the tests
+ ibm-sw-tpm2
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/tpm2-software/tpm2-pytss";
+ description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ baloo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
index ba40723e7d..950a618a52 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
@@ -1,28 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
-, nose
-, coverage
-, glibcLocales
-, flake8
, setuptools_scm
, pytestCheckHook
+, pytest-asyncio
+, pytest-timeout
+, numpy
+, pandas
+, rich
+, tkinter
}:
buildPythonPackage rec {
pname = "tqdm";
- version = "4.54.1";
+ version = "4.58.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1x9chlh3msikddmq8p8p5s5kgqqs48bclxgzz3vb9ygcwjimidiq";
+ sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2";
};
nativeBuildInputs = [
setuptools_scm
];
- checkInputs = [ nose coverage glibcLocales flake8 pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ pytest-asyncio
+ pytest-timeout
+ # tests of optional features
+ numpy
+ pandas
+ rich
+ tkinter
+ ];
# Remove performance testing.
# Too sensitive for on Hydra.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
index e76a36bcf4..5748ff91db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "traitsui";
- version = "7.1.0";
+ version = "7.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b699aeea588b55723860ddc6b2bd9b5013c4a72e18d1bbf51c6689cc7c6a562a";
+ sha256 = "77d9dc5830c4e7ab94f9225bc2f082430399d95c943f1616db41e83a94df38e5";
};
propagatedBuildInputs = [ traits pyface six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix
index 6bb5987ba4..78022cdba5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "transaction";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3b0ad400cb7fa25f95d1516756c4c4557bb78890510f69393ad0bd15869eaa2d";
+ sha256 = "0c15ef0b7ff3518357ceea75722a30d974c3f85e11aa5cec5d5a2b6a40cfcf68";
};
propagatedBuildInputs = [ zope_interface mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index 6c04bacbd7..bebd32877d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.3.2";
+ version = "4.3.3";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- hash = "sha256-vv4wKf1PcuVR63ZQJd3oixdNvS7VcTmAaKkmL8I4COg=";
+ hash = "sha256-KII7ZR+vnCxCxUcBOQo9y0KxZa+XuIIAkSJejk8HrlA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
new file mode 100644
index 0000000000..3a484692d1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transmissionrpc/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "transmissionrpc";
+ version = "0.11";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ # no tests
+ doCheck = false;
+ pythonImportsCheck = [ "transmissionrpc" ];
+
+ meta = with lib; {
+ description = "Python implementation of the Transmission bittorent client RPC protocol";
+ homepage = "https://pypi.python.org/pypi/transmissionrpc/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
index b157e32ed8..d4a021a0e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.9.1";
+ version = "3.9.7";
src = fetchPypi {
inherit pname version;
- sha256 = "d19cbdb830a17297aa218ba6ce4955fc11b4b553414289cfd71f58f8144cc91f";
+ sha256 = "63dd76531a4c6ddd53e00209b971e83d3fbfd9b012f4033a1c4b0f04f1f551e3";
};
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
index 68254d8601..20394fb2de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
@@ -23,12 +23,12 @@
buildPythonApplication rec {
pname = "trytond";
- version = "5.8.2";
+ version = "5.8.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "dea7d11ec0b4584a438fab7a1acb56864b32cc9e7d6ffa166572f75a2b033dc0";
+ sha256 = "28e467b51f6dc67b8b4ca60afec82614bba8cf78852c1941cc9071d615ba7972";
};
# Tells the tests which database to use
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
index 927fe1e562..9d63e466e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "tubeup";
- version = "0.0.23";
+ version = "0.0.25";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d504327e055889edfe56512a829f76b24b40c5965b93120f8b9300f5390014b4";
+ sha256 = "c1869363eddb85f39c05971d159bb2bf8cafa596acff3b9117635ebebfd1d342";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix
index a717ab2bc9..e234084d31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix
@@ -5,11 +5,11 @@
}:
buildPythonPackage rec {
pname = "twill";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "85bc45bc34e3d4116123e3021c07d3a86b5e67be1ee01bc8062288eb83ae7799";
+ sha256 = "fc694ac1cb0616cfba2f9db4720e9d354bf656c318e21ef604a7e3caaef83d10";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix
new file mode 100644
index 0000000000..fc856430da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twinkly-client/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "twinkly-client";
+ version = "0.0.2";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "twinkly_client" ];
+
+ meta = with lib; {
+ description = "Python module to communicate with Twinkly LED strings";
+ homepage = "https://github.com/dr1rrb/py-twinkly-client";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
index f7c5d4d2e8..b244167f88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "twitterapi";
- version = "2.6.6";
+ version = "2.6.8";
src = fetchFromGitHub {
owner = "geduldig";
repo = "TwitterAPI";
rev = "v${version}";
- sha256 = "0ib4yggigpkn8rp71j94xyxl20smh3d04xsa9fhyh0mws4ri33j8";
+ sha256 = "sha256-X/j+3bWLQ9b4q0k/JTE984o1VZS0KTQnC0AdZpNsksY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
index e93fd83656..c278680404 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
# the default string formatting of regular expression flags which breaks test assertion
"test_to_json_schema_complex_regular_expression"
];
- disabledTestFiles = [
+ disabledTestPaths = [
# for some reason jinja2 not picking up forms directory (1% of tests)
"tests/test_forms.py"
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix
new file mode 100644
index 0000000000..0772b73a15
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "tzdata";
+ version = "2021.1";
+ format = "pyproject";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-4ZxzUfiHUioaxznSEEHlkt3ebdG3ZP3vqPeys1UdPTg=";
+ };
+
+ pythonImportsCheck = [ "tzdata" ];
+
+ meta = with lib; {
+ description = "Provider of IANA time zone data";
+ homepage = "https://github.com/python/tzdata";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
index cb46666f21..69cc04ee2d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "ueberzug";
- version = "18.1.8";
+ version = "18.1.9";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "3718db8f824ef5f6a69dc25b3f08e0a45388dd46843c61721476bad2b64345ee";
+ sha256 = "7ce49f351132c7d1b0f8097f6e4c5635376151ca59318540da3e296e5b21adc3";
};
buildInputs = [ libX11 libXext ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index 9c759bd41b..d93ee9f5af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "ujson";
- version = "4.0.1";
+ version = "4.0.2";
disabled = isPyPy || (!isPy3k);
src = fetchPypi {
inherit pname version;
- sha256 = "26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3";
+ sha256 = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
index 70724bb71b..65cb088238 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Unidecode";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8";
+ sha256 = "a039f89014245e0cad8858976293e23501accc9ff5a7bdbc739a14a2b7b85cdc";
};
LC_ALL="en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index 6cf7ce34d3..7bfb2ba75a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "urllib3";
- version = "1.26.2";
+ version = "1.26.3";
src = fetchPypi {
inherit pname version;
- sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
+ sha256 = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73";
};
NOSE_EXCLUDE = lib.concatStringsSep "," [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index 1bc73a3773..3ba9dcb5f1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "uvloop";
- version = "0.15.1";
+ version = "0.15.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1p33xfzcy60qqca3rplzbh8h4x7x9l77vi6zbyy9md5z2a0q4ikq";
+ sha256 = "2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
index 1bc9b1777f..37f00b7348 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "validators";
- version = "0.18.1";
+ version = "0.18.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1a653b33c0ab091790f65f42b61aa191e354ed5fdedfeb17d24a86d0789966d7";
+ sha256 = "37cd9a9213278538ad09b5b9f9134266e7c226ab1fede1d500e29e0a8fbb9ea6";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
index 8b64bddc5a..ec22660830 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
@@ -5,7 +5,6 @@
, distlib
, fetchPypi
, filelock
-, fish
, flaky
, importlib-metadata
, importlib-resources
@@ -24,11 +23,11 @@
buildPythonPackage rec {
pname = "virtualenv";
- version = "20.2.1";
+ version = "20.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
+ sha256 = "b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b";
};
nativeBuildInputs = [
@@ -56,7 +55,6 @@ buildPythonPackage rec {
checkInputs = [
cython
- fish
flaky
pytest-freezegun
pytest-mock
@@ -69,7 +67,7 @@ buildPythonPackage rec {
'';
# Ignore tests which require network access
- disabledTestFiles = [
+ disabledTestPaths = [
"tests/unit/create/test_creator.py"
"tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
];
@@ -77,6 +75,9 @@ buildPythonPackage rec {
disabledTests = [
"test_can_build_c_extensions"
"test_xonsh" # imports xonsh, which is not in pythonPackages
+ # tests search `python3`, fail on python2, pypy
+ "test_python_via_env_var"
+ "test_python_multi_value_prefer_newline_via_env_var"
];
pythonImportsCheck = [ "virtualenv" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
index 0c80423e36..a626bdd6ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, six
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -14,7 +14,14 @@ buildPythonPackage rec {
sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha";
};
- buildInputs = [ six pytest ];
+ propagatedBuildInputs = [ six ];
+
+ checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "w3lib" ];
+
+ disabledTests = [
+ "test_add_or_replace_parameter"
+ ];
meta = with lib; {
description = "A library of web-related functions";
@@ -22,5 +29,4 @@ buildPythonPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ drewkett ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix
index 45b5a47345..fcddf538d8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "wadllib";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "e995691713d3c795d2b36278de8e212241870f46bec6ecba91794ea3cc5bd67d";
+ sha256 = "84fecbaec2fef5ae2d7717a8115d271f18c6b5441eac861c58be8ca57f63c1d3";
};
propagatedBuildInputs = [ setuptools lazr-uri ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
index 3e674ae266..f58574014e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "wasabi";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchPypi {
inherit pname version;
- sha256 = "6e5228a51f5550844ef5080e74759e7ecb6e344241989d018686ba968f0b4f5a";
+ sha256 = "b4a36aaa9ca3a151f0c558f269d442afbb3526f0160fd541acd8a0d5e5712054";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix
index ff4fffc821..28c9b8b5c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix
@@ -1,62 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
-, maturin
, buildPythonPackage
-, python
}:
let
pname = "wasmer";
version = "1.0.0";
-
- wheel = rustPlatform.buildRustPackage rec {
- inherit pname version;
-
- src = fetchFromGitHub {
- owner = "wasmerio";
- repo = "wasmer-python";
- rev = version;
- hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
- };
-
- cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
-
- nativeBuildInputs = [ maturin python ];
-
- preBuild = ''
- cd packages/api
- '';
-
- buildPhase = ''
- runHook preBuild
- maturin build --release --manylinux off --strip
- runHook postBuild
- '';
-
- postBuild = ''
- cd ../..
- '';
-
- doCheck = false;
-
- installPhase = ''
- runHook preInstall
- install -Dm644 -t $out target/wheels/*.whl
- runHook postInstall
- '';
- };
-
-in
-buildPythonPackage rec {
+in buildPythonPackage rec {
inherit pname version;
- format = "wheel";
- src = wheel;
+ src = fetchFromGitHub {
+ owner = "wasmerio";
+ repo = "wasmer-python";
+ rev = version;
+ hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
+ };
- unpackPhase = ''
- mkdir -p dist
- cp $src/*.whl dist
- '';
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
+ };
+
+ format = "pyproject";
+
+ nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
+
+ buildAndTestSubdir = "packages/api";
+
+ doCheck = false;
pythonImportsCheck = [ "wasmer" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index 6930be7d65..31f41c5009 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, buildPythonPackage
, fetchPypi
+, fetchpatch
, argh
, pathtools
, pyyaml
@@ -11,13 +12,21 @@
buildPythonPackage rec {
pname = "watchdog";
- version = "2.0.0";
+ version = "2.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/UtWz74NDZxPxDGs7KdXAKfxLTc33C6csuwrpkloBCU=";
+ sha256 = "sha256-Uy/t2ZPnVVRnH6o2zQTFgM7T+uCEJUp3mvu9iq8AVms=";
};
+ patches = [
+ (fetchpatch {
+ # Fix test flakiness on Apple Silicon, remove after upgrade to 2.0.6.
+ url = "https://github.com/gorakhargosh/watchdog/commit/331fd7c2c819663be39bc146e78ce67553f265fa.patch";
+ sha256 = "sha256-pLkZmbPN3qRNHs53OP0HIyDxqYCPPo6yOcBLD3aO2YE=";
+ })
+ ];
+
buildInputs = lib.optionals stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/web-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/web-cache/default.nix
new file mode 100644
index 0000000000..9246b2b571
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/web-cache/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+ pname = "web-cache";
+ version = "1.1.0";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit version;
+ pname = "web_cache";
+ sha256 = "1d8f1s3i0s3h1jqvjq6cp639hhbbpxvyq7cf9dwzrvvvr0s0m8fm";
+ };
+
+ # No tests in downloaded archive
+ doCheck = false;
+
+ pythonImportsCheck = [ "web_cache" ];
+
+ meta = with lib; {
+ description = "Simple Python key-value storage backed up by sqlite3 database";
+ homepage = "https://github.com/desbma/web_cache";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [ fortuneteller2k ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
index 124b45a2eb..201893c253 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "WebOb";
- version = "1.8.6";
+ version = "1.8.7";
src = fetchPypi {
inherit pname version;
- sha256 = "aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108";
+ sha256 = "b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323";
};
propagatedBuildInputs = [ nose pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix
index 7c3d25068e..861cb38389 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix
@@ -6,7 +6,7 @@
, futures
, gdata
, gnupg
-, google_api_python_client
+, google-api-python-client
, html2text
, libyaml
, lxml
@@ -56,7 +56,7 @@ buildPythonPackage rec {
feedparser
gdata
gnupg
- google_api_python_client
+ google-api-python-client
html2text
libyaml
lxml
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index 4f51fb486e..6039899838 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "wheel";
- version = "0.35.1";
+ version = "0.36.2";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "uS+9a47ZopI0yGlEnJi421WyzS//8BxUvH25hX4BBL8=";
+ sha256 = "sha256-8lK2UvqBIxUYm6IOuT+Jk71wYbEEjvI7typS3749N9g=";
name = "${pname}-${version}-source";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix
index c08c5541a6..9aca67e2ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "winacl";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp";
+ sha256 = "sha256-V+W0WRtL4rJD1LeYgr0PtiKdWTDQYv2ulB1divaqKe4=";
};
# Project doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
index 8f51ec1e77..59a2c8d7c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "0.11.0";
+ version = "0.11.1";
pname = "xcffib";
src = fetchPypi {
inherit pname version;
- sha256 = "a751081d816a63d02a4c63f91fd9c0112c1e0061af7ccf79c4e7c18517a75406";
+ sha256 = "12949cfe2e68c806efd57596bb9bf3c151f399d4b53e15d1101b2e9baaa66f5a";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
index 841348339a..72a5474886 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.17.0";
+ version = "0.17.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
- sha256 = "sha256-fzLqkeCfeLNu13R9cp1XVh8fE2B3L47UDpuWOod33gU=";
+ sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix
new file mode 100644
index 0000000000..82f4a968ba
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pytestCheckHook
+, libxslt
+, libxml2
+, libtool
+, pkg-config
+, xmlsec
+, pkgconfig
+, setuptools-scm
+, toml
+, lxml
+, hypothesis
+}:
+
+buildPythonPackage rec {
+ pname = "xmlsec";
+ version = "1.3.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx";
+ };
+
+ # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
+ patches = [
+ ./reset-lxml-in-tests.patch
+ ];
+
+ nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ];
+
+ buildInputs = [ xmlsec libxslt libxml2 libtool ];
+
+ propagatedBuildInputs = [ lxml ];
+
+ # Full git clone required for test_doc_examples
+ checkInputs = [ pytestCheckHook hypothesis ];
+ disabledTestPaths = [ "tests/test_doc_examples.py" ];
+
+ meta = with lib; {
+ description = "Python bindings for the XML Security Library";
+ homepage = "https://github.com/mehcode/python-xmlsec";
+ license = licenses.mit;
+ maintainers = with maintainers; [ zhaofengli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch
new file mode 100644
index 0000000000..0968583faa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/base.py b/tests/base.py
+index b05de1d..5ec356f 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
+
+ def load_xml(self, name, xpath=None):
+ """returns xml.etree"""
++ etree.set_default_parser(parser=etree.XMLParser())
+ root = etree.parse(self.path(name)).getroot()
+ if xpath is None:
+ return root
+diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
+index 2fc490f..53d2377 100644
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+ """
+ with cd(example.parent):
+ runpy.run_path(str(example))
++ from lxml import etree
++ etree.set_default_parser(parser=etree.XMLParser())
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
index 6dccf51100..2786fc979f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zeroc-ice";
- version = "3.7.4";
+ version = "3.7.5";
src = fetchPypi {
inherit version pname;
- sha256 = "dc79a1eaad1d1cd1cf8cfe636e1bc413c60645e3e87a5a8e9b97ce882690e0e4";
+ sha256 = "3b4897cc3f2adf3d03802368cedb72a038aa33c988663a667c1c48e42ea10797";
};
buildInputs = [ openssl bzip2 ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
index 3141f666a6..bc4599f08f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.53";
+ version = "0.0.54";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
- sha256 = "16n99r7bjd3lnxn72lfnxg44n7mkv196vdhkw2sf1nq1an4ks1nc";
+ sha256 = "1xc4rky9x2n15rsb18vyg4lb2897k14gkz03khgf8gp37bg2dk5h";
};
propagatedBuildInputs = [ aiohttp zigpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
index 1a1c639a47..2543d06758 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "zigpy-znp";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "zha-ng";
repo = "zigpy-znp";
rev = "v${version}";
- sha256 = "18dav2n5fqdigf8dl7gcqa9z8l6p2ig6l5q78gqg2wj7wjpncwyj";
+ sha256 = "1g5jssdnibhb4i4k1js9iy9w40cipf1gdnyp847x0bv6wblzx8rl";
};
propagatedBuildInputs = [
@@ -45,11 +45,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- disabledTests = [
- # zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0
- "test_force_remove"
- ];
-
meta = with lib; {
description = "A library for zigpy which communicates with TI ZNP radios";
homepage = "https://github.com/zha-ng/zigpy-znp";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
index 75683cb2eb..43fab18dae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "zope.schema";
- version = "6.0.0";
+ version = "6.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "20fbbce8a0726ba34f0e3958676498feebb818f06575193254e139d8d7214f26";
+ sha256 = "9b3fc3ac656099aa9ebf3beb2bbd83d2d6ee6f94b9ac6969d6e3993ec9c4a197";
};
propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix
new file mode 100644
index 0000000000..912328ead2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "air";
+ version = "1.15.1";
+
+ src = fetchFromGitHub {
+ owner = "cosmtrek";
+ repo = "air";
+ rev = "v${version}";
+ sha256 = "0d34k8hyag84j24bhax4gvg8mkzqyhdqd16rfirpfjiqvqh0vdkz";
+ };
+
+ vendorSha256 = "0k28rxnd0vyb6ljbi83bm1gl7j4r660a3ckjxnzc2qzwvfj69g53";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Live reload for Go apps";
+ homepage = "https://github.com/cosmtrek/air";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ Gonzih ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix
index 13e9c56be9..48182760dc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
- version = "0.13.4";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
- sha256 = "sha256-+ZsefwH1hag2syWaEXkdxgmxk6JsxP7MvV+ILlo+Hy8=";
+ sha256 = "sha256-9oLVv0fCJzYyBApR4yzQKc25Uz9X5Rrvj638yD0JDMU=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
index e5325f7da8..d6fa39036a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "8.39";
+ version = "8.41";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "sha256-CPPSJVKf01TA89Qk/uyvIU+ejo5JyT4Mc35KKJPv4IE=";
+ sha256 = "sha256-+XMCstfxOabLDp66pRQtYelrLUOMCWnTc3KbiOlfVzI=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index 4d7bc7c277..fb5d5b0c53 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.4.2";
+ version = "2.4.4";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "sha256-hOTxlrS47gS7stfNXuGKkAbCINhPXBVncOdPr1EDU5M=";
+ sha256 = "sha256-ZwGOk4HxURlPwGcWGHg6rqPh9ONPx9iJ2EB6lWKOMiY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
index 35c75d67da..30df5daed6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk";
};
- buildInputs = [ perl makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl ];
preBuild = ''
patchShebangs bin/
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
index 91f3f24d6f..f7f933392a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
@@ -12,8 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
};
- nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ cmake pkg-config makeWrapper ];
propagatedBuildInputs = with qt5; [
qt5.qtbase
qtdeclarative
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index aa5223ce3f..8aa9c97a9a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.24.1";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "00v6d1ffj1f4djbdf41bw4ymy2fhph1b5kfi50fp9c3c7319sqwr";
+ sha256 = "1n234ivpjfvppfqcpgbvsqg869m4g5xyi536di3ckm3sba9r4jwr";
};
- vendorSha256 = "1xy1vg34nv6v77sx13d3663v7xfm0f2kimdsjqzwpkzz8a6q6g2m";
+ vendorSha256 = "101bw29c2dn0mf5n32r7rkqrb9r71z3afbhwnzrm31xckbkvlwsa";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
index 98a6bcd5bb..6b94ed0a93 100644
--- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.8.0";
+ version = "10.9.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "v${version}";
- sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8=";
+ sha256 = "sha256-IVbvBqp/7Y3La0pP6gbWl0ATfEvkCuR4J9ChTDPNhB0=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA=";
+ vendorSha256 = "sha256-mj1TvNuFFPJGAJCBTQtU5WWPhHbiXUxRiMZQ/XvEy0U=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
index ba9412c286..3937992417 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/bazel-kazel/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bazel-kazel";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "repo-infra";
rev = "v${version}";
- sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs=";
+ sha256 = "sha256-g7jfuWe4UeAbNf+kOa0Y9BamUnGEbOGxZ+KdQWdWl48=";
};
vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
index 182b8633aa..93644caa5a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
pname = "ant";
inherit version;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
index d88068c1c3..d2ef8361ec 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
pname = "ant";
inherit version;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
index 4658703f8b..3a1866e0b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
inherit jdk;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 5de894bd1b..7c2e5372e7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation (rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
- version = "3.19.3";
+ version = "3.19.4";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
- sha256 = "sha256-P6ynwTFJSh401m6fiXL/U2nkjUGeqM6qPcFbTBE2dzI=";
+ sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
index c73b7149a3..da5e11cce2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, fetchFromGitHub, git, pkg-config }:
+{ lib, stdenv, python3, fetchFromGitHub, git, pkg-config, fetchpatch }:
# Note:
# Conan has specific dependency demands; check
@@ -20,6 +20,13 @@ let newPython = python3.override {
inherit version;
sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
};
+ patches = oldAttrs.patches or [] ++ [
+ # Don't raise import error on non-linux os. Remove after upgrading to distro≥1.2.0
+ (fetchpatch {
+ url = "https://github.com/nir0s/distro/commit/25aa3f8c5934346dc838387fc081ce81baddeb95.patch";
+ sha256 = "0m09ldf75gacazh2kr04cifgsqfxg670vk4ypl62zv7fp3nyd5dc";
+ })
+ ];
});
node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
version = "0.6.1";
@@ -69,7 +76,7 @@ in newPython.pkgs.buildPythonApplication rec {
six
tqdm
urllib3
- ];
+ ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ];
checkInputs = [
pkg-config
@@ -90,6 +97,9 @@ in newPython.pkgs.buildPythonApplication rec {
substituteInPlace conans/requirements.txt \
--replace "PyYAML>=3.11, <3.14.0" "PyYAML" \
--replace "deprecation>=2.0, <2.1" "deprecation" \
+ --replace "idna==2.6" "idna" \
+ --replace "cryptography>=1.3.4, <2.4.0" "cryptography" \
+ --replace "pyOpenSSL>=16.0.0, <19.0.0" "pyOpenSSL" \
--replace "six>=1.10.0,<=1.14.0" "six"
'';
@@ -98,6 +108,5 @@ in newPython.pkgs.buildPythonApplication rec {
description = "Decentralized and portable C/C++ package manager";
license = licenses.mit;
maintainers = with maintainers; [ HaoZeke ];
- platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index 93935e47b3..4c5d9a5df8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -33,7 +33,8 @@ rec {
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
'';
- buildInputs = [ unzip java makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip java ];
meta = {
description = "Enterprise-grade build system";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index 488697033d..51b97b242d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ jdk ];
# the jar is not in share/java, because it's a standalone jar and should
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
index d22f4bc487..093a825723 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
sourceRoot = ".";
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
index 06bf2c5467..db988bb16e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,38 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, which
-, curl
-, makeWrapper
-, jdk
-, writeScript
-, common-updater-scripts
-, cacert
-, git
-, nixfmt
-, nix
-, jq
-, coreutils
-, gnused
-}:
+{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript
+, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }:
stdenv.mkDerivation rec {
pname = "sbt-extras";
- rev = "830b72140583e2790bbd3649890ac8ef5371d0c6";
- version = "2021-02-04";
+ rev = "6db3d3d1c38082dd4c49cce9933738d9bff50065";
+ version = "2021-03-08";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
- sha256 = "0wq2mf8s254ns0sss5q394c1j2rnvl42x9l6kkrav505hbx0gyq6";
+ sha256 = "0sd9a6ldcl3pgs2rjg4pydk72ciavhggbpwfar3bj1h7vsgafnng";
};
dontBuild = true;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/bin
substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"'
@@ -40,6 +27,8 @@ stdenv.mkDerivation rec {
install bin/sbt $out/bin
wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]}
+
+ runHook postInstall
'';
doInstallCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
index c9518d685b..09c1485e81 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix
@@ -8,15 +8,15 @@
stdenv.mkDerivation rec {
pname = "sbt";
- version = "1.4.7";
+ version = "1.4.8";
src = fetchurl {
url =
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
- sha256 = "sha256-wqdZ/kCjwhoWtaiNAM1m869vByHk6mG2OULfuDotVP0=";
+ sha256 = "sha256-WXItvaPW0dfsfcPiHWGi6AAjAwpCQ4I+7q3XftnFo50=";
};
- patchPhase = ''
+ postPatch = ''
echo -java-home ${jre.home} >>conf/sbtopts
'';
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.isLinux [ zlib ];
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/share/sbt $out/bin
cp -ra . $out/share/sbt
ln -sT ../share/sbt/bin/sbt $out/bin/sbt
ln -sT ../share/sbt/bin/sbtn-x86_64-${
if (stdenv.isDarwin) then "apple-darwin" else "pc-linux"
} $out/bin/sbtn
- '';
- doInstallCheck = true;
- installCheckPhase = ''
- ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version} (this may take some time)'
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
index 5c852f2155..0f4ea722d9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix
@@ -43,11 +43,11 @@ rec {
crystal = crystal_0_34;
};
- shards_0_13 = generic {
- version = "0.12.0";
- sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c";
+ shards_0_14 = generic {
+ version = "0.14.0";
+ sha256 = "sha256-HEyGXoGkQvLrk672/ekmBxnR1eRM//GwRPd/19LM8Wo=";
crystal = crystal_0_36;
};
- shards = shards_0_13;
+ shards = shards_0_14;
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/shards.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/shards.nix
index 901b7f6e47..95250acf19 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/shards.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/shards.nix
@@ -2,7 +2,7 @@
molinillo = {
owner = "crystal-lang";
repo = "crystal-molinillo";
- rev = "v0.1.0";
- sha256 = "0rs0w59m6ccsgkdxfy3xv6alxsziy9sy9smz71cz0dnyvlzlnaxj";
+ rev = "v0.2.0";
+ sha256 = "0pzi8pbrjn03zgk3kbha2kqqq0crmr8gy98dr05kisafvbghzwnh";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
index 24ee987099..e5763e6aa9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.19.6";
+ version = "1.19.8";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-YTguBkQcMNjHMVMEN3/P+8fOC5eqmQvlRd1ny9umS/4=";
+ sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE=";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix
index 5589405879..806eb7c5b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "buildkit";
- version = "0.8.1";
+ version = "0.8.2";
goPackagePath = "github.com/moby/buildkit";
subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
- sha256 = "0lqfz097nyb6q6bn5mmfg6vl1nmgb6k4lmwxc8anza6zp8qh7wif";
+ sha256 = "sha256-aPVroqpR4ynfHhjJ6jJX6y5cdgmoUny3A8GBhnooOeo=";
};
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/checkmake/default.nix
new file mode 100644
index 0000000000..3c21af8ff3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/checkmake/default.nix
@@ -0,0 +1,49 @@
+{ buildGoPackage, fetchFromGitHub, git, pandoc, lib }:
+
+buildGoPackage rec {
+ pname = "checkmake";
+ version = "0.1.0-2020.11.30";
+
+ goPackagePath = "github.com/mrtazz/checkmake";
+
+ src = fetchFromGitHub {
+ owner = "mrtazz";
+ repo = pname;
+ rev = "575315c9924da41534a9d0ce91c3f0d19bb53ffc";
+ sha256 = "121rsl9mh3wwadgf8ggi2xnb050pak6ma68b2sw5j8clmxbrqli3";
+ };
+
+ nativeBuildInputs = [ pandoc ];
+
+ preBuild =
+ let
+ buildVars = {
+ version = version;
+ buildTime = "N/A";
+ builder = "nix";
+ goversion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')";
+ };
+ buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X main.${k}=${v}") buildVars);
+ in
+ ''
+ buildFlagsArray+=("-ldflags=${buildVarsFlags}")
+ '';
+
+ postInstall = ''
+ pandoc -s -t man -o checkmake.1 go/src/${goPackagePath}/man/man1/checkmake.1.md
+ mkdir -p $out/share/man/man1
+ mv checkmake.1 $out/share/man/man1/checkmake.1
+ '';
+
+ meta = with lib; {
+ description = "Experimental tool for linting and checking Makefiles";
+ homepage = https://github.com/mrtazz/checkmake;
+ license = licenses.mit;
+ maintainers = with maintainers; [ vidbina ];
+ platforms = platforms.linux;
+ longDescription = ''
+ checkmake is an experimental tool for linting and checking
+ Makefiles. It may not do what you want it to.
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 64ca730d7d..3b9de427bd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -1,4 +1,4 @@
-{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
+{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
, src, version, hasBootstrapScript, postPatch ? ""
, ... }:
let
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
new file mode 100644
index 0000000000..373c618372
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "drone-runner-exec";
+ version = "unstable-2020-04-19";
+
+ src = fetchFromGitHub {
+ owner = "drone-runners";
+ repo = "drone-runner-exec";
+ rev = "c0a612ef2bdfdc6d261dfbbbb005c887a0c3668d";
+ sha256 = "sha256-0UIJwpC5Y2TQqyZf6C6neICYBZdLQBWAZ8/K1l6KVRs=";
+ };
+
+ vendorSha256 = "sha256-ypYuQKxRhRQGX1HtaWt6F6BD9vBpD8AJwx/4esLrJsw=";
+
+ meta = with lib; {
+ description = "Drone pipeline runner that executes builds directly on the host machine";
+ homepage = "https://github.com/drone-runners/drone-runner-exec";
+ # https://polyformproject.org/licenses/small-business/1.0.0/
+ license = licenses.unfree;
+ maintainers = with maintainers; [ mic92 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix b/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix
index a95cac4514..e25aae0eba 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dapper/default.nix
@@ -5,7 +5,7 @@
buildGoPackage rec {
pname = "dapper";
- version = "0.5.5";
+ version = "0.5.6";
goPackagePath = "github.com/rancher/dapper";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "rancher";
repo = "dapper";
rev = "v${version}";
- sha256 = "sha256-QzPW1uC/WuYM/lLqyKodIozGTz5Qn1haoDvgNgjhrRA=";
+ sha256 = "sha256-o64r4TBDpICnVZMIX2jKQjoJkA/jAviJkvI/xJ4ToM8=";
};
patchPhase = ''
substituteInPlace main.go --replace 0.0.0 ${version}
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
index ae10c40294..0fb3ae8103 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz";
sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
PREFIX=$out make install
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
index 32c606e0e2..0be77237f4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU=";
};
- buildInputs = [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
unpackPhase = ''
tar xfz ${src}
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
index c42197e13c..8fb7677f58 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -49,7 +49,8 @@ in
sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
};
- buildInputs = [ makeWrapper unzip ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
unpackCmd = "unzip $curSrc";
diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
index bd8e71090c..20185ff7d1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/diesel-cli/default.nix
@@ -9,11 +9,9 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq
let
inherit (lib) optional optionals optionalString;
- features = ''
- ${optionalString sqliteSupport "sqlite"} \
- ${optionalString postgresqlSupport "postgres"} \
- ${optionalString mysqlSupport "mysql"} \
- '';
+ features = optional sqliteSupport "sqlite"
+ ++ optional postgresqlSupport "postgres"
+ ++ optional mysqlSupport "mysql";
in
rustPlatform.buildRustPackage rec {
@@ -35,11 +33,12 @@ rustPlatform.buildRustPackage rec {
./allow-warnings.patch
];
- cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
+ cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ openssl ]
++ optional stdenv.isDarwin Security
++ optional (stdenv.isDarwin && mysqlSupport) libiconv
@@ -47,12 +46,7 @@ rustPlatform.buildRustPackage rec {
++ optional postgresqlSupport postgresql
++ optionals mysqlSupport [ mysql zlib ];
- # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build
- # because --features fails to apply to the package:
- # https://github.com/rust-lang/cargo/issues/5015
- # https://github.com/rust-lang/cargo/issues/4753
- preBuild = "cd diesel_cli";
- postBuild = "cd ..";
+ buildAndTestSubdir = "diesel_cli";
checkPhase = optionalString sqliteSupport ''
(cd diesel_cli && cargo check --features sqlite)
@@ -65,7 +59,7 @@ rustPlatform.buildRustPackage rec {
# Fix the build with mariadb, which otherwise shows "error adding symbols:
# DSO missing from command line" errors for libz and libssl.
- NIX_LDFLAGS = lib.optionalString mysqlSupport "-lz -lssl -lcrypto";
+ NIX_LDFLAGS = optionalString mysqlSupport "-lz -lssl -lcrypto";
meta = with lib; {
description = "Database tool for working with Rust projects that use Diesel";
diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix
index 07ca12cc9c..3b04c0fb89 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dive";
- version = "0.9.2";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "wagoodman";
repo = pname;
rev = "v${version}";
- sha256 = "1v69xbkjmyzm5g4wi9amjk65fs4qgxkqc0dvq55vqjigzrranp22";
+ sha256 = "sha256-1pmw8pUlek5FlI1oAuvLSqDow7hw5rw86DRDZ7pFAmA=";
};
- vendorSha256 = "0219q9zjc0i6fbdngqh0wjpmq8wj5bjiz5dls0c1aam0lh4vwkhc";
+ vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";
doCheck = false;
@@ -25,6 +25,6 @@ buildGoModule rec {
description = "A tool for exploring each layer in a docker image";
homepage = "https://github.com/wagoodman/dive";
license = licenses.mit;
- maintainers = with maintainers; [ marsam spacekookie ];
+ maintainers = with maintainers; [ marsam spacekookie SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
index d78b54b33e..5ecaddc6f1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dockle";
- version = "0.3.10";
+ version = "0.3.11";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oS3ZGQkDSRdVLluLNg56VGp6MCrRDlgjk1va1+xocas=";
+ sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw=";
};
vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4=";
@@ -16,12 +16,9 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
- buildFlagsArray = [
- "-ldflags="
- "-s"
- "-w"
- "-X main.version=${version}"
- ];
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}")
+ '';
preCheck = ''
# Remove tests that use networking
diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
index a1759df945..c83b6142b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.56.0";
+ version = "1.57.0";
vendorSha256 = null;
@@ -32,7 +32,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
- sha256 = "sha256-rBUao5j4Bofn6uSB20TTN7G1JgKu3mQpISJp+hX28mw=";
+ sha256 = "sha256-waaBillxI7tKQAugyolAWQWf4CG+uIkjtvNXNNFpqRY=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index d82c288e5a..e74a6b9c3c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -5,7 +5,7 @@
, pkg-config
, python3
, docbook_xml_dtd_43
-, docbook_xsl
+, docbook-xsl-nons
, libxslt
, gettext
, gnome3
@@ -14,7 +14,9 @@
python3.pkgs.buildPythonApplication rec {
pname = "gtk-doc";
- version = "1.33.1";
+ version = "1.33.2";
+
+ outputDevdoc = "out";
format = "other";
@@ -23,15 +25,13 @@ python3.pkgs.buildPythonApplication rec {
owner = "GNOME";
repo = pname;
rev = version;
- sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo=";
+ sha256 = "A6OXpazrJ05SUIO1ZPVN0xHTXOSov8UnPvUolZAv/Iw=";
};
patches = [
passthru.respect_xml_catalog_files_var_patch
];
- outputDevdoc = "out";
-
nativeBuildInputs = [
pkg-config
gettext
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
docbook_xml_dtd_43
- docbook_xsl
+ docbook-xsl-nons
libxslt
] ++ lib.optionals withDblatex [
dblatex
@@ -50,7 +50,6 @@ python3.pkgs.buildPythonApplication rec {
pythonPath = with python3.pkgs; [
pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
- (anytree.override { withGraphviz = false; })
lxml
];
@@ -79,8 +78,8 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Tools to extract documentation embedded in GTK and GNOME source code";
- homepage = "https://www.gtk.org/gtk-doc";
- license = licenses.gpl2;
- maintainers = with maintainers; [ pSub worldofpeace ];
+ homepage = "https://gitlab.gnome.org/GNOME/gtk-doc";
+ license = licenses.gpl2Plus;
+ maintainers = teams.gnome.members ++ (with maintainers; [ pSub ]);
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
index c8e6cafa27..68be931aa4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/documentation/mdsh/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdsh";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
- sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl";
+ sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy";
};
- cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g";
+ cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y";
meta = with lib; {
description = "Markdown shell pre-processor";
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
index e906936d2e..e0792fbc36 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
@@ -14,6 +14,7 @@
, mesa
, libxkbcommon
, libappindicator-gtk3
+, libxshmfence
}@args:
let
@@ -21,7 +22,7 @@ let
in
rec {
- electron = electron_11;
+ electron = electron_12;
electron_3 = mkElectron "3.1.13" {
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
@@ -76,30 +77,39 @@ rec {
headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5";
};
- electron_9 = mkElectron "9.4.3" {
- x86_64-linux = "7744ec8af6512e569d600d7fd8e9105d3ca5ac7b6f54390dd553edbd7816289f";
- x86_64-darwin = "68c67a32f149618d629eb4a8a8044b98dc6ceedc16d46ff20782fcccad72fc44";
- i686-linux = "904955ee8365b95439fb4643844ac868b59525ed230a76c8e0395c0aa5719813";
- armv7l-linux = "5cfb3ae97a75d33d4b102d75944610dd56a566ee98186a030eb5bdbbd3d76323";
- aarch64-linux = "8afa647e4b5b1e290d5d852c7420e82916ba740e3e5576599076dc139cd1d556";
- headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l";
+ electron_9 = mkElectron "9.4.4" {
+ x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450";
+ x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c";
+ i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187";
+ armv7l-linux = "2dfe3e21d30526688cc3d3215d06dfddca597a2cb62ff0c9d0d5f33d3e464a33";
+ aarch64-linux = "f1145e9a1feb5f2955e5f5565962423ac3c52ffe45ccc3b96c6ca485fa35bf27";
+ headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
};
- electron_10 = mkElectron "10.3.2" {
- x86_64-linux = "e28748c813ddc69c611a47961d68ae2dc3761f547c509d9ce2c56c2c6eadc9a2";
- x86_64-darwin = "3120ae3eab94d9102003f6fa2dc833a0629295c7ec0e154b35f61116d55a4954";
- i686-linux = "13f42ad6ea0fa41553b8f50323d0baaa29272220a2e81ca5293ad4439cda1d79";
- armv7l-linux = "0e571f63697b8985782175af07bdd7069886195d9ccd7fc5c04578b4144ea922";
- aarch64-linux = "173551fa6cd3ca1fb52fab3bd3e7f0ffd3e4758e78a5174e6d636a45a282ab8f";
- headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn";
+ electron_10 = mkElectron "10.4.0" {
+ x86_64-linux = "6246481577bc0bfa719e0efb3144e8d7ca53e3f20defce7b5e1be4d9feb0becb";
+ x86_64-darwin = "bc9e201643db3dae803db934fa4e180d13b707de6be1c3348ca5ed2c21d30bf4";
+ i686-linux = "aa6a9042097b964230b519c158e369a249a668cc6c7654b30ddd02ced4bad9d1";
+ armv7l-linux = "7e99a9c6aeedd7cc0b25260ac4630730629f363a09b72bd024b42837ab9777bd";
+ aarch64-linux = "ef671fe3cbb7c84e277d885ed157552602bc88d326dc95b322953c6b193f59a1";
+ headers = "1vsvna2zr7qxnk2qsdjzgkv5v2svrllbsjj08qrilly7nbksk9fg";
};
- electron_11 = mkElectron "11.2.3" {
- x86_64-linux = "9249901fd7b85a7f952abe0df2ce83a566df612ef3ee15cce488cb1d751bc94d";
- x86_64-darwin = "e0b2784b25fd4a5ee4041d508d59bbb8386039c7ea7e9cea3e547c672f052b60";
- i686-linux = "78b2dd2d7b5e891e695cd31c28ac5fa1e99967ff538b944aa9d1ec224e82a964";
- armv7l-linux = "06178cd44792c7dceb72286460948cb7f575acba4e46cf72c154f243e93eaf65";
- aarch64-linux = "e23f2572a6a66779aff5d7cf25149fd343b0eef420fbfa3e8c3742284ce6e613";
- headers = "1yjc7zl7l5n3l2s2x3lbic2lc527alcd4mnwih7pjl5dhvdgmbm9";
+ electron_11 = mkElectron "11.3.0" {
+ x86_64-linux = "136794f9ecc1c6ea38fe9b85682e8fcc8c4afd559f5cd6b4059339b017279917";
+ x86_64-darwin = "7569db1d2e470b0db512735f27f99498f631da3cd86374345139f18df88789fe";
+ i686-linux = "48ab133cab380c564529ea605d4521404b9bd07d80dad6346e1756a0952081cd";
+ armv7l-linux = "5774c2995c6dcf911ece00a94ace0f37d55132da91b1fd242c69e047872ef137";
+ aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15";
+ headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0";
+ };
+
+ electron_12 = mkElectron "12.0.0" {
+ x86_64-linux = "d132a80e08500e783e36a25cb72bc2555ec388798326c22348e3d9ff57fa91f1";
+ x86_64-darwin = "18546dec0ecc63d1a679762e00bc85fbb820e08f7ca205924681379bb0a7afc2";
+ i686-linux = "79651836e857f8c860c6ad053346f7e2cf38351160845687b199faba113b9483";
+ armv7l-linux = "e98eb2df69f240806e283018d4e0349a45b4cb5b6635d1e1c11d869e50cc60cb";
+ aarch64-linux = "ea26777ffea5e788bb708814c8707e8ac3529146e7738729aa8bd49d0d74bcd1";
+ headers = "0h7mkz7wmcf0jq8gmq21ag2ax5ivy2wlz0ykw7rv2r4l5686xdjr";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
index e29064e673..c60ab738aa 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix
@@ -14,6 +14,7 @@
, mesa
, libxkbcommon
, libappindicator-gtk3
+, libxshmfence
}:
version: hashes:
@@ -60,6 +61,7 @@ let
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
+ ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ]
);
linux = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix
index eb9589f723..a387c14c0a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/errcheck/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "errcheck";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "kisielk";
repo = "errcheck";
rev = "v${version}";
- sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI=";
+ sha256 = "sha256-Przf2c2jFNdkUq7IOUD7ChXHiSayAz4xTsNzajycYZ0=";
};
vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
index 0fd9cf1f06..f581806433 100644
--- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
let
- version = "7.5.3";
+ version = "7.5.4";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "sha256-XDfY/OnXSmgF2u8DMr+WgzNJD3VYw/hQ8v3cr4/jhVY=";
+ sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/fmbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/fmbt/default.nix
index e6bb203274..852f00bf69 100644
--- a/third_party/nixpkgs/pkgs/development/tools/fmbt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/fmbt/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
, flex
-, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
+, gettext, libedit, glib, imagemagick6, libxml2, boost, gnuplot, graphviz
, tesseract, gts, libXtst
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
python.pkgs.wrapPython ];
- buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
+ buildInputs = [ python gettext libedit glib imagemagick6 libxml2 boost
gnuplot graphviz tesseract gts
];
diff --git a/third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix
index 81b125ac05..4326d4bf71 100644
--- a/third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/github/github-release/default.nix
@@ -1,40 +1,17 @@
-{ lib, stdenv, system, fetchurl }:
+{ buildGoPackage, fetchFromGitHub, lib }:
-let
- linuxPredicate = system == "x86_64-linux";
- bsdPredicate = system == "x86_64-freebsd";
- darwinPredicate = system == "x86_64-darwin";
- metadata = assert linuxPredicate || bsdPredicate || darwinPredicate;
- if linuxPredicate then
- { arch = "linux-amd64";
- sha256 = "0p0qj911nmmdj0r7wx3363gid8g4bm3my6mj3d6s4mwgh9lfisiz";
- archiveBinaryPath = "linux/amd64"; }
- else if bsdPredicate then
- { arch = "freebsd-amd64";
- sha256 = "0g618y9n39j11l1cbhyhwlbl2gv5a2a122c1dps3m2wmv7yzq5hk";
- archiveBinaryPath = "freebsd/amd64"; }
- else
- { arch = "darwin-amd64";
- sha256 = "0l623fgnsix0y3f960bwx3dgnrqaxs21w5652kvaaal7dhnlgmwj";
- archiveBinaryPath = "darwin/amd64"; };
-in stdenv.mkDerivation rec {
- shortname = "github-release";
- name = "${shortname}-${version}";
- version = "0.7.2";
+buildGoPackage rec {
+ pname = "github-release";
+ version = "0.10.0";
- src = fetchurl {
- url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2";
- sha256 = metadata.sha256;
+ src = fetchFromGitHub {
+ owner = "github-release";
+ repo = "github-release";
+ rev = "v${version}";
+ sha256 = "sha256-J5Y0Kvon7DstTueCsoYvw6x4cOH/C1IaVArE0bXtZts=";
};
- buildInputs = [ ];
-
- phases = [ "unpackPhase" "installPhase" ];
-
- installPhase = ''
- mkdir -p "$out/bin"
- cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/"
- '';
+ goPackagePath = "github.com/github-release/github-release";
meta = with lib; {
description = "Commandline app to create and edit releases on Github (and upload artifacts)";
@@ -45,8 +22,8 @@ in stdenv.mkDerivation rec {
'';
license = licenses.mit;
- homepage = "https://github.com/aktau/github-release";
- maintainers = with maintainers; [ ardumont ];
+ homepage = "https://github.com/github-release/github-release";
+ maintainers = with maintainers; [ ardumont j03 ];
platforms = with platforms; unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
new file mode 100644
index 0000000000..db876ea09f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "go-mockery";
+ version = "2.5.1";
+
+ src = fetchFromGitHub {
+ owner = "vektra";
+ repo = "mockery";
+ rev = "v${version}";
+ sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos=";
+ };
+
+ vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
+
+ meta = with lib; {
+ homepage = "https://github.com/vektra/mockery";
+ description = "A mock code autogenerator for Golang";
+ maintainers = with maintainers; [ fbrs ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
index 49928b1a08..4336ba76a2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
- version = "1.37.1";
+ version = "1.38.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "sha256-x0VLNQeTVN9aPO06Yi1DTb8bTjq+9VemJaX1R+8s/Bg=";
+ sha256 = "sha256-hJGyK+hrP6CuSkODNsN8d2IhteKe/fXTF9GxbF7TQOk=";
};
- vendorSha256 = "sha256-uduT4RL6p6/jdT8JeTx+FY9bz0P2eUSaFNDIzi7jcqg=";
+ vendorSha256 = "sha256-zTWipGoWFndBSH8V+QxWmGv+8RoFa+OGT4BhAq/yIbE=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/golint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golint/default.nix
index 89b9f14649..3187f79312 100644
--- a/third_party/nixpkgs/pkgs/development/tools/golint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/golint/default.nix
@@ -1,11 +1,10 @@
-{ lib, buildGoPackage, fetchgit }:
+{ lib, buildGoModule, fetchgit }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "lint";
- version = "20181026-${lib.strings.substring 0 7 rev}";
- rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
+ version = "20201208-${lib.strings.substring 0 7 rev}";
+ rev = "83fdc39ff7b56453e3793356bcff3070b9b96445";
- goPackagePath = "golang.org/x/lint";
excludedPackages = "testdata";
# we must allow references to the original `go` package, as golint uses
@@ -15,15 +14,15 @@ buildGoPackage rec {
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/lint";
- sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
+ sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c=";
};
- goDeps = ./deps.nix;
+ vendorSha256 = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo=";
meta = with lib; {
homepage = "https://golang.org";
description = "Linter for Go source code";
license = licenses.bsd3;
- maintainers = with maintainers; [ jhillyerd ];
+ maintainers = with maintainers; [ jhillyerd tomberek ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/golint/deps.nix b/third_party/nixpkgs/pkgs/development/tools/golint/deps.nix
deleted file mode 100644
index e264009893..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/golint/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "91f80e683c10fea00e7f965a1a7cac482ce52541";
- sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index 4d572e070e..c20d7a2e49 100644
--- a/third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp";
};
- buildInputs = [ python makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python ];
installPhase = ''
mkdir -p $out/bin $out/share/
diff --git a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix
new file mode 100644
index 0000000000..0f0230049c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "gops";
+ version = "0.3.16";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gops";
+ rev = "v${version}";
+ sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp";
+ };
+
+ vendorSha256 = null;
+
+ preCheck = "export HOME=$(mktemp -d)";
+
+ meta = with lib; {
+ description = "A tool to list and diagnose Go processes currently running on your system";
+ homepage = "https://github.com/google/gops";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ pborzenkov ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
index bbc1989466..5f0f2da2da 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gosec";
- version = "2.6.1";
+ version = "2.7.0";
subPackages = [ "cmd/gosec" ];
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "securego";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KMXRYudnJab/X6FBG0lnG9hHVmbKwnrN1oqkSn6q3DU=";
+ sha256 = "sha256-U7+0wXnuIDlATpVRVknwaPxib36+iYvvYUVM6d7Xf6I=";
};
- vendorSha256 = "sha256-0yxGEUOame9yfeIErLESWY8kZtt7Q4vD3TU6Wl9Xa54=";
+ vendorSha256 = "sha256-nr1rx6GM+ETcfLreYT081xNzUz2exloogJ+gcwF2u2o=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 4203564ae4..364117577b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -1,4 +1,4 @@
-{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages
+{ lib, supportedGhcVersions ? [ "865" "884" "8104" ], stdenv, haskellPackages
, haskell }:
#
# The recommended way to override this package is
diff --git a/third_party/nixpkgs/pkgs/development/tools/jbake/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbake/default.nix
index 97d1c75368..e14cfe8740 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jbake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jbake/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw";
};
- buildInputs = [ makeWrapper jre ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
postPatch = "patchShebangs .";
diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
index c41fb4c639..c10fa46f67 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
- version = "0.65.1";
+ version = "0.66.1";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
- sha256 = "sha256-Puddnem03RGORKkvcLy5o/eOzKzrOuRvqPk5FsjQ3Lw=";
+ sha256 = "sha256-D7xZbuxSdE1zcyVZ9hqNOgq1oZDSFjBeITNqKXEpjyU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix b/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix
index 233b393387..15a3a68340 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jsduck/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
phases = [ "installPhase" ];
- buildInputs = [ env makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ env ];
installPhase = ''
mkdir -p $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix
index 4695585533..f9d109f338 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectx";
- version = "0.9.1";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
- sha256 = "1c7y5hj4w72bm6y3riw0acayn4w9x7bbf1vykqcprbyw3a3dvcsw";
+ sha256 = "sha256-anTogloat0YJN6LR6mww5IPwokHYoDY6L7i2pMzI8/M=";
};
- vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y";
+ vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
index a2707eb72e..10e701d1e9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazygit";
- version = "0.24.2";
+ version = "0.25.1";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
- sha256 = "0hy13l1v2kcsn99dswlq1hl0ly18cal387zhnzjfqv51qng2q5kq";
+ sha256 = "sha256-A4Nim1jnyMHd5hxyLu8oZkQ9nDWxTmaX/25WX714ry4=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix
new file mode 100644
index 0000000000..991f1a3771
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix
@@ -0,0 +1,30 @@
+{ cmake, fetchFromGitHub, lib, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "luaformatter";
+ version = "1.3.4";
+
+ src = fetchFromGitHub {
+ owner = "koihik";
+ repo = "luaformatter";
+ rev = version;
+ sha256 = "163190g37r6npg5k5mhdwckdhv9nwy2gnfp5jjk8p0s6cyvydqjw";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp lua-format $out/bin
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Code formatter for lua";
+ homepage = "https://github.com/koihik/luaformatter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
index 729ab88c68..100190b089 100644
--- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
- version = "0.9.10";
+ version = "0.10.0";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
+ outputHash = "1v9br6nad6yhq9y1z4b9z6xdsjrgqh7wlxww7vp7ws28cg85mqyg";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
index da387105ce..186608cde3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";
};
- buildInputs = [ makeWrapper perl openssh rsync ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perl openssh rsync ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
index 0f7edeea81..62aa0ab5de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
patches = [ ./backslashes-quotes.diff ];
- buildInputs = [ tk makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ tk ];
installPhase = ''
mkdir -p $out/bin $out/share/${name}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
index 140e4869e8..c22f839321 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.11924";
+ version = "0.1.15085";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KY1kqqRRpwNt0ovllfFcWSsJAH2J1NrlQAueqQrw354=";
+ sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA=";
};
- vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs=";
+ vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix
new file mode 100644
index 0000000000..6684fdc886
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix
@@ -0,0 +1,46 @@
+{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex
+, clang-unwrapped, llvm, unifdef
+, pebble, psutil, pytestCheckHook, pytest-flake8
+}:
+
+buildPythonApplication rec {
+ pname = "cvise";
+ version = "2.2.0";
+
+ src = fetchFromGitHub {
+ owner = "marxin";
+ repo = "cvise";
+ rev = "v${version}";
+ sha256 = "116cicz4d506ds3m9bmnb7f9nkp07hyzcrw29ljhznh1i620msim";
+ };
+
+ patches = [
+ # Refer to unifdef by absolute path.
+ ./unifdef.patch
+ ];
+
+ nativeBuildInputs = [ cmake flex ];
+ buildInputs = [ clang-unwrapped llvm unifdef ];
+ propagatedBuildInputs = [ pebble psutil ];
+ checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];
+
+ preCheck = ''
+ patchShebangs cvise.py
+ '';
+ disabledTests = [
+ # Needs gcc, fails when run noninteractively (without tty).
+ "test_simple_reduction"
+ ];
+
+ dontUsePipInstall = true;
+ dontUseSetuptoolsBuild = true;
+ dontUseSetuptoolsCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/marxin/cvise";
+ description = "Super-parallel Python port of C-Reduce";
+ license = licenses.ncsa;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/unifdef.patch b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/unifdef.patch
new file mode 100644
index 0000000000..d15ca6dce0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/unifdef.patch
@@ -0,0 +1,8 @@
+--- a/cvise.py
++++ b/cvise.py
+@@ -93,4 +93,5 @@ def find_external_programs():
+ # Special case for clang-format
+ programs['clang-format'] = '@CLANG_FORMAT_PATH@'
++ programs['unifdef'] = '@UNIFDEF@'
+
+ return programs
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
index 285805ccb0..6125143457 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
};
- buildInputs = [ expect makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ expect ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
index 3477d60b78..cf2a522760 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/direvent/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "Directory event monitoring daemon";
homepage = "https://www.gnu.org.ua/software/direvent/";
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ puffnfresh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
index 6f9f5e113c..47716b5ea9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/fswatch/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk";
};
- nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
- buildInputs = [ gettext libtool makeWrapper texinfo ];
+ nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
+ buildInputs = [ gettext libtool texinfo ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
index 13437b7195..f5298d685e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/gpshell/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ globalplatform pcsclite makeWrapper ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ buildInputs = [ globalplatform pcsclite ];
postFixup = ''
wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
index 6afc4415e1..ba1fa720dd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/help2man/default.nix
@@ -6,11 +6,11 @@
# files.
stdenv.mkDerivation rec {
- name = "help2man-1.47.16";
+ name = "help2man-1.47.17";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
- sha256 = "1x586h7wvripcay35kdh2kvydx84y8yy93ffjah2rqw6bc65iy1y";
+ sha256 = "sha256-2jo1xQseH4yPoyLWn6R8kBHORDqPuNHWcbHwG4sACOs=";
};
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix
index 201241fb83..e5bf070898 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/hound/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "hound";
- version = "unstable-2021-01-26";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "hound-search";
repo = "hound";
- rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9";
- sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44";
+ rev = "v${version}";
+ sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65";
};
vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix
new file mode 100644
index 0000000000..904256ee66
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "k2tf";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "sl1pm4t";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0i1bhn0sccvnqbd4kv2xgng5r68adhcc61im2mn8hxmds5nf6in2";
+ };
+
+ vendorSha256 = "1c2mwhrj0xapc661z1nb6am4qq3rd1pvbvjaxikjyx95n0gs8gjk";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=v${version}" ];
+
+ meta = with lib; {
+ description = "Kubernetes YAML to Terraform HCL converter";
+ homepage = "https://github.com/sl1pm4t/k2tf";
+ license = licenses.mpl20;
+ maintainers = [ maintainers.flokli ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
index 3fa2d219fe..9ba19c836b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
./disable-nodejs-version-check.patch
];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/libexec/kibana $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
index 7f46d6f651..754559969d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
./disable-nodejs-version-check-7.patch
];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/libexec/kibana $out/bin
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
index c92d7b0779..f37815081e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
index 2db336a499..96ce9d4059 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix
@@ -1,27 +1,86 @@
-{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, vala
+, gobject-introspection
+, perl
+, bison
+, gettext
+, glib
+, pkg-config
+, libgsf
+, gcab
+, bzip2
+, gnome3
+}:
stdenv.mkDerivation rec {
pname = "msitools";
- version = "0.99";
+ version = "0.101";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU=";
+ sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
};
- nativeBuildInputs = [ bison intltool pkg-config ];
- buildInputs = [ glib libgsf libuuid gcab bzip2 ];
+ patches = [
+ # Fix executable bit on tools (regression in Meson migration).
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
+ sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
+ })
+
+ # Fix failure on big-endian platforms.
+ # https://gitlab.gnome.org/GNOME/msitools/issues/31
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
+ sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ vala
+ gobject-introspection
+ perl
+ bison
+ gettext
+ pkg-config
+ ];
+
+ buildInputs = [
+ glib
+ libgsf
+ gcab
+ bzip2
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ patchShebangs subprojects/bats-core/{bin,libexec}
+ '';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
+ versionPolicy = "none";
};
};
meta = with lib; {
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
homepage = "https://wiki.gnome.org/msitools";
- license = [ licenses.gpl2 licenses.lgpl21 ];
+ license = with licenses; [
+ # Library
+ lgpl21Plus
+ # Tools
+ gpl2Plus
+ ];
maintainers = with maintainers; [ PlushBeaver ];
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
index a35cc57b82..8b603fbc5c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
preConfigure = "echo ${version} > .tarball-version";
+ postInstall = ''
+ # rules printed by the following invocation are static,
+ # they come from hardcoded configs in libuuu/config.cpp:48
+ $out/bin/uuu -udev > udev-rules 2>stderr.txt
+ rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')"
+ install -D udev-rules "$out/lib/udev/rules.d/$rules_file"
+ '';
+
meta = with lib; {
description = "Freescale/NXP I.MX chip image deploy tools";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
index d86277993c..b26fbf7503 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
inherit name;
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# The default build phase (`make`) runs the test code. It's difficult to do
# the test in the build environment because it depends on the system package
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix
index 8a5cbbcfdf..9dfa5955f5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "scc";
- version = "2.13.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "boyter";
repo = "scc";
rev = "v${version}";
- sha256 = "16p5g20n5jsbisbgikk9xny94xx6c0dxf19saa686ghh31jr2hh3";
+ sha256 = "sha256-G5LYOtAUnu82cgDdtYzcfVx/WFg9/HvFQAlQtd6GaDE=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
index c41ab92fb9..ccadaa8aeb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
- cargoBuildFlags = [ "--features=all" ];
+ cargoBuildFlags = [ "--features=dist-client,dist-server" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
- platforms = platforms.unix;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
index 9695c75a3c..eb823904ee 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0WbUJYNRBKixRFl+YM1uSEltQneB6FYPFHNVVhmdseA=";
+ sha256 = "sha256-p9q+cSnMN6Na+XZoYSHfE4SCNYOEavXE+eWIaxcD73k=";
};
- vendorSha256 = "sha256-WYTn2QoI1Z3L4Wxjrq0YT++X9vMA1Wm3zgl08CYiU1Y=";
+ vendorSha256 = "sha256-XOIs5Ng0FYz7OfwbrNiVN3GTIABqxlO8ITKGfnC+kWo=";
# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
index e75248aa86..52a740ed1c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
- cc tie.c -o tie
+ ${stdenv.cc.targetPrefix}cc tie.c -o tie
'';
installPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.ctan.org/tex-archive/web/tie";
description = "Allow multiple web change files";
- platforms = with platforms; unix;
+ platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];
license = licenses.abstyles;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/neoload/default.nix b/third_party/nixpkgs/pkgs/development/tools/neoload/default.nix
index fb85aa80dc..63452728b9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/neoload/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/neoload/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation {
{ url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh";
sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } );
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
phases = [ "installPhase" ];
# TODO: load generator / monitoring agent only builds
diff --git a/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix b/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
index 3135812982..475c08eb16 100644
--- a/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/node-webkit/nw12.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share/nwjs/nwjc $out/bin
'';
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
meta = with lib; {
description = "An app runtime based on Chromium and node.js";
diff --git a/third_party/nixpkgs/pkgs/development/tools/nrpl/default.nix b/third_party/nixpkgs/pkgs/development/tools/nrpl/default.nix
index 7217758291..67a86ca8de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nrpl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/nrpl/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2";
};
- buildInputs = [ makeWrapper nim pcre ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ nim pcre ];
patches = [
(fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix
index d3490b2b9c..1356bc46ce 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share/nwjs/nw $out/bin
'';
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
meta = with lib; {
description = "An app runtime based on Chromium and node.js";
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix
index e48707dcb9..07082b7f5d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/crunch/default.nix
@@ -1,10 +1,12 @@
-{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, opaline, ptime }:
+{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }:
buildDunePackage rec {
pname = "crunch";
version = "3.1.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-v${version}.tbz";
sha256 = "0d26715a4h9r1wibnc12xy690m1kan7hrcgbb5qk8x78zsr67lnf";
@@ -15,7 +17,7 @@ buildDunePackage rec {
outputs = [ "lib" "bin" "out" ];
installPhase = ''
- ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib/
+ dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib/
'';
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix
similarity index 95%
rename from third_party/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
rename to third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix
index bbdbc45270..a16b3ab23f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, ocaml, findlib }:
if !lib.versionAtLeast ocaml.version "4.02"
+|| lib.versionAtLeast ocaml.version "4.12"
then throw "dune is not available for OCaml ${ocaml.version}"
else
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
index c03dbf7562..c14cd7ddc0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "ocp-index";
- version = "1.2.1";
+ version = "1.2.2";
useDune2 = true;
src = fetchzip {
url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
- sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8";
+ sha256 = "0k4i0aabyn750f4wqbnk0yv10kdjd6nhjw2pbmpc4cz639qcsm40";
};
buildInputs = [ cppo cmdliner re ];
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ocp-indent ];
meta = {
- homepage = "http://typerex.ocamlpro.com/ocp-index.html";
+ homepage = "https://www.typerex.org/ocp-index.html";
description = "A simple and light-weight documentation extractor for OCaml";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ vbgl ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index b12aa2e6d6..c3da3bc232 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec
{
pname = "ocsigen-i18n";
- version = "3.5.0";
+ version = "3.7.0";
buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec
src = fetchzip {
url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
- sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq";
+ sha256 = "sha256-PmdDyn+MUcNFrZpP/KLGQzdXUFRr+dYRAZjTZxHSeaw=";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 047246cd0a..5a4b55cc7f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
patchFlags = [ "-p0" ];
patches = [ ./warn.patch ];
- buildInputs = [ ocaml makeWrapper ncurses ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ocaml ncurses ];
phases = "unpackPhase patchPhase buildPhase";
buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
index a128f2144e..610093af19 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -47,7 +47,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "1.2.2";
- buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip curl ncurses ocaml ];
src = srcs.opam;
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
index b99880fe7f..30bc089ee0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix
@@ -63,7 +63,8 @@ in stdenv.mkDerivation {
pname = "opam";
version = "2.0.8";
- buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
src = srcs.opam;
diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
index 8090fc6ff1..764041b6ad 100644
--- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
@@ -17,7 +17,8 @@ buildGoModule rec {
subPackages = [ "cmd/operator-sdk" ];
- buildInputs = [ go makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ go ];
# operator-sdk uses the go compiler at runtime
allowGoReference = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
index 4547012e2f..597d680cc2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix
@@ -4,7 +4,7 @@ buildGoModule rec {
pname = "out-of-tree";
version = "1.4.0";
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
src = fetchgit {
rev = "refs/tags/v${version}";
diff --git a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix
new file mode 100644
index 0000000000..d29e124437
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix
@@ -0,0 +1,33 @@
+{ fetchFromGitHub, installShellFiles, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "pactorio";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "figsoda";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "07h9hywz0pc29411myhxjq6pks4p6q6czbqjv7fxf3xkb1mg9grq";
+ };
+
+ cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ preFixup = ''
+ completions=($releaseDir/build/pactorio-*/out/completions)
+ installShellCompletion ''${completions[0]}/pactorio.{bash,fish}
+ installShellCompletion --zsh ''${completions[0]}/_pactorio
+ '';
+
+ GEN_COMPLETIONS = "1";
+
+ meta = with lib; {
+ description = "Mod package for factorio";
+ homepage = "https://github.com/figsoda/pactorio";
+ changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
index 662961ae46..42c9ee872f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "bison";
- version = "3.7.4";
+ version = "3.7.5";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv";
+ sha256 = "sha256-FRy18ScW4/6TonoxfNRIeDKWWfJ1s0J3m/rvSlJrv3A=";
};
nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man;
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 78fb3b7f93..48f48ed748 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -16,14 +16,14 @@ let
# 1) change all these hashes
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) run the ./result script that is output by that (it updates ./grammars)
- version = "0.17.3";
- sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U=";
- cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4=";
+ version = "0.18.2";
+ sha256 = "1kh3bqn28nal3mmwszbih8hbq25vxy3zd45pzj904yf0ds5ql684";
+ cargoSha256 = "06jbn4ai5lrxzv51vfjzjs7kgxw4nh2vbafc93gma4k14gggyygc";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter";
- rev = version;
+ rev = "v${version}";
inherit sha256;
fetchSubmodules = true;
};
@@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage {
};
};
- meta = {
+ meta = with lib; {
homepage = "https://github.com/tree-sitter/tree-sitter";
description = "A parser generator tool and an incremental parsing library";
longDescription = ''
@@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage {
* Robust enough to provide useful results even in the presence of syntax errors
* Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
'';
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ Profpatsch ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ Profpatsch ];
# Aarch has test failures with how tree-sitter compiles the generated C files
broken = stdenv.isAarch64;
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix
index f92e0d7942..d9ad21dea6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@@ -30,7 +30,11 @@ stdenv.mkDerivation {
if [ ! -f "$scanner_cc" ]; then
scanner_cc=""
fi
- $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc -lstdc++
+ scanner_c="$src/src/scanner.c"
+ if [ ! -f "$scanner_c" ]; then
+ scanner_c=""
+ fi
+ $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc $scanner_c -lstdc++
runHook postBuild
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index 81ccf5a847..989f7bf536 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
- "rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5",
- "date": "2021-01-08T13:18:05+00:00",
- "path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp",
- "sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8",
+ "rev": "21ec3c3deb4365085aa353fadbc6a616d7769f9f",
+ "date": "2021-02-18T09:41:56-08:00",
+ "path": "/nix/store/8172rv05dvvlyp4cfmr2b41g4a20vlcf-tree-sitter-c-sharp",
+ "sha256": "1cc0ss09bfv2xy77bpcmy6y2hqis7a8xby9afcaxcn5llj593ynj",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 401bea63e0..31301d981d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
- "rev": "99151b1e9293c9e025498fee7e6691e1a52e1d03",
- "date": "2020-05-14T11:39:30-07:00",
- "path": "/nix/store/b5xqnw967s9a58wcpyspbkgbph6jxarv-tree-sitter-c",
- "sha256": "07ax01r3npw13jlv20k15q2hdhqa0rwm2km6f5j50byqvmgfc6fm",
+ "rev": "fa408bc9e77f4b770bd1db984ca00c901ddf95fc",
+ "date": "2021-02-24T11:13:22-08:00",
+ "path": "/nix/store/8rlr93kjsvbpc8vgfxw02vcaprlfmprq-tree-sitter-c",
+ "sha256": "03nb8nlnkfw8p8bi4grfyh31l6419sk7ak2hnkpnnjs0y0gqb7jm",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index a4538b1a93..d5878b65fa 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
- "rev": "a35a275df92e7583df38f2de2562361f2b69987e",
- "date": "2020-12-13T11:27:21-08:00",
- "path": "/nix/store/l0mv4q1xdxz94ym1nl73y52i1yr9zcgi-tree-sitter-cpp",
- "sha256": "130vizybkm11j3lpzmf183myz0vjxq75mpy6qz48rrkidhnrlryk",
+ "rev": "3bfe046f3967fef92ebb33f8cd58c3ff373d5e56",
+ "date": "2021-02-25T11:55:19-08:00",
+ "path": "/nix/store/m2sd8ic8j3dayfa0zz0shc2pjaamahpf-tree-sitter-cpp",
+ "sha256": "052imxj6920ia002pzgwj2rg75xq3xpa80w8sjdq4mnlksy8v7g6",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index b8609c0bd1..6a4795d740 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-css",
- "rev": "23f2cb97d47860c517f67f03e1f4b621d5bd2085",
- "date": "2020-05-14T14:44:30-07:00",
- "path": "/nix/store/r5pkz9kly0mhgrmqzdzdsr6d1dpqavld-tree-sitter-css",
- "sha256": "17svpf36p0p7spppzhm3fi833zpdl2l1scg34r6d4vcbv7dknrjy",
+ "rev": "e882c98b5e62d864f7f9e4d855b19b6050c897a8",
+ "date": "2021-02-12T10:45:27-08:00",
+ "path": "/nix/store/g368rqak07i91ddma16pkccp63y2s5yv-tree-sitter-css",
+ "sha256": "0firlbl81vxnw5dp31inabizjhqc37rnbvwf05668qpfjl9gc03z",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index f0ef7079bf..02e4977fa3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
- "rev": "8269c1360e5b1b9ba3e04e7896d9dd2f060de12f",
- "date": "2020-07-20T12:50:27-07:00",
- "path": "/nix/store/9ijnzv72vc1n56k6f1xp3kb7lc9hvlhh-tree-sitter-embedded-template",
- "sha256": "03symsaxp8m128cn5h14pnm30ihpc49syb4vybpdvgcvraa408qq",
+ "rev": "872f037009ae700e3d4c3f83284af8f51c184dd4",
+ "date": "2021-02-05T09:53:39-08:00",
+ "path": "/nix/store/qg1lmgjrvjxg05bf7dczx5my9r83rxyb-tree-sitter-embedded-template",
+ "sha256": "0iffxki8pqavvi0cyndgyr4gp0f4zcdbv7gn7ar4sp17pksk5ss6",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index 260dc4d10c..66c8594496 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-java",
- "rev": "f7b62ac33d63bea56ce202ace107aaa4285e50af",
- "date": "2020-10-27T13:41:02-04:00",
- "path": "/nix/store/h51zjbzdrm89gczcdv7nyih54vnd2xps-tree-sitter-java",
- "sha256": "0jbh79brs1dskfqw05s9ndrp46hibyc37nfvhxlvanmgj3pjwgxb",
+ "rev": "16c07a726c34c9925b3e28716b2d6d60e3643252",
+ "date": "2021-02-11T09:32:05-08:00",
+ "path": "/nix/store/1b64g1a3cvq1hspys9z2z1lsawg2b9m2-tree-sitter-java",
+ "sha256": "1rag75r71cp8cvkf4f3wj911jppypziri19zysyy3pgzhznqy4zd",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 2c563f3fbf..8d1aa2daf5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
- "rev": "3f8b62f9befd3cb3b4cb0de22f6595a0aadf76ca",
- "date": "2020-12-02T10:20:20-08:00",
- "path": "/nix/store/c17bf7sjq95lank5ygbglv8j48i5z9w3-tree-sitter-javascript",
- "sha256": "0fjq1jzrzd8c8rfxkh2s25gnqlyc19k3a8i3r1129kakisn1288k",
+ "rev": "37af80d372ae9e2f5adc2c6321d5a34294dc348b",
+ "date": "2021-02-24T09:50:29-08:00",
+ "path": "/nix/store/y8jbjblicw2c65kil2y4d6vdn9r9h9w5-tree-sitter-javascript",
+ "sha256": "0cr75184abpg95bl6wgkqn7ay849bjsib48m9pdb5jrly1idw6n2",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 6d055ca0ae..8d0b5aaf0e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
- "rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621",
- "date": "2019-05-10T15:57:43-05:00",
- "path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix",
- "sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66",
+ "rev": "a6bae0619126d70c756c11e404d8f4ad5108242f",
+ "date": "2021-02-09T00:48:18-06:00",
+ "path": "/nix/store/1rfsi62v549h72vw7ysciaw17vr5h9yx-tree-sitter-nix",
+ "sha256": "08n496k0vn7c2751gywl1v40490azlri7c92dr2wfgw5jxhjmb0d",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index ff60ff8010..ded864c897 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "f568dfabf7c4611077467a9cd13297fa0658abb6",
- "date": "2021-01-06T13:32:39-08:00",
- "path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python",
- "sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh",
+ "rev": "3196e288650992bca2399dda15ac703c342a22bb",
+ "date": "2021-01-19T11:31:59-08:00",
+ "path": "/nix/store/0y394nsknvjxpxnsfscab531mivnzhap-tree-sitter-python",
+ "sha256": "0fbkyysz0qsjqzqznwgf52wsgb10h8agc4p68zafiibwlp72gd09",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index 27042b6ef9..f799ce410c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql",
- "rev": "a0d688d62dcb9cbc7c53f0d98343c458b3776b3d",
- "date": "2020-09-16T12:56:09-07:00",
- "path": "/nix/store/dfdaf6wg80dfw5fvdiir7n9nj6j30g3g-tree-sitter-ql",
- "sha256": "0f6rfhrbvpg8czfa7mld45by3rp628bs6fyl47a8mn18w6x0n5g2",
+ "rev": "f3738c138ba753eed5da386c7321cb139d185d39",
+ "date": "2021-02-19T10:26:41+00:00",
+ "path": "/nix/store/dww93fp6psaw4lhiwyn8qajq8mvsyv5s-tree-sitter-ql",
+ "sha256": "15wqyf0q9arr4jh0dfjr5200rghy989wvf311cffma7706ngmgxb",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index c02d03d11d..12d7f58aec 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0",
- "date": "2021-01-05T10:00:48-08:00",
- "path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust",
- "sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly",
+ "rev": "ab7f7962073fec96e0b64fbd1697263fe2c79281",
+ "date": "2021-02-16T21:17:08-08:00",
+ "path": "/nix/store/zy2sccixlk8lwkqamikz03j42s13ndjp-tree-sitter-rust",
+ "sha256": "06zmbwgsvyaz0wgja8r3ir06z67gix7i62zj0k3bbng6smdnhp9w",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index fda72fc99c..679d7e4ed6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
- "rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4",
- "date": "2021-01-07T09:49:56-08:00",
- "path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript",
- "sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi",
+ "rev": "543cbe44f16189f7f1b739cf268d70f373d94b87",
+ "date": "2021-02-25T11:54:57-08:00",
+ "path": "/nix/store/liyi8hkl55dcbs1wc4w2jw4zf717bb29-tree-sitter-typescript",
+ "sha256": "0ljhkhi8fp38l1n6wam7l8bdqxr95d0c1mf7i6p1gb6xrjzssik0",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index c23b50b840..3b622c2055 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -4,6 +4,9 @@
, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; }
}:
let
+ # Poetry2nix version
+ version = "1.16.0";
+
inherit (poetryLib) isCompatible readTOML moduleName;
/* The default list of poetry2nix override overlays */
@@ -70,8 +73,7 @@ let
in
lib.makeScope pkgs.newScope (self: {
- # Poetry2nix version
- version = "1.15.5";
+ inherit version;
/* Returns a package of editable sources whose changes will be available without needing to restart the
nix-shell.
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 4626f7fec3..6af37b395e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -157,7 +157,7 @@ let
missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. "
+ "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517";
requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject;
- requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~\[]+).*" n) 0) requires;
+ requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires;
in
builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs;
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 7a5233fecd..2106708a28 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -250,6 +250,15 @@ self: super:
}
);
+ gdal = super.gdal.overridePythonAttrs (
+ old: {
+ preBuild = (old.preBuild or "") + ''
+ substituteInPlace setup.cfg \
+ --replace "../../apps/gdal-config" '${pkgs.gdal}/bin/gdal-config'
+ '';
+ }
+ );
+
grandalf = super.grandalf.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
@@ -360,9 +369,13 @@ self: super:
}
);
- # disable the removal of pyproject.toml, required because of setuptools_scm
jaraco-functools = super.jaraco-functools.overridePythonAttrs (
old: {
+ # required for the extra "toml" dependency in setuptools_scm[toml]
+ buildInputs = (old.buildInputs or [ ]) ++ [
+ self.toml
+ ];
+ # disable the removal of pyproject.toml, required because of setuptools_scm
dontPreferSetupPy = true;
}
);
@@ -378,6 +391,15 @@ self: super:
}
);
+ jsondiff = super.jsondiff.overridePythonAttrs (
+ old: {
+ preBuild = (old.preBuild or "") + ''
+ substituteInPlace setup.py \
+ --replace "'jsondiff=jsondiff.cli:main_deprecated'," ""
+ '';
+ }
+ );
+
jsonpickle = super.jsonpickle.overridePythonAttrs (
old: {
dontPreferSetupPy = true;
@@ -558,6 +580,13 @@ self: super:
buildInputs = oa.buildInputs ++ [ self.pbr ];
});
+ moto = super.moto.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++
+ [ self.sshpubkeys ];
+ }
+ );
+
mpi4py = super.mpi4py.overridePythonAttrs (
old:
let
@@ -674,6 +703,12 @@ self: super:
}
);
+ pdal = super.pdal.overridePythonAttrs (
+ old: {
+ PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config";
+ }
+ );
+
peewee = super.peewee.overridePythonAttrs (
old:
let
@@ -733,9 +768,13 @@ self: super:
'';
});
- # disable the removal of pyproject.toml, required because of setuptools_scm
portend = super.portend.overridePythonAttrs (
old: {
+ # required for the extra "toml" dependency in setuptools_scm[toml]
+ buildInputs = (old.buildInputs or [ ]) ++ [
+ self.toml
+ ];
+ # disable the removal of pyproject.toml, required because of setuptools_scm
dontPreferSetupPy = true;
}
);
@@ -920,6 +959,16 @@ self: super:
}
);
+ pyproj = super.pyproj.overridePythonAttrs (
+ old: {
+ buildInputs = (old.buildInputs or [ ]) ++
+ [ self.cython ];
+ PROJ_DIR = "${pkgs.proj}";
+ PROJ_LIBDIR = "${pkgs.proj}/lib";
+ PROJ_INCDIR = "${pkgs.proj.dev}/include";
+ }
+ );
+
python-bugzilla = super.python-bugzilla.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
@@ -952,6 +1001,8 @@ self: super:
old: {
format = "other";
+ dontWrapQtApps = true;
+
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config
pkgs.qt5.qmake
@@ -1071,12 +1122,9 @@ self: super:
pytest-runner = super.pytest-runner or super.pytestrunner;
- python-jose = super.python-jose.overridePythonAttrs (
+ pytest-pylint = super.pytest-pylint.overridePythonAttrs (
old: {
- postPath = ''
- substituteInPlace setup.py --replace "'pytest-runner'," ""
- substituteInPlace setup.py --replace "'pytest-runner'" ""
- '';
+ buildInputs = [ self.pytest-runner ];
}
);
@@ -1101,6 +1149,11 @@ self: super:
'';
});
+ python-jose = super.python-jose.overridePythonAttrs (
+ old: {
+ buildInputs = [ self.pytest-runner ];
+ }
+ );
ffmpeg-python = super.ffmpeg-python.overridePythonAttrs (
old: {
@@ -1233,9 +1286,13 @@ self: super:
}
);
- # disable the removal of pyproject.toml, required because of setuptools_scm
tempora = super.tempora.overridePythonAttrs (
old: {
+ # required for the extra "toml" dependency in setuptools_scm[toml]
+ buildInputs = (old.buildInputs or [ ]) ++ [
+ self.toml
+ ];
+ # disable the removal of pyproject.toml, required because of setuptools_scm
dontPreferSetupPy = true;
}
);
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
index 973733a6d6..b1be7a3f4e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
@@ -16,15 +16,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[[package]]
name = "attrs"
-version = "20.2.0"
+version = "20.3.0"
description = "Classes Without Boilerplate"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "sphinx-rtd-theme", "pre-commit"]
-docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
+docs = ["furo", "sphinx", "zope.interface"]
tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
@@ -38,7 +38,7 @@ python-versions = ">=2.6"
[package.extras]
docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"]
[[package]]
name = "cachecontrol"
@@ -72,7 +72,7 @@ msgpack = ["msgpack-python (>=0.5,<0.6)"]
[[package]]
name = "certifi"
-version = "2020.6.20"
+version = "2020.12.5"
description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false
@@ -80,7 +80,7 @@ python-versions = "*"
[[package]]
name = "cffi"
-version = "1.14.3"
+version = "1.14.5"
description = "Foreign Function Interface for Python calling C code."
category = "main"
optional = false
@@ -99,11 +99,11 @@ python-versions = ">=3.6.1"
[[package]]
name = "chardet"
-version = "3.0.4"
+version = "4.0.0"
description = "Universal encoding detector for Python 2 and 3"
category = "main"
optional = false
-python-versions = "*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]]
name = "cleo"
@@ -134,7 +134,7 @@ typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\
[[package]]
name = "colorama"
-version = "0.4.3"
+version = "0.4.4"
description = "Cross-platform colored terminal text."
category = "dev"
optional = false
@@ -150,7 +150,7 @@ python-versions = ">=2.6"
[package.extras]
docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"]
[[package]]
name = "contextlib2"
@@ -162,7 +162,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[[package]]
name = "coverage"
-version = "5.3"
+version = "5.5"
description = "Code coverage measurement for Python"
category = "dev"
optional = false
@@ -181,7 +181,7 @@ python-versions = ">=3.6,<4.0"
[[package]]
name = "cryptography"
-version = "3.1.1"
+version = "3.2.1"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
category = "main"
optional = false
@@ -194,11 +194,30 @@ ipaddress = {version = "*", markers = "python_version < \"3\""}
six = ">=1.4.1"
[package.extras]
-docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"]
+test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+
+[[package]]
+name = "cryptography"
+version = "3.4.6"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+cffi = ">=1.12"
+
+[package.extras]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
+docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
+pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
+sdist = ["setuptools-rust (>=0.11.4)"]
+ssh = ["bcrypt (>=3.1.5)"]
+test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
[[package]]
name = "distlib"
@@ -298,11 +317,11 @@ six = "*"
[[package]]
name = "identify"
-version = "1.5.5"
+version = "2.1.0"
description = "File identification library for Python"
category = "dev"
optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+python-versions = ">=3.6.1"
[package.extras]
license = ["editdistance"]
@@ -335,7 +354,7 @@ testing = ["packaging", "pep517", "importlib-resources (>=1.3)"]
[[package]]
name = "importlib-resources"
-version = "3.0.0"
+version = "3.2.1"
description = "Read resources from Python packages"
category = "main"
optional = false
@@ -361,14 +380,14 @@ python-versions = "*"
[[package]]
name = "jeepney"
-version = "0.4.3"
+version = "0.6.0"
description = "Low-level, pure Python DBus protocol wrapper."
category = "main"
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
[package.extras]
-dev = ["testpath"]
+test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio"]
[[package]]
name = "keyring"
@@ -385,7 +404,7 @@ secretstorage = {version = "<3", markers = "(sys_platform == \"linux2\" or sys_p
[package.extras]
docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs", "pytest-flake8"]
[[package]]
name = "keyring"
@@ -402,25 +421,25 @@ secretstorage = {version = "*", markers = "sys_platform == \"linux\""}
[package.extras]
docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"]
[[package]]
name = "keyring"
-version = "21.4.0"
+version = "21.8.0"
description = "Store and access your passwords safely."
category = "main"
optional = false
python-versions = ">=3.6"
[package.dependencies]
-importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
+importlib-metadata = {version = ">=1", markers = "python_version < \"3.8\""}
jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""}
pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""}
-SecretStorage = {version = ">=3", markers = "sys_platform == \"linux\""}
+SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""}
[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black (>=0.3.7)", "pytest-cov", "pytest-mypy"]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "pytest-black (>=0.3.7)", "pytest-mypy"]
[[package]]
name = "lockfile"
@@ -460,7 +479,15 @@ six = ">=1.0.0,<2.0.0"
[[package]]
name = "more-itertools"
-version = "8.5.0"
+version = "8.6.0"
+description = "More routines for operating on iterables, beyond itertools"
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "more-itertools"
+version = "8.7.0"
description = "More routines for operating on iterables, beyond itertools"
category = "dev"
optional = false
@@ -468,7 +495,7 @@ python-versions = ">=3.5"
[[package]]
name = "msgpack"
-version = "1.0.0"
+version = "1.0.2"
description = "MessagePack (de)serializer."
category = "main"
optional = false
@@ -484,7 +511,7 @@ python-versions = "*"
[[package]]
name = "packaging"
-version = "20.4"
+version = "20.9"
description = "Core utilities for Python packages"
category = "main"
optional = false
@@ -492,7 +519,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[package.dependencies]
pyparsing = ">=2.0.2"
-six = "*"
[[package]]
name = "pastel"
@@ -527,7 +553,7 @@ ptyprocess = ">=0.5"
[[package]]
name = "pkginfo"
-version = "1.5.0.1"
+version = "1.7.0"
description = "Query metadatdata from sdists / bdists / installed packages."
category = "main"
optional = false
@@ -552,7 +578,7 @@ dev = ["pre-commit", "tox"]
[[package]]
name = "poetry-core"
-version = "1.0.0"
+version = "1.0.2"
description = "Poetry PEP 517 Build Backend"
category = "main"
optional = false
@@ -567,7 +593,7 @@ typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" a
[[package]]
name = "pre-commit"
-version = "2.7.1"
+version = "2.10.1"
description = "A framework for managing and maintaining multi-language pre-commit hooks."
category = "dev"
optional = false
@@ -585,7 +611,7 @@ virtualenv = ">=20.0.8"
[[package]]
name = "ptyprocess"
-version = "0.6.0"
+version = "0.7.0"
description = "Run a subprocess in a pseudo terminal"
category = "main"
optional = false
@@ -593,7 +619,7 @@ python-versions = "*"
[[package]]
name = "py"
-version = "1.9.0"
+version = "1.10.0"
description = "library with cross-python path, ini-parsing, io, code, log facilities"
category = "dev"
optional = false
@@ -672,23 +698,23 @@ py = ">=1.5.0"
wcwidth = "*"
[package.extras]
-checkqa-mypy = ["mypy (v0.761)"]
+checkqa-mypy = ["mypy (==v0.761)"]
testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
[[package]]
name = "pytest-cov"
-version = "2.10.1"
+version = "2.11.1"
description = "Pytest plugin for measuring coverage."
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[package.dependencies]
-coverage = ">=4.4"
+coverage = ">=5.2.1"
pytest = ">=4.6"
[package.extras]
-testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"]
+testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"]
[[package]]
name = "pytest-mock"
@@ -728,15 +754,15 @@ python-versions = "*"
[[package]]
name = "pyyaml"
-version = "5.3.1"
+version = "5.4.1"
description = "YAML parser and emitter for Python"
category = "dev"
optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
[[package]]
name = "requests"
-version = "2.24.0"
+version = "2.25.1"
description = "Python HTTP for Humans."
category = "main"
optional = false
@@ -744,13 +770,13 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[package.dependencies]
certifi = ">=2017.4.17"
-chardet = ">=3.0.2,<4"
+chardet = ">=3.0.2,<5"
idna = ">=2.5,<3"
-urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26"
+urllib3 = ">=1.21.1,<1.27"
[package.extras]
security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
[[package]]
name = "requests-toolbelt"
@@ -787,19 +813,19 @@ dbus-python = ["dbus-python"]
[[package]]
name = "secretstorage"
-version = "3.1.2"
+version = "3.3.1"
description = "Python bindings to FreeDesktop.org Secret Service API"
category = "main"
optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
[package.dependencies]
-cryptography = "*"
-jeepney = ">=0.4.2"
+cryptography = ">=2.0"
+jeepney = ">=0.6"
[[package]]
name = "shellingham"
-version = "1.3.2"
+version = "1.4.0"
description = "Tool to Detect Surrounding Shell"
category = "main"
optional = false
@@ -807,15 +833,19 @@ python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6"
[[package]]
name = "singledispatch"
-version = "3.4.0.3"
-description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3."
+version = "3.6.1"
+description = "Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3."
category = "main"
optional = false
-python-versions = "*"
+python-versions = ">=2.6"
[package.dependencies]
six = "*"
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2"]
+
[[package]]
name = "six"
version = "1.15.0"
@@ -842,11 +872,11 @@ python-versions = "*"
[[package]]
name = "toml"
-version = "0.10.1"
+version = "0.10.2"
description = "Python Library for Tom's Obvious, Minimal Language"
category = "dev"
optional = false
-python-versions = "*"
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
[[package]]
name = "tomlkit"
@@ -863,7 +893,7 @@ typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and pytho
[[package]]
name = "tox"
-version = "3.20.0"
+version = "3.23.0"
description = "tox is a generic virtualenv management and test command line tool"
category = "dev"
optional = false
@@ -872,7 +902,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
[package.dependencies]
colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""}
filelock = ">=3.0.0"
-importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""}
+importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
packaging = ">=14"
pluggy = ">=0.12.0"
py = ">=1.4.17"
@@ -882,7 +912,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
[package.extras]
docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"]
[[package]]
name = "typing"
@@ -900,12 +930,9 @@ category = "main"
optional = false
python-versions = "*"
-[package.dependencies]
-typing = {version = ">=3.7.4", markers = "python_version < \"3.5\""}
-
[[package]]
name = "urllib3"
-version = "1.25.10"
+version = "1.25.11"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
@@ -913,12 +940,12 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
[package.extras]
brotli = ["brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)", "ipaddress"]
-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[[package]]
name = "virtualenv"
-version = "20.0.31"
+version = "20.4.2"
description = "Virtual Python Environment builder"
category = "main"
optional = false
@@ -928,14 +955,14 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
appdirs = ">=1.4.3,<2"
distlib = ">=0.3.1,<1"
filelock = ">=3.0.0,<4"
-importlib-metadata = {version = ">=0.12,<2", markers = "python_version < \"3.8\""}
+importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""}
pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""}
six = ">=1.9.0,<2"
[package.extras]
docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"]
-testing = ["coverage (>=5)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-xdist (>=1.31.0)", "packaging (>=20.0)", "xonsh (>=0.9.16)"]
+testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)", "xonsh (>=0.9.16)"]
[[package]]
name = "wcwidth"
@@ -974,7 +1001,7 @@ testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"]
[metadata]
lock-version = "1.1"
python-versions = "~2.7 || ^3.5"
-content-hash = "1e774c9d8b7f6812d721cff08b51554f9a0cd051e2ae0e884421bcb56718d131"
+content-hash = "f716089bf560bb051980ddb5ff40b200027e9d9f2ed17fc7dd5576d80f5ad62a"
[metadata.files]
appdirs = [
@@ -986,8 +1013,8 @@ atomicwrites = [
{file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
]
attrs = [
- {file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"},
- {file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"},
+ {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"},
+ {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
]
"backports.functools-lru-cache" = [
{file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"},
@@ -1002,54 +1029,55 @@ cachy = [
{file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"},
]
certifi = [
- {file = "certifi-2020.6.20-py2.py3-none-any.whl", hash = "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"},
- {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"},
+ {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
+ {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"},
]
cffi = [
- {file = "cffi-1.14.3-2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc"},
- {file = "cffi-1.14.3-2-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768"},
- {file = "cffi-1.14.3-2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d"},
- {file = "cffi-1.14.3-2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1"},
- {file = "cffi-1.14.3-2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca"},
- {file = "cffi-1.14.3-2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a"},
- {file = "cffi-1.14.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c"},
- {file = "cffi-1.14.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730"},
- {file = "cffi-1.14.3-cp27-cp27m-win32.whl", hash = "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d"},
- {file = "cffi-1.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05"},
- {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b"},
- {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171"},
- {file = "cffi-1.14.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f"},
- {file = "cffi-1.14.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4"},
- {file = "cffi-1.14.3-cp35-cp35m-win32.whl", hash = "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d"},
- {file = "cffi-1.14.3-cp35-cp35m-win_amd64.whl", hash = "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d"},
- {file = "cffi-1.14.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3"},
- {file = "cffi-1.14.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808"},
- {file = "cffi-1.14.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537"},
- {file = "cffi-1.14.3-cp36-cp36m-win32.whl", hash = "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0"},
- {file = "cffi-1.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e"},
- {file = "cffi-1.14.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1"},
- {file = "cffi-1.14.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579"},
- {file = "cffi-1.14.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394"},
- {file = "cffi-1.14.3-cp37-cp37m-win32.whl", hash = "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc"},
- {file = "cffi-1.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869"},
- {file = "cffi-1.14.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e"},
- {file = "cffi-1.14.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828"},
- {file = "cffi-1.14.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9"},
- {file = "cffi-1.14.3-cp38-cp38-win32.whl", hash = "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522"},
- {file = "cffi-1.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15"},
- {file = "cffi-1.14.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d"},
- {file = "cffi-1.14.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c"},
- {file = "cffi-1.14.3-cp39-cp39-win32.whl", hash = "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b"},
- {file = "cffi-1.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3"},
- {file = "cffi-1.14.3.tar.gz", hash = "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"},
+ {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"},
+ {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"},
+ {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"},
+ {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"},
+ {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"},
+ {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"},
+ {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"},
+ {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"},
+ {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"},
+ {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"},
+ {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"},
+ {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"},
+ {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"},
+ {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"},
+ {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"},
+ {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"},
+ {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"},
+ {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"},
+ {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"},
+ {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"},
+ {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"},
+ {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"},
+ {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"},
+ {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"},
+ {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"},
+ {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"},
+ {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"},
+ {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"},
+ {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"},
+ {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"},
+ {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"},
+ {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"},
+ {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"},
+ {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"},
+ {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"},
+ {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"},
+ {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"},
]
cfgv = [
{file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"},
{file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"},
]
chardet = [
- {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"},
- {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"},
+ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
+ {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
]
cleo = [
{file = "cleo-0.8.1-py2.py3-none-any.whl", hash = "sha256:141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753"},
@@ -1060,8 +1088,8 @@ clikit = [
{file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"},
]
colorama = [
- {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"},
- {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"},
+ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
]
configparser = [
{file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"},
@@ -1072,68 +1100,93 @@ contextlib2 = [
{file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"},
]
coverage = [
- {file = "coverage-5.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270"},
- {file = "coverage-5.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4"},
- {file = "coverage-5.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9"},
- {file = "coverage-5.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729"},
- {file = "coverage-5.3-cp27-cp27m-win32.whl", hash = "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d"},
- {file = "coverage-5.3-cp27-cp27m-win_amd64.whl", hash = "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418"},
- {file = "coverage-5.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9"},
- {file = "coverage-5.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5"},
- {file = "coverage-5.3-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822"},
- {file = "coverage-5.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097"},
- {file = "coverage-5.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9"},
- {file = "coverage-5.3-cp35-cp35m-win32.whl", hash = "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636"},
- {file = "coverage-5.3-cp35-cp35m-win_amd64.whl", hash = "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f"},
- {file = "coverage-5.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237"},
- {file = "coverage-5.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54"},
- {file = "coverage-5.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7"},
- {file = "coverage-5.3-cp36-cp36m-win32.whl", hash = "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a"},
- {file = "coverage-5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d"},
- {file = "coverage-5.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"},
- {file = "coverage-5.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f"},
- {file = "coverage-5.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c"},
- {file = "coverage-5.3-cp37-cp37m-win32.whl", hash = "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751"},
- {file = "coverage-5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709"},
- {file = "coverage-5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516"},
- {file = "coverage-5.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f"},
- {file = "coverage-5.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259"},
- {file = "coverage-5.3-cp38-cp38-win32.whl", hash = "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82"},
- {file = "coverage-5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221"},
- {file = "coverage-5.3-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978"},
- {file = "coverage-5.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21"},
- {file = "coverage-5.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24"},
- {file = "coverage-5.3-cp39-cp39-win32.whl", hash = "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7"},
- {file = "coverage-5.3-cp39-cp39-win_amd64.whl", hash = "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7"},
- {file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"},
+ {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"},
+ {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"},
+ {file = "coverage-5.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:c2723d347ab06e7ddad1a58b2a821218239249a9e4365eaff6649d31180c1669"},
+ {file = "coverage-5.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:900fbf7759501bc7807fd6638c947d7a831fc9fdf742dc10f02956ff7220fa90"},
+ {file = "coverage-5.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c"},
+ {file = "coverage-5.5-cp27-cp27m-win32.whl", hash = "sha256:06191eb60f8d8a5bc046f3799f8a07a2d7aefb9504b0209aff0b47298333302a"},
+ {file = "coverage-5.5-cp27-cp27m-win_amd64.whl", hash = "sha256:7501140f755b725495941b43347ba8a2777407fc7f250d4f5a7d2a1050ba8e82"},
+ {file = "coverage-5.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:372da284cfd642d8e08ef606917846fa2ee350f64994bebfbd3afb0040436905"},
+ {file = "coverage-5.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8963a499849a1fc54b35b1c9f162f4108017b2e6db2c46c1bed93a72262ed083"},
+ {file = "coverage-5.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:869a64f53488f40fa5b5b9dcb9e9b2962a66a87dab37790f3fcfb5144b996ef5"},
+ {file = "coverage-5.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a7697d8cb0f27399b0e393c0b90f0f1e40c82023ea4d45d22bce7032a5d7b81"},
+ {file = "coverage-5.5-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:8d0a0725ad7c1a0bcd8d1b437e191107d457e2ec1084b9f190630a4fb1af78e6"},
+ {file = "coverage-5.5-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:51cb9476a3987c8967ebab3f0fe144819781fca264f57f89760037a2ea191cb0"},
+ {file = "coverage-5.5-cp310-cp310-win_amd64.whl", hash = "sha256:c0891a6a97b09c1f3e073a890514d5012eb256845c451bd48f7968ef939bf4ae"},
+ {file = "coverage-5.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:3487286bc29a5aa4b93a072e9592f22254291ce96a9fbc5251f566b6b7343cdb"},
+ {file = "coverage-5.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:deee1077aae10d8fa88cb02c845cfba9b62c55e1183f52f6ae6a2df6a2187160"},
+ {file = "coverage-5.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6"},
+ {file = "coverage-5.5-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:6c90e11318f0d3c436a42409f2749ee1a115cd8b067d7f14c148f1ce5574d701"},
+ {file = "coverage-5.5-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:30c77c1dc9f253283e34c27935fded5015f7d1abe83bc7821680ac444eaf7793"},
+ {file = "coverage-5.5-cp35-cp35m-win32.whl", hash = "sha256:9a1ef3b66e38ef8618ce5fdc7bea3d9f45f3624e2a66295eea5e57966c85909e"},
+ {file = "coverage-5.5-cp35-cp35m-win_amd64.whl", hash = "sha256:972c85d205b51e30e59525694670de6a8a89691186012535f9d7dbaa230e42c3"},
+ {file = "coverage-5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:af0e781009aaf59e25c5a678122391cb0f345ac0ec272c7961dc5455e1c40066"},
+ {file = "coverage-5.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:74d881fc777ebb11c63736622b60cb9e4aee5cace591ce274fb69e582a12a61a"},
+ {file = "coverage-5.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:92b017ce34b68a7d67bd6d117e6d443a9bf63a2ecf8567bb3d8c6c7bc5014465"},
+ {file = "coverage-5.5-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d636598c8305e1f90b439dbf4f66437de4a5e3c31fdf47ad29542478c8508bbb"},
+ {file = "coverage-5.5-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:41179b8a845742d1eb60449bdb2992196e211341818565abded11cfa90efb821"},
+ {file = "coverage-5.5-cp36-cp36m-win32.whl", hash = "sha256:040af6c32813fa3eae5305d53f18875bedd079960822ef8ec067a66dd8afcd45"},
+ {file = "coverage-5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:5fec2d43a2cc6965edc0bb9e83e1e4b557f76f843a77a2496cbe719583ce8184"},
+ {file = "coverage-5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:18ba8bbede96a2c3dde7b868de9dcbd55670690af0988713f0603f037848418a"},
+ {file = "coverage-5.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2910f4d36a6a9b4214bb7038d537f015346f413a975d57ca6b43bf23d6563b53"},
+ {file = "coverage-5.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d"},
+ {file = "coverage-5.5-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:796c9c3c79747146ebd278dbe1e5c5c05dd6b10cc3bcb8389dfdf844f3ead638"},
+ {file = "coverage-5.5-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:53194af30d5bad77fcba80e23a1441c71abfb3e01192034f8246e0d8f99528f3"},
+ {file = "coverage-5.5-cp37-cp37m-win32.whl", hash = "sha256:184a47bbe0aa6400ed2d41d8e9ed868b8205046518c52464fde713ea06e3a74a"},
+ {file = "coverage-5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:2949cad1c5208b8298d5686d5a85b66aae46d73eec2c3e08c817dd3513e5848a"},
+ {file = "coverage-5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:217658ec7187497e3f3ebd901afdca1af062b42cfe3e0dafea4cced3983739f6"},
+ {file = "coverage-5.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1aa846f56c3d49205c952d8318e76ccc2ae23303351d9270ab220004c580cfe2"},
+ {file = "coverage-5.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:24d4a7de75446be83244eabbff746d66b9240ae020ced65d060815fac3423759"},
+ {file = "coverage-5.5-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1f8bf7b90ba55699b3a5e44930e93ff0189aa27186e96071fac7dd0d06a1873"},
+ {file = "coverage-5.5-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:970284a88b99673ccb2e4e334cfb38a10aab7cd44f7457564d11898a74b62d0a"},
+ {file = "coverage-5.5-cp38-cp38-win32.whl", hash = "sha256:01d84219b5cdbfc8122223b39a954820929497a1cb1422824bb86b07b74594b6"},
+ {file = "coverage-5.5-cp38-cp38-win_amd64.whl", hash = "sha256:2e0d881ad471768bf6e6c2bf905d183543f10098e3b3640fc029509530091502"},
+ {file = "coverage-5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1f9ce122f83b2305592c11d64f181b87153fc2c2bbd3bb4a3dde8303cfb1a6b"},
+ {file = "coverage-5.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:13c4ee887eca0f4c5a247b75398d4114c37882658300e153113dafb1d76de529"},
+ {file = "coverage-5.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:52596d3d0e8bdf3af43db3e9ba8dcdaac724ba7b5ca3f6358529d56f7a166f8b"},
+ {file = "coverage-5.5-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2cafbbb3af0733db200c9b5f798d18953b1a304d3f86a938367de1567f4b5bff"},
+ {file = "coverage-5.5-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44d654437b8ddd9eee7d1eaee28b7219bec228520ff809af170488fd2fed3e2b"},
+ {file = "coverage-5.5-cp39-cp39-win32.whl", hash = "sha256:d314ed732c25d29775e84a960c3c60808b682c08d86602ec2c3008e1202e3bb6"},
+ {file = "coverage-5.5-cp39-cp39-win_amd64.whl", hash = "sha256:13034c4409db851670bc9acd836243aeee299949bd5673e11844befcb0149f03"},
+ {file = "coverage-5.5-pp36-none-any.whl", hash = "sha256:f030f8873312a16414c0d8e1a1ddff2d3235655a2174e3648b4fa66b3f2f1079"},
+ {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"},
+ {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"},
]
crashtest = [
{file = "crashtest-0.3.1-py3-none-any.whl", hash = "sha256:300f4b0825f57688b47b6d70c6a31de33512eb2fa1ac614f780939aa0cf91680"},
{file = "crashtest-0.3.1.tar.gz", hash = "sha256:42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"},
]
cryptography = [
- {file = "cryptography-3.1.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:65beb15e7f9c16e15934569d29fb4def74ea1469d8781f6b3507ab896d6d8719"},
- {file = "cryptography-3.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:983c0c3de4cb9fcba68fd3f45ed846eb86a2a8b8d8bc5bb18364c4d00b3c61fe"},
- {file = "cryptography-3.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:e97a3b627e3cb63c415a16245d6cef2139cca18bb1183d1b9375a1c14e83f3b3"},
- {file = "cryptography-3.1.1-cp27-cp27m-win32.whl", hash = "sha256:cb179acdd4ae1e4a5a160d80b87841b3d0e0be84af46c7bb2cd7ece57a39c4ba"},
- {file = "cryptography-3.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:b372026ebf32fe2523159f27d9f0e9f485092e43b00a5adacf732192a70ba118"},
- {file = "cryptography-3.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:680da076cad81cdf5ffcac50c477b6790be81768d30f9da9e01960c4b18a66db"},
- {file = "cryptography-3.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5d52c72449bb02dd45a773a203196e6d4fae34e158769c896012401f33064396"},
- {file = "cryptography-3.1.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:f0e099fc4cc697450c3dd4031791559692dd941a95254cb9aeded66a7aa8b9bc"},
- {file = "cryptography-3.1.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:a7597ffc67987b37b12e09c029bd1dc43965f75d328076ae85721b84046e9ca7"},
- {file = "cryptography-3.1.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:4549b137d8cbe3c2eadfa56c0c858b78acbeff956bd461e40000b2164d9167c6"},
- {file = "cryptography-3.1.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:89aceb31cd5f9fc2449fe8cf3810797ca52b65f1489002d58fe190bfb265c536"},
- {file = "cryptography-3.1.1-cp35-cp35m-win32.whl", hash = "sha256:559d622aef2a2dff98a892eef321433ba5bc55b2485220a8ca289c1ecc2bd54f"},
- {file = "cryptography-3.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:451cdf60be4dafb6a3b78802006a020e6cd709c22d240f94f7a0696240a17154"},
- {file = "cryptography-3.1.1-cp36-abi3-win32.whl", hash = "sha256:762bc5a0df03c51ee3f09c621e1cee64e3a079a2b5020de82f1613873d79ee70"},
- {file = "cryptography-3.1.1-cp36-abi3-win_amd64.whl", hash = "sha256:b12e715c10a13ca1bd27fbceed9adc8c5ff640f8e1f7ea76416352de703523c8"},
- {file = "cryptography-3.1.1-cp36-cp36m-win32.whl", hash = "sha256:21b47c59fcb1c36f1113f3709d37935368e34815ea1d7073862e92f810dc7499"},
- {file = "cryptography-3.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:48ee615a779ffa749d7d50c291761dc921d93d7cf203dca2db663b4f193f0e49"},
- {file = "cryptography-3.1.1-cp37-cp37m-win32.whl", hash = "sha256:b2bded09c578d19e08bd2c5bb8fed7f103e089752c9cf7ca7ca7de522326e921"},
- {file = "cryptography-3.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f99317a0fa2e49917689b8cf977510addcfaaab769b3f899b9c481bbd76730c2"},
- {file = "cryptography-3.1.1-cp38-cp38-win32.whl", hash = "sha256:ab010e461bb6b444eaf7f8c813bb716be2d78ab786103f9608ffd37a4bd7d490"},
- {file = "cryptography-3.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:99d4984aabd4c7182050bca76176ce2dbc9fa9748afe583a7865c12954d714ba"},
- {file = "cryptography-3.1.1.tar.gz", hash = "sha256:9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d"},
+ {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"},
+ {file = "cryptography-3.2.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d"},
+ {file = "cryptography-3.2.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33"},
+ {file = "cryptography-3.2.1-cp27-cp27m-win32.whl", hash = "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297"},
+ {file = "cryptography-3.2.1-cp27-cp27m-win_amd64.whl", hash = "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4"},
+ {file = "cryptography-3.2.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8"},
+ {file = "cryptography-3.2.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e"},
+ {file = "cryptography-3.2.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b"},
+ {file = "cryptography-3.2.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"},
+ {file = "cryptography-3.2.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77"},
+ {file = "cryptography-3.2.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7"},
+ {file = "cryptography-3.2.1-cp35-cp35m-win32.whl", hash = "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b"},
+ {file = "cryptography-3.2.1-cp35-cp35m-win_amd64.whl", hash = "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7"},
+ {file = "cryptography-3.2.1-cp36-abi3-win32.whl", hash = "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f"},
+ {file = "cryptography-3.2.1-cp36-abi3-win_amd64.whl", hash = "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538"},
+ {file = "cryptography-3.2.1-cp36-cp36m-win32.whl", hash = "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b"},
+ {file = "cryptography-3.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13"},
+ {file = "cryptography-3.2.1-cp37-cp37m-win32.whl", hash = "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e"},
+ {file = "cryptography-3.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb"},
+ {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"},
+ {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"},
+ {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"},
+ {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"},
+ {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"},
+ {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"},
+ {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"},
+ {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"},
+ {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"},
+ {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"},
]
distlib = [
{file = "distlib-0.3.1-py2.py3-none-any.whl", hash = "sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb"},
@@ -1175,8 +1228,8 @@ httpretty = [
{file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"},
]
identify = [
- {file = "identify-1.5.5-py2.py3-none-any.whl", hash = "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d"},
- {file = "identify-1.5.5.tar.gz", hash = "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4"},
+ {file = "identify-2.1.0-py2.py3-none-any.whl", hash = "sha256:2a5fdf2f5319cc357eda2550bea713a404392495961022cf2462624ce62f0f46"},
+ {file = "identify-2.1.0.tar.gz", hash = "sha256:2179e7359471ab55729f201b3fdf7dc2778e221f868410fedcb0987b791ba552"},
]
idna = [
{file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
@@ -1187,24 +1240,24 @@ importlib-metadata = [
{file = "importlib_metadata-1.7.0.tar.gz", hash = "sha256:90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83"},
]
importlib-resources = [
- {file = "importlib_resources-3.0.0-py2.py3-none-any.whl", hash = "sha256:d028f66b66c0d5732dae86ba4276999855e162a749c92620a38c1d779ed138a7"},
- {file = "importlib_resources-3.0.0.tar.gz", hash = "sha256:19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"},
+ {file = "importlib_resources-3.2.1-py2.py3-none-any.whl", hash = "sha256:e2860cf0c4bc999947228d18be154fa3779c5dde0b882bd2d7b3f4d25e698bd6"},
+ {file = "importlib_resources-3.2.1.tar.gz", hash = "sha256:a9fe213ab6452708ec1b3f4ec6f2881b8ab3645cb4e5efb7fea2bbf05a91db3b"},
]
ipaddress = [
{file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"},
{file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"},
]
jeepney = [
- {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"},
- {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"},
+ {file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"},
+ {file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"},
]
keyring = [
{file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"},
{file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"},
{file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"},
{file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"},
- {file = "keyring-21.4.0-py3-none-any.whl", hash = "sha256:4e34ea2fdec90c1c43d6610b5a5fafa1b9097db1802948e90caf5763974b8f8d"},
- {file = "keyring-21.4.0.tar.gz", hash = "sha256:9aeadd006a852b78f4b4ef7c7556c2774d2432bbef8ee538a3e9089ac8b11466"},
+ {file = "keyring-21.8.0-py3-none-any.whl", hash = "sha256:4be9cbaaaf83e61d6399f733d113ede7d1c73bc75cb6aeb64eee0f6ac39b30ea"},
+ {file = "keyring-21.8.0.tar.gz", hash = "sha256:1746d3ac913d449a090caf11e9e4af00e26c3f7f7e81027872192b2398b98675"},
]
lockfile = [
{file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"},
@@ -1218,36 +1271,48 @@ more-itertools = [
{file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"},
{file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"},
{file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"},
- {file = "more-itertools-8.5.0.tar.gz", hash = "sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20"},
- {file = "more_itertools-8.5.0-py3-none-any.whl", hash = "sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c"},
+ {file = "more-itertools-8.6.0.tar.gz", hash = "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"},
+ {file = "more_itertools-8.6.0-py3-none-any.whl", hash = "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330"},
+ {file = "more-itertools-8.7.0.tar.gz", hash = "sha256:c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713"},
+ {file = "more_itertools-8.7.0-py3-none-any.whl", hash = "sha256:5652a9ac72209ed7df8d9c15daf4e1aa0e3d2ccd3c87f8265a0673cd9cbc9ced"},
]
msgpack = [
- {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"},
- {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"},
- {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"},
- {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"},
- {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"},
- {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"},
- {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"},
- {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"},
- {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"},
- {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"},
- {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"},
- {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"},
- {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"},
- {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"},
- {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"},
- {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"},
- {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"},
- {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"},
+ {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9"},
+ {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:a99b144475230982aee16b3d249170f1cccebf27fb0a08e9f603b69637a62192"},
+ {file = "msgpack-1.0.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:1026dcc10537d27dd2d26c327e552f05ce148977e9d7b9f1718748281b38c841"},
+ {file = "msgpack-1.0.2-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:fe07bc6735d08e492a327f496b7850e98cb4d112c56df69b0c844dbebcbb47f6"},
+ {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:9ea52fff0473f9f3000987f313310208c879493491ef3ccf66268eff8d5a0326"},
+ {file = "msgpack-1.0.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:26a1759f1a88df5f1d0b393eb582ec022326994e311ba9c5818adc5374736439"},
+ {file = "msgpack-1.0.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:497d2c12426adcd27ab83144057a705efb6acc7e85957a51d43cdcf7f258900f"},
+ {file = "msgpack-1.0.2-cp36-cp36m-win32.whl", hash = "sha256:e89ec55871ed5473a041c0495b7b4e6099f6263438e0bd04ccd8418f92d5d7f2"},
+ {file = "msgpack-1.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a4355d2193106c7aa77c98fc955252a737d8550320ecdb2e9ac701e15e2943bc"},
+ {file = "msgpack-1.0.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:d6c64601af8f3893d17ec233237030e3110f11b8a962cb66720bf70c0141aa54"},
+ {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f484cd2dca68502de3704f056fa9b318c94b1539ed17a4c784266df5d6978c87"},
+ {file = "msgpack-1.0.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f3e6aaf217ac1c7ce1563cf52a2f4f5d5b1f64e8729d794165db71da57257f0c"},
+ {file = "msgpack-1.0.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:8521e5be9e3b93d4d5e07cb80b7e32353264d143c1f072309e1863174c6aadb1"},
+ {file = "msgpack-1.0.2-cp37-cp37m-win32.whl", hash = "sha256:31c17bbf2ae5e29e48d794c693b7ca7a0c73bd4280976d408c53df421e838d2a"},
+ {file = "msgpack-1.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8ffb24a3b7518e843cd83538cf859e026d24ec41ac5721c18ed0c55101f9775b"},
+ {file = "msgpack-1.0.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:b28c0876cce1466d7c2195d7658cf50e4730667196e2f1355c4209444717ee06"},
+ {file = "msgpack-1.0.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87869ba567fe371c4555d2e11e4948778ab6b59d6cc9d8460d543e4cfbbddd1c"},
+ {file = "msgpack-1.0.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b55f7db883530b74c857e50e149126b91bb75d35c08b28db12dcb0346f15e46e"},
+ {file = "msgpack-1.0.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ac25f3e0513f6673e8b405c3a80500eb7be1cf8f57584be524c4fa78fe8e0c83"},
+ {file = "msgpack-1.0.2-cp38-cp38-win32.whl", hash = "sha256:0cb94ee48675a45d3b86e61d13c1e6f1696f0183f0715544976356ff86f741d9"},
+ {file = "msgpack-1.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:e36a812ef4705a291cdb4a2fd352f013134f26c6ff63477f20235138d1d21009"},
+ {file = "msgpack-1.0.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2a5866bdc88d77f6e1370f82f2371c9bc6fc92fe898fa2dec0c5d4f5435a2694"},
+ {file = "msgpack-1.0.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:92be4b12de4806d3c36810b0fe2aeedd8d493db39e2eb90742b9c09299eb5759"},
+ {file = "msgpack-1.0.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:de6bd7990a2c2dabe926b7e62a92886ccbf809425c347ae7de277067f97c2887"},
+ {file = "msgpack-1.0.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:5a9ee2540c78659a1dd0b110f73773533ee3108d4e1219b5a15a8d635b7aca0e"},
+ {file = "msgpack-1.0.2-cp39-cp39-win32.whl", hash = "sha256:c747c0cc08bd6d72a586310bda6ea72eeb28e7505990f342552315b229a19b33"},
+ {file = "msgpack-1.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:d8167b84af26654c1124857d71650404336f4eb5cc06900667a493fc619ddd9f"},
+ {file = "msgpack-1.0.2.tar.gz", hash = "sha256:fae04496f5bc150eefad4e9571d1a76c55d021325dcd484ce45065ebbdd00984"},
]
nodeenv = [
{file = "nodeenv-1.5.0-py2.py3-none-any.whl", hash = "sha256:5304d424c529c997bc888453aeaa6362d242b6b4631e90f3d4bf1b290f1c84a9"},
{file = "nodeenv-1.5.0.tar.gz", hash = "sha256:ab45090ae383b716c4ef89e690c41ff8c2b257b85b309f01f3654df3d084bd7c"},
]
packaging = [
- {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"},
- {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"},
+ {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"},
+ {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"},
]
pastel = [
{file = "pastel-0.2.1-py2.py3-none-any.whl", hash = "sha256:4349225fcdf6c2bb34d483e523475de5bb04a5c10ef711263452cb37d7dd4364"},
@@ -1262,28 +1327,28 @@ pexpect = [
{file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"},
]
pkginfo = [
- {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"},
- {file = "pkginfo-1.5.0.1.tar.gz", hash = "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"},
+ {file = "pkginfo-1.7.0-py2.py3-none-any.whl", hash = "sha256:9fdbea6495622e022cc72c2e5e1b735218e4ffb2a2a69cde2694a6c1f16afb75"},
+ {file = "pkginfo-1.7.0.tar.gz", hash = "sha256:029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"},
]
pluggy = [
{file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
{file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
]
poetry-core = [
- {file = "poetry-core-1.0.0.tar.gz", hash = "sha256:6a664ff389b9f45382536f8fa1611a0cb4d2de7c5a5c885db1f0c600cd11fbd5"},
- {file = "poetry_core-1.0.0-py2.py3-none-any.whl", hash = "sha256:769288e0e1b88dfcceb3185728f0b7388b26d5f93d6c22d2dcae372da51d200d"},
+ {file = "poetry-core-1.0.2.tar.gz", hash = "sha256:ff505d656a6cf40ffbf84393d8b5bf37b78523a15def3ac473b6fad74261ee71"},
+ {file = "poetry_core-1.0.2-py2.py3-none-any.whl", hash = "sha256:ee0ed4164440eeab27d1b01bc7b9b3afdc3124f68d4ea28d0821a402a9c7c044"},
]
pre-commit = [
- {file = "pre_commit-2.7.1-py2.py3-none-any.whl", hash = "sha256:810aef2a2ba4f31eed1941fc270e72696a1ad5590b9751839c90807d0fff6b9a"},
- {file = "pre_commit-2.7.1.tar.gz", hash = "sha256:c54fd3e574565fe128ecc5e7d2f91279772ddb03f8729645fa812fe809084a70"},
+ {file = "pre_commit-2.10.1-py2.py3-none-any.whl", hash = "sha256:16212d1fde2bed88159287da88ff03796863854b04dc9f838a55979325a3d20e"},
+ {file = "pre_commit-2.10.1.tar.gz", hash = "sha256:399baf78f13f4de82a29b649afd74bef2c4e28eb4f021661fc7f29246e8c7a3a"},
]
ptyprocess = [
- {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"},
- {file = "ptyprocess-0.6.0.tar.gz", hash = "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"},
+ {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"},
+ {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"},
]
py = [
- {file = "py-1.9.0-py2.py3-none-any.whl", hash = "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2"},
- {file = "py-1.9.0.tar.gz", hash = "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"},
+ {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
+ {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
]
pycparser = [
{file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
@@ -1304,8 +1369,8 @@ pytest = [
{file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"},
]
pytest-cov = [
- {file = "pytest-cov-2.10.1.tar.gz", hash = "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"},
- {file = "pytest_cov-2.10.1-py2.py3-none-any.whl", hash = "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191"},
+ {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"},
+ {file = "pytest_cov-2.11.1-py2.py3-none-any.whl", hash = "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"},
]
pytest-mock = [
{file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"},
@@ -1319,21 +1384,31 @@ pywin32-ctypes = [
{file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"},
]
pyyaml = [
- {file = "PyYAML-5.3.1-cp27-cp27m-win32.whl", hash = "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f"},
- {file = "PyYAML-5.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76"},
- {file = "PyYAML-5.3.1-cp35-cp35m-win32.whl", hash = "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2"},
- {file = "PyYAML-5.3.1-cp35-cp35m-win_amd64.whl", hash = "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c"},
- {file = "PyYAML-5.3.1-cp36-cp36m-win32.whl", hash = "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2"},
- {file = "PyYAML-5.3.1-cp36-cp36m-win_amd64.whl", hash = "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648"},
- {file = "PyYAML-5.3.1-cp37-cp37m-win32.whl", hash = "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"},
- {file = "PyYAML-5.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf"},
- {file = "PyYAML-5.3.1-cp38-cp38-win32.whl", hash = "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97"},
- {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"},
- {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"},
+ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
+ {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
+ {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
+ {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
+ {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
+ {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
+ {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
+ {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
+ {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
+ {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
+ {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
+ {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
+ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
]
requests = [
- {file = "requests-2.24.0-py2.py3-none-any.whl", hash = "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"},
- {file = "requests-2.24.0.tar.gz", hash = "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"},
+ {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},
+ {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
]
requests-toolbelt = [
{file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"},
@@ -1354,16 +1429,16 @@ scandir = [
]
secretstorage = [
{file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"},
- {file = "SecretStorage-3.1.2-py3-none-any.whl", hash = "sha256:b5ec909dde94d4ae2fa26af7c089036997030f0cf0a5cb372b4cccabd81c143b"},
- {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"},
+ {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"},
+ {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"},
]
shellingham = [
- {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"},
- {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"},
+ {file = "shellingham-1.4.0-py2.py3-none-any.whl", hash = "sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9"},
+ {file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"},
]
singledispatch = [
- {file = "singledispatch-3.4.0.3-py2.py3-none-any.whl", hash = "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8"},
- {file = "singledispatch-3.4.0.3.tar.gz", hash = "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"},
+ {file = "singledispatch-3.6.1-py2.py3-none-any.whl", hash = "sha256:85c97f94c8957fa4e6dab113156c182fb346d56d059af78aad710bced15f16fb"},
+ {file = "singledispatch-3.6.1.tar.gz", hash = "sha256:58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"},
]
six = [
{file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
@@ -1371,22 +1446,23 @@ six = [
]
subprocess32 = [
{file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"},
+ {file = "subprocess32-3.5.4-cp27-cp27mu-manylinux2014_x86_64.whl", hash = "sha256:e45d985aef903c5b7444d34350b05da91a9e0ea015415ab45a21212786c649d0"},
{file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"},
]
termcolor = [
{file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
]
toml = [
- {file = "toml-0.10.1-py2.py3-none-any.whl", hash = "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"},
- {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"},
+ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
+ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
]
tomlkit = [
{file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"},
{file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"},
]
tox = [
- {file = "tox-3.20.0-py2.py3-none-any.whl", hash = "sha256:e6318f404aff16522ff5211c88cab82b39af121735a443674e4e2e65f4e4637b"},
- {file = "tox-3.20.0.tar.gz", hash = "sha256:eb629ddc60e8542fd4a1956b2462e3b8771d49f1ff630cecceacaa0fbfb7605a"},
+ {file = "tox-3.23.0-py2.py3-none-any.whl", hash = "sha256:e007673f3595cede9b17a7c4962389e4305d4a3682a6c5a4159a1453b4f326aa"},
+ {file = "tox-3.23.0.tar.gz", hash = "sha256:05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"},
]
typing = [
{file = "typing-3.7.4.3-py2-none-any.whl", hash = "sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5"},
@@ -1398,12 +1474,12 @@ typing-extensions = [
{file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"},
]
urllib3 = [
- {file = "urllib3-1.25.10-py2.py3-none-any.whl", hash = "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461"},
- {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"},
+ {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"},
+ {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"},
]
virtualenv = [
- {file = "virtualenv-20.0.31-py2.py3-none-any.whl", hash = "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"},
- {file = "virtualenv-20.0.31.tar.gz", hash = "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc"},
+ {file = "virtualenv-20.4.2-py2.py3-none-any.whl", hash = "sha256:2be72df684b74df0ea47679a7df93fd0e04e72520022c57b479d8f881485dbe3"},
+ {file = "virtualenv-20.4.2.tar.gz", hash = "sha256:147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d"},
]
wcwidth = [
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
index 0868175ea4..02f6dabc86 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "poetry"
-version = "1.1.4"
+version = "1.1.5"
description = "Python dependency management and packaging made easy."
authors = [
"Sébastien Eustace "
@@ -24,7 +24,7 @@ classifiers = [
[tool.poetry.dependencies]
python = "~2.7 || ^3.5"
-poetry-core = "^1.0.0"
+poetry-core = "~1.0.2"
cleo = "^0.8.1"
clikit = "^0.6.2"
crashtest = { version = "^0.3.0", python = "^3.6" }
@@ -71,6 +71,10 @@ pre-commit = { version = "^2.6", python = "^3.6.1" }
tox = "^3.0"
pytest-sugar = "^0.9.2"
httpretty = "^0.9.6"
+# We need to restrict the version of urllib3 to avoid
+# httpretty breaking. This is fixed in httpretty >= 1.0.3
+# but it's not compatible with Python 2.7 and 3.5.
+urllib3 = "~1.25.10"
[tool.poetry.scripts]
poetry = "poetry.console:main"
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
index 4a1e8890c2..fcdb01e29c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
@@ -1,7 +1,7 @@
{
"owner": "python-poetry",
"repo": "poetry",
- "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3",
- "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs",
+ "rev": "a9704149394151f4d0d28cd5d8ee2283c7d10787",
+ "sha256": "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf",
"fetchSubmodules": true
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
index 33a2823f36..915726c658 100755
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p curl nix-prefetch-github
+#! nix-shell -i bash -p curl nix-prefetch-github jq
rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name')
nix-prefetch-github --rev "$rev" python-poetry poetry > src.json
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
index bf001392e6..0ef1d4c316 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
@@ -3,7 +3,7 @@ let
inherit (builtins) elemAt match;
operators =
let
- matchWildCard = s: match "([^\*])(\.[\*])" s;
+ matchWildCard = s: match "([^*])(\\.[*])" s;
mkComparison = ret: version: v: builtins.compareVersions version v == ret;
mkIdxComparison = idx: version: v:
let
@@ -52,8 +52,8 @@ let
#
};
re = {
- operators = "([=> 2.4.1)
rainbow (3.0.0)
- regexp_parser (2.0.3)
+ regexp_parser (2.1.1)
rexml (3.2.4)
- rubocop (1.10.0)
+ rubocop (1.11.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix b/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix
index 9a6393977d..a388377ae0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/default.nix
@@ -14,6 +14,5 @@ bundlerEnv {
homepage = "https://docs.rubocop.org/";
license = licenses.mit;
maintainers = with maintainers; [ marsam leemachin ];
- platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
index b460200c74..46d920bc65 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
@@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip";
+ sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr";
type = "gem";
};
- version = "2.0.3";
+ version = "2.1.1";
};
rexml = {
groups = ["default"];
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ncd6w4sc112j86j9j12ws7flxfi8dk8nal2kyxg7phdfr703qlz";
+ sha256 = "0zrzsgx35mcr81c51gyx63s7yngcfgk33dbkx5j0npkaks4fcm7r";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.0";
};
rubocop-ast = {
dependencies = ["parser"];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
index 8638bb5844..eeec0487c6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
- sha256 = "sha256-+CqWPgdPuTE9TRwQJYibRCtdyAr25sJ2sXCUEoI0VtM=";
+ sha256 = "sha256-/TROCaguzIdXnkQ4BpVR1W14ppGODGQ0MQAjJExMGVw=";
};
- cargoSha256 = "sha256-cBuAVU/fS2HQohjDyzrhDEsgWD5CxTrTCsQeZll90IQ=";
+ cargoSha256 = "sha256-3uIf6vyeDeww8+dqrzOG4J/T9QbXAnKQKXRbeujeqSo=";
nativeBuildInputs = [ perl pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
new file mode 100644
index 0000000000..931fb8fd98
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-criterion";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "bheisler";
+ repo = pname;
+ rev = version;
+ sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi";
+ };
+
+ cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8=";
+
+ meta = with lib; {
+ description = "Cargo extension for running Criterion.rs benchmarks";
+ homepage = "https://github.com/bheisler/cargo-criterion";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ humancalico ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
new file mode 100644
index 0000000000..f7ce0283f6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, fetchpatch
+, nix-update-script
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-cross";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "rust-embedded";
+ repo = "cross";
+ rev = "v${version}";
+ sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w";
+ };
+
+ cargoSha256 = "sha256-3xSuTBcWRGn5HH7LnvwioeRWjehaPW1HCPjN5SUUVfo=";
+
+ cargoPatches = [
+ (fetchpatch {
+ url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch";
+ sha256 = "sha256:1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k";
+ })
+ ];
+
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
+ meta = with lib; {
+ description = "Zero setup cross compilation and cross testing";
+ homepage = "https://github.com/rust-embedded/cross";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ otavio ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
index ea7f01ada7..b328f32dc2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
- version = "0.8.7";
+ version = "0.8.8";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
- sha256 = "sha256-LXc4PFJ1FbdF3yotqqOkhhe+MKGZ4sqJgxAvDml9GeA=";
+ sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU=";
};
- cargoSha256 = "sha256-4FFyRhmMpzKmKrvU2bmGHWUnLAbTDU1bPv7RfhQfYeY=";
+ cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
index 09650e8a38..7cb366c550 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3";
+ sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio=";
};
- cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9";
+ cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM=";
meta = with lib; {
description =
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
index 37c905879b..3ebe5ef130 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-limit";
- version = "0.0.6";
+ version = "0.0.7";
src = fetchFromGitHub {
owner = "alopatindev";
repo = "cargo-limit";
rev = version;
- sha256 = "sha256-2YngMRPNiUVqg82Ck/ovcMbZV+STGyowT9zlwBkcKok=";
+ sha256 = "sha256-8HsYhWYeRhCPTxVnU8hOJKLXvza8i9KvKTLL6yLo0+c=";
};
- cargoSha256 = "sha256-4HQhBE4kNhOhO48PBiAxtppmaqy7jaV8p/jb/Uv7vJk=";
+ cargoSha256 = "sha256-8uA4oFExrzDMeMV5MacbtE0Awdfx+jUUkrKd7ushOHo=";
passthru = {
updateScript = nix-update-script {
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
new file mode 100644
index 0000000000..5e12c1cae1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
@@ -0,0 +1,25 @@
+{ fetchFromGitHub, lib, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-play";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "fanzeyi";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02";
+ };
+
+ cargoSha256 = "0fvsdyivq5991ka6avh12aqdkjx0myk61kmzlr19p2vlfpg70q07";
+
+ # some tests require internet access
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Run your rust code without setting up cargo";
+ homepage = "https://github.com/fanzeyi/cargo-play";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
index 50cffe7484..1c1a4c32c6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, rustPlatform
, fetchFromGitHub
, nix-update-script
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
index a941d43bb9..9432c4fd85 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "crate2nix";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub
{
owner = "kolloch";
repo = pname;
rev = version;
- sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4=";
+ sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
} + "/crate2nix";
- cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4=";
+ cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
index addcab582f..e9a5150bef 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
- rev = "2021-02-22";
+ rev = "2021-03-01";
version = "unstable-${rev}";
- sha256 = "sha256-QiVSwpTTOqR2WEm0nXyLLavlF2DnY9GY93HtpgHt2uI=";
- cargoSha256 = "sha256-934ApOv/PJzkLc/LChckb/ZXKrh4kU556Bo/Zck+q8g=";
+ sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph";
+ cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz";
};
rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/third_party/nixpkgs/pkgs/development/tools/scaff/default.nix b/third_party/nixpkgs/pkgs/development/tools/scaff/default.nix
deleted file mode 100644
index 2449769e07..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/scaff/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }:
-
-rustPlatform.buildRustPackage rec {
- pname = "scaff";
- version = "0.1.2";
-
- src = fetchFromGitLab {
- owner = "jD91mZM2";
- repo = pname;
- rev = version;
-
- sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r";
- };
-
- cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
-
- meta = with lib; {
- description = "Painless and powerful scaffolding of projects";
- license = licenses.mit;
- maintainers = with maintainers; [ jD91mZM2 ];
- platforms = platforms.unix;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix
index 00fda8bfc3..c27d6e8a65 100644
--- a/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix
@@ -19,7 +19,8 @@ in
stdenv.mkDerivation {
name = "${baseName}-${version}";
- buildInputs = [ jdk makeWrapper deps ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jdk deps ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
index c25190cab7..b029e7711a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
dontUnpack = true;
- buildInputs = [ jdk makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jdk ];
installPhase = ''
mkdir -p $out/share/lib/selendroid
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix
index 10893a9d17..c4f8653794 100644
--- a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix
@@ -18,7 +18,8 @@ in stdenv.mkDerivation rec {
dontUnpack = true;
- buildInputs = [ jre makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre ];
installPhase = ''
mkdir -p $out/share/lib/${pname}-${version}
diff --git a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
index 46f097e5b6..7b06e720ca 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/default.nix
@@ -1,15 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook
-, boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils
-, shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, fetchpatch, cmake
+, wrapQtAppsHook, qt5, boost, llvmPackages, gcc, jdk, maven, pythonPackages
+, coreutils, which, desktop-file-utils, shared-mime-info, imagemagick, libicns
+}:
let
# TODO: remove when version incompatibility issue with python3Packages.jedi is
# resolved
- parso = pythonPackages.callPackage ./parso.nix {};
+ parso = pythonPackages.callPackage ./parso.nix { };
jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; };
- pythonIndexer = pythonPackages.callPackage ./python.nix { inherit jedi parso; };
- javaIndexer = callPackage ./java.nix {};
+ pythonIndexer =
+ pythonPackages.callPackage ./python.nix { inherit jedi parso; };
+ javaIndexer = callPackage ./java.nix { };
+
+ appPrefixDir = if stdenv.isDarwin then
+ "$out/Applications/Sourcetrail.app/Contents"
+ else
+ "$out/opt/sourcetrail";
+ appBinDir =
+ if stdenv.isDarwin then "${appPrefixDir}/MacOS" else "${appPrefixDir}/bin";
+ appResourceDir = if stdenv.isDarwin then
+ "${appPrefixDir}/Resources"
+ else
+ "${appPrefixDir}/share";
# Upstream script:
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh
@@ -17,7 +30,7 @@ let
#!${stdenv.shell}
cd "$(dirname "$0")/.."
- dst="$out/opt/sourcetrail/share/data/java/lib"
+ dst="${appResourceDir}/data/java/lib"
mkdir -p "$dst"
cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar"
@@ -29,12 +42,12 @@ let
installPythonIndexer = writeScript "download_python_indexer.sh" ''
#!${stdenv.shell}
- mkdir -p $out/opt/sourcetrail/share/data
- ln -s "${pythonIndexer}/bin" "$out/opt/sourcetrail/share/data/python"
+ mkdir -p ${appResourceDir}/data
+ ln -s "${pythonIndexer}/bin" "${appResourceDir}/data/python"
'';
-in
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
pname = "sourcetrail";
+ # NOTE: skip 2020.4.35 https://github.com/CoatiSoftware/Sourcetrail/pull/1136
version = "2020.2.43";
src = fetchFromGitHub {
@@ -45,7 +58,8 @@ stdenv.mkDerivation rec {
};
patches = let
- url = commit: "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
+ url = commit:
+ "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
in [
./disable-updates.patch
./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox
@@ -69,21 +83,22 @@ stdenv.mkDerivation rec {
desktop-file-utils
imagemagick
javaIndexer # the resulting jar file is copied by our install script
- ] ++ lib.optionals doCheck testBinPath;
- buildInputs = [
- boost pythonIndexer shared-mime-info
- ] ++ (with qt5; [ qtbase qtsvg ])
- ++ (with llvmPackages; [ libclang llvm ]);
+ ] ++ lib.optional (stdenv.isDarwin) libicns
+ ++ lib.optionals doCheck testBinPath;
+ buildInputs = [ boost pythonIndexer shared-mime-info ]
+ ++ (with qt5; [ qtbase qtsvg ]) ++ (with llvmPackages; [ libclang llvm ]);
binPath = [ gcc jdk.jre maven which ];
testBinPath = binPath ++ [ coreutils ];
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
"-DBUILD_CXX_LANGUAGE_PACKAGE=ON"
- "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
"-DBUILD_JAVA_LANGUAGE_PACKAGE=ON"
"-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON"
- ];
+ ] ++ lib.optional stdenv.isLinux
+ "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
+ ++ lib.optional stdenv.isDarwin
+ "-DClang_DIR=${llvmPackages.clang-unwrapped}";
postPatch = let
major = lib.versions.major version;
@@ -112,6 +127,8 @@ stdenv.mkDerivation rec {
ln -sf ${installPythonIndexer} script/download_python_indexer.sh
'';
+ # Directory layout for Linux:
+ #
# Sourcetrail doesn't use the usual cmake install() commands and instead uses
# its own bash script for packaging. Since we're not able to reuse the script,
# we'll have to roll our own in nixpkgs.
@@ -141,7 +158,7 @@ stdenv.mkDerivation rec {
#
# nixpkgs
# ├── bin/
- # │ └── sourcetrail* (wrapper for opt/sourcetrail/bin/sourcetrail)
+ # │ └── sourcetrail@ (symlink to opt/sourcetrail/bin/sourcetrail)
# └── opt/sourcetrail/
# ├── bin/
# │ └── sourcetrail*
@@ -151,35 +168,76 @@ stdenv.mkDerivation rec {
# Upstream install script:
# https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh
installPhase = ''
- mkdir -p $out/opt/sourcetrail/bin
- cp app/Sourcetrail $out/opt/sourcetrail/bin/sourcetrail
- cp app/sourcetrail_indexer $out/opt/sourcetrail/bin/sourcetrail_indexer
+ runHook preInstall
+
+ mkdir -p ${appResourceDir}
+ cp -R ../bin/app/data ${appResourceDir}
+ cp -R ../bin/app/user/projects ${appResourceDir}/data/fallback
+ rm -r ${appResourceDir}/data/install ${appResourceDir}/data/*_template.xml
+
+ mkdir -p "${appBinDir}"
+ cp app/Sourcetrail ${appBinDir}/sourcetrail
+ cp app/sourcetrail_indexer ${appBinDir}/sourcetrail_indexer
+ wrapQtApp ${appBinDir}/sourcetrail \
+ --prefix PATH : ${lib.makeBinPath binPath}
+
+ mkdir -p $out/bin
+ '' + lib.optionalString (stdenv.isLinux) ''
+ ln -sf ${appBinDir}/sourcetrail $out/bin/sourcetrail
desktop-file-install --dir=$out/share/applications \
- --set-key Exec --set-value $out/bin/sourcetrail \
+ --set-key Exec --set-value ${appBinDir}/sourcetrail \
../setup/Linux/data/sourcetrail.desktop
mkdir -p $out/share/mime/packages
cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/
- mkdir -p $out/opt/sourcetrail/share
- cp -R ../bin/app/data $out/opt/sourcetrail/share
- cp -R ../bin/app/user/projects $out/opt/sourcetrail/share/data/fallback
- rm $out/opt/sourcetrail/share/data/*_template.xml
- rm -r $out/opt/sourcetrail/share/data/install
-
for size in 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
- convert app/data/gui/icon/logo_1024_1024.png -resize ''${size}x''${size} \
+ convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+ -resize ''${size}x''${size} \
$out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png
done
+ '' + lib.optionalString (stdenv.isDarwin) ''
+ # change case (some people *might* choose a case sensitive Nix store)
+ mv ${appBinDir}/sourcetrail{,.tmp}
+ mv ${appBinDir}/{sourcetrail.tmp,Sourcetrail}
+ mv ${appBinDir}/sourcetrail_indexer ${appResourceDir}/Sourcetrail_indexer
- mkdir -p $out/bin
- makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \
- --prefix PATH : ${lib.makeBinPath binPath}
+ ln -sf ${appBinDir}/Sourcetrail $out/bin/sourcetrail
+
+ cp app/bundle_info.plist ${appPrefixDir}/Info.plist
+
+ mkdir -p ${appResourceDir}/icon.iconset
+ for size in 16 32 128 256 512; do
+ convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+ -resize ''${size}x''${size} \
+ ${appResourceDir}/icon.iconset/icon_''${size}x''${size}.png
+ convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+ -resize $(( 2 * size ))x$(( 2 * size )) \
+ ${appResourceDir}/icon.iconset/icon_''${size}x''${size}@2x.png
+ done
+ png2icns ${appResourceDir}/icon.icns \
+ ${appResourceDir}/icon.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
+
+ mkdir -p ${appResourceDir}/project.iconset
+ for size in 16 32 64 128 256 512; do
+ convert ${appResourceDir}/data/gui/icon/project_256_256.png \
+ -resize ''${size}x''${size} \
+ ${appResourceDir}/project.iconset/icon_''${size}x''${size}.png
+ convert ${appResourceDir}/data/gui/icon/project_256_256.png \
+ -resize $(( 2 * size ))x$(( 2 * size )) \
+ ${appResourceDir}/project.iconset/icon_''${size}x''${size}@2x.png
+ done
+ png2icns ${appResourceDir}/project.icns \
+ ${appResourceDir}/project.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
+ '' + ''
+ runHook postInstall
'';
checkPhase = ''
+ runHook preCheck
+
rm -rf ../bin/app/data/{python,java/lib}
ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python
ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib
@@ -194,20 +252,24 @@ stdenv.mkDerivation rec {
popd
rm ../bin/app/data/{python,java/lib}
+
+ runHook postCheck
'';
# This has to be done manually in the installPhase because the actual binary
# lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook
dontWrapQtApps = true;
- # FIXME: some test cases are disabled in the patch phase
- doCheck = true;
+ # FIXME: Some test cases are disabled in the patch phase.
+ # FIXME: Tests are disabled on some platforms because of faulty detection
+ # logic for libjvm.so. Should work with manual configuration.
+ doCheck = !stdenv.isDarwin && stdenv.isx86_64;
meta = with lib; {
homepage = "https://www.sourcetrail.com";
description = "A cross-platform source explorer for C/C++ and Java";
platforms = platforms.all;
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ midchildan ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/python.nix b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/python.nix
index 8ec9c9a229..f9ea964632 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/python.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/python.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
make -j $NIX_BUILD_CORES
popd
popd
+ '' + lib.optionalString stdenv.isDarwin ''
+ pushd SourcetrailDB/build/bindings_python
+ cp _sourcetraildb.dylib _sourcetraildb.so
+ popd
'';
checkPhase = ''
@@ -52,7 +56,7 @@ stdenv.mkDerivation rec {
pushd SourcetrailDB/build/bindings_python
cp sourcetraildb.py $out/libexec
- cp _sourcetraildb* $out/libexec/_sourcetraildb.so
+ cp _sourcetraildb.so $out/libexec/_sourcetraildb.so
popd
wrapPythonProgramsIn "$out/libexec" "$pythonPath"
@@ -64,7 +68,5 @@ stdenv.mkDerivation rec {
description = "Python indexer for Sourcetrail";
homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer";
license = licenses.gpl3;
- broken = stdenv.isDarwin;
- # https://github.com/NixOS/nixpkgs/pull/107533#issuecomment-751063675
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix
index cdf2242bdb..ef04725e56 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
- buildInputs = [ perlPackages.perl makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ perlPackages.perl ];
postInstall = ''
wrapProgram $out/bin/sslmate --prefix PERL5LIB : \
diff --git a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix
index e8f52fa833..6d7fbef2f1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/the-way/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE=";
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
- cargoParallelTestThreads = false;
+ dontUseCargoParallelTests = true;
postInstall = ''
$out/bin/the-way config default tmp.toml
diff --git a/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix b/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
index 44dfa1a4ba..02183282ce 100644
--- a/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/thrust/default.nix
@@ -22,7 +22,8 @@ in stdenv.mkDerivation rec {
sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
};
- buildInputs = [ thrustEnv makeWrapper unzip ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ thrustEnv unzip ];
phases = [ "installPhase" "fixupPhase" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix
index 701b973ad4..34662498f2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive
-, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch
+, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux
}:
let
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
index 94ee6d3a1b..9c6d3ed8cb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix
@@ -18,7 +18,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
};
- cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
+ cargoPatches = [
+ ./update-deps.patch
+ ];
+
+ cargoSha256 = "0br7r8wz3knzgl3gjpq6z8w33my0yiaq711s1wih9jizhia02y5r";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch
new file mode 100644
index 0000000000..d61067438e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch
@@ -0,0 +1,3625 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 9737a15..229ec35 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,2439 +1,2574 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
++[[package]]
++name = "addr2line"
++version = "0.14.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
++dependencies = [
++ "gimli",
++]
++
++[[package]]
++name = "adler"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
++
+ [[package]]
+ name = "adler32"
+-version = "1.0.4"
++version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+ [[package]]
+ name = "aho-corasick"
+-version = "0.7.7"
++version = "0.7.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+ dependencies = [
+- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
+ ]
+
+ [[package]]
+ name = "ansi_term"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+ dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "arrayref"
+ version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+
+ [[package]]
+ name = "arrayvec"
+-version = "0.5.1"
++version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+ [[package]]
+ name = "assert_cmd"
+ version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
+ dependencies = [
+- "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "escargot",
++ "predicates",
++ "predicates-core",
++ "predicates-tree",
+ ]
+
+ [[package]]
+ name = "atty"
+ version = "0.2.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+ dependencies = [
+- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "autocfg"
+ version = "0.1.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+
+ [[package]]
+ name = "autocfg"
+-version = "1.0.0"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+ [[package]]
+ name = "backtrace"
+-version = "0.3.43"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "backtrace-sys"
+-version = "0.1.32"
++version = "0.3.56"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
+ dependencies = [
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "addr2line",
++ "cfg-if 1.0.0",
++ "libc",
++ "miniz_oxide 0.4.3",
++ "object",
++ "rustc-demangle",
+ ]
+
+ [[package]]
+ name = "base64"
+ version = "0.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+ dependencies = [
+- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
+ ]
+
+ [[package]]
+ name = "base64"
+-version = "0.11.0"
++version = "0.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+ [[package]]
+ name = "binary-install"
+ version = "0.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4"
+ dependencies = [
+- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
+- "zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl",
++ "dirs",
++ "failure",
++ "flate2",
++ "hex",
++ "is_executable",
++ "siphasher",
++ "tar",
++ "zip",
+ ]
+
+ [[package]]
+ name = "bitflags"
+ version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+ [[package]]
+ name = "blake2b_simd"
+-version = "0.5.10"
++version = "0.5.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+ dependencies = [
+- "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "arrayref",
++ "arrayvec",
++ "constant_time_eq",
+ ]
+
+ [[package]]
+ name = "byteorder"
+-version = "1.3.2"
++version = "1.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+
+ [[package]]
+ name = "bytes"
+ version = "0.4.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+ dependencies = [
+- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "either",
++ "iovec",
+ ]
+
+ [[package]]
+ name = "bzip2"
+ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
+ dependencies = [
+- "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bzip2-sys",
++ "libc",
+ ]
+
+ [[package]]
+ name = "bzip2-sys"
+-version = "0.1.7"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "c2-chacha"
+-version = "0.2.3"
++version = "0.1.10+1.0.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c"
+ dependencies = [
+- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
++ "pkg-config",
+ ]
+
+ [[package]]
+ name = "cargo_metadata"
+ version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426"
+ dependencies = [
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver",
++ "serde",
++ "serde_derive",
++ "serde_json",
+ ]
+
+ [[package]]
+ name = "cc"
+-version = "1.0.50"
++version = "1.0.67"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+
+ [[package]]
+ name = "cfg-if"
+ version = "0.1.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+ [[package]]
+-name = "chrono"
+-version = "0.4.10"
++name = "cfg-if"
++version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+ [[package]]
+-name = "clap"
+-version = "2.33.0"
++name = "chrono"
++version = "0.4.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+ dependencies = [
+- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "num-integer",
++ "num-traits",
++ "time",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+-name = "clicolors-control"
+-version = "0.2.0"
++name = "clap"
++version = "2.33.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+ dependencies = [
+- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ansi_term",
++ "atty",
++ "bitflags",
++ "strsim",
++ "textwrap",
++ "unicode-width",
++ "vec_map",
+ ]
+
+ [[package]]
+ name = "clicolors-control"
+-version = "1.0.1"
++version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
+ dependencies = [
+- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys",
++ "lazy_static 0.2.11",
++ "libc",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "cloudabi"
+ version = "0.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+ dependencies = [
+- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
+ ]
+
+ [[package]]
+ name = "console"
+ version = "0.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6"
+ dependencies = [
+- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty",
++ "clicolors-control",
++ "lazy_static 1.4.0",
++ "libc",
++ "parking_lot 0.11.1",
++ "regex",
++ "termios",
++ "unicode-width",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "console"
+-version = "0.9.2"
++version = "0.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa"
+ dependencies = [
+- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encode_unicode",
++ "lazy_static 1.4.0",
++ "libc",
++ "regex",
++ "terminal_size",
++ "unicode-width",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "constant_time_eq"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+ [[package]]
+ name = "cookie"
+ version = "0.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
+ dependencies = [
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time",
++ "url 1.7.2",
+ ]
+
+ [[package]]
+ name = "cookie_store"
+ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
+ dependencies = [
+- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+- "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cookie",
++ "failure",
++ "idna 0.1.5",
++ "log",
++ "publicsuffix",
++ "serde",
++ "serde_json",
++ "time",
++ "try_from",
++ "url 1.7.2",
+ ]
+
+ [[package]]
+ name = "core-foundation"
+-version = "0.6.4"
++version = "0.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+ dependencies = [
+- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys",
++ "libc",
+ ]
+
+ [[package]]
+ name = "core-foundation-sys"
+-version = "0.6.2"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+
+ [[package]]
+ name = "crc32fast"
+-version = "1.2.0"
++version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
+ ]
+
+ [[package]]
+ name = "crossbeam-deque"
+-version = "0.7.2"
++version = "0.7.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+ dependencies = [
+- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-epoch",
++ "crossbeam-utils 0.7.2",
++ "maybe-uninit",
+ ]
+
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.8.0"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+ dependencies = [
+- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
++ "cfg-if 0.1.10",
++ "crossbeam-utils 0.7.2",
++ "lazy_static 1.4.0",
++ "maybe-uninit",
++ "memoffset",
++ "scopeguard 1.1.0",
+ ]
+
+ [[package]]
+ name = "crossbeam-queue"
+-version = "0.1.2"
++version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+ dependencies = [
+- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
++ "crossbeam-utils 0.7.2",
++ "maybe-uninit",
+ ]
+
+ [[package]]
+ name = "crossbeam-utils"
+-version = "0.6.6"
++version = "0.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
++ "cfg-if 0.1.10",
++ "lazy_static 1.4.0",
+ ]
+
+ [[package]]
+ name = "crossbeam-utils"
+-version = "0.7.0"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
+ dependencies = [
+- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
++ "cfg-if 1.0.0",
++ "lazy_static 1.4.0",
++ "loom",
+ ]
+
+ [[package]]
+ name = "curl"
+-version = "0.4.25"
++version = "0.4.34"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e"
+ dependencies = [
+- "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl-sys",
++ "libc",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "socket2",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "curl-sys"
+-version = "0.4.25"
++version = "0.4.40+curl-7.75.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2ffafc1c35958318bd7fdd0582995ce4c72f4f461a8e70499ccee83a619fd562"
+ dependencies = [
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
++ "libz-sys",
++ "openssl-sys",
++ "pkg-config",
++ "vcpkg",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "dialoguer"
+ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9"
+ dependencies = [
+- "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "console 0.14.0",
++ "lazy_static 1.4.0",
++ "tempfile 2.2.0",
+ ]
+
+ [[package]]
+ name = "difference"
+ version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+
+ [[package]]
+ name = "dirs"
+ version = "1.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "redox_users",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "dtoa"
+-version = "0.4.5"
++version = "0.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"
+
+ [[package]]
+ name = "either"
+-version = "1.5.3"
++version = "1.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+ [[package]]
+ name = "encode_unicode"
+ version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+ [[package]]
+ name = "encoding_rs"
+-version = "0.8.22"
++version = "0.8.28"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
+ ]
+
+ [[package]]
+ name = "env_logger"
+ version = "0.5.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+ dependencies = [
+- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty",
++ "humantime",
++ "log",
++ "termcolor",
+ ]
+
+ [[package]]
+ name = "error-chain"
+-version = "0.12.1"
++version = "0.12.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
+ dependencies = [
+- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check",
+ ]
+
+ [[package]]
+ name = "escargot"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
+ dependencies = [
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0",
++ "log",
++ "serde",
++ "serde_json",
+ ]
+
+ [[package]]
+ name = "failure"
+-version = "0.1.6"
++version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
+ dependencies = [
+- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
+- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace",
++ "failure_derive",
+ ]
+
+ [[package]]
+ name = "failure_derive"
+-version = "0.1.6"
++version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
+ dependencies = [
+- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.24",
++ "quote 1.0.9",
++ "syn 1.0.60",
++ "synstructure",
+ ]
+
+ [[package]]
+ name = "filetime"
+-version = "0.2.8"
++version = "0.2.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "libc",
++ "redox_syscall 0.2.5",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "flate2"
+-version = "1.0.13"
++version = "1.0.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
++ "crc32fast",
++ "libc",
++ "miniz_oxide 0.3.7",
+ ]
+
+ [[package]]
+ name = "float-cmp"
+-version = "0.5.3"
++version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
+ dependencies = [
+- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits",
+ ]
+
+ [[package]]
+ name = "fnv"
+-version = "1.0.6"
++version = "1.0.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+ [[package]]
+ name = "foreign-types"
+ version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+ dependencies = [
+- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "foreign-types-shared",
+ ]
+
+ [[package]]
+ name = "foreign-types-shared"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
++dependencies = [
++ "matches",
++ "percent-encoding 2.1.0",
++]
+
+ [[package]]
+ name = "fuchsia-cprng"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+ [[package]]
+ name = "fuchsia-zircon"
+ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+ dependencies = [
+- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "fuchsia-zircon-sys",
+ ]
+
+ [[package]]
+ name = "fuchsia-zircon-sys"
+ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
+ [[package]]
+ name = "futures"
+-version = "0.1.29"
++version = "0.1.30"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
+
+ [[package]]
+ name = "futures-cpupool"
+ version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+ dependencies = [
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures",
++ "num_cpus",
++]
++
++[[package]]
++name = "generator"
++version = "0.6.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
++dependencies = [
++ "cc",
++ "libc",
++ "log",
++ "rustversion",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
+ ]
+
+ [[package]]
+ name = "getrandom"
+-version = "0.1.14"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.10.2+wasi-snapshot-preview1",
+ ]
+
++[[package]]
++name = "gimli"
++version = "0.23.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
++
+ [[package]]
+ name = "glob"
+ version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+
+ [[package]]
+ name = "h2"
+ version = "0.1.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
+ dependencies = [
+- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "bytes",
++ "fnv",
++ "futures",
++ "http",
++ "indexmap",
++ "log",
++ "slab",
++ "string",
++ "tokio-io",
+ ]
+
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++
+ [[package]]
+ name = "heck"
+-version = "0.3.1"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
+ dependencies = [
+- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation",
+ ]
+
+ [[package]]
+ name = "hermit-abi"
+-version = "0.1.6"
++version = "0.1.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
+ ]
+
+ [[package]]
+ name = "hex"
+ version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+
+ [[package]]
+ name = "http"
+ version = "0.1.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "fnv",
++ "itoa",
+ ]
+
+ [[package]]
+ name = "http-body"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "futures",
++ "http",
++ "tokio-buf",
+ ]
+
+ [[package]]
+ name = "httparse"
+-version = "1.3.4"
++version = "1.3.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
+
+ [[package]]
+ name = "human-panic"
+-version = "1.0.1"
++version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36"
+ dependencies = [
+- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
+- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "backtrace",
++ "os_type",
++ "serde",
++ "serde_derive",
++ "termcolor",
++ "toml 0.5.8",
++ "uuid 0.8.2",
+ ]
+
+ [[package]]
+ name = "humantime"
+ version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+ dependencies = [
+- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quick-error",
+ ]
+
+ [[package]]
+ name = "hyper"
+-version = "0.12.35"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.12.36"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52"
++dependencies = [
++ "bytes",
++ "futures",
++ "futures-cpupool",
++ "h2",
++ "http",
++ "http-body",
++ "httparse",
++ "iovec",
++ "itoa",
++ "log",
++ "net2",
++ "rustc_version",
++ "time",
++ "tokio",
++ "tokio-buf",
++ "tokio-executor",
++ "tokio-io",
++ "tokio-reactor",
++ "tokio-tcp",
++ "tokio-threadpool",
++ "tokio-timer",
++ "want",
+ ]
+
+ [[package]]
+ name = "hyper-tls"
+ version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "futures",
++ "hyper",
++ "native-tls",
++ "tokio-io",
+ ]
+
+ [[package]]
+ name = "idna"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+ dependencies = [
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
+ ]
+
+ [[package]]
+ name = "idna"
+-version = "0.2.0"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+ dependencies = [
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
+ ]
+
+ [[package]]
+ name = "indexmap"
+-version = "1.3.1"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
++dependencies = [
++ "autocfg 1.0.1",
++ "hashbrown",
++]
++
++[[package]]
++name = "instant"
++version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+ dependencies = [
+- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
+ ]
+
+ [[package]]
+ name = "iovec"
+ version = "0.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
+ ]
+
+ [[package]]
+ name = "is_executable"
+ version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577"
+ dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "itoa"
+-version = "0.4.5"
++version = "0.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+ [[package]]
+ name = "kernel32-sys"
+ version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+ dependencies = [
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8",
++ "winapi-build",
+ ]
+
+ [[package]]
+ name = "lazy_static"
+ version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+
+ [[package]]
+ name = "lazy_static"
+ version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+ [[package]]
+ name = "libc"
+-version = "0.2.66"
++version = "0.2.86"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+
+ [[package]]
+ name = "libz-sys"
+-version = "1.0.25"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
+ dependencies = [
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
+ ]
+
+ [[package]]
+ name = "lock_api"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+ dependencies = [
+- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "owning_ref",
++ "scopeguard 0.3.3",
+ ]
+
+ [[package]]
+ name = "lock_api"
+-version = "0.3.3"
++version = "0.3.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
+ dependencies = [
+- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "scopeguard 1.1.0",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
++dependencies = [
++ "scopeguard 1.1.0",
+ ]
+
+ [[package]]
+ name = "log"
+-version = "0.4.8"
++version = "0.4.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "loom"
++version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "generator",
++ "scoped-tls",
+ ]
+
+ [[package]]
+ name = "matches"
+ version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+
+ [[package]]
+ name = "maybe-uninit"
+ version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+ [[package]]
+ name = "memchr"
+-version = "2.3.0"
++version = "2.3.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+ [[package]]
+ name = "memoffset"
+-version = "0.5.3"
++version = "0.5.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+ dependencies = [
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
+ ]
+
+ [[package]]
+ name = "mime"
+ version = "0.3.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+
+ [[package]]
+ name = "mime_guess"
+-version = "2.0.1"
++version = "2.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
+ dependencies = [
+- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime",
++ "unicase",
+ ]
+
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.3.5"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+ dependencies = [
+- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "adler32",
++]
++
++[[package]]
++name = "miniz_oxide"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
++dependencies = [
++ "adler",
++ "autocfg 1.0.1",
+ ]
+
+ [[package]]
+ name = "mio"
+-version = "0.6.21"
++version = "0.6.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
++ "fuchsia-zircon",
++ "fuchsia-zircon-sys",
++ "iovec",
++ "kernel32-sys",
++ "libc",
++ "log",
++ "miow",
++ "net2",
++ "slab",
++ "winapi 0.2.8",
+ ]
+
+ [[package]]
+ name = "miow"
+-version = "0.2.1"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+ dependencies = [
+- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys",
++ "net2",
++ "winapi 0.2.8",
++ "ws2_32-sys",
+ ]
+
+ [[package]]
+ name = "native-tls"
+-version = "0.2.3"
++version = "0.2.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
+ dependencies = [
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+- "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0",
++ "libc",
++ "log",
++ "openssl",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "security-framework",
++ "security-framework-sys",
++ "tempfile 3.2.0",
+ ]
+
+ [[package]]
+ name = "net2"
+-version = "0.2.33"
++version = "0.2.37"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
++ "libc",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "normalize-line-endings"
+-version = "0.2.2"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
+ [[package]]
+ name = "num-integer"
+-version = "0.1.42"
++version = "0.1.44"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+ dependencies = [
+- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
++ "num-traits",
+ ]
+
+ [[package]]
+ name = "num-traits"
+-version = "0.2.11"
++version = "0.2.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+ dependencies = [
+- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
+ ]
+
+ [[package]]
+ name = "num_cpus"
+-version = "1.12.0"
++version = "1.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+ dependencies = [
+- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
+ ]
+
++[[package]]
++name = "object"
++version = "0.23.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
++
++[[package]]
++name = "once_cell"
++version = "1.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd"
++
+ [[package]]
+ name = "openssl"
+-version = "0.10.27"
++version = "0.10.32"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
+ dependencies = [
+- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "cfg-if 1.0.0",
++ "foreign-types",
++ "lazy_static 1.4.0",
++ "libc",
++ "openssl-sys",
+ ]
+
+ [[package]]
+ name = "openssl-probe"
+ version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+
+ [[package]]
+ name = "openssl-src"
+-version = "111.6.1+1.1.1d"
++version = "111.14.0+1.1.1j"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "055b569b5bd7e5462a1700f595c7c7d487691d73b5ce064176af7f9f0cbb80a9"
+ dependencies = [
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
+ ]
+
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.54"
++version = "0.9.60"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
+ dependencies = [
+- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)",
+- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.1",
++ "cc",
++ "libc",
++ "openssl-src",
++ "pkg-config",
++ "vcpkg",
+ ]
+
+ [[package]]
+ name = "os_type"
+ version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb"
+ dependencies = [
+- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex",
+ ]
+
+ [[package]]
+ name = "owning_ref"
+-version = "0.4.0"
++version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
+ dependencies = [
+- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "stable_deref_trait",
+ ]
+
+ [[package]]
+ name = "parking_lot"
+ version = "0.6.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
+ dependencies = [
+- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lock_api 0.1.5",
++ "parking_lot_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "parking_lot"
+ version = "0.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+ dependencies = [
+- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lock_api 0.3.4",
++ "parking_lot_core 0.6.2",
++ "rustc_version",
+ ]
+
+ [[package]]
+ name = "parking_lot"
+-version = "0.10.0"
++version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+ dependencies = [
+- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "instant",
++ "lock_api 0.4.2",
++ "parking_lot_core 0.8.3",
+ ]
+
+ [[package]]
+ name = "parking_lot_core"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand 0.5.6",
++ "rustc_version",
++ "smallvec 0.6.14",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "parking_lot_core"
+ version = "0.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
++ "cloudabi",
++ "libc",
++ "redox_syscall 0.1.57",
++ "rustc_version",
++ "smallvec 0.6.14",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "parking_lot_core"
+-version = "0.7.0"
++version = "0.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "instant",
++ "libc",
++ "redox_syscall 0.2.5",
++ "smallvec 1.6.1",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "percent-encoding"
+ version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+
+ [[package]]
+ name = "percent-encoding"
+ version = "2.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
+ [[package]]
+ name = "pkg-config"
+-version = "0.3.17"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "podio"
+-version = "0.1.6"
++version = "0.3.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+ [[package]]
+ name = "ppv-lite86"
+-version = "0.2.6"
++version = "0.2.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+ [[package]]
+ name = "predicates"
+-version = "1.0.2"
++version = "1.0.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eeb433456c1a57cc93554dea3ce40b4c19c4057e41c55d4a0f3d84ea71c325aa"
+ dependencies = [
+- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "difference",
++ "float-cmp",
++ "normalize-line-endings",
++ "predicates-core",
++ "regex",
+ ]
+
+ [[package]]
+ name = "predicates-core"
+-version = "1.0.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
+
+ [[package]]
+ name = "predicates-tree"
+-version = "1.0.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2"
+ dependencies = [
+- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "predicates-core",
++ "treeline",
+ ]
+
+ [[package]]
+ name = "proc-macro2"
+ version = "0.4.30"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+ dependencies = [
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0",
+ ]
+
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.8"
++version = "1.0.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+ dependencies = [
+- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.1",
+ ]
+
+ [[package]]
+ name = "publicsuffix"
+ version = "1.5.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
+ dependencies = [
+- "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain",
++ "idna 0.2.2",
++ "lazy_static 1.4.0",
++ "regex",
++ "url 2.2.1",
+ ]
+
+ [[package]]
+ name = "quick-error"
+ version = "1.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+ [[package]]
+ name = "quote"
+ version = "0.6.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+ dependencies = [
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30",
+ ]
+
+ [[package]]
+ name = "quote"
+-version = "1.0.2"
++version = "1.0.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+ dependencies = [
+- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.24",
+ ]
+
+ [[package]]
+ name = "rand"
+ version = "0.3.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand 0.4.6",
+ ]
+
+ [[package]]
+ name = "rand"
+ version = "0.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+ dependencies = [
+- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "rdrand",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "rand"
+ version = "0.5.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+ dependencies = [
+- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "rand"
+ version = "0.6.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+ dependencies = [
+- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "libc",
++ "rand_chacha 0.1.1",
++ "rand_core 0.4.2",
++ "rand_hc 0.1.0",
++ "rand_isaac",
++ "rand_jitter",
++ "rand_os",
++ "rand_pcg",
++ "rand_xorshift",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "rand"
+-version = "0.7.3"
++version = "0.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+ dependencies = [
+- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand_chacha 0.3.0",
++ "rand_core 0.6.2",
++ "rand_hc 0.3.0",
+ ]
+
+ [[package]]
+ name = "rand_chacha"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+ dependencies = [
+- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "rand_chacha"
+-version = "0.2.1"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+ dependencies = [
+- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86",
++ "rand_core 0.6.2",
+ ]
+
+ [[package]]
+ name = "rand_core"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+ dependencies = [
+- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2",
+ ]
+
+ [[package]]
+ name = "rand_core"
+ version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+ [[package]]
+ name = "rand_core"
+-version = "0.5.1"
++version = "0.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+ dependencies = [
+- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.2.2",
+ ]
+
+ [[package]]
+ name = "rand_hc"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+ dependencies = [
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "rand_hc"
+-version = "0.2.0"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+ dependencies = [
+- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.6.2",
+ ]
+
+ [[package]]
+ name = "rand_isaac"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+ dependencies = [
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "rand_jitter"
+ version = "0.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand_core 0.4.2",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "rand_os"
+ version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+ dependencies = [
+- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.4.2",
++ "rdrand",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "rand_pcg"
+ version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+ dependencies = [
+- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.4.2",
+ ]
+
+ [[package]]
+ name = "rand_xorshift"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+ dependencies = [
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "rdrand"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+ dependencies = [
+- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
+ ]
+
+ [[package]]
+ name = "redox_syscall"
+-version = "0.1.56"
++version = "0.1.57"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++dependencies = [
++ "bitflags",
++]
+
+ [[package]]
+ name = "redox_users"
+-version = "0.3.4"
++version = "0.3.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+ dependencies = [
+- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.1.16",
++ "redox_syscall 0.1.57",
++ "rust-argon2",
+ ]
+
+ [[package]]
+ name = "regex"
+-version = "1.3.4"
++version = "1.4.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+ dependencies = [
+- "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
+ ]
+
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.14"
++version = "0.6.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+
+ [[package]]
+ name = "remove_dir_all"
+-version = "0.5.2"
++version = "0.5.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+ dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "reqwest"
+ version = "0.9.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
+- "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
++dependencies = [
++ "base64 0.10.1",
++ "bytes",
++ "cookie",
++ "cookie_store",
++ "encoding_rs",
++ "flate2",
++ "futures",
++ "http",
++ "hyper",
++ "hyper-tls",
++ "log",
++ "mime",
++ "mime_guess",
++ "native-tls",
++ "serde",
++ "serde_json",
++ "serde_urlencoded",
++ "time",
++ "tokio",
++ "tokio-executor",
++ "tokio-io",
++ "tokio-threadpool",
++ "tokio-timer",
++ "url 1.7.2",
++ "uuid 0.7.4",
++ "winreg",
+ ]
+
+ [[package]]
+ name = "rust-argon2"
+-version = "0.7.0"
++version = "0.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+ dependencies = [
+- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.13.0",
++ "blake2b_simd",
++ "constant_time_eq",
++ "crossbeam-utils 0.8.2",
+ ]
+
+ [[package]]
+ name = "rustc-demangle"
+-version = "0.1.16"
++version = "0.1.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+
+ [[package]]
+ name = "rustc_version"
+ version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+ dependencies = [
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver",
+ ]
+
++[[package]]
++name = "rustversion"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
++
+ [[package]]
+ name = "ryu"
+-version = "1.0.2"
++version = "1.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+ [[package]]
+ name = "same-file"
+ version = "1.0.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+ dependencies = [
+- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util",
+ ]
+
+ [[package]]
+ name = "schannel"
+-version = "0.1.16"
++version = "0.1.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+ dependencies = [
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0",
++ "winapi 0.3.9",
+ ]
+
++[[package]]
++name = "scoped-tls"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
++
+ [[package]]
+ name = "scopeguard"
+ version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+
+ [[package]]
+ name = "scopeguard"
+-version = "1.0.0"
++version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+ [[package]]
+ name = "security-framework"
+-version = "0.3.4"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
+ dependencies = [
+- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "core-foundation",
++ "core-foundation-sys",
++ "libc",
++ "security-framework-sys",
+ ]
+
+ [[package]]
+ name = "security-framework-sys"
+-version = "0.3.3"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
+ dependencies = [
+- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys",
++ "libc",
+ ]
+
+ [[package]]
+ name = "semver"
+ version = "0.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+ dependencies = [
+- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver-parser",
++ "serde",
+ ]
+
+ [[package]]
+ name = "semver-parser"
+ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+ [[package]]
+ name = "serde"
+-version = "1.0.104"
++version = "1.0.123"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+ dependencies = [
+- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive",
+ ]
+
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.104"
++version = "1.0.123"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+ dependencies = [
+- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.24",
++ "quote 1.0.9",
++ "syn 1.0.60",
+ ]
+
+ [[package]]
+ name = "serde_ignored"
+ version = "0.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
+ dependencies = [
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde",
+ ]
+
+ [[package]]
+ name = "serde_json"
+-version = "1.0.45"
++version = "1.0.62"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
+ dependencies = [
+- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itoa",
++ "ryu",
++ "serde",
+ ]
+
+ [[package]]
+ name = "serde_urlencoded"
+ version = "0.5.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
+ dependencies = [
+- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dtoa",
++ "itoa",
++ "serde",
++ "url 1.7.2",
+ ]
+
+ [[package]]
+ name = "serial_test"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
+ dependencies = [
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0",
+ ]
+
+ [[package]]
+ name = "serial_test_derive"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
+ dependencies = [
+- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13",
++ "syn 0.15.44",
+ ]
+
+ [[package]]
+ name = "siphasher"
+ version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+
+ [[package]]
+ name = "slab"
+ version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+
+ [[package]]
+ name = "smallvec"
+-version = "0.6.13"
++version = "0.6.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
+ dependencies = [
+- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "maybe-uninit",
+ ]
+
+ [[package]]
+ name = "smallvec"
+-version = "1.2.0"
++version = "1.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
+ [[package]]
+ name = "socket2"
+-version = "0.3.11"
++version = "0.3.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "libc",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "stable_deref_trait"
+-version = "1.1.1"
++version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+ [[package]]
+ name = "string"
+ version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
+ ]
+
+ [[package]]
+ name = "strsim"
+ version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+ [[package]]
+ name = "structopt"
+ version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
+ dependencies = [
+- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap",
++ "structopt-derive",
+ ]
+
+ [[package]]
+ name = "structopt-derive"
+ version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
+ dependencies = [
+- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++ "heck",
++ "proc-macro2 0.4.30",
++ "quote 0.6.13",
++ "syn 0.15.44",
+ ]
+
+ [[package]]
+ name = "syn"
+ version = "0.15.44"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+ dependencies = [
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30",
++ "quote 0.6.13",
++ "unicode-xid 0.1.0",
+ ]
+
+ [[package]]
+ name = "syn"
+-version = "1.0.14"
++version = "1.0.60"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+ dependencies = [
+- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.24",
++ "quote 1.0.9",
++ "unicode-xid 0.2.1",
+ ]
+
+ [[package]]
+ name = "synstructure"
+-version = "0.12.3"
++version = "0.12.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+ dependencies = [
+- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.24",
++ "quote 1.0.9",
++ "syn 1.0.60",
++ "unicode-xid 0.2.1",
+ ]
+
+ [[package]]
+ name = "tar"
+-version = "0.4.26"
++version = "0.4.33"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
+ dependencies = [
+- "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+-name = "tempdir"
+-version = "0.3.7"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "filetime",
++ "libc",
++ "xattr",
+ ]
+
+ [[package]]
+ name = "tempfile"
+ version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
+ dependencies = [
+- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys",
++ "libc",
++ "rand 0.3.23",
++ "redox_syscall 0.1.57",
++ "winapi 0.2.8",
+ ]
+
+ [[package]]
+ name = "tempfile"
+-version = "3.1.0"
++version = "3.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "libc",
++ "rand 0.8.3",
++ "redox_syscall 0.2.5",
++ "remove_dir_all",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "termcolor"
+-version = "0.3.6"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+ dependencies = [
+- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util",
+ ]
+
+ [[package]]
+-name = "termcolor"
+-version = "1.1.0"
++name = "terminal_size"
++version = "0.1.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
+ dependencies = [
+- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "termios"
+-version = "0.3.1"
++version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
+ ]
+
+ [[package]]
+ name = "textwrap"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+ dependencies = [
+- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
++dependencies = [
++ "proc-macro2 1.0.24",
++ "quote 1.0.9",
++ "syn 1.0.60",
+ ]
+
+ [[package]]
+ name = "thread_local"
+-version = "1.0.1"
++version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+ dependencies = [
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "once_cell",
+ ]
+
+ [[package]]
+ name = "time"
+-version = "0.1.42"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
++dependencies = [
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "tinyvec"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tinyvec_macros",
+ ]
+
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
++
+ [[package]]
+ name = "tokio"
+ version = "0.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "futures",
++ "mio",
++ "num_cpus",
++ "tokio-current-thread",
++ "tokio-executor",
++ "tokio-io",
++ "tokio-reactor",
++ "tokio-tcp",
++ "tokio-threadpool",
++ "tokio-timer",
+ ]
+
+ [[package]]
+ name = "tokio-buf"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "either",
++ "futures",
+ ]
+
+ [[package]]
+ name = "tokio-current-thread"
+-version = "0.1.6"
++version = "0.1.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
+ dependencies = [
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures",
++ "tokio-executor",
+ ]
+
+ [[package]]
+ name = "tokio-executor"
+-version = "0.1.9"
++version = "0.1.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
+ dependencies = [
+- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.2",
++ "futures",
+ ]
+
+ [[package]]
+ name = "tokio-io"
+-version = "0.1.12"
++version = "0.1.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "futures",
++ "log",
+ ]
+
+ [[package]]
+ name = "tokio-reactor"
+-version = "0.1.11"
++version = "0.1.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
+ dependencies = [
+- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.2",
++ "futures",
++ "lazy_static 1.4.0",
++ "log",
++ "mio",
++ "num_cpus",
++ "parking_lot 0.9.0",
++ "slab",
++ "tokio-executor",
++ "tokio-io",
++ "tokio-sync",
+ ]
+
+ [[package]]
+ name = "tokio-sync"
+-version = "0.1.7"
++version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
+ dependencies = [
+- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fnv",
++ "futures",
+ ]
+
+ [[package]]
+ name = "tokio-tcp"
+-version = "0.1.3"
++version = "0.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
+ dependencies = [
+- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bytes",
++ "futures",
++ "iovec",
++ "mio",
++ "tokio-io",
++ "tokio-reactor",
+ ]
+
+ [[package]]
+ name = "tokio-threadpool"
+-version = "0.1.17"
++version = "0.1.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
+ dependencies = [
+- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque",
++ "crossbeam-queue",
++ "crossbeam-utils 0.7.2",
++ "futures",
++ "lazy_static 1.4.0",
++ "log",
++ "num_cpus",
++ "slab",
++ "tokio-executor",
+ ]
+
+ [[package]]
+ name = "tokio-timer"
+-version = "0.2.12"
++version = "0.2.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
+ dependencies = [
+- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.2",
++ "futures",
++ "slab",
++ "tokio-executor",
+ ]
+
+ [[package]]
+ name = "toml"
+ version = "0.4.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
+ dependencies = [
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
++dependencies = [
++ "serde",
+ ]
+
+ [[package]]
+ name = "treeline"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
+
+ [[package]]
+ name = "try-lock"
+-version = "0.2.2"
++version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+
+ [[package]]
+ name = "try_from"
+ version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10",
+ ]
+
+ [[package]]
+ name = "unicase"
+ version = "2.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+ dependencies = [
+- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check",
+ ]
+
+ [[package]]
+ name = "unicode-bidi"
+ version = "0.3.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+ dependencies = [
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
+ ]
+
+ [[package]]
+ name = "unicode-normalization"
+-version = "0.1.12"
++version = "0.1.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+ dependencies = [
+- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tinyvec",
+ ]
+
+ [[package]]
+ name = "unicode-segmentation"
+-version = "1.6.0"
++version = "1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+
+ [[package]]
+ name = "unicode-width"
+-version = "0.1.7"
++version = "0.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+ [[package]]
+ name = "unicode-xid"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+
+ [[package]]
+ name = "unicode-xid"
+-version = "0.2.0"
++version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+ [[package]]
+ name = "url"
+ version = "1.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+ dependencies = [
+- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "idna 0.1.5",
++ "matches",
++ "percent-encoding 1.0.1",
+ ]
+
+ [[package]]
+ name = "url"
+-version = "2.1.1"
++version = "2.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+ dependencies = [
+- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "form_urlencoded",
++ "idna 0.2.2",
++ "matches",
++ "percent-encoding 2.1.0",
+ ]
+
+ [[package]]
+ name = "uuid"
+-version = "0.6.5"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+ dependencies = [
+- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.6.5",
+ ]
+
+ [[package]]
+ name = "uuid"
+-version = "0.7.4"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+ dependencies = [
+- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom 0.2.2",
+ ]
+
+ [[package]]
+ name = "vcpkg"
+-version = "0.2.8"
++version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+
+ [[package]]
+ name = "vec_map"
+-version = "0.8.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "version_check"
+-version = "0.1.5"
++version = "0.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+ [[package]]
+ name = "version_check"
+-version = "0.9.1"
++version = "0.9.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+
+ [[package]]
+ name = "walkdir"
+ version = "2.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+ dependencies = [
+- "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "same-file",
++ "winapi 0.3.9",
++ "winapi-util",
+ ]
+
+ [[package]]
+ name = "want"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
+ dependencies = [
+- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures",
++ "log",
++ "try-lock",
+ ]
+
+ [[package]]
+ name = "wasi"
+ version = "0.9.0+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.2+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+ [[package]]
+ name = "wasm-pack"
+ version = "0.9.1"
+ dependencies = [
+- "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+- "dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)",
+- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
+- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "assert_cmd",
++ "atty",
++ "binary-install",
++ "cargo_metadata",
++ "chrono",
++ "console 0.6.2",
++ "curl",
++ "dialoguer",
++ "dirs",
++ "env_logger",
++ "failure",
++ "glob",
++ "human-panic",
++ "lazy_static 1.4.0",
++ "log",
++ "openssl",
++ "parking_lot 0.6.4",
++ "predicates",
++ "reqwest",
++ "semver",
++ "serde",
++ "serde_derive",
++ "serde_ignored",
++ "serde_json",
++ "serial_test",
++ "serial_test_derive",
++ "siphasher",
++ "strsim",
++ "structopt",
++ "tempfile 3.2.0",
++ "toml 0.4.10",
++ "walkdir",
++ "which",
+ ]
+
+ [[package]]
+ name = "which"
+ version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
+ dependencies = [
+- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure",
++ "libc",
+ ]
+
+ [[package]]
+ name = "winapi"
+ version = "0.2.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
+ [[package]]
+ name = "winapi"
+-version = "0.3.8"
++version = "0.3.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+ dependencies = [
+- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
+ ]
+
+ [[package]]
+ name = "winapi-build"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
+ [[package]]
+ name = "winapi-i686-pc-windows-gnu"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+ [[package]]
+ name = "winapi-util"
+-version = "0.1.3"
++version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+ dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "winapi-x86_64-pc-windows-gnu"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+-[[package]]
+-name = "wincolor"
+-version = "0.1.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+ [[package]]
+ name = "winreg"
+ version = "0.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+ dependencies = [
+- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.9",
+ ]
+
+ [[package]]
+ name = "ws2_32-sys"
+ version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+ dependencies = [
+- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8",
++ "winapi-build",
+ ]
+
+ [[package]]
+ name = "xattr"
+ version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
+ dependencies = [
+- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
+ ]
+
+ [[package]]
+ name = "zip"
+-version = "0.5.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-dependencies = [
+- "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[metadata]
+-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
+-"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744"
+-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+-"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+-"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+-"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
+-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+-"checksum backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f"
+-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+-"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+-"checksum binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4"
+-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+-"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+-"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+-"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
+-"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f"
+-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
+-"checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426"
+-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+-"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
+-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+-"checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
+-"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
+-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+-"checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6"
+-"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0"
+-"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+-"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
+-"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
+-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+-"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
+-"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
+-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+-"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+-"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283"
+-"checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b"
+-"checksum dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9"
+-"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+-"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+-"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
+-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+-"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+-"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+-"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
+-"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
+-"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
+-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+-"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
+-"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
+-"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e"
+-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+-"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+-"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+-"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
+-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+-"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
+-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+-"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+-"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
+-"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+-"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd"
+-"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+-"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
+-"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f"
+-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+-"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
+-"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+-"checksum is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577"
+-"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+-"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+-"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+-"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
+-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+-"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
+-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
+-"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+-"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599"
+-"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
+-"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
+-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+-"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
+-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
+-"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8"
+-"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+-"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
+-"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f"
+-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+-"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
+-"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
+-"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb"
+-"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
+-"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
+-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+-"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
+-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
+-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
+-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+-"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd"
+-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
+-"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4"
+-"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
+-"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
+-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+-"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+-"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
+-"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+-"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
+-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+-"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+-"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
+-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+-"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+-"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
+-"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
+-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
+-"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab"
+-"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
+-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+-"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+-"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+-"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
+-"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
+-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+-"checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142"
+-"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b"
+-"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
+-"checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
+-"checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
+-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+-"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
+-"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
+-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+-"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
+-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+-"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
+-"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
+-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+-"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+-"checksum tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
+-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+-"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
+-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
+-"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+-"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
+-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+-"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+-"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
+-"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
+-"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
+-"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
+-"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
+-"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
+-"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
+-"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+-"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c"
+-"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
+-"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
+-"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
+-"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+-"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
+-"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+-"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
+-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
+-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+-"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+-"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
+-"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+-"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
+-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+-"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+-"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+-"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
+-"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+-"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
+-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+-"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
+-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
+-"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
+-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+-"checksum xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
+-"checksum zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e41ff37ba788e2169b19fa70253b70cb53d9f2db9fb9aea9bcfc5047e02c3bae"
++version = "0.5.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a8977234acab718eb2820494b2f96cbb16004c19dddf88b7445b27381450997"
++dependencies = [
++ "byteorder",
++ "bzip2",
++ "crc32fast",
++ "flate2",
++ "thiserror",
++ "time",
++]
+diff --git a/Cargo.toml b/Cargo.toml
+index 6e8c66f..3dba85e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ failure = "0.1.2"
+ human-panic = "1.0.1"
+ glob = "0.2"
+ log = "0.4.6"
+-openssl = { version = '0.10.11', optional = true }
++openssl = { version = '0.10.32', optional = true }
+ parking_lot = "0.6"
+ reqwest = "0.9.14"
+ semver = "0.9.0"
diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
index c7b1c0329f..f867fd836a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
@@ -13,15 +13,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
- nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
+ nativeBuildInputs = [ perl ]
+ ++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
- ++ lib.optionals stdenv.isDarwin [
- curl
- darwin.apple_sdk.frameworks.Security
- darwin.apple_sdk.frameworks.CoreServices
- darwin.apple_sdk.frameworks.CoreFoundation
- ];
+ ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
# tries to use "/homeless-shelter" and fails
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
index 955bc35c5a..b2d0581c05 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "mikefarah";
rev = "v${version}";
repo = "yq";
- sha256 = "sha256-9D00I34pfoiI5cqXjsVLTT6XbFUYxgGit0ZuYeWSEyE=";
+ sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM=";
};
vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4=";
diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix
index 9274149932..dae3243e1e 100644
--- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "6.0.0";
+ version = "6.5.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by";
+ sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o=";
};
# don't remove runtime deps
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
index 83e456e728..09d15901ad 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
@@ -60,7 +60,7 @@ in
configureFlags = let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
- inherit (stdenv.hostPlatform) gcc isArch32;
+ inherit (stdenv.hostPlatform) gcc isAarch32;
in sharedConfigureFlags ++ [
"--without-dtrace"
] ++ (optionals isCross [
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
index 050e752ed0..f564d5bccc 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.10.0";
- sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p";
+ version = "15.11.0";
+ sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
}
diff --git a/third_party/nixpkgs/pkgs/games/airstrike/default.nix b/third_party/nixpkgs/pkgs/games/airstrike/default.nix
index f45ac2f015..12b485764a 100644
--- a/third_party/nixpkgs/pkgs/games/airstrike/default.nix
+++ b/third_party/nixpkgs/pkgs/games/airstrike/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi";
};
- buildInputs = [ makeWrapper SDL SDL_image ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ SDL SDL_image ];
NIX_LDFLAGS = "-lm";
diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix
index 5509d8a90c..f5677b142e 100644
--- a/third_party/nixpkgs/pkgs/games/anki/bin.nix
+++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix
@@ -3,14 +3,14 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
- version = "2.1.38";
+ version = "2.1.40";
unpacked = stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
- sha256 = "14zbz8k142djka3b5sld3368m98lj80c39m6xg87bz140h25ylz4";
+ sha256 = "0zcvjm0dv3mjln2npv415yfaa1fykif738qkis52x3pq1by2aiam";
};
installPhase = ''
@@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
src = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
- sha256 = "1krl014jhhby0zv4if9cgbcarmhcg6zccyhxw1yb6djiqap0zii7";
+ sha256 = "14f0sp9h963qix4wa0kg7z8a2nhch9aybv736rm55aqk6mady6vi";
};
nativeBuildInputs = [ undmg ];
diff --git a/third_party/nixpkgs/pkgs/games/black-hole-solver/default.nix b/third_party/nixpkgs/pkgs/games/black-hole-solver/default.nix
new file mode 100644
index 0000000000..e859e72d96
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/black-hole-solver/default.nix
@@ -0,0 +1,30 @@
+{
+ stdenv, lib, fetchurl,
+ cmake, perl, pkg-config, python3,
+ rinutils, PathTiny,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "black-hole-solver";
+ version = "1.10.1";
+
+ meta = with lib; {
+ homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
+ description = "A solver for Solitaire variants Golf, Black Hole, and All in a Row.";
+ license = licenses.mit;
+ };
+
+ src = fetchurl {
+ url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
+ sha256 = "1qhihmk4fwz6n16c7bnxnh3v7jhbb7xhkc9wk9484bp0k4x9bq9n";
+ };
+
+ nativeBuildInputs = [ cmake perl pkg-config python3 ];
+
+ buildInputs = [ rinutils PathTiny ];
+
+ prePatch = ''
+ patchShebangs ./scripts
+ '';
+
+}
diff --git a/third_party/nixpkgs/pkgs/games/cbonsai/default.nix b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix
new file mode 100644
index 0000000000..4702991c29
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/cbonsai/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.0";
+ pname = "cbonsai";
+
+ src = fetchFromGitLab {
+ owner = "jallbrit";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1jc34j627pnyjgs8hjxqaa89j24gyf0rq9w61mkhgg0kria62as7";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ ncurses ];
+ installFlags = [ "PREFIX=$(out)" ];
+
+ passthru.updateScript = nix-update-script { attrPath = pname; };
+
+ meta = with lib; {
+ description = "Grow bonsai trees in your terminal";
+ homepage = "https://gitlab.com/jallbrit/cbonsai";
+ license = with licenses; [ gpl3Only ];
+ maintainers = with maintainers; [ manveru ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/chessdb/default.nix b/third_party/nixpkgs/pkgs/games/chessdb/default.nix
index 656e4ab6ad..40f90e75ff 100644
--- a/third_party/nixpkgs/pkgs/games/chessdb/default.nix
+++ b/third_party/nixpkgs/pkgs/games/chessdb/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62";
};
- buildInputs = [ tcl tk libX11 makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ tcl tk libX11 ];
makeFlags = [
"BINDIR=$(out)/bin"
diff --git a/third_party/nixpkgs/pkgs/games/ckan/default.nix b/third_party/nixpkgs/pkgs/games/ckan/default.nix
index 052982bf15..26a0ba748b 100644
--- a/third_party/nixpkgs/pkgs/games/ckan/default.nix
+++ b/third_party/nixpkgs/pkgs/games/ckan/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
dontUnpack = true;
- buildInputs = [ makeWrapper mono ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ mono ];
libraries = lib.makeLibraryPath [ gtk2 curl ];
diff --git a/third_party/nixpkgs/pkgs/games/cockatrice/default.nix b/third_party/nixpkgs/pkgs/games/cockatrice/default.nix
index a657913aad..cb51489de9 100644
--- a/third_party/nixpkgs/pkgs/games/cockatrice/default.nix
+++ b/third_party/nixpkgs/pkgs/games/cockatrice/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "cockatrice";
- version = "2020-08-23-Release-2.7.5";
+ version = "2021-01-26-Release-2.8.0";
src = fetchFromGitHub {
owner = "Cockatrice";
repo = "Cockatrice";
rev = version;
- sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34";
+ sha256 = "0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index bd75a66b48..7db79012ec 100644
--- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
paths = [ dwarf-therapist ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
passthru = { inherit dwarf-fortress dwarf-therapist; };
diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix
index 1efae4d280..2a3da233b4 100644
--- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix
+++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/legends-browser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, buildEnv, writeShellScriptBin, fetchurl, jre }:
+{ lib, buildEnv, writeShellScriptBin, fetchurl, jre }:
let
name = "legends-browser-${version}";
diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix
index 356cedd350..879bbfa231 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/default.nix
+++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix
@@ -178,7 +178,8 @@ let
headless = base;
demo = base // {
- buildInputs = [ makeWrapper libpulseaudio ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ libpulseaudio ];
libPath = lib.makeLibraryPath [
alsaLib
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index 810332a975..21aa2f6d20 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.25.tar.xz",
+ "name": "factorio_alpha_x64-1.1.26.tar.xz",
"needsAuth": true,
- "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
+ "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
- "version": "1.1.25"
+ "url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
+ "version": "1.1.26"
},
"stable": {
"name": "factorio_alpha_x64-1.1.25.tar.xz",
@@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
- "name": "factorio_demo_x64-1.1.25.tar.xz",
+ "name": "factorio_demo_x64-1.1.26.tar.xz",
"needsAuth": false,
- "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
+ "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/demo/linux64",
- "version": "1.1.25"
+ "url": "https://factorio.com/get-download/1.1.26/demo/linux64",
+ "version": "1.1.26"
},
"stable": {
"name": "factorio_demo_x64-1.1.25.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.25.tar.xz",
+ "name": "factorio_headless_x64-1.1.26.tar.xz",
"needsAuth": false,
- "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
+ "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.25/headless/linux64",
- "version": "1.1.25"
+ "url": "https://factorio.com/get-download/1.1.26/headless/linux64",
+ "version": "1.1.26"
},
"stable": {
"name": "factorio_headless_x64-1.1.25.tar.xz",
diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix
index 3e65915ec1..62db756a48 100644
--- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix
+++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# Of all the files in the source and data archives, there doesn't seem to be
# a decent icon :-)
iconsrc = fetchurl {
- url = "http://wiki.flightgear.org/images/6/62/FlightGear_logo.png";
+ url = "https://wiki.flightgear.org/w/images/6/62/FlightGear_logo.png";
sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p";
};
diff --git a/third_party/nixpkgs/pkgs/games/frotz/default.nix b/third_party/nixpkgs/pkgs/games/frotz/default.nix
index 58339e5d26..2e90176be7 100644
--- a/third_party/nixpkgs/pkgs/games/frotz/default.nix
+++ b/third_party/nixpkgs/pkgs/games/frotz/default.nix
@@ -8,7 +8,7 @@
, lib, stdenv }:
stdenv.mkDerivation rec {
- version = "2.52";
+ version = "2.53";
pname = "frotz";
src = fetchFromGitLab {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "DavidGriffith";
repo = "frotz";
rev = version;
- sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y";
+ sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo=";
};
buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ];
diff --git a/third_party/nixpkgs/pkgs/games/gcs/default.nix b/third_party/nixpkgs/pkgs/games/gcs/default.nix
index a471b425f0..9d8d74921e 100644
--- a/third_party/nixpkgs/pkgs/games/gcs/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gcs/default.nix
@@ -42,7 +42,8 @@ in stdenv.mkDerivation rec {
cp -r ${library} gcs_library
'';
- buildInputs = [ jdk8 jre8 ant makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jdk8 jre8 ant ];
buildPhase = ''
cd apple_stubs
ant
diff --git a/third_party/nixpkgs/pkgs/games/gogui/default.nix b/third_party/nixpkgs/pkgs/games/gogui/default.nix
index 8eb989a8f4..fa901c14f8 100644
--- a/third_party/nixpkgs/pkgs/games/gogui/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gogui/default.nix
@@ -5,7 +5,8 @@ let
in stdenv.mkDerivation {
pname = "gogui";
inherit version;
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unzip ];
src = fetchurl {
url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";
diff --git a/third_party/nixpkgs/pkgs/games/gtypist/default.nix b/third_party/nixpkgs/pkgs/games/gtypist/default.nix
index d0ddf43fe2..43b95bacef 100644
--- a/third_party/nixpkgs/pkgs/games/gtypist/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gtypist/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1";
};
- buildInputs = [ makeWrapper ncurses perl fortune ]
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ncurses perl fortune ]
++ lib.optional stdenv.isDarwin libiconv;
preFixup = ''
diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix
index df645171a7..af8ff5f24f 100644
--- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix
+++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix
@@ -29,20 +29,20 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
- version = "125.1";
+ version = "126.1";
buildVersion = makeBuildVersion version;
Mindustry = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
- sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw";
+ sha256 = "cyg4TofSSFLv8pM3zzvc0FxXMiTm+OIchBJF9PDQrkg=";
};
Arc = fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
rev = "v${version}";
- sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk";
+ sha256 = "uBIm82mt1etBB/HrNY6XGa7mmBfwd1E3RtqN8Rk5qeY=";
};
soloud = fetchFromGitHub {
owner = "Anuken";
@@ -114,7 +114,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k";
+ outputHash = "Mw8LZ1iW6vn4RkBBs8SWHp6mo2Bhj7tMZjLbyuJUqSI=";
};
in
diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
index c2b9718cd2..3d0b53035e 100644
--- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix
+++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix
@@ -88,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "minecraft-launcher";
- version = "2.2.1867";
+ version = "2.2.1441";
src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
- sha256 = "1gpagrinam595153jbxwagcq20ij2dk8nn6zajy2iyqmj12y66ay";
+ sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm";
};
icon = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix b/third_party/nixpkgs/pkgs/games/mrrescue/default.nix
index c5b2b7d20e..ae7519c948 100644
--- a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix
+++ b/third_party/nixpkgs/pkgs/games/mrrescue/default.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation {
sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi";
};
- nativeBuildInputs = [ lua love ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ lua love makeWrapper ];
phases = "installPhase";
diff --git a/third_party/nixpkgs/pkgs/games/newtonwars/default.nix b/third_party/nixpkgs/pkgs/games/newtonwars/default.nix
index 0da6d9352e..0be3d9bf7a 100644
--- a/third_party/nixpkgs/pkgs/games/newtonwars/default.nix
+++ b/third_party/nixpkgs/pkgs/games/newtonwars/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs";
};
- buildInputs = [ makeWrapper freeglut libGL libGLU ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ freeglut libGL libGLU ];
patchPhase = ''
sed -i "s;font24.raw;$out/share/font24.raw;g" display.c
diff --git a/third_party/nixpkgs/pkgs/games/nottetris2/default.nix b/third_party/nixpkgs/pkgs/games/nottetris2/default.nix
index 53e7dec080..42e5a33cad 100644
--- a/third_party/nixpkgs/pkgs/games/nottetris2/default.nix
+++ b/third_party/nixpkgs/pkgs/games/nottetris2/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation {
sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs";
};
- nativeBuildInputs = [ zip ];
- buildInputs = [ love_0_7 makeWrapper ];
+ nativeBuildInputs = [ zip makeWrapper ];
+ buildInputs = [ love_0_7 ];
phases = [ "unpackPhase" "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
index 7bea330e1c..5bffe2a490 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2021.220.0";
+ version = "2021.226.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU=";
+ sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU=";
};
patches = [ ./bypass-tamper-detection.patch ];
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
index 519d7b4179..a1bbc6d051 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
@@ -395,14 +395,9 @@
sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb";
})
(fetchNuGet {
- name = "Microsoft.CodeAnalysis.FxCopAnalyzers";
- version = "3.3.2";
- sha256 = "02apz67f1gbp4p0wy7r593m10mhjm0rwp9q1n96p9avhdc3dwmv5";
- })
- (fetchNuGet {
- name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer";
- version = "3.3.2";
- sha256 = "1wxfkn16bqay7z64yxx50y9qkyznbfrv269h19fd60dy0vflwlfv";
+ name = "Microsoft.CodeAnalysis.NetAnalyzers";
+ version = "5.0.3";
+ sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Workspaces.Common";
@@ -414,11 +409,6 @@
version = "3.8.0";
sha256 = "1ag78ls51s88znv4v004sbklrx3qnbphpdngjq196188a3vljww7";
})
- (fetchNuGet {
- name = "Microsoft.CodeQuality.Analyzers";
- version = "3.3.2";
- sha256 = "0hfsjqg4kz5ylx461ssvbx64wgaiy8gcalb760jc53lvbd8qrq5r";
- })
(fetchNuGet {
name = "Microsoft.CSharp";
version = "4.0.1";
@@ -579,11 +569,6 @@
version = "5.0.0";
sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6";
})
- (fetchNuGet {
- name = "Microsoft.NetCore.Analyzers";
- version = "3.3.2";
- sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq";
- })
(fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.linux-x64";
version = "5.0.0";
@@ -619,11 +604,6 @@
version = "5.0.0";
sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6";
})
- (fetchNuGet {
- name = "Microsoft.NetFramework.Analyzers";
- version = "3.3.2";
- sha256 = "0samfc6c3mm7c4g6b0m01c8c37ip5ywy1i2my02xsbf9vygkal89";
- })
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
version = "4.0.1";
@@ -726,8 +706,8 @@
})
(fetchNuGet {
name = "ppy.osu.Framework";
- version = "2021.220.0";
- sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp";
+ version = "2021.226.0";
+ sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/games/portmod/default.nix
index ef535991c2..108d81815f 100644
--- a/third_party/nixpkgs/pkgs/games/portmod/default.nix
+++ b/third_party/nixpkgs/pkgs/games/portmod/default.nix
@@ -1,5 +1,5 @@
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
- rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip,
+ rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
jre, makeWrapper, tr-patcher, tes3cmd }:
let
@@ -29,7 +29,7 @@ let
python3Packages.virtualenv
tr-patcher
tes3cmd
- imagemagick7
+ imagemagick
];
in
diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix
index fbca6e0eb5..3565ce10ba 100644
--- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix
+++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vkquake";
- version = "1.05.1";
+ version = "1.05.2";
src = fetchFromGitHub {
owner = "Novum";
repo = "vkQuake";
rev = version;
- sha256 = "03b2vxpakp6zizb0m65q9lq800z67b052k01q251b3f04kr1waih";
+ sha256 = "sha256-h4TpeOwCK3Ynd+XZKo7wHncWS1OI6+b9SReD5xMK9zk=";
};
sourceRoot = "source/Quake";
diff --git a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
index b81f1814ac..a966731725 100644
--- a/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
+++ b/third_party/nixpkgs/pkgs/games/r2mod_cli/default.nix
@@ -7,16 +7,16 @@
stdenv.mkDerivation rec {
pname = "r2mod_cli";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "Foldex";
repo = "r2mod_cli";
rev = "v${version}";
- sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m";
+ sha256 = "0as3nl9qiyf9daf2n78lyish319qclf2gbhr20mdd5wnqmxpk276";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/games/racer/default.nix b/third_party/nixpkgs/pkgs/games/racer/default.nix
index dfbe9bc45e..16507fa219 100644
--- a/third_party/nixpkgs/pkgs/games/racer/default.nix
+++ b/third_party/nixpkgs/pkgs/games/racer/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
} else
throw "System not supported";
-
- buildInputs = [ allegro libjpeg makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ allegro libjpeg ];
prePatch = ''
sed -i s,/usr/local,$out, Makefile src/HGFX.cpp src/STDH.cpp
diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/games/runelite/default.nix
index df8a5c3e8d..e9e77e275d 100644
--- a/third_party/nixpkgs/pkgs/games/runelite/default.nix
+++ b/third_party/nixpkgs/pkgs/games/runelite/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
startupNotify = null;
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
# colon is bash form of no-op (do nothing)
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/games/scid/default.nix b/third_party/nixpkgs/pkgs/games/scid/default.nix
index f0fdef8e62..7b1a15c0a5 100644
--- a/third_party/nixpkgs/pkgs/games/scid/default.nix
+++ b/third_party/nixpkgs/pkgs/games/scid/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
sha256 = "0zb5qp04x8w4gn2kvfdfq2p44kmzfcqn7v167dixz6nlyxg41hrw";
};
- buildInputs = [ tcl tk libX11 zlib makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ tcl tk libX11 zlib ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix
index eea8d5650b..8d92c88e1b 100644
--- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -2,7 +2,7 @@
, makeWrapper
, fetchFromGitHub
, nixosTests
-, gradle_5
+, gradle
, perl
, jre
, libpulseaudio
@@ -10,13 +10,15 @@
let
pname = "shattered-pixel-dungeon";
- version = "0.9.1d";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
- rev = "v${version}";
- sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247";
+ # NOTE: always use the commit sha, not the tag. Tags _will_ disappear!
+ # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596
+ rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783";
+ sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6";
};
postPatch = ''
@@ -31,7 +33,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
- nativeBuildInputs = [ gradle_5 perl ];
+ nativeBuildInputs = [ gradle perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
@@ -52,7 +54,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
- nativeBuildInputs = [ gradle_5 perl makeWrapper ];
+ nativeBuildInputs = [ gradle perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -79,11 +81,10 @@ in stdenv.mkDerivation rec {
homepage = "https://shatteredpixel.com/";
downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases";
description = "Traditional roguelike game with pixel-art graphics and simple interface";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
# https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005
broken = stdenv.isDarwin;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/games/sil/default.nix b/third_party/nixpkgs/pkgs/games/sil/default.nix
index 3128ed5358..5f589ede2b 100644
--- a/third_party/nixpkgs/pkgs/games/sil/default.nix
+++ b/third_party/nixpkgs/pkgs/games/sil/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
stripRoot=false;
};
- buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ ncurses libX11 libXaw libXt libXext libXmu ];
sourceRoot = "source/Sil/src";
diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
index 42faaf287d..6692f9bd9b 100644
--- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
@@ -140,6 +140,7 @@ in buildFHSUserEnv rec {
# dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers
+ vulkan-loader
expat
wayland
xlibs.libxcb
@@ -232,7 +233,14 @@ in buildFHSUserEnv rec {
libvdpau
] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs;
- extraBuildCommands = if (!nativeOnly) then ''
+ extraBuildCommands = ''
+ if [ -f $out/usr/share/vulkan/icd.d/nvidia_icd.json ]; then
+ cp $out/usr/share/vulkan/icd.d/nvidia_icd{,32}.json
+ nvidia32Lib=$(realpath $out/lib32/libGLX_nvidia.so.0 | cut -d'/' -f-4)
+ escapedNvidia32Lib="''${nvidia32Lib//\//\\\/}"
+ sed -i "s/\/nix\/store\/.*\/lib\/libGLX_nvidia\.so\.0/$escapedNvidia32Lib\/lib\/libGLX_nvidia\.so\.0/g" $out/usr/share/vulkan/icd.d/nvidia_icd32.json
+ fi
+ '' + (if (!nativeOnly) then ''
mkdir -p steamrt
ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch}
${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
@@ -245,7 +253,7 @@ in buildFHSUserEnv rec {
${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
''}
- '';
+ '');
extraInstallCommands = ''
mkdir -p $out/share/applications
diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix
index 0f04ebfe4d..1632f7c41d 100644
--- a/third_party/nixpkgs/pkgs/games/unciv/default.nix
+++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.12.13-patch1";
+ version = "3.12.14";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI=";
+ sha256 = "sha256-FE6oPtEerjVusK3fpxLwcpvKjIAQl6oCrBj8GIkuVwU=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix
index effb999e02..2a916094af 100644
--- a/third_party/nixpkgs/pkgs/games/vassal/default.nix
+++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin $out/share/vassal $out/doc
diff --git a/third_party/nixpkgs/pkgs/games/vms-empire/default.nix b/third_party/nixpkgs/pkgs/games/vms-empire/default.nix
index fcfc89667a..b3e89617ef 100644
--- a/third_party/nixpkgs/pkgs/games/vms-empire/default.nix
+++ b/third_party/nixpkgs/pkgs/games/vms-empire/default.nix
@@ -1,26 +1,50 @@
-{ lib, stdenv, fetchurl, ncurses, xmlto }:
+{ lib
+, stdenv
+, fetchurl
+, ncurses
+, xmlto
+, docbook_xml_dtd_44
+, docbook_xsl
+, installShellFiles
+}:
stdenv.mkDerivation rec {
pname = "vms-empire";
- version = "1.15";
+ version = "1.16";
src = fetchurl{
- url = "http://www.catb.org/~esr/vms-empire/${pname}-${version}.tar.gz";
- sha256 = "1vcpglkimcljb8s1dp6lzr5a0vbfxmh6xf37cmb8rf9wc3pghgn3";
+ url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz";
+ hash = "sha256-XETIbt/qVU+TpamPc2WQynqqUuZqkTUnItBprjg+gPk=";
};
- buildInputs =
- [ ncurses xmlto ];
+ nativeBuildInputs = [ installShellFiles ];
+ buildInputs = [
+ ncurses
+ xmlto
+ docbook_xml_dtd_44
+ docbook_xsl
+ ];
- patchPhase = ''
- sed -i -e 's|^install: empire\.6 uninstall|install: empire.6|' -e 's|usr/||g' Makefile
+ postBuild = ''
+ xmlto man vms-empire.xml
+ xmlto html-nochunks vms-empire.xml
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D vms-empire -t ${placeholder "out"}/bin/
+ install -D vms-empire.html -t ${placeholder "out"}/share/doc/${pname}/
+ install -D vms-empire.desktop -t ${placeholder "out"}/share/applications/
+ install -D vms-empire.png -t ${placeholder "out"}/share/icons/hicolor/48x48/apps/
+ install -D vms-empire.xml -t ${placeholder "out"}/share/appdata/
+ installManPage empire.6
+ runHook postInstall
'';
hardeningDisable = [ "format" ];
- makeFlags = [ "DESTDIR=$(out)" ];
-
meta = with lib; {
+ homepage = "http://catb.org/~esr/vms-empire/";
description = "The ancestor of all expand/explore/exploit/exterminate games";
longDescription = ''
Empire is a simulation of a full-scale war between two emperors, the
@@ -30,11 +54,8 @@ stdenv.mkDerivation rec {
expand/explore/exploit/exterminate games, including Civilization and
Master of Orion.
'';
- homepage = "http://catb.org/~esr/vms-empire/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
-
-
diff --git a/third_party/nixpkgs/pkgs/games/warsow/engine.nix b/third_party/nixpkgs/pkgs/games/warsow/engine.nix
index 4c8de4a02d..e796c58929 100644
--- a/third_party/nixpkgs/pkgs/games/warsow/engine.nix
+++ b/third_party/nixpkgs/pkgs/games/warsow/engine.nix
@@ -1,15 +1,9 @@
-{ stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype
+{ stdenv, lib, substituteAll, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype
, libjpeg, libpng, SDL2, libGL, openal, zlib
}:
-let
- # The game loads all those via dlopen().
- libs = lib.mapAttrs (name: x: lib.getLib x) {
- inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;
- };
-
-in stdenv.mkDerivation (libs // rec {
- name = "warsow-engine-${version}";
+stdenv.mkDerivation rec {
+ pname = "warsow-engine";
version = "2.1.0";
src = fetchurl {
@@ -17,6 +11,13 @@ in stdenv.mkDerivation (libs // rec {
sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r";
};
+ patches = [
+ (substituteAll {
+ src = ./libpath.patch;
+ inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [
@@ -24,28 +25,30 @@ in stdenv.mkDerivation (libs // rec {
libpng
];
- patches = [ ./libpath.patch ];
- postPatch = ''
- cd source/source
- substituteAllInPlace gameshared/q_arch.h
- '';
-
cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];
+ preConfigure = ''
+ cd source/source
+ '';
+
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/lib
cp -r libs $out/lib/warsow
for i in warsow.* wsw_server.* wswtv_server.*; do
install -Dm755 "$i" "$out/bin/''${i%.*}"
done
+
+ runHook postInstall
'';
meta = with lib; {
description = "Multiplayer FPS game designed for competitive gaming (engine only)";
homepage = "http://www.warsow.net";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ astsmtl abbradar ];
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
-})
+}
diff --git a/third_party/nixpkgs/pkgs/games/zod/default.nix b/third_party/nixpkgs/pkgs/games/zod/default.nix
index b07db62aa1..6c48caf875 100644
--- a/third_party/nixpkgs/pkgs/games/zod/default.nix
+++ b/third_party/nixpkgs/pkgs/games/zod/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation {
sourceRoot=`pwd`/src
'';
- buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index baf7e3c150..c46bb564a1 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation {
pname = "cnijfilter2";
- version = "5.90";
+ version = "6.00";
src = fetchzip {
- url = "https://gdlp01.c-wss.com/gds/4/0100010484/01/cnijfilter2-source-5.90-1.tar.gz";
- sha256 = "1bwyv9s6xv18xxp3m04a5fyh628nzcjdjvsgmgqndnk7832h5ani";
+ url = "https://gdlp01.c-wss.com/gds/9/0100010739/01/cnijfilter2-source-6.00-1.tar.gz";
+ sha256 = "1n4vq44zya0n4a7jvq3yyqy7dcvc2911cjvxmq48zqicb2xdgafr";
};
buildInputs = [
@@ -114,7 +114,18 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series";
+ description = "Canon InkJet printer drivers for many Pixma series printers.";
+ longDescription = ''
+ Canon InjKet printer drivers for series E200, E300, E3100, E3300, E4200, E450, E470, E480,
+ G3000, G3010, G4000, G4010, G5000, G5080, G6000, G6050, G6080, G7000, G7050, G7080, GM2000,
+ GM2080, GM4000, GM4080, iB4000, iB4100, iP110, MB2000, MB2100, MB2300, MB2700, MB5000,
+ MB5100, MB5300, MB5400, MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800,
+ MG6900, MG7500, MG7700, MX490, TR4500, TR703, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530,
+ TS200, TS300, TS3100, TS3300, TS5000, TS5100, TS5300, TS5380, TS6000, TS6100, TS6130, TS6180,
+ TS6200, TS6230, TS6280, TS6300, TS6330, TS6380, TS700, TS708, TS7330, TS8000, TS8100, TS8130,
+ TS8180, TS8200, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180, TS9500,
+ TS9580, XK50, XK60, XK70, XK80.
+ '';
homepage = "https://hk.canon/en/support/0101048401/1";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix
index 022cc4aa83..2a34e36742 100644
--- a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runCommand }:
+{ lib, runCommand }:
runCommand "documentation-highlighter" {
meta = {
description = "Highlight.js sources for the Nix Ecosystem's documentation";
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
new file mode 100644
index 0000000000..03eb329f4b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/configure-socket-path.patch
@@ -0,0 +1,118 @@
+diff --git a/src/proto_unix.c b/src/proto_unix.c
+index 998f234..d38452c 100644
+--- a/src/proto_unix.c
++++ b/src/proto_unix.c
+@@ -36,11 +36,14 @@ enum {
+
+ static int lsock = -1;
+
++static char *spath = NULL;
++
+ int init_unix(void)
+ {
+ int s;
+ mode_t prev_umask;
+ struct sockaddr_un addr;
++ char *sock_path;
+
+ if(lsock >= 0) return 0;
+
+@@ -49,16 +52,18 @@ int init_unix(void)
+ return -1;
+ }
+
+- unlink(SOCK_NAME); /* in case it already exists */
++ sock_path = socket_path();
++
++ unlink(sock_path); /* in case it already exists */
+
+ memset(&addr, 0, sizeof addr);
+ addr.sun_family = AF_UNIX;
+- strcpy(addr.sun_path, SOCK_NAME);
++ strcpy(addr.sun_path, sock_path);
+
+ prev_umask = umask(0);
+
+ if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
+- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));
++ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));
+ close(s);
+ return -1;
+ }
+@@ -68,7 +73,7 @@ int init_unix(void)
+ if(listen(s, 8) == -1) {
+ logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));
+ close(s);
+- unlink(SOCK_NAME);
++ unlink(sock_path);
+ return -1;
+ }
+
+@@ -82,7 +87,7 @@ void close_unix(void)
+ close(lsock);
+ lsock = -1;
+
+- unlink(SOCK_NAME);
++ unlink(socket_path());
+ }
+ }
+
+@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)
+
+ return 0;
+ }
++
++char *socket_path(void)
++{
++ char *xdg_runtime_dir;
++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {
++ if ( spath == NULL ) {
++ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);
++ if ( spath != NULL ) {
++ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);
++ }
++ };
++ return spath;
++ } else {
++ return DEFAULT_SOCK_NAME;
++ }
++}
+diff --git a/src/proto_unix.h b/src/proto_unix.h
+index 045b379..ec4509c 100644
+--- a/src/proto_unix.h
++++ b/src/proto_unix.h
+@@ -23,6 +23,7 @@ along with this program. If not, see .
+ #include "event.h"
+ #include "client.h"
+
++char *socket_path(void);
+ int init_unix(void);
+ void close_unix(void);
+ int get_unix_socket(void);
+diff --git a/src/spnavd.c b/src/spnavd.c
+index cbea191..03080da 100644
+--- a/src/spnavd.c
++++ b/src/spnavd.c
+@@ -344,7 +344,7 @@ static int find_running_daemon(void)
+ }
+ memset(&addr, 0, sizeof addr);
+ addr.sun_family = AF_UNIX;
+- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);
++ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);
+
+ if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {
+ close(s);
+diff --git a/src/spnavd.h b/src/spnavd.h
+index fa0a916..deea4e0 100644
+--- a/src/spnavd.h
++++ b/src/spnavd.h
+@@ -26,7 +26,8 @@ along with this program. If not, see .
+ #define DEF_CFGFILE "/etc/spnavrc"
+ #define DEF_LOGFILE "/var/log/spnavd.log"
+
+-#define SOCK_NAME "/var/run/spnav.sock"
++#define DEFAULT_SOCK_NAME "/run/spnav.sock"
++#define SOCK_NAME_ENV "SPNAVD_SOCK_LOCATION"
+ #define PIDFILE "/var/run/spnavd.pid"
+ #define SYSLOG_ID "spnavd"
+
diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix
new file mode 100644
index 0000000000..1051d469f6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, libX11 }:
+
+stdenv.mkDerivation rec {
+ version = "0.8";
+ pname = "spacenavd";
+
+ src = fetchFromGitHub {
+ owner = "FreeSpacenav";
+ repo = "spacenavd";
+ rev = "v${version}";
+ sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf";
+ };
+
+ buildInputs = [ libX11 ];
+
+ patches = [
+ # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock
+ # to allow for a user service
+ ./configure-socket-path.patch
+ ];
+
+ configureFlags = [ "--disable-debug"];
+
+ meta = with lib; {
+ homepage = "http://spacenav.sourceforge.net/";
+ description = "Device driver and SDK for 3Dconnexion 3D input devices";
+ longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)";
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ sohalt ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/blastem/default.nix
index eba646e2f2..a2dc86449d 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/blastem/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/blastem/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";
};
- buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ];
preBuild = ''
patchShebangs img2tiles.py
'';
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
index c0e54e48db..7bc23130b7 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libdsk";
- version = "1.5.12";
+ version = "1.5.14";
src = fetchurl {
url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz";
- sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv";
+ sha256 = "sha256-fQc6QAj160OskhAo1zQsQKiLgDgZRInU/derP2pEw54=";
};
meta = with lib; {
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.seasip.info/Unix/LibDsk/";
license = licenses.gpl2Plus;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mednafen/server.nix b/third_party/nixpkgs/pkgs/misc/emulators/mednafen/server.nix
index 0654262555..24c13bf022 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/mednafen/server.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/mednafen/server.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = "https://mednafen.github.io/";
license = licenses.gpl2;
maintainers = with maintainers; [ AndersonTorres ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
index 7d0d6c6f68..8a11b633d2 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mednaffe";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "AmatCoder";
repo = "mednaffe";
rev = version;
- sha256 = "sha256-BS/GNnRYj9klc4RRj7LwNikgApNttv4IyWPL694j+gM=";
+ sha256 = "sha256-YU8PHnQHAsY90LN/WDugi4WhsuZGBj/z3BS4o69qMS4=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix
index 08ebf8ea85..40d9f07846 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
pname = "retroarch";
version = lib.getVersion retroarch;
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/lib
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix
index d23129eba7..6b20984016 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sameboy";
- version = "0.13.6";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "LIJI32";
repo = "SameBoy";
rev = "v${version}";
- sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc";
+ sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7";
};
enableParallelBuilding = true;
@@ -16,20 +16,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ rgbds glib wrapGAppsHook ];
buildInputs = [ SDL2 ];
- makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/";
+ makeFlags = [
+ "CONF=release"
+ "FREEDESKTOP=true"
+ "PREFIX=$(out)"
+ ];
- patchPhase = ''
- sed 's/-Werror //g' -i Makefile
- sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c
- '';
-
- installPhase = ''
- pushd build/bin/SDL
- install -Dm755 sameboy $out/bin/sameboy
- rm sameboy
- mkdir -p $out/share/sameboy
- cp -r * $out/share/sameboy
- popd
+ postPatch = ''
+ substituteInPlace OpenDialog/gtk.c \
+ --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix
index f6a3d65c4b..ff90ae8908 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/stella/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "stella";
- version = "6.5.1";
+ version = "6.5.2";
src = fetchFromGitHub {
owner = "stella-emu";
repo = pname;
rev = version;
- sha256 = "2O7pN0xByEbWVL32VZw9191tG+kCMOuivJZRpXssQIw=";
+ hash = "sha256-CDLMOqSgRx75tjBoLycis/cckCNwgdlb9TRBlD3Dd04=";
};
nativeBuildInputs = [ pkg-config ];
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
As of its 3.5 release, Stella is officially donationware.
'';
- license = licenses.gpl2;
- maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index d69f38dece..1bcd08e6f4 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
@@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "6.2";
+ version = "6.3";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
- sha256 = "sha256-tmCWCaOrzGrZJ83WXHQL4BFiuAFSPg97qf1mkYALvxk=";
+ sha256 = "sha256-aCp3wf0S9WNHyiCA2F/hfe8bZV0yQdlFgvh1kdnQzDs=";
inherit (stable) mono gecko32 gecko64;
patches = [
@@ -58,7 +58,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "sha256-swhd5gTIWTz8eEk6f78iXG8bmA3y4ynO0/wBm0/Kimk=";
+ sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix
index 24d2b5e135..9dd9736744 100644
--- a/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/jackaudio/default.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
--replace /bin/bash ${bash}/bin/bash
'';
+ PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config";
+
+ dontAddWafCrossFlags = "true";
wafConfigureFlags = [
"--classic"
"--autostart=${if (optDbus != null) then "dbus" else "classic"}"
diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix
index f005a59dbf..d8db893f7d 100644
--- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
-, python2, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
+, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, makeWrapper, t1utils
, texlive, tex ? texlive.combine {
@@ -9,22 +9,13 @@
stdenv.mkDerivation rec {
pname = "lilypond";
- version = "2.20.0";
+ version = "2.22.0";
src = fetchurl {
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
- sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar";
+ sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4";
};
- patches = [
- ./findlib.patch
- (fetchurl {
- name = "CVE-2020-17353.patch";
- url = "https://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=b84ea4740f3279516905c5db05f4074e777c16ff;hp=b97bd35ac99efd68569327f62f3c8a19511ebe43";
- sha256 = "1i79gy3if070rdgj7j6inw532j0f6ya5qc6kgcnlkbx02rqrhr7v";
- })
- ];
-
postInstall = ''
for f in "$out/bin/"*; do
# Override default argv[0] setting so LilyPond can find
@@ -51,7 +42,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
- python2 gettext perl fontconfig freetype pango
+ python3 gettext perl fontconfig freetype pango
fontforge help2man groff t1utils
];
diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/findlib.patch b/third_party/nixpkgs/pkgs/misc/lilypond/findlib.patch
deleted file mode 100644
index 30e130bc8a..0000000000
--- a/third_party/nixpkgs/pkgs/misc/lilypond/findlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
-index 3825101..bf37d16 100644
---- a/stepmake/stepmake/executable-vars.make
-+++ b/stepmake/stepmake/executable-vars.make
-@@ -1,4 +1,4 @@
--MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS)))
-+MODULE_LIBES =$(addprefix , $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS)))
- LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(CONFIG_LIBS)
-
- EXECUTABLE = $(outdir)/$(NAME)
-
-diff --git a/make/stepmake.make b/make/stepmake.make
-index 604341b..7f0d9d8 100644
---- a/make/stepmake.make
-+++ b/make/stepmake.make
-@@ -87,7 +87,7 @@ outdir=$(outroot)/$(outbase)
- config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh
-
- # The outdir that was configured for: best guess to find binaries
--outconfbase=out$(CONFIGSUFFIX)
-+outconfbase=$(outdir)
- outconfdir=$(outroot)/$(outconfbase)
-
- # user package
diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/with-fonts.nix b/third_party/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
index 2f3a95a330..47cbb59f2f 100644
--- a/third_party/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
+++ b/third_party/nixpkgs/pkgs/misc/lilypond/with-fonts.nix
@@ -7,7 +7,8 @@ lib.appendToName "with-fonts" (symlinkJoin {
paths = [ lilypond ] ++ openlilylib-fonts.all;
- buildInputs = [ makeWrapper lndir ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ lndir ];
postBuild = ''
for p in $out/bin/*; do
diff --git a/third_party/nixpkgs/pkgs/misc/pylode/default.nix b/third_party/nixpkgs/pkgs/misc/pylode/default.nix
new file mode 100644
index 0000000000..fb90815176
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/pylode/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "pyLODE";
+ version = "2.8.6";
+
+ src = fetchFromGitHub {
+ owner = "RDFLib";
+ repo = pname;
+ rev = version;
+ sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ dateutil
+ falcon
+ gunicorn
+ isodate
+ jinja2
+ markdown
+ rdflib
+ rdflib-jsonld
+ requests
+ six
+ beautifulsoup4
+ ];
+
+ meta = with lib; {
+ description = "An OWL ontology documentation tool using Python and templating, based on LODE";
+ homepage = "https://github.com/RDFLib/pyLODE";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ koslambrou ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
index 11d85e5977..be605192ac 100644
--- a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir $out -p
diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
index f3e5ae251a..981db782c7 100644
--- a/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/screensavers/rss-glx/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}:
+{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}:
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ];
+ buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ];
- NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";
+ NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick";
NIX_LDFLAGS= "-rpath ${libXext}/lib";
meta = {
diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
index ef8caccbc3..f8f3df665d 100644
--- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
@@ -270,6 +270,12 @@ in {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
+ ubootOrangePiZero = buildUBoot {
+ defconfig = "orangepi_zero_defconfig";
+ extraMeta.platforms = ["armv7l-linux"];
+ filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+ };
+
ubootPcduino3Nano = buildUBoot {
defconfig = "Linksprite_pcDuino3_Nano_defconfig";
extraMeta.platforms = ["armv7l-linux"];
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 1ca828fc37..8ac029250e 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-02-23";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "76965615558e9398ef4cc79991632a7b68a6c7bc";
- sha256 = "06djm6di95sci45gwm1mrvd8hhiwxh59lix1p34ky0k7yjb6vygk";
+ rev = "8c5081f6316183c97298ec4a819fd94c2a2a9516";
+ sha256 = "1k1d19w9avvxk6ccgdj2sricr3c3crvlwdfj0g7ybgh8nyn2isvs";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -89,12 +89,12 @@ let
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
- version = "2021-02-07";
+ version = "2021-02-27";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
- rev = "4fbb34ccc09354ec09033719133c32d531111934";
- sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld";
+ rev = "984d84a1bda7208587feb3d62cfec5bcab404af2";
+ sha256 = "00gf2xm20wg0p1ik55jwhzlbd5sz06k3hk30415xayfa6flgh0n4";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
@@ -161,12 +161,12 @@ let
asyncomplete-vim = buildVimPluginFrom2Nix {
pname = "asyncomplete-vim";
- version = "2021-01-28";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "asyncomplete.vim";
- rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61";
- sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6";
+ rev = "8e018dee9c5e2205288bda01be0de196b04b7cf2";
+ sha256 = "1ghv6zp3qajd4n9qv3mnxqhczi77qmds2b2iicbl252slvldr604";
};
meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
};
@@ -233,12 +233,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2021-02-21";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "d41cf6a68af44dd74bd4a1af0b2c7f33f4475730";
- sha256 = "1ibj1drcj56gjsqhkid3la58jj7y32ygiib3sjsw35091yamcqc2";
+ rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a";
+ sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538";
};
meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-02-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "30b987585d83389e05fde6443160f570aa39e1e7";
- sha256 = "1snz1wskla014cxk3dw290bpd0krznhwpm341a9v5vcidhciaprx";
+ rev = "4608bbe255e66f463cf08de888e470cb00966f8d";
+ sha256 = "06rkj244frd2a7w0x0dp4nnzn8sdnbyww1jwn9xlypfcn67gg0nn";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -425,12 +425,12 @@ let
ci_dark = buildVimPluginFrom2Nix {
pname = "ci_dark";
- version = "2021-02-21";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "chuling";
repo = "ci_dark";
- rev = "29eee5e5c23b3fde59192df92baf7ba775867092";
- sha256 = "0plq37r00d5sn6hci7wn8df09dca3cigvd80pq08pcngbm4h19wl";
+ rev = "9063153b05ca47c030a5f656411dbbed33697678";
+ sha256 = "011017ywcgjcflsl21fjcrz7ap68aqvgx5y5z64075qkrk1pqgz1";
};
meta.homepage = "https://github.com/chuling/ci_dark/";
};
@@ -461,60 +461,60 @@ let
coc-clap = buildVimPluginFrom2Nix {
pname = "coc-clap";
- version = "2020-12-17";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "vn-ki";
repo = "coc-clap";
- rev = "5a0685a6e9eac82d5b1912e10b4ebdd41823dccd";
- sha256 = "16g10s8zwzjzk21s09bvlc8z20gxv0whb83wf9kbysiv5aamf0n1";
+ rev = "57116d2f999dfa025fac579835fd23e1a6341fa2";
+ sha256 = "0m2khf11krkqmbykfx21yq9ydglz6dldw4xml5nkyqm93n37xn1s";
};
meta.homepage = "https://github.com/vn-ki/coc-clap/";
};
coc-denite = buildVimPluginFrom2Nix {
pname = "coc-denite";
- version = "2021-01-14";
+ version = "2021-02-24";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-denite";
- rev = "819b0e334431a9e914d69f3fedf68122799fcab9";
- sha256 = "02zy4ip7m1jivqzs67c8bzc8lis8wxkm38nvk6nngz2790xpfywc";
+ rev = "37016bc170014e36fc8212b2dc7ce7adda48bbe3";
+ sha256 = "0kpw2gfkpdfsi2kwm6rbzmz3diyinc3lcf91rxm8wyw486sp0s10";
};
meta.homepage = "https://github.com/neoclide/coc-denite/";
};
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
- version = "2021-02-19";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
- rev = "e4409b415a7c299282556422c71a070ad33c8c71";
- sha256 = "19j0p6ar0kr97xw5sxyywhy4r3wgyzplb482s23rglgxzcdfvp4c";
+ rev = "62206b3cf8e06137919e8cbdcb52c474fe1dbd95";
+ sha256 = "0y1j2qmncp0n2piiayfbfk39rj0nivjx0wfjh9wnq0s1y2ijcg91";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-02-22";
+ version = "2021-02-27";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "087ab5582607fca8e35e8afd5121b3b39b7cdb32";
- sha256 = "0vpzhhnyybyq90c525263dan2mha64hwrmbc22kw6rwm1n9smxx8";
+ rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13";
+ sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "228e27dd3118703b4d169b134b458635a3043918";
- sha256 = "1wxz1bljg7p1gyasf71gm3953pkrmaafw84bmwghfgrp8l3914h2";
+ rev = "9454f352914475f3595efad08bb1524cf8812853";
+ sha256 = "0j3h8jyn2gbyyk7vpbjprg4kpk77j85npb0m090z0iqhlvcdrhh1";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-02-23";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "2bec473a4d8eab4b6a933fc4d2c564a323fb34f8";
- sha256 = "1a6i7mlylpbvj7dbqpd6mcfw8r7cjdjb1mdvk7snaizh7ahl2cc9";
+ rev = "71b5766a7cc28daef89fac7db99340cd532035b3";
+ sha256 = "035fhkf6n4iyi01jc84a8bsaapz5dd3m49cbilxag2wr85gc4b9p";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -593,12 +593,12 @@ let
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2020-06-02";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "ea7a889bda2849ba87fc12053bf6dd14467d7b72";
- sha256 = "02rswhlkgbapnjzqi2nv95ag08p9cjlqscwv6i17f9kvba929hkl";
+ rev = "7c14a8c0da5127c38f0c5b1b7061491c3cfb5ea3";
+ sha256 = "128331ipqjqicb5j8jifmg268faxfd4lwy4b20h5hy9macfyvys6";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/wincent/command-t/";
@@ -618,24 +618,24 @@ let
compe-conjure = buildVimPluginFrom2Nix {
pname = "compe-conjure";
- version = "2021-02-23";
+ version = "2021-02-02";
src = fetchFromGitHub {
owner = "tami5";
repo = "compe-conjure";
rev = "809853ff8098dffcf8ba5ac89bcf07806eb8f981";
sha256 = "0p7p4bgkh05zy0gzmq0g9nn9npykh1l17cvfzjyhcb3n1sczpjzf";
};
- meta.homepage = "https://github.com/tami5/compe-conjure";
+ meta.homepage = "https://github.com/tami5/compe-conjure/";
};
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
- version = "2021-02-21";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
- rev = "d717a953dbb745289ea794e86e32deb3750a3a18";
- sha256 = "1d8nqcfarcwxyz7cwn200g118v0gky0snvzhc22xl766pacgvslk";
+ rev = "0739a2587e8d12fd746964578ba5c579fec1560a";
+ sha256 = "11fjpvzng735b7zyaia6dhshca9j22gx65k6r85j0698pwrk9wz6";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@@ -702,24 +702,24 @@ let
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2021-02-10";
+ version = "2021-02-27";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "88e7865b97737809d963b81b10737c41e90b4377";
- sha256 = "075rm1s1y1cklnsqf7845s3knfwyiqs1wd82d9rvbvc3gs12xlpf";
+ rev = "4dc7c745618a24799af44797c51af7cc308e42a4";
+ sha256 = "1p0bck7gh1alybfz14s0yaawx056mfqjc8hba1wappch4jp07si6";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
context_filetype-vim = buildVimPluginFrom2Nix {
pname = "context_filetype-vim";
- version = "2020-09-17";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "Shougo";
repo = "context_filetype.vim";
- rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce";
- sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8";
+ rev = "f5e4ed8f7847cd5474017459c2a0f2dfd2bf971c";
+ sha256 = "039mnsd6k0sgs8l1a8ngl3y817c8g657nv8v9bdw9h8l5a934cb2";
};
meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
};
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-02-16";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "309b5ca4386e0a191168c2a4a7e6a0e8ddcb0317";
- sha256 = "07fhi1wsa8p3hqrkr56is4ijpc879npqfnhkv6cfi01aagp8kz9h";
+ rev = "5e78fa379d6c1a604834e89eff31c9a28123c6d9";
+ sha256 = "1phkq68hv6pi1z637in8hl5m5xzaw7ybmqyvljy8rly89w9gis5w";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -858,14 +858,14 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-02-23";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "7cdd2288d5aaf986f6f23c58fa27c50311636142";
- sha256 = "1rg63sl4q4qlxdllmrmi3x54zz2xqgf6l56zi3wv83x3zd5lj2c9";
+ rev = "dbcee4399394e56e4bbae5039af78408b2a35334";
+ sha256 = "1p6ckanaqxgag1l1kmpiwq2fxygfp6rghbf4a3mx5ldh17lhnii8";
};
- meta.homepage = "https://github.com/glepnir/dashboard-nvim";
+ meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
defx-git = buildVimPluginFrom2Nix {
@@ -894,12 +894,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-02-07";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "4d2353619262fe487a052288859f3eea64cd229c";
- sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq";
+ rev = "f4e082b3e4a62ca2cd5dfe041288f4acf3b2031f";
+ sha256 = "1lm4x0skg9mm776bm7s34sjmxjjvcsy7gjn95qhplg7r6799xsn0";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -942,12 +942,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-02-20";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "2b5360f3f2965ee5a6f82e09648d0c18e78142f3";
- sha256 = "09bya9rqzk809s5i1xda94f64jnzm3vkh8kiziclgyg42sv6in9b";
+ rev = "db2d82cfbd85d8b6caafbd967a27f4d1c6ea5fa6";
+ sha256 = "173nmv0d729hk9xbz9jdk9h9zlm9dhz89pgda7vggrp9dp8d1z5v";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@@ -1136,12 +1136,12 @@ let
deoplete-tabnine = buildVimPluginFrom2Nix {
pname = "deoplete-tabnine";
- version = "2021-01-15";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "tbodt";
repo = "deoplete-tabnine";
- rev = "80a329eca215f48de8a4e575af55607700ddc93e";
- sha256 = "1i23ajbkx3yrll4mnqzf17g66c9x5g6ih3hk3acjq7h3m6ifgfyi";
+ rev = "6997d621f6bd10351041be8e9dfbc6874009bf1b";
+ sha256 = "17xxxk75w852qj89b1283pff1rsv6qd3siy14sxrz4455x4j1sj5";
};
meta.homepage = "https://github.com/tbodt/deoplete-tabnine/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-02-08";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "27af4ab2de157f80c8a8391aebb60061318814ea";
- sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc";
+ rev = "a4683be7c58c346458e2cdb1f8b244e14fe35a8e";
+ sha256 = "0ph4mj4s2gklr8rz8ny80i91r7fcivh9kb5q0y20c19mmyjsvifm";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1256,24 +1256,24 @@ let
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
- version = "2020-12-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
- rev = "e7154372adc95d637ccd911c2f8601d9ff2eac1f";
- sha256 = "1li5q3151kjh8c6a7cdnmbydxhkjgqsa5nlv49dy6dnqc3b50m7s";
+ rev = "32f0a489d1f47405f3327d0686f8d96da216cead";
+ sha256 = "1czs335wdjs8vfx3ydy92m145wibp6jy47fia5p5mhrp6zncibqq";
};
meta.homepage = "https://github.com/dracula/vim/";
};
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
- version = "2021-01-28";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
- rev = "c805de7e9811cd298861c7bc6ef455093dcdfaf5";
- sha256 = "1jhhscldckydzzjnl1jki3025brmlbmr7czhw1s30jx5wr00zc5w";
+ rev = "af235aaaa74f41cd83181a16b9f17c16e56afc47";
+ sha256 = "1jzn7w6rv2bl1m4aqm716flg28jdjsgkikfjjjiz4if5vjsfj0lw";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
@@ -1402,12 +1402,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-02-06";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c";
- sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50";
+ rev = "c09eb24de7a647a2b4878f8dc86b3d3565b3e8af";
+ sha256 = "0mqrrb899bgf13r2klkqh4ycz167fx98kjnrhdg2jhq8gg85i0ih";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1535,12 +1535,12 @@ let
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "916c00d6a53ab492a46b1f8aa3e052136e804483";
- sha256 = "18yvbxa5rc2s1qyv94d7y6jd2b10ivcv01i42w80gp2kbipp9nay";
+ rev = "dd1cd3098f95423fa744be5d65b61132caae51b5";
+ sha256 = "12k25aq9giivfh2nw086ha8jq77bd5d5v9mmqsxjb15bp6b2mbc5";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1595,12 +1595,12 @@ let
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
- version = "2021-02-23";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "rhysd";
repo = "git-messenger.vim";
- rev = "bac4f07c9c70aeed25d2a3f5173b782f4efe7c17";
- sha256 = "00m9j6lvg96xaxnzg0vwridhk1m9zaxna2qcki4y2cr083bsc0vd";
+ rev = "b79422434a419b97c5817d9ff645216952152443";
+ sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9";
};
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
};
@@ -1619,12 +1619,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-02-18";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "a0f08c700313947e554a1933a9e7d06c0e3d2f42";
- sha256 = "0zfzh1nhxmrfxa97kfyl1cdx3c186ig3p61sfxm4w1phz0r44lch";
+ rev = "d54291e425d324db56a4b0990c73a0facb9ae877";
+ sha256 = "1zwnsblklw9a9khr6xpwsfn115synrzg1b92pvzsh5p53ydaqaj2";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1703,12 +1703,12 @@ let
gruvbox-community = buildVimPluginFrom2Nix {
pname = "gruvbox-community";
- version = "2021-02-13";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "gruvbox-community";
repo = "gruvbox";
- rev = "8b29832551088fd7ecc1241c2576c8cf89f0842c";
- sha256 = "0447iplif457yyd6d7xanvrrizfl9jlwim16i31vwnrlrb3s0r4x";
+ rev = "197103a55543b1398c194369306cff896bfd3fc1";
+ sha256 = "18ng4qk4wi56bq64hc7sw3dx299cnjcg0zghk9r39dpi5fv68d8h";
};
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
};
@@ -1787,14 +1787,14 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-02-23";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "be919d61d4136d2092f42c922f545bb8c8723fb8";
- sha256 = "0swslw4g7i8xzzcnz5rxdr0a2g3wm471vg35drynr2r18q2hqqd1";
+ rev = "114354c337dc0f492b014853f8972fa42ca4c379";
+ sha256 = "0laxlhzv70zln8wsxdcgimbc3zg4dpyixik7qa44lw4g8szmpyxc";
};
- meta.homepage = "https://github.com/phaazon/hop.nvim";
+ meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
i3config-vim = buildVimPluginFrom2Nix {
@@ -1991,12 +1991,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2021-01-30";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30";
- sha256 = "0m8dafwz76glmgi7jvc3sxsxill5a3prf5qi0r9266swdw4v8ah3";
+ rev = "088469a8eeffe421d522e953c4b49de486a0cbce";
+ sha256 = "0vwz33ffawazdk6dsmd6m2fiygi9sn7xn601bzfcgf73z1sc41gh";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -2040,12 +2040,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "b2bda998c0e141ee9215ccc123fb7d8ddc8c9d16";
- sha256 = "1lrhydjjriczcf05sj1gzs8yasnixar40mlbzph5fnx4d044jsk4";
+ rev = "ebafbe4e5fbeee5f6af70fb46e51bd10b00fd589";
+ sha256 = "1i7ylv0pwvqqaggvdcv8n2sm4wdfny76kny2qp21r47xj6dyw2sf";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -2196,12 +2196,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2021-01-06";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "65614730a667144a444fbd4a028a81171481c537";
- sha256 = "1vxm3ym51qa63zbrkdz2pvwafr3kmdxgpxrdwb1g8i7qsxjsvgl1";
+ rev = "7afb5525addfab7c177c2912a7aa98053c79e495";
+ sha256 = "18jwc65q0k1q7nd2w31gi476cg4h7bfrr7z39is3s3qw0z2nprp9";
};
meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
};
@@ -2220,12 +2220,12 @@ let
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2021-01-31";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "936598633d19a2f171347494c3240e72da6db78a";
- sha256 = "0j0swcbvhhy5gajl42z6g1dwr62b68l4c913fdfvdhjngq26wbyw";
+ rev = "9cec4e2329324366801e1272305be907d141d77c";
+ sha256 = "1xz36jrm3iql6xgznycwf8mxlaw05f788k4p9xbvcrh3i0zck1za";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -2304,24 +2304,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-02-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "1fb30cb0334a0b12aa1dbf40a00e7a06c9539f44";
- sha256 = "0kvfbcck0f3nj5fb08yr2yfpp0cszxxp556jix59g3y6drah6bnn";
+ rev = "afbe401bf8e8b02e4b61459d012bf2c1c70b7cf0";
+ sha256 = "03hbh3y5ya0v2qgc5mhs0v7vwn2z56c8srg3arfqaphhr18da7s7";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-02-22";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "e59ac51ca90fe1b914e94be2f38292c81388912c";
- sha256 = "0v1ijxmqyjk05xzcx2nycrpqbyahai8y380qd9xyl4gmgyfmhvs9";
+ rev = "9c9212c5b63675b43459e29858d3e0a64bce9507";
+ sha256 = "07nz7wj8vr9dckbfx3dymjv9yq1q3wyy7mcj8lvlg1d9g28snnd1";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2388,12 +2388,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "fcf8aa05f3a3c128011236147b4cd1ced718b671";
- sha256 = "1ya5scd3rwiypiwj3xgwr153n3a1d4mg9r5m1wbj3cb7x0s6ddjk";
+ rev = "df3bef57602e9633151c9c4a0ab2b48f1c0d5abc";
+ sha256 = "1v4k8nhss8asg2p5jdxkjaqg3z7w1byzxi62vl4k1wkzmp5afpnf";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2700,12 +2700,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-02-08";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "53f22813fb3e60a4175ee44de55732b93c2903de";
- sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj";
+ rev = "974f8c51385710a1422e841372848308ca7e615b";
+ sha256 = "1n0y4gsjbh4yc5b1smckzx7gy4kzavdp7dpaic03adf23akndm1i";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2832,24 +2832,24 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
- version = "2021-02-18";
+ version = "2021-02-27";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
- rev = "1c7b57608e653b55731d5971ba11c4c691b14c8c";
- sha256 = "0ax3f1gyg0gqc2wmv11icsc5ykjq7b3cgk49hxla8zyf84rhdnn2";
+ rev = "16ecc429ec2792ba5c972f0a920dc14223b7bd4a";
+ sha256 = "03hfkfw34scbw127gmihxa6x9f02y979ig2204br508rz75qqfaw";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2021-02-13";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
- rev = "a1fa4a33bf16b6661e502080fc97788bb98afd35";
- sha256 = "1qi2jzrps2c2h8c91rxma445yj8knl41sb5yfg37wjnsbig6jcxl";
+ rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2";
+ sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@@ -2928,16 +2928,40 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-01-10";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc";
- sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x";
+ rev = "536f99f6c5aa27f3362be6c7bc61e5251c9bdbcc";
+ sha256 = "1n0xrzvplsrrc17jyqnyapwx2vj7b39d2ma0pd40qjf97rsvv4a4";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
+ nvim-ale-diagnostic = buildVimPluginFrom2Nix {
+ pname = "nvim-ale-diagnostic";
+ version = "2021-03-03";
+ src = fetchFromGitHub {
+ owner = "nathunsmitty";
+ repo = "nvim-ale-diagnostic";
+ rev = "894a6790637fdda0df1a2ee1de3f58cd8c276e10";
+ sha256 = "07jfmhac8s27awx9pknxlaqz9x3sbmjx7n90pr4np389b43zgrmp";
+ };
+ meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/";
+ };
+
+ nvim-autopairs= buildVimPluginFrom2Nix {
+ pname = "nvim-autopairs";
+ version = "2021-02-25";
+ src = fetchFromGitHub {
+ owner = "windwp";
+ repo = "nvim-autopairs";
+ rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
+ sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
+ };
+ meta.homepage = "https://github.com/windwp/nvim-autopairs";
+ };
+
nvim-cm-racer = buildVimPluginFrom2Nix {
pname = "nvim-cm-racer";
version = "2017-07-27";
@@ -2950,14 +2974,26 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
+ nvim-bqf = buildVimPluginFrom2Nix {
+ pname = "nvim-bqf";
+ version = "2021-02-25";
+ src = fetchFromGitHub {
+ owner = "kevinhwang91";
+ repo = "nvim-bqf";
+ rev = "4a424267e110e9637b84096a7080aa280c56be31";
+ sha256 = "034x827nka73znvnbm5slnypw1az9s7xlrpkv5ia6hi7pcapjyfn";
+ };
+ meta.homepage = "https://github.com/kevinhwang91/nvim-bqf";
+ };
+
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-02-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "c1764beef2ceba2adb62de5ed89475c71f183a57";
- sha256 = "0h8b2hnqn21lyzla8w79sl8r702702dyi0q8jr1kpqny0s57s0jg";
+ rev = "c2dcc0d7469da71728a5443c053cd51a32c600fa";
+ sha256 = "049ngs57xn19yv6p0xbz69riykxdv9mas5aj8ivdph67kwi5c7ym";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -2976,12 +3012,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-02-14";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "273890967e76322f726405e6c6c79d4fc69ae068";
- sha256 = "0azk7n06kn2n4l0xdyvbhvmgzq0rp24dng7vlkairl0sm3bnb3x9";
+ rev = "9d2a8bf00b26c2acafdf921f3c81ee2283e5daff";
+ sha256 = "1qma3cnh7hm81qpx1x8zx5qbqjh4m0c7n7x7622vs4c0698j9nqc";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -3000,36 +3036,36 @@ let
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-02-20";
+ version = "2021-02-25";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "b70aa802940db871b6a6b1e9668c5a3052327134";
- sha256 = "0ihij29p38669bdkc5mpbrdszs6iijsbm835n5qp6gj16768jasw";
+ rev = "5a95e50556deebf45d771abc58c7cd440fd6390a";
+ sha256 = "187yxnjxb9pp98yzvkpssmdcfqwvggzg5fpc20jwa7fvq8cdl0a0";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-02-10";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7";
- sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh";
+ rev = "5567fddecd08115857ef9fa49d1341ea6acf8620";
+ sha256 = "02wgywj3sm4pc65qchdv3b217wrrrg11l5k60vrilqdk2spc4xvp";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-02-14";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "1e06ce52015d0578cd24c5b01fcae1a2e2abbdc2";
- sha256 = "1c6crqc3yfi3h8mh55555sjrlif7j2q0j9wvajiagjfhggkhdggb";
+ rev = "3ce138f52ba5fb8731899bcee0323594bf0aa7a0";
+ sha256 = "042x1s1xqv81ym1jblhpm6ak8nf6s9pax6g340nac639x34zm7bh";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3048,12 +3084,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-01-30";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26";
- sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn";
+ rev = "58e7ee50b847956e31b4e293efc24fe86eb1e193";
+ sha256 = "063vgba5bqgji416bmp4vzy4pfsmvn3gjflinkyv05vcs76vy82w";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3072,12 +3108,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-02-20";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "a21a509417aa530fb7b54020f590fa5ccc67de77";
- sha256 = "1xlksbcv6va3ih9zg6yw5x6q2d76pr5cs942lh5gcypkx9m2f6r5";
+ rev = "100a8bbfa621db3d373dc41b6f593719b53f860c";
+ sha256 = "1p781j10mhyv8vgi9chkv36kxhy09hpnlk0iam915fhpm050q887";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3096,24 +3132,24 @@ let
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
- version = "2021-02-23";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-peekup";
- rev = "dde78e4adba0192c3986b20de28d26eca315dec6";
- sha256 = "1hmdrw60glr0lgixwblns73xzc6l5i1yfl7g64lp9plm8gkzb48b";
+ rev = "4da5cd216643ec15164237cdbab4884604053b46";
+ sha256 = "0q5j3d4bdapb9m5h5ijkxh05q4fsc2inbskq2rhmannlq94myljb";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
};
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-02-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "ae7b979a87ff284c2381e6b6d36ac35ac0bbfd84";
- sha256 = "0dh2wspygagcxzscl2626nhb8pnwqyjzsgivy162xmmy3g0sbppw";
+ rev = "33e5262777b26e1e81a887d1a85fb0d2037c8249";
+ sha256 = "0agk44v8l91cmaczrraylkb8k69s1c05cz0yj9ipn06l0dmj2rlh";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3132,24 +3168,24 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-02-22";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "905afba20900caea1e6f0f541c2ed7302de9f598";
- sha256 = "1hcqplvlk2cymxv7lx0yv7m5gc8p4281q1s3rhizvf4jvv973g59";
+ rev = "1984c125100247f79e1aaa4de335032ea6092d63";
+ sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-02-22";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "2d82a7fe07f3e4959219e231a58e0707d577262e";
- sha256 = "0qzv0vr89mj58aas30bqh3w479njd84qw7c965f9489p5sg9wg8x";
+ rev = "2f60b43c0f003f549f845ac1578878c69514929b";
+ sha256 = "1q7q5rd7cyjk7s83w5vnfin76dv52ggjn3q2ja15zayi758bg78k";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3168,24 +3204,24 @@ let
nvim-treesitter-refactor = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-refactor";
- version = "2021-01-07";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-refactor";
- rev = "16bbe963d044ec94316679868e0988caa7b5b4c3";
- sha256 = "0jgasxphwi222ga73y3jh5zq9m95n74331jn8r3nv741lk2g0772";
+ rev = "c87b8ecd7ae2d337499df9f2e70400250c921ca9";
+ sha256 = "17z9p6vkpw264cbrh9napkqkqazlp90yv0qz7j6w6ac4z5mgv0mp";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
};
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-02-14";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "b0f6d2c91b46faecee8b44f426de4b40d8ec8494";
- sha256 = "1r93lbh6yzq59nzkj8sdmdy4pjris5cjlh7w491xkahyizfja1ln";
+ rev = "ffe8dbb0f6ab22ed746ef753535a849e3147d914";
+ sha256 = "0bq3416v9wijcx1jw5nqvjgn8md9fr4hgnm7pnf16dyrpvmihf4m";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -3276,12 +3312,12 @@ let
onedark-vim = buildVimPluginFrom2Nix {
pname = "onedark-vim";
- version = "2020-12-14";
+ version = "2021-02-25";
src = fetchFromGitHub {
owner = "joshdick";
repo = "onedark.vim";
- rev = "94ff495eac89cea2532d8e0022f67c79a24d9649";
- sha256 = "0x4wdmk28r85g14xv1acc0fimh4bsvm30mrgsws7dm8lqx3ws8g3";
+ rev = "b70ed293f3c3adaea23f9fcd84ef942015664756";
+ sha256 = "0wz4kmbgc9rlvbxj8s8xg1sx53w0v94r6qicq3ggs9raca51ywfg";
};
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
@@ -3324,12 +3360,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-02-18";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "e6b4bacf355c9ef2daed4ff40887f949da9da019";
- sha256 = "1x7m2pw2klk4m4hv0h5cjxzr46ljiyxrmwq4c38zbk2x5mncy5jr";
+ rev = "3c7bdd7afb0a0149fdf3e77ec8d6dd93b3159d52";
+ sha256 = "1dxx0mjyms5h2a5g6abbmjvq00sn25q1xw4r4fa7l8sifsa9i7r4";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3420,12 +3456,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "116aedc7fb327eda6e7c05915f3d97088569c0e8";
- sha256 = "1mnf12bzdcpy0sgwl45sjxvzzifyy9k8mx7ffr7q8ddxwvbmmakp";
+ rev = "41b4f834c4cc22ff283f381fd3fe3e00ead3099d";
+ sha256 = "0vd4haaj2agsy3592j6kp72azpjj3lm51gahq2s7d4a63cr93xl8";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3625,12 +3661,12 @@ let
Recover-vim = buildVimPluginFrom2Nix {
pname = "Recover-vim";
- version = "2020-04-20";
+ version = "2021-02-24";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "Recover.vim";
- rev = "c84f07260f1e839bc7bfc2ab69bf4f3f4aaa423d";
- sha256 = "1q87n2xz6p879ihijvhxs1iv9iyrqcbx7z8dkql0ivbf572q9iwh";
+ rev = "f019bb0bc15093da74ef0bd1a9356dedf13ba885";
+ sha256 = "1v23k4wfiazvkm9iaqw987cs69fwf230a7i15x3rv68azw63fl2b";
};
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
};
@@ -3793,12 +3829,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-02-22";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "1a7f12cb1f878063d675924ac97f242950805541";
- sha256 = "1nmicnq2b6n8a9zmgqqkzd9y47x2d11n75ix114qv3xyin0vqnqc";
+ rev = "3a3210c8f1c4edf884a853631e641ea7c309cea0";
+ sha256 = "04x1jfshk2j4mr7l9bybpk2q64ilgh1yf20qjw1fzdh5l395dv6q";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -3853,24 +3889,24 @@ let
snippets-nvim = buildVimPluginFrom2Nix {
pname = "snippets-nvim";
- version = "2021-02-23";
+ version = "2020-09-09";
src = fetchFromGitHub {
owner = "norcalli";
repo = "snippets.nvim";
rev = "7b5fd8071d4fb6fa981a899aae56b55897c079fd";
sha256 = "1fdsx7d5nyhhklwidgh387ijd485g2836rwd5i1r0di777mp7w80";
};
- meta.homepage = "https://github.com/norcalli/snippets.nvim";
+ meta.homepage = "https://github.com/norcalli/snippets.nvim/";
};
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2021-02-14";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "522571a37d78afe13538a22cfecb8ed9cccb21a3";
- sha256 = "14jhx428lk4q0s6qgj97q4s03msqhnli8l71rw6541m7gcdhjvjj";
+ rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68";
+ sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -3961,12 +3997,12 @@ let
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
- version = "2021-02-22";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "df823938421e66adbd6c570bacdc3ce85d6c776c";
- sha256 = "02hcdsdvbdybcpamj304jld4sh3mxp3j78idzv7ybkizvp8wjlpd";
+ rev = "f0d785f7607be60c282b5f5a5d32a2e51560c07c";
+ sha256 = "1gbnhl1w0krlf2ppiz4h4fvnrjf8i0552nckhd67gfba2nqha0z4";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -4203,12 +4239,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "d7c02e3b52b5a13265e071d0de2d6a989110a515";
- sha256 = "1xd080ysfi9mvxhv717cgsah7qk5z7ci0gxmq9sls6rsjrk8dykv";
+ rev = "6e941e0ecec1ab6a1b4ce40c693ef1272c505abb";
+ sha256 = "1dd7al3zh02fdjsnvxcbqxw9q27x57fl5krcdwn5yifadwmbrdml";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4322,6 +4358,18 @@ let
meta.homepage = "https://github.com/tjdevries/train.nvim/";
};
+ tremor-vim = buildVimPluginFrom2Nix {
+ pname = "tremor-nvim";
+ version = "2020-11-19";
+ src = fetchFromGitHub {
+ owner = "tremor-rs";
+ repo = "tremor-vim";
+ rev = "17e53c33f3b0e825330580034ca60172b8ddaadc";
+ sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki";
+ };
+ meta.homepage = "https://github.com/tremor-rs/tremor-vim";
+ };
+
tslime-vim = buildVimPluginFrom2Nix {
pname = "tslime-vim";
version = "2020-09-09";
@@ -4372,12 +4420,12 @@ let
undotree = buildVimPluginFrom2Nix {
pname = "undotree";
- version = "2020-11-10";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "mbbill";
repo = "undotree";
- rev = "9ceb50062135dd30de3da000d5fd46125f51887d";
- sha256 = "1vwjggf3csbysavk3yyfzjklyq8xwfvk17rprmj660h2whgjjzvg";
+ rev = "1dce5c869f2cec23b6bcc0b40330e358ada9f37d";
+ sha256 = "198bvd54m8dvhj0jwfzkws35fw18cc075023c8hirplbsgyj6msm";
};
meta.homepage = "https://github.com/mbbill/undotree/";
};
@@ -4454,6 +4502,18 @@ let
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
};
+ embark-vim = buildVimPluginFrom2Nix {
+ pname = "embark-vim";
+ version = "2021-02-23";
+ src = fetchFromGitHub {
+ owner = "embark-theme";
+ repo = "vim";
+ rev = "d9ea898794c486e2517823f24b9577ce4c488364";
+ sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
+ };
+ meta.homepage = "https://github.com/embark-theme/vim/";
+ };
+
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
version = "2020-10-30";
@@ -4708,12 +4768,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-02-15";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "cb1bc19064d3762e4e08103afb37a246b797d902";
- sha256 = "1mw62q54cybybbmlvw7f0yzwr41dv4rsgqvk7psazb5zwjrsqn0z";
+ rev = "df956aa08b8bdb176d7127cc4940aea123ec4ffc";
+ sha256 = "1wk9df1c80198xpp6zd2yxh3j216w573lv5ssfq6ck26jy7p4q44";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -4732,12 +4792,12 @@ let
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2021-02-12";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "d148d42d9caf331ff08b6cae683d5b210003cde7";
- sha256 = "0dd0vp72r95wqa2780rbdmj61mcj77b4hg6fpkwbb07apizrp43b";
+ rev = "fa808d74e0aacf131337b58f01ee45fd3d3588af";
+ sha256 = "02dq887676dq2rm1fxpzf3piyabs6zj0rvc70nxa5vvlv68qp6k7";
};
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
};
@@ -4984,12 +5044,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-02-19";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "b6d82bc748a80577a31f2a40eb36947d70197a67";
- sha256 = "0w7yhqzdiknqm2y2cyx04sqmyr0sixfk1lrxbmra01d4sv4p7lis";
+ rev = "791e2e7cffc6db2858dc6099af109e3b6e9d7f19";
+ sha256 = "1d5z4s3llkz324ij9cz7sxhzn0a5bjgdvxg0wnd8v9d1vc7hjpp3";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5020,12 +5080,12 @@ let
vim-closer = buildVimPluginFrom2Nix {
pname = "vim-closer";
- version = "2020-10-24";
+ version = "2021-02-24";
src = fetchFromGitHub {
owner = "rstacruz";
repo = "vim-closer";
- rev = "c61667d27280df171a285b1274dd3cf04cbf78d4";
- sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn";
+ rev = "c34636e104e8731d4a414d6500303442ff7ed94e";
+ sha256 = "07ap62n10dfvw9q71q8zkms8z3jl279a99shr7scyf8q4ngsj024";
};
meta.homepage = "https://github.com/rstacruz/vim-closer/";
};
@@ -5224,12 +5284,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-01-25";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "fb543e602de2fe74a7928c78e152bb964abb7a9a";
- sha256 = "05fwa2v0fz1rgfyp2f47hcr7vzgwfrw14flr43d7a88d8qka9lqs";
+ rev = "28c3b294c9f1d88078eeebfa62a8533e6ea97f87";
+ sha256 = "0myj7ng62sjxhrq0lfk142dzr637rfl0ll6khrd0a3hrwxjjnb2x";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5416,12 +5476,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2020-11-26";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "elixir-editors";
repo = "vim-elixir";
- rev = "1ad996e64dadf0d2a65c8a079d55a0ad057c08b4";
- sha256 = "1f4g7m09x67xfajanm9aw4z6rl1hcp24c5a01m1avn9594qgnh2c";
+ rev = "527e6fd8798638a79621e0b5c788b67b2b4b4dbc";
+ sha256 = "02ncqbxlncm9gz7dvxv6lv9zsnfhqmqq05m95lh95l3lm0gs44ph";
};
meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
};
@@ -5620,12 +5680,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "c66412d238bd2e6c7b84c01a7e92b399bfbf1915";
- sha256 = "0mlvm6x754251pcd9hdwwnjfbwnvkbpywfnyp090dkvhlx19rm0w";
+ rev = "a4c834bc8ed2e7e2ef3f02de2d3055007e464956";
+ sha256 = "0lhfdnsqys0091k85nkd1g68xgv09m6jymv8ikax0xfar1zmymx3";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5668,12 +5728,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-02-22";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "6c4c7c9aebc4c65c13f94597e4c9352dbba21fa5";
- sha256 = "09q6ijr3f6aaki17cpidn02lxk00gficsclg1zcprxcq8fp8v8d1";
+ rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6";
+ sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5932,12 +5992,12 @@ let
vim-hexokinase = buildVimPluginFrom2Nix {
pname = "vim-hexokinase";
- version = "2021-01-31";
+ version = "2021-02-25";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-hexokinase";
- rev = "9f7f4bad24f23d5284543a02349a5114e8b8f032";
- sha256 = "1i435avz23mclf1ag7v273xmpbgp66msvmi7mljkbs8k6xxygaks";
+ rev = "969d6362bd0ba09e97fefdb694a59e48eb028e9c";
+ sha256 = "02a96vaj7a9limd99b8fvhfmz1b4nzf0z48jdj98f9d5psfyx7cv";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RRethy/vim-hexokinase/";
@@ -6065,12 +6125,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
- version = "2021-02-05";
+ version = "2021-02-25";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
- rev = "1ce3c4de54d2f0115129b50c4b056620953336f4";
- sha256 = "1g6lfxvs4nqlkyj0f7gd5f297r20cjxs6m6mza3bymivl9lwbj8p";
+ rev = "7dbacfb73f56b84d14fff993ff4869dfd4610443";
+ sha256 = "0msz6ip67saw9scxmdqgws3sy5hb4ihlhv72m7p5347fmm1cdh43";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@@ -6366,24 +6426,24 @@ let
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
- version = "2020-11-27";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
- rev = "532979346087c029badd02c9605a4efa84ac032a";
- sha256 = "1hjhwaw5bl37a2c9s0wd16z3x9pf0d26dwbrh6s3jk6ivwiz0v7p";
+ rev = "0dc9c746ef2459964bab31ccca4225320fe0d687";
+ sha256 = "1fkbi0yw62ga0fmyi40gz173ydydlp0xkbxl0c8l40d68yx0ckvh";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
vim-lightline-coc = buildVimPluginFrom2Nix {
pname = "vim-lightline-coc";
- version = "2020-11-15";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "josa42";
repo = "vim-lightline-coc";
- rev = "92a32b37ac1039ba39a451bd928bc62a316f0a7a";
- sha256 = "1qwim9y20ffn6dx4s69389w4d2c0rwlp7ri2pxhfb6bgyvibrc3s";
+ rev = "53465b2c2ce7b6ae3497ad1cdb751dd3d8084d5c";
+ sha256 = "1r1w4j2ir6lzrlr2jhhy3ai4arswrbvjp46dxb6y9fyl516z5mza";
};
meta.homepage = "https://github.com/josa42/vim-lightline-coc/";
};
@@ -6438,24 +6498,24 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2021-02-04";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "25d625aa0274b4c9845afd49a5c8f21aceb25073";
- sha256 = "0pdmzv3rxdawxy4qy5p283nzrjs4lc0ki2j7xxiz5bhdgnznbkcc";
+ rev = "801572d71ad05683a4ef57c1d35305f566c09bf5";
+ sha256 = "02qj2svrdhhazyr8id0crw1qk0030pivdna28xnm9l7v24g7h9hl";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-02-22";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "a78536ad745852c73cdf2d0defffd6b81bc377f0";
- sha256 = "06xpv6k80jyrd6psjhrwq84a4dm2kn7c1a89yhql7jqkrsx0iyy2";
+ rev = "fea03524cb89385dc8997867a8588135bbd454ca";
+ sha256 = "1p8ahb8wl6prs7jdbjchk9w3h3yfz9mnklr4k5j360nwdj7mvbm8";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -6535,12 +6595,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-02-23";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "b131a5b35707eb0bf0cf088d85a8f100b4609332";
- sha256 = "0j8pryc4g0w329d27likagxg6ww9lll4fj653i3ka0cffb01jjri";
+ rev = "4f5619fd1ad2b1aa36536b332b058ef6a3387a85";
+ sha256 = "0420fmdjbyi037ghs2g49zzxcpfb2vf6dnn3dk4xivl2af2jrr43";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -6775,12 +6835,12 @@ let
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
- version = "2021-02-19";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
- rev = "ba6a32d0d079b3670cc3c02257dccea4808fdfa1";
- sha256 = "0h4k9p5r7xwwwbi28p013dqhpl75k8458xiisl5ncswyw4wva75v";
+ rev = "400bee047d116d1cbe72a479943ec69d5b5bba01";
+ sha256 = "0njprv1h38rsagpmp1z68vq90pf9fll3pa8767nhgv2kyadn29jx";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@@ -6907,12 +6967,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2020-11-07";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "0aeed75603a55887c2b492d1fe19ac8065dae671";
- sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn";
+ rev = "94b6a23b4c0fb3268408a38badd480d974b0919f";
+ sha256 = "1dv33anir1pfnnbvj9alf4g13q58hdppry0hspy1d5kqsr5wfpix";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
};
@@ -6931,12 +6991,12 @@ let
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2021-02-18";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "36509e99779746866f34dadc8df64449aaca9c27";
- sha256 = "1ir7nymhz613w5bfmk927w892lpz92b71by0j2jfnb7flh9ad6f4";
+ rev = "76812f583d7fbec2ef0257424ec1f43fd32473fb";
+ sha256 = "0dfhn03nirz2iccpsi9g3rdw3vg1pm0hv75swv5dwhshjzw8rw70";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
@@ -7051,12 +7111,12 @@ let
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
- version = "2021-01-14";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "sheerun";
repo = "vim-polyglot";
- rev = "4c10562d2cc9b084518284c49a158558da5180a7";
- sha256 = "0avrjy1mxzkpsrbblzqx81ml08gm7n4bd4ihxm4qbvcdbg8n5chx";
+ rev = "cc63193ce82c1e7b9ee2ad7d0ddd14e8394211ef";
+ sha256 = "0and9148l36m8bhnzlyjirl1bd2ynswwzjc22605if82az9j55m8";
};
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
@@ -7291,12 +7351,12 @@ let
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
- version = "2020-09-18";
+ version = "2021-03-01";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
- rev = "45ea40da3f223fff83fce0a643875e560ed20aae";
- sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2";
+ rev = "67d51540a4b173d7c77bcf1db9742b3d50e4bf45";
+ sha256 = "0a86qb39c5k1h2mi5qsn03zv598776gcvlsrkgw53f3g23xm6rk5";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@@ -7495,12 +7555,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2021-01-09";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "72171eaaf176d7eb3f73ecebf86ff3e5f4ba7dbd";
- sha256 = "0rcy6p4g8784w2dbbq0b7y1z3anqjpvycns40d556vbf1y1pbc41";
+ rev = "a522fed677e50175f52efc5848cc35209af33216";
+ sha256 = "0k4b629jn6xlxyjxdl3cgm06v9dmx967rqnslv5m82c9kscwpyh4";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -7567,12 +7627,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-02-09";
+ version = "2021-02-25";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "8426857c1b8d1c00bbe0faa6dfff99acb1521042";
- sha256 = "16lvwd22813k38dbkfx4w46gmvbkfla4a0zyklpz7qa658phfprw";
+ rev = "24a9bf959211bb0ba9ada17d6425ff167adf7bd9";
+ sha256 = "0jwjhpw1g0hy935vzslbhcw9n5sfbpcc7hs1bvvvir05619hr21y";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7796,12 +7856,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2021-02-15";
+ version = "2021-03-03";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "5a1cfbbd2b34a64852760497945dd3a5c5df349a";
- sha256 = "164i8kzqyald74ibqimn6871ma02wwnx82d4rz9g21x2qgwyy6gr";
+ rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8";
+ sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -7916,11 +7976,11 @@ let
vim-tmux-focus-events = buildVimPluginFrom2Nix {
pname = "vim-tmux-focus-events";
- version = "2020-10-05";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "tmux-plugins";
repo = "vim-tmux-focus-events";
- rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941";
+ rev = "f8b5ef76ecbdc38d2b38abc3df218b47e5320c30";
sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1";
};
meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/";
@@ -7964,12 +8024,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-02-19";
+ version = "2021-03-04";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "753c64f356da0e1bed43ce0b9e8923b1e9fc0670";
- sha256 = "06j03r6hqb72ahmdpwxxys9nw86b8c63zsxhrlngzqa5z02z6k9c";
+ rev = "e47a0cc3eaedb4072c564d616001dc61ae403ab6";
+ sha256 = "1kjp6rx7k1svr90s56z8xqs4j1hii7y48acmdcl6lmhyxp5jindk";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8096,12 +8156,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
- version = "2021-02-11";
+ version = "2021-02-28";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
- rev = "d840e1af9e680b384e8a28e62b46ad5148907fdd";
- sha256 = "0d6gmw38829ln6mvn5j3gyy6by3ks5g62qiyzapz3vw67zyblyjz";
+ rev = "925fb3d0163e4c50b8d639029837696ead0f5a56";
+ sha256 = "06ssm3m64mcfzasf2sx09nrk8rizgjm9dgl36nm7qk2vchrcbg33";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@@ -8154,6 +8214,18 @@ let
meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/";
};
+ vim-wayland-clipboard = buildVimPluginFrom2Nix {
+ pname = "vim-wayland-clipboard";
+ version = "2021-02-17";
+ src = fetchFromGitHub {
+ owner = "jasonccox";
+ repo = "vim-wayland-clipboard";
+ rev = "2dc05c0f556213068a9ddf37a8b9b2276deccf84";
+ sha256 = "16x7dk1x9q8kzjcgapgb9hw8hm4w8v1g6pzpiz6ccsd0ab0jzf40";
+ };
+ meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
+ };
+
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
version = "2021-02-09";
@@ -8336,12 +8408,12 @@ let
vimsence = buildVimPluginFrom2Nix {
pname = "vimsence";
- version = "2021-01-01";
+ version = "2021-03-02";
src = fetchFromGitHub {
owner = "hugolgst";
repo = "vimsence";
- rev = "d135a75530d2ad4d034a5a2515136f043ffcecb2";
- sha256 = "0v0qbqms513c4fcwa69d175ylkzb9n5i93gz1pqlcgnfmzdsfn22";
+ rev = "16ce1f653d3ae7b65506f7e35c3723aeea9f758f";
+ sha256 = "0rnfmr8qk59dbdwd2jjjlkjwh82w58pmsm7p8b3lr2hhxz0z4sfd";
};
meta.homepage = "https://github.com/hugolgst/vimsence/";
};
@@ -8360,12 +8432,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-02-23";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "6fac220ee55af66c0c2ab3dae630086da5b0263f";
- sha256 = "0q7zj8wmg88wzhjr4xz2rkcvw091jdi3mfyv8rn09plf2w4bkszy";
+ rev = "943ae6c7c9d0f256e444c3ddc5e876156335f997";
+ sha256 = "0wfdb89iafpwazgg42wxq1fd5g99gyrmk95nzxvnws2a7fy5hi65";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8373,24 +8445,24 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-02-22";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "d99f8ff57a13323d5d2fe7f3163679848bca334e";
- sha256 = "12h180awhpaj6x0aq8vfzdxp5w474lgncb1yl0ccj6kblkr1pp32";
+ rev = "f64e85873dbe654937a9ce50c987440c5a53975b";
+ sha256 = "1nnj5qgb9hnkrp7hj0hiiacckak97mrygsv4j44rxqgdibwszi9h";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
vimux = buildVimPluginFrom2Nix {
pname = "vimux";
- version = "2021-02-19";
+ version = "2021-02-23";
src = fetchFromGitHub {
owner = "preservim";
repo = "vimux";
- rev = "3bfe0ea285031f40f1a1e8e00f57a933eb8a8325";
- sha256 = "1jl9a1fms4vaq5fhi40dvk5nwfy7n0gzj75dmfyfyb41j0c2a5hl";
+ rev = "5b1791673c1a089a78be16187f7532f95e50580b";
+ sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc";
};
meta.homepage = "https://github.com/preservim/vimux/";
};
@@ -8421,12 +8493,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2021-02-17";
+ version = "2021-02-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "30bf0bdaf33d942d35a0e767cf2387ced755d0e0";
- sha256 = "1bs4v3ym6mhczmzg7z6np7myziyp3n40xz2xdhcalbzwkdz5k43j";
+ rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e";
+ sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -8603,12 +8675,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-02-20";
+ version = "2021-03-05";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "79c05946ade40f211ca058e5c4678b438f6242e1";
- sha256 = "0p41dmhasl1xlsi2wvng35nb3rdz4yw36gdn5n6m744dha0z9khm";
+ rev = "18d39cb21e00e0cd6b24a39f0c012c288d624246";
+ sha256 = "12m0i9ma0lmy5vmc9b7ksijnn8lr5a4jkwgnfch496cyakpipvd9";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index bfe9006506..a1d970c26a 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -106,6 +106,7 @@ eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
elzr/vim-json
+embark-theme/vim as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock
@@ -197,6 +198,7 @@ jacoborus/tender.vim
jakwings/vim-pony
jamessan/vim-gnupg@main
jaredgorski/SpaceCamp
+jasonccox/vim-wayland-clipboard
jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher
jceb/vim-hier
@@ -262,6 +264,7 @@ kchmck/vim-coffee-script
KeitaNakamura/neodark.vim
keith/investigate.vim
keith/swift.vim
+kevinhwang91/nvim-bqf@main
kevinhwang91/nvim-hlslens@main
kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator
@@ -373,6 +376,7 @@ nanotech/jellybeans.vim
natebosch/vim-lsc
nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount
+nathunsmitty/nvim-ale-diagnostic@main
navicore/vissort.vim
nbouscal/vim-stylish-haskell
ncm2/float-preview.nvim
@@ -623,6 +627,7 @@ tpope/vim-tbone
tpope/vim-unimpaired
tpope/vim-vinegar
travitch/hasksyn
+tremor-rs/tremor-vim
triglav/vim-visual-increment
troydm/zoomwintab.vim
twerth/ir_black
@@ -703,6 +708,7 @@ whonore/Coqtail
will133/vim-dirdiff
wincent/command-t
wincent/ferret
+windwp/nvim-autopairs
wlangstroth/vim-racket
wsdjeg/vim-fetch
xavierd/clang_complete
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index e7bb08865a..e932ab552f 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
@@ -189,6 +189,22 @@ let
};
};
+ dracula-theme.theme-dracula = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "theme-dracula";
+ publisher = "dracula-theme";
+ version = "2.22.3";
+ sha256 = "0wni9sriin54ci8rly2s68lkfx8rj1cys6mgcizvps9sam6377w6";
+ };
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/dracula-theme.theme-dracula/changelog";
+ description = "Dark theme for many editors, shells, and more";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=dracula-theme.theme-dracula";
+ homepage = "https://draculatheme.com/";
+ license = licenses.mit;
+ };
+ };
+
eamodio.gitlens = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "gitlens";
@@ -349,8 +365,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.196";
- sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz";
+ version = "0.0.201";
+ sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8";
};
meta = with lib; {
license = licenses.mit;
@@ -508,6 +524,8 @@ let
};
};
+ ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { };
+
ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-kubernetes-tools";
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
new file mode 100644
index 0000000000..a7b0e17ecb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
@@ -0,0 +1,143 @@
+{ lib
+, fetchurl
+, vscode-utils
+, unzip
+, patchelf
+, makeWrapper
+, icu
+, stdenv
+, openssl
+, mono6
+}:
+
+let
+ # Get as close as possible as the `package.json` required version.
+ # This is what drives omnisharp.
+ mono = mono6;
+
+ rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json);
+
+ rtDepsBinSrcs = builtins.mapAttrs (k: v:
+ let
+ # E.g: "OmniSharp-x86_64-linux"
+ kSplit = builtins.split "(-)" k;
+ name = builtins.elemAt kSplit 0;
+ arch = builtins.elemAt kSplit 2;
+ platform = builtins.elemAt kSplit 4;
+ in
+ {
+ inherit name arch platform;
+ installPath = v.installPath;
+ binaries = v.binaries;
+ bin-src = fetchurl {
+ urls = v.urls;
+ inherit (v) sha256;
+ };
+ }
+ )
+ rtDepsSrcsFromJson;
+
+ arch = "x86_64";
+ platform = "linux";
+
+ rtDepBinSrcByName = bSrcName:
+ rtDepsBinSrcs."${bSrcName}-${arch}-${platform}";
+
+ omnisharp = rtDepBinSrcByName "OmniSharp";
+ vsdbg = rtDepBinSrcByName "Debugger";
+ razor = rtDepBinSrcByName "Razor";
+in
+
+vscode-utils.buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "csharp";
+ publisher = "ms-dotnettools";
+ version = "1.23.2";
+ sha256 = "0ydaiy8jfd1bj50bqiaz5wbl7r6qwmbz9b29bydimq0rdjgapaar";
+ };
+
+ nativeBuildInputs = [
+ unzip
+ patchelf
+ makeWrapper
+ ];
+
+ postPatch = ''
+ declare ext_unique_id
+ # See below as to why we cannot take the whole basename.
+ ext_unique_id="$(basename "$out" | head -c 32)"
+
+ # Fix 'Unable to connect to debuggerEventsPipeName .. exceeds the maximum length 107.' when
+ # attempting to launch a specific test in debug mode. The extension attemps to open
+ # a pipe in extension dir which would fail anyway. We change to target file path
+ # to a path in tmp dir with a short name based on the unique part of the nix store path.
+ # This is however a brittle patch as we're working on minified code.
+ # Hence the attempt to only hold on stable names.
+ # However, this really would better be fixed upstream.
+ sed -i \
+ -E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \
+ "$PWD/dist/extension.js"
+
+ unzip_to() {
+ declare src_zip="''${1?}"
+ declare target_dir="''${2?}"
+ mkdir -p "$target_dir"
+ if unzip "$src_zip" -d "$target_dir"; then
+ true
+ elif [[ "1" -eq "$?" ]]; then
+ 1>&2 echo "WARNING: unzip('$?' -> skipped files)."
+ else
+ 1>&2 echo "ERROR: unzip('$?')."
+ fi
+ }
+
+ patchelf_add_icu_as_needed() {
+ declare elf="''${1?}"
+ declare icu_major_v="${
+ with builtins; head (splitVersion (parseDrvName icu.name).version)}"
+
+ for icu_lib in icui18n icuuc icudata; do
+ patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf"
+ done
+ }
+
+ patchelf_common() {
+ declare elf="''${1?}"
+
+ patchelf_add_icu_as_needed "$elf"
+ patchelf --add-needed "libssl.so" "$elf"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc openssl.out icu.out ]}:\$ORIGIN" \
+ "$elf"
+ }
+
+ declare omnisharp_dir="$PWD/${omnisharp.installPath}"
+ unzip_to "${omnisharp.bin-src}" "$omnisharp_dir"
+ rm "$omnisharp_dir/bin/mono"
+ ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono"
+ chmod a+x "$omnisharp_dir/run"
+ touch "$omnisharp_dir/install.Lock"
+
+ declare vsdbg_dir="$PWD/${vsdbg.installPath}"
+ unzip_to "${vsdbg.bin-src}" "$vsdbg_dir"
+ chmod a+x "$vsdbg_dir/vsdbg-ui"
+ chmod a+x "$vsdbg_dir/vsdbg"
+ touch "$vsdbg_dir/install.complete"
+ touch "$vsdbg_dir/install.Lock"
+ patchelf_common "$vsdbg_dir/vsdbg"
+ patchelf_common "$vsdbg_dir/vsdbg-ui"
+
+ declare razor_dir="$PWD/${razor.installPath}"
+ unzip_to "${razor.bin-src}" "$razor_dir"
+ chmod a+x "$razor_dir/rzls"
+ touch "$razor_dir/install.Lock"
+ patchelf_common "$razor_dir/rzls"
+ '';
+
+ meta = with lib; {
+ description = "C# for Visual Studio Code (powered by OmniSharp)";
+ license = licenses.mit;
+ maintainers = [ maintainers.jraygauthier ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json
new file mode 100644
index 0000000000..91ee056efc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json
@@ -0,0 +1,37 @@
+{
+ "OmniSharp-x86_64-linux": {
+ "installPath": ".omnisharp/1.37.1",
+ "binaries": [
+ "./mono.linux-x86_64",
+ "./run"
+ ],
+ "urls": [
+ "https://download.visualstudio.microsoft.com/download/pr/46933d64-075c-4f9f-b205-da4a839e2e3c/4bba2c3f40106056b53721c164ff86fa/omnisharp-linux-x64-1.37.1.zip",
+ "https://roslynomnisharp.blob.core.windows.net/releases/1.37.1/omnisharp-linux-x64-1.37.1.zip"
+ ],
+ "sha256": "0yzxkbq0fyq2bv0s7qmycxl0w54lla0vykg1a5lpv9j38k062vvz"
+ },
+ "Debugger-x86_64-linux": {
+ "installPath": ".debugger",
+ "binaries": [
+ "./vsdbg-ui",
+ "./vsdbg"
+ ],
+ "urls": [
+ "https://download.visualstudio.microsoft.com/download/pr/292d2e01-fb93-455f-a6b3-76cddad4f1ef/2e9b8bc5431d8f6c56025e76eaabbdff/coreclr-debug-linux-x64.zip",
+ "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-22-2/coreclr-debug-linux-x64.zip"
+ ],
+ "sha256": "1lhyjq6g6lc1b4n4z57g0ssr5msqgsmrl8yli8j9ah5s3jq1lrda"
+ },
+ "Razor-x86_64-linux": {
+ "installPath": ".razor",
+ "binaries": [
+ "./rzls"
+ ],
+ "urls": [
+ "https://download.visualstudio.microsoft.com/download/pr/757f5246-2b09-43fe-9a8d-840cfd15092b/2b6d8eee0470acf725c1c7a09f8b6475/razorlanguageserver-linux-x64-6.0.0-alpha.1.20418.9.zip",
+ "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-6.0.0-alpha.1.20418.9.zip"
+ ],
+ "sha256": "1hksxq867anb9h040497phszq64f6krg4a46w0xqrm6crj8znqr5"
+ }
+}
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs
new file mode 100755
index 0000000000..ecd7efba05
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs
@@ -0,0 +1,25 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip
+set -euf -o pipefail
+
+declare scriptDir
+scriptDir=$(cd "$(dirname "$0")"; pwd)
+1>&2 echo "scriptDir='$scriptDir'"
+
+. "$scriptDir/update-bin-srcs-lib.sh"
+
+declare extPublisher="ms-dotnettools"
+declare extName="csharp"
+declare defaultExtVersion="1.23.2"
+declare extVersion="${1:-$defaultExtVersion}"
+
+formatExtRuntimeDeps \
+ "$extPublisher" "$extName" "$extVersion" \
+ | computeAndAttachExtRtDepsChecksums \
+ | jqStreamToJson \
+ | tee "$scriptDir/rt-deps-bin-srcs.json" \
+ | jq '.'
+
+# TODO: Unfortunatly no simple json to nix implementation available.
+# This would allow us to dump to './rt-deps-bin-srcs.nix' instead.
+# jsonToNix
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh
new file mode 100755
index 0000000000..ad494a3790
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs-lib.sh
@@ -0,0 +1,154 @@
+#!/usr/bin/env bash
+
+prefetchExtensionZip() {
+ declare publisher="${1?}"
+ declare name="${2?}"
+ declare version="${3?}"
+
+ 1>&2 echo
+ 1>&2 echo "------------- Downloading extension ---------------"
+
+ declare extZipStoreName="${publisher}-${name}.zip"
+ declare extUrl="https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";
+ 1>&2 echo "extUrl='$extUrl'"
+ declare nixPrefetchArgs=( --name "$extZipStoreName" --print-path "$extUrl" )
+
+ 1>&2 printf "$ nix-prefetch-url"
+ 1>&2 printf " %q" "${nixPrefetchArgs[@]}"
+ 1>&2 printf " 2> /dev/null\n"
+ declare zipShaWStorePath
+ zipShaWStorePath=$(nix-prefetch-url "${nixPrefetchArgs[@]}" 2> /dev/null)
+
+ 1>&2 echo "zipShaWStorePath='$zipShaWStorePath'"
+ echo "$zipShaWStorePath"
+}
+
+
+prefetchExtensionUnpacked() {
+ declare publisher="${1?}"
+ declare name="${2?}"
+ declare version="${3?}"
+
+ declare zipShaWStorePath
+ zipShaWStorePath="$(prefetchExtensionZip "$publisher" "$name" "$version")"
+
+ declare zipStorePath
+ zipStorePath="$(echo "$zipShaWStorePath" | tail -n1)"
+ 1>&2 echo "zipStorePath='$zipStorePath'"
+
+ function rm_tmpdir() {
+ 1>&2 printf "rm -rf -- %q\n" "$tmpDir"
+ rm -rf -- "$tmpDir"
+ unset tmpDir
+ trap - INT TERM HUP EXIT
+ }
+ function make_trapped_tmpdir() {
+ tmpDir=$(mktemp -d)
+ trap rm_tmpdir INT TERM HUP EXIT
+ }
+
+ 1>&2 echo
+ 1>&2 echo "------------- Unpacking extension ---------------"
+
+ make_trapped_tmpdir
+ declare unzipArgs=( -q -d "$tmpDir" "$zipStorePath" )
+ 1>&2 printf "$ unzip"
+ 1>&2 printf " %q" "${unzipArgs[@]}"
+ 1>&2 printf "\n"
+ unzip "${unzipArgs[@]}"
+
+ declare unpackedStoreName="${publisher}-${name}"
+
+ declare unpackedStorePath
+ unpackedStorePath="$(nix add-to-store -n "$unpackedStoreName" "$tmpDir")"
+ declare unpackedSha256
+ unpackedSha256="$(nix hash-path --base32 --type sha256 "$unpackedStorePath")"
+ 1>&2 echo "unpackedStorePath='$unpackedStorePath'"
+ 1>&2 echo "unpackedSha256='$unpackedSha256'"
+
+ rm_tmpdir
+
+ echo "$unpackedSha256"
+ echo "$unpackedStorePath"
+}
+
+
+prefetchExtensionJson() {
+ declare publisher="${1?}"
+ declare name="${2?}"
+ declare version="${3?}"
+
+ declare unpackedShaWStorePath
+ unpackedShaWStorePath="$(prefetchExtensionUnpacked "$publisher" "$name" "$version")"
+
+ declare unpackedStorePath
+ unpackedStorePath="$(echo "$unpackedShaWStorePath" | tail -n1)"
+ 1>&2 echo "unpackedStorePath='$unpackedStorePath'"
+
+ declare jsonShaWStorePath
+ jsonShaWStorePath=$(nix-prefetch-url --print-path "file://${unpackedStorePath}/extension/package.json" 2> /dev/null)
+
+ 1>&2 echo "jsonShaWStorePath='$jsonShaWStorePath'"
+ echo "$jsonShaWStorePath"
+}
+
+
+formatExtRuntimeDeps() {
+ declare publisher="${1?}"
+ declare name="${2?}"
+ declare version="${3?}"
+
+ declare jsonShaWStorePath
+ jsonShaWStorePath="$(prefetchExtensionJson "$publisher" "$name" "$version")"
+
+ declare jsonStorePath
+ jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)"
+ 1>&2 echo "jsonStorePath='$jsonStorePath'"
+
+ declare jqQuery
+ jqQuery=$(cat <<'EOF'
+.runtimeDependencies \
+| map(select(.platforms[] | in({"linux": null}))) \
+| map(select(.architectures[] | in({"x86_64": null}))) \
+| .[] | {(.id + "-" + (.architectures[0]) + "-" + (.platforms[0])): \
+{installPath, binaries, urls: [.url, .fallbackUrl]}}
+EOF
+)
+
+ 1>&2 printf "$ cat %q | jq '%s'\n" "$jsonStorePath" "$jqQuery"
+ cat "$jsonStorePath" | jq "$jqQuery"
+}
+
+
+computeExtRtDepChecksum() {
+ declare rtDepJsonObject="${1?}"
+ declare url
+ url="$(echo "$rtDepJsonObject" | jq -j '.[].urls[0]')"
+ declare sha256
+ 1>&2 printf "$ nix-prefetch-url '%s'\n" "$url"
+ sha256="$(nix-prefetch-url "$url")"
+ 1>&2 echo "$sha256"
+ echo "$sha256"
+}
+
+
+computeAndAttachExtRtDepsChecksums() {
+ while read -r rtDepJsonObject; do
+ declare sha256
+ sha256="$(computeExtRtDepChecksum "$rtDepJsonObject")"
+ echo "$rtDepJsonObject" | jq --arg sha256 "$sha256" '.[].sha256 = $sha256'
+ done < <(cat - | jq -c '.')
+}
+
+
+jqStreamToJson() {
+ cat - | jq --slurp '. | add'
+}
+
+
+jsonToNix() {
+ # TODO: Replacing this non functional stuff with a proper json to nix
+ # implementation would allow us to produce a 'rt-deps-bin-srcs.nix' file instead.
+ false
+ cat - | sed -E -e 's/": /" = /g' -e 's/,$/;/g' -e 's/ }$/ };/g' -e 's/ ]$/ ];/g'
+}
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
index c49f798899..e8e8ead9db 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix
@@ -1,9 +1,10 @@
-# Baseed on previous attempts:
+# Based on previous attempts:
# -
# -
-{ lib, gccStdenv, vscode-utils, autoPatchelfHook, bash, file, makeWrapper, dotnet-sdk_3
-, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib
-, desktop-file-utils, xprop
+{ lib, gccStdenv, vscode-utils
+, jq, autoPatchelfHook, bash, makeWrapper
+, dotnet-sdk_3, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib
+, desktop-file-utils, xprop, xsel
}:
with lib;
@@ -37,11 +38,17 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
mktplcRef = {
name = "vsliveshare";
publisher = "ms-vsliveshare";
- version = "1.0.2902";
- sha256 = "0fx2vi0wxamcwqcgcx7wpg8hi7f1c2pibrmd2qy2whilpsv3gzmb";
+ version = "1.0.3912";
+ sha256 = "1k5yy04q85jjr7hzrv0s7x1m2251kglb038wcvvbs568vpscghi8";
};
-}).overrideAttrs(attrs: {
- buildInputs = attrs.buildInputs ++ libs ++ [ autoPatchelfHook bash file makeWrapper ];
+}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
+ nativeBuildInputs = nativeBuildInputs ++ [
+ bash
+ jq
+ autoPatchelfHook
+ makeWrapper
+ ];
+ buildInputs = buildInputs ++ libs;
# Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.
# Rather than patching the calls to functions, we modify the functions to return what we want,
@@ -57,32 +64,31 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
# Fix extension attempting to write to 'modifiedInternalSettings.json'.
# Move this write to the tmp directory indexed by the nix store basename.
- sed -i \
- -E -e $'s/path\.resolve\(constants_1\.EXTENSION_ROOT_PATH, \'\.\/modifiedInternalSettings\.json\'\)/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-modifiedInternalSettings.json"\)/g' \
- out/prod/extension-prod.js
+ substituteInPlace out/prod/extension-prod.js \
+ --replace "path.resolve(constants_1.EXTENSION_ROOT_PATH, './modifiedInternalSettings.json')" \
+ "path.join(os.tmpdir(), '$ext_unique_id-modifiedInternalSettings.json')"
# Fix extension attempting to write to 'vsls-agent.lock'.
# Move this write to the tmp directory indexed by the nix store basename.
- sed -i \
- -E -e $'s/(Agent_1.getAgentPath\(\) \+ \'.lock\')/path.join\(os.tmpdir(), "'$ext_unique_id'" + "-vsls-agent.lock"\)/g' \
- out/prod/extension-prod.js
+ substituteInPlace out/prod/extension-prod.js \
+ --replace "path + '.lock'" \
+ "__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')"
- # TODO: Under 'node_modules/@vsliveshare/vscode-launcher-linux' need to hardcode path to 'desktop-file-install'
- # 'update-desktop-database' and 'xprop'. Might want to wrap the script instead.
+ # Hardcode executable paths
+ echo '#!/bin/sh' >node_modules/@vsliveshare/vscode-launcher-linux/check-reqs.sh
+ substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/install.sh \
+ --replace desktop-file-install ${desktop-file-utils}/bin/desktop-file-install
+ substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/uninstall.sh \
+ --replace update-desktop-database ${desktop-file-utils}/bin/update-desktop-database
+ substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/vsls-launcher \
+ --replace /bin/bash ${bash}/bin/bash
+ substituteInPlace out/prod/extension-prod.js \
+ --replace xprop ${xprop}/bin/xprop \
+ --replace "'xsel'" "'${xsel}/bin/xsel'"
'';
- # Support for the `postInstall` hook was added only in nixos-20.03,
- # so for backwards compatibility reasons lets not use it yet.
- installPhase = attrs.installPhase + ''
- # Support both the new and old directory structure of vscode extensions.
- if [[ -d $out/ms-vsliveshare.vsliveshare ]]; then
- cd $out/ms-vsliveshare.vsliveshare
- elif [[ -d $out/share/vscode/extensions/ms-vsliveshare.vsliveshare ]]; then
- cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare
- else
- echo "Could not find extension directory 'ms-vsliveshare.vsliveshare'." >&2
- exit 1
- fi
+ postInstall = ''
+ cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare
bash -s <
Date: Fri, 19 Dec 2014 14:46:17 +0100
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
-Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided
-by packages installed into the default profile via
-`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for
-persistent, mutable units (used for Dysnomia).
+Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
+units provided by packages installed into the default profile via
+`nix-env -iA nixos.$package`.
Also, remove /usr and /lib as these don't exist on NixOS.
---
- src/basic/path-lookup.c | 20 +++++---------------
+ src/basic/path-lookup.c | 17 ++---------------
src/core/systemd.pc.in | 5 +++--
- 2 files changed, 8 insertions(+), 17 deletions(-)
+ 2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
-index 96b82170d0..b9fbed5c61 100644
+index 96b82170d0..bf66bd6b77 100644
--- a/src/basic/path-lookup.c
+++ b/src/basic/path-lookup.c
-@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
+@@ -94,11 +94,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
}
static const char* const user_data_unit_paths[] = {
@@ -30,18 +29,10 @@ index 96b82170d0..b9fbed5c61 100644
NULL
};
- static const char* const user_config_unit_paths[] = {
- USER_CONFIG_UNIT_DIR,
- "/etc/systemd/user",
-+ "/etc/systemd-mutable/user",
- NULL
- };
-
-@@ -616,15 +613,14 @@ int lookup_paths_init(
+@@ -616,15 +612,13 @@ int lookup_paths_init(
persistent_config,
SYSTEM_CONFIG_UNIT_DIR,
"/etc/systemd/system",
-+ "/etc/systemd-mutable/system",
+ "/nix/var/nix/profiles/default/lib/systemd/system",
STRV_IFNOTNULL(persistent_attached),
runtime_config,
@@ -55,11 +46,10 @@ index 96b82170d0..b9fbed5c61 100644
STRV_IFNOTNULL(generator_late));
break;
-@@ -640,14 +636,12 @@ int lookup_paths_init(
+@@ -640,14 +634,11 @@ int lookup_paths_init(
persistent_config,
USER_CONFIG_UNIT_DIR,
"/etc/systemd/user",
-+ "/etc/systemd-mutable/user",
+ "/nix/var/nix/profiles/default/lib/systemd/user",
runtime_config,
"/run/systemd/user",
@@ -72,7 +62,7 @@ index 96b82170d0..b9fbed5c61 100644
STRV_IFNOTNULL(generator_late));
break;
-@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+@@ -797,7 +788,6 @@ char **generator_binary_paths(UnitFileScope scope) {
case UNIT_FILE_SYSTEM:
add = strv_new("/run/systemd/system-generators",
"/etc/systemd/system-generators",
@@ -80,7 +70,7 @@ index 96b82170d0..b9fbed5c61 100644
SYSTEM_GENERATOR_DIR);
break;
-@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) {
+@@ -805,7 +795,6 @@ char **generator_binary_paths(UnitFileScope scope) {
case UNIT_FILE_USER:
add = strv_new("/run/systemd/user-generators",
"/etc/systemd/user-generators",
@@ -88,7 +78,7 @@ index 96b82170d0..b9fbed5c61 100644
USER_GENERATOR_DIR);
break;
-@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) {
+@@ -844,12 +833,10 @@ char **env_generator_binary_paths(bool is_system) {
if (is_system)
add = strv_new("/run/systemd/system-environment-generators",
"/etc/systemd/system-environment-generators",
@@ -102,7 +92,7 @@ index 96b82170d0..b9fbed5c61 100644
if (!add)
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index f2c045511d..ccb382e421 100644
+index f2c045511d..d38a3a0302 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
@@ -110,11 +100,11 @@ index f2c045511d..ccb382e421 100644
systemduserconfdir=${systemd_user_conf_dir}
-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
-+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
systemdsystemunitpath=${systemd_system_unit_path}
-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
-+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
+
systemduserunitpath=${systemd_user_unit_path}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index 421fc5986a..7e3c6d1fe5 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -1,3 +1,5 @@
+# NOTE: Make sure to (re-)format this file on changes with `nixpkgs-fmt`!
+
{ stdenv
, lib
, fetchFromGitHub
@@ -111,7 +113,7 @@ assert withCryptsetup ->
let
wantCurl = withRemote || withImportd;
- version = "247.2";
+ version = "247.3";
in
stdenv.mkDerivation {
inherit version pname;
@@ -122,7 +124,7 @@ stdenv.mkDerivation {
owner = "systemd";
repo = "systemd-stable";
rev = "v${version}";
- sha256 = "091pwrvxz3gcf80shlp28d6l4gvjzc6pb61v4mwxmk9d71qaq7ry";
+ sha256 = "0zn0b74iwz3vxabqsk4yydwpgky3c5z4dl83wxbs1qi5d2dnbqa7";
};
# If these need to be regenerated, `git am path/to/00*.patch` them into a
@@ -160,83 +162,87 @@ stdenv.mkDerivation {
--replace \
"find_program('objcopy'" \
"find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
- '' + (let
+ '' + (
+ let
+ # The folllowing dlopen patches ensure that all the features that are
+ # implemented via dlopen(3) are available (or explicitly deactivated) by
+ # pointing dlopen to the absolute store path instead of relying on the
+ # linkers runtime lookup code.
+ #
+ # All of the dlopen calls have to be handled. When new ones are introduced
+ # by upstream (or one of our patches) they must be explicitly declared,
+ # otherwise the build will fail.
+ #
+ # As of systemd version 247 we've seen a few errors like `libpcre2.… not
+ # found` when using e.g. --grep with journalctl. Those errors should
+ # become less unexpected now.
+ #
+ # There are generally two classes of dlopen(3) calls. Those that we want to
+ # support and those that should be deactivated / unsupported. This change
+ # enforces that we handle all dlopen calls explicitly. Meaning: There is
+ # not a single dlopen call in the source code tree that we did not
+ # explicitly handle.
+ #
+ # In order to do this we introduced a list of attributes that maps from
+ # shared object name to the package that contains them. The package can be
+ # null meaning the reference should be nuked and the shared object will
+ # never be loadable during runtime (because it points at an invalid store
+ # path location).
+ #
+ # To get a list of dynamically loaded libraries issue something like
+ # `grep -ri 'dlopen("lib' $src` and update the below list.
+ dlopenLibs = [
+ # We did never provide support for libxkbcommon & qrencode
+ { name = "libxkbcommon.so.0"; pkg = null; }
+ { name = "libqrencode.so.4"; pkg = null; }
- # The folllowing dlopen patches ensure that all the features that are
- # implemented via dlopen(3) are available (or explicitly deactivated) by
- # pointing dlopen to the absolute store path instead of relying on the
- # linkers runtime lookup code.
- #
- # All of the dlopen calls have to be handled. When new ones are introduced
- # by upstream (or one of our patches) they must be explicitly declared,
- # otherwise the build will fail.
- #
- # As of systemd version 247 we've seen a few errors like `libpcre2.… not
- # found` when using e.g. --grep with journalctl. Those errors should
- # become less unexpected now.
- #
- # There are generally two classes of dlopen(3) calls. Those that we want to
- # support and those that should be deactivated / unsupported. This change
- # enforces that we handle all dlopen calls explicitly. Meaning: There is
- # not a single dlopen call in the source code tree that we did not
- # explicitly handle.
- #
- # In order to do this we introduced a list of attributes that maps from
- # shared object name to the package that contains them. The package can be
- # null meaning the reference should be nuked and the shared object will
- # never be loadable during runtime (because it points at an invalid store
- # path location).
- #
- # To get a list of dynamically loaded libraries issue something like
- # `grep -ri 'dlopen("lib' $src` and update the below list.
- dlopenLibs = [
- # We did never provide support for libxkbcommon & qrencode
- { name = "libxkbcommon.so.0"; pkg = null; }
- { name = "libqrencode.so.4"; pkg = null; }
+ # We did not provide libpwquality before so it is safe to disable it for
+ # now.
+ { name = "libpwquality.so.1"; pkg = null; }
- # We did not provide libpwquality before so it is safe to disable it for
- # now.
- { name = "libpwquality.so.1"; pkg = null; }
+ # Only include cryptsetup if it is enabled. We might not be able to
+ # provide it during "bootstrap" in e.g. the minimal systemd build as
+ # cryptsetup has udev (aka systemd) in it's dependencies.
+ { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; }
- # Only include cryptsetup if it is enabled. We might not be able to
- # provide it during "bootstrap" in e.g. the minimal systemd build as
- # cryptsetup has udev (aka systemd) in it's dependencies.
- { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; }
+ # We are using libidn2 so we only provide that and ignore the others.
+ # Systemd does this decision during configure time and uses ifdef's to
+ # enable specific branches. We can safely ignore (nuke) the libidn "v1"
+ # libraries.
+ { name = "libidn2.so.0"; pkg = libidn2; }
+ { name = "libidn.so.12"; pkg = null; }
+ { name = "libidn.so.11"; pkg = null; }
- # We are using libidn2 so we only provide that and ignore the others.
- # Systemd does this decision during configure time and uses ifdef's to
- # enable specific branches. We can safely ignore (nuke) the libidn "v1"
- # libraries.
- { name = "libidn2.so.0"; pkg = libidn2; }
- { name = "libidn.so.12"; pkg = null; }
- { name = "libidn.so.11"; pkg = null; }
+ # journalctl --grep requires libpcre so lets provide it
+ { name = "libpcre2-8.so.0"; pkg = pcre2; }
+ ];
- # journalctl --grep requires libpcre so lets provide it
- { name = "libpcre2-8.so.0"; pkg = pcre2; }
- ];
-
- patchDlOpen = dl: let
- library = "${lib.makeLibraryPath [dl.pkg]}/${dl.name}";
- in if dl.pkg == null then ''
- # remove the dependency on the library by replacing it with an invalid path
- for file in $(grep -lr 'dlopen("${dl.name}"' src); do
- echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
- substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
- done
- '' else ''
- # ensure that the library we provide actually exists
- if ! [ -e ${library} ]; then
- echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'
- exit 1
- fi
- # make the path to the dependency explicit
- for file in $(grep -lr 'dlopen("${dl.name}"' src); do
- echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…"
- substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"'
- done
- '';
- in # patch all the dlopen calls to contain absolute paths to the libraries
- lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs)
+ patchDlOpen = dl:
+ let
+ library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}";
+ in
+ if dl.pkg == null then ''
+ # remove the dependency on the library by replacing it with an invalid path
+ for file in $(grep -lr 'dlopen("${dl.name}"' src); do
+ echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
+ substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
+ done
+ '' else ''
+ # ensure that the library we provide actually exists
+ if ! [ -e ${library} ]; then
+ echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'
+ exit 1
+ fi
+ # make the path to the dependency explicit
+ for file in $(grep -lr 'dlopen("${dl.name}"' src); do
+ echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…"
+ substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"'
+ done
+ '';
+ in
+ # patch all the dlopen calls to contain absolute paths to the libraries
+ lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs
+ )
# finally ensure that there are no left-over dlopen calls that we didn't handle
+ ''
if grep -qr 'dlopen("[^/]' src; then
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
index 4d3446d5a5..f08ac284f2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "targetcli";
- version = "2.1.53";
+ version = "2.1.54";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "${pname}-fb";
rev = "v${version}";
- sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750";
+ sha256 = "1kbbvx0lba96ynr5iwws9jpi319m4rzph4bmcj7yfb37k8mi161v";
};
propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix
index 5e0125da00..73b2f58951 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
description = "A kernel module to create V4L2 loopback devices";
homepage = "https://github.com/umlaeute/v4l2loopback";
license = licenses.gpl2;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = [ ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
index ee8b26c384..d9767cbdd9 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch";
sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4";
})
+ # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/)
+ (fetchurl {
+ name = "CVE-2021-27803.patch";
+ url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch";
+ sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z";
+ })
];
# TODO: Patch epoll so that the dbus actually responds
@@ -118,7 +124,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://hostap.epitest.fi/wpa_supplicant/";
+ homepage = "https://w1.fi/wpa_supplicant/";
description = "A tool for connecting to WPA and WPA2-protected wireless networks";
license = licenses.bsd3;
maintainers = with maintainers; [ marcweber ];
diff --git a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
index 826e952376..4bd50653d5 100644
--- a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
inherit sha256;
};
- buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ps ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre bash gnugrep gnused coreutils ps ];
installPhase = ''
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix
index e1cf490993..4a5846d011 100644
--- a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j";
};
- buildInputs = [ jre makeWrapper bash ];
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre bash ];
installPhase = ''
cp -R $confluentCli confluent-cli
diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix
index 9dc723417d..cc00f4cf0c 100644
--- a/third_party/nixpkgs/pkgs/servers/consul/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.9.2";
+ version = "1.9.4";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "sha256-e4pE30MvJ/9wrYA1oolBF+5C1IHTm+4xhDb88Il9E7o=";
+ sha256 = "1ck55i8snpm583p21y1hac0w76wiwyjpgfxkzscd4whp2jnzhhif";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- vendorSha256 = "sha256-bTwm6F1Y0LFTfUJ5zIsmGcNztwC2aTJIDd+bDPqnzcA=";
+ vendorSha256 = "0y744zpj49zvn5vqqb9wmfs1fs0lir71h2kcmhidmn9j132vg1bq";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
index cdfc78d622..188c3f77cb 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "coredns";
- version = "1.8.1";
+ version = "1.8.3";
src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
- sha256 = "sha256-F4YiLjWrAjCNorR5dHQ2nzEBVWvJVuDDmAbUXruaPYQ=";
+ sha256 = "sha256-aE+kw854/wjFJqiRC/1gLzRpaVa6EPJPJaKqXtFM+Sw=";
};
- vendorSha256 = "sha256-QvT1vnvF+gvABh2SzR6vUsj3KCD8ABqZwXQUm3NldM0=";
+ vendorSha256 = "sha256-1+WgBsknyPcZhvQLffhlWBH1o0pYTFoOG5BviUJYxyA=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
index 8954c9fcd8..a945198af6 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix
@@ -17,11 +17,11 @@ lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
- version = "5.2.1";
+ version = "5.3.0";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
- sha256 = "aa37b744c400f437acba7a54aebcbdbe722ece743d342cbc39f2dd8087f05826";
+ sha256 = "fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e";
};
outputs = [ "out" "dev" ];
@@ -43,7 +43,8 @@ unwrapped = stdenv.mkDerivation rec {
# some tests have issues with network sandboxing, apparently
+ optionalString doInstallCheck ''
echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
- sed '/^[[:blank:]]*test_dstaddr,$/d' -i tests/config/doh2.test.lua
+ sed '/^[[:blank:]]*test_dstaddr,$/d' -i \
+ tests/config/doh2.test.lua modules/http/http_doh.test.lua
'';
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
index 972b92e7de..fff18486ab 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix
@@ -2,9 +2,6 @@
, openssl, systemd, lua, luajit, protobuf
, enableProtoBuf ? false
}:
-assert enableProtoBuf -> protobuf != null;
-
-with lib;
stdenv.mkDerivation rec {
pname = "pdns-recursor";
@@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost openssl systemd
lua luajit
- ] ++ optional enableProtoBuf protobuf;
+ ] ++ lib.optional enableProtoBuf protobuf;
configureFlags = [
"--enable-reproducible"
@@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
nixos = nixosTests.pdns-recursor;
};
- meta = {
+ meta = with lib; {
description = "A recursive DNS server";
homepage = "https://www.powerdns.com/";
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix
index dc9fc0898d..f533b4537a 100644
--- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix
+++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix
@@ -2,10 +2,10 @@
buildGoModule rec {
pname = "etcd";
- version = "3.4.14";
+ version = "3.4.15";
deleteVendor = true;
- vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc";
+ vendorSha256 = "sha256-1q5tYNDmlgHdPgL2Pn5BS8z3SwW2E3OaZkKPAtnhJZY=";
doCheck = false;
@@ -13,7 +13,7 @@ buildGoModule rec {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
- sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f";
+ sha256 = "sha256-jJC2+zv0io0ZulLVaPMrDD7qkOxGfGtFyZvJ2hTmU24=";
};
buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/exhibitor/default.nix b/third_party/nixpkgs/pkgs/servers/exhibitor/default.nix
index 0b92aca74c..5636f51a16 100644
--- a/third_party/nixpkgs/pkgs/servers/exhibitor/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/exhibitor/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
# (given the state of Maven support in Nix). We're not actually building any java
# source here.
pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven";
- nativeBuildInputs = [ maven ];
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ maven makeWrapper ];
buildPhase = ''
cd ${pomFileDir}
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix b/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
index 6844db1b81..d246159402 100644
--- a/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
- rev = "b4fa30e57ec8976fb1c10bd36737bc784351b93e";
- sha256 = "0gfs9lm4ih3h3fmgqylw05ii1h0d6mpjfxadnw3wymnjsspfb0m4";
+ rev = "acd36ab6ccee67a652b6d84aedc4c2828abac5c6";
+ sha256 = "0mh4gh6qij70clp64m4jw6q7dafr7gwjqpvpaf9vc6h10g1rhzrx";
};
relAssetsPath = "share/${pname}";
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/niklasf/fishnet-assets";
license = licenses.gpl3Only;
maintainers = with maintainers; [ tu-maurice ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
index 508068bd2d..8060943fa5 100644
--- a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "fishnet";
- version = "2.2.4";
+ version = "2.2.5";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
rev = "v${version}";
- sha256 = "19dh69b6mqx16195w9d20fah4jl8hhbxm84xq4zwsgl4khmw7zqz";
+ sha256 = "0gif9wagm9bzq7j3biasqvzp9lfvmxqr5wagqqybmhbn8ipj20a8";
};
- cargoSha256 = "0zl2fnmqncyjd52wkn6dddx9lm9ywpw7swy895yq299z2bbbkv3h";
+ cargoSha256 = "0hqyh0nzfrm7m34kqixrlbc7w8d0k7v6psw8jg6zpwpfcmhqq15j";
preBuild = ''
rmdir ./assets
@@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/niklasf/fishnet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ tu-maurice ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
index 10d517179c..78addfc4aa 100644
--- a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
@@ -69,6 +69,7 @@ in with builtins; {
patches = [
./patches/ldflags-6.0.patch
+ ./patches/include-fixes-6.0.patch
];
};
@@ -76,13 +77,14 @@ in with builtins; {
# ------------------------------------------------------
foundationdb61 = cmakeBuild {
- version = "6.1.12";
+ version = "6.1.13";
branch = "release-6.1";
- sha256 = "1yh5hx6rim41m0dwhnb2pcwz67wlnk0zwvyw845d36b29gwy58ab";
+ sha256 = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00";
patches = [
./patches/clang-libcxx.patch
./patches/suppress-clang-warnings.patch
+ ./patches/stdexcept-6.1.patch
glibc230-fix
];
};
diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch b/third_party/nixpkgs/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch
new file mode 100644
index 0000000000..93959def44
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch
@@ -0,0 +1,137 @@
+diff --git a/fdbrpc/ContinuousSample.h b/fdbrpc/ContinuousSample.h
+index 54ff1b109..577c228ae 100644
+--- a/fdbrpc/ContinuousSample.h
++++ b/fdbrpc/ContinuousSample.h
+@@ -26,6 +26,7 @@
+ #include "flow/IRandom.h"
+ #include
+ #include
++#include
+
+ template
+ class ContinuousSample {
+diff --git a/fdbrpc/Smoother.h b/fdbrpc/Smoother.h
+index 3ed8e6e98..f3e4504b6 100644
+--- a/fdbrpc/Smoother.h
++++ b/fdbrpc/Smoother.h
+@@ -23,6 +23,7 @@
+ #pragma once
+
+ #include "flow/flow.h"
++#include
+
+ struct Smoother {
+ // Times (t) are expected to be nondecreasing
+@@ -50,7 +51,7 @@ struct Smoother {
+ double elapsed = t - time;
+ if(elapsed) {
+ time = t;
+- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime ));
++ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime ));
+ }
+ }
+
+@@ -83,11 +84,11 @@ struct TimerSmoother {
+ void update(double t) {
+ double elapsed = t - time;
+ time = t;
+- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime ));
++ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime ));
+ }
+
+ double eFoldingTime;
+ double time, total, estimate;
+ };
+
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
+index a924bc905..0dc70e7ac 100644
+--- a/fdbserver/Knobs.cpp
++++ b/fdbserver/Knobs.cpp
+@@ -20,6 +20,7 @@
+
+ #include "Knobs.h"
+ #include "fdbrpc/Locality.h"
++#include
+
+ ServerKnobs const* SERVER_KNOBS = new ServerKnobs();
+
+diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
+index 2d706dddd..5dbe08861 100644
+--- a/flow/Knobs.cpp
++++ b/flow/Knobs.cpp
+@@ -20,6 +20,7 @@
+
+ #include "Knobs.h"
+ #include "flow/flow.h"
++#include
+
+ FlowKnobs const* FLOW_KNOBS = new FlowKnobs();
+
+@@ -128,7 +129,7 @@ FlowKnobs::FlowKnobs(bool randomize, bool isSimulated) {
+ init( MAX_METRICS, 600 );
+ init( MAX_METRIC_SIZE, 2500 );
+ init( MAX_METRIC_LEVEL, 25 );
+- init( METRIC_LEVEL_DIVISOR, log(4) );
++ init( METRIC_LEVEL_DIVISOR, std::log(4) );
+ init( METRIC_LIMIT_START_QUEUE_SIZE, 10 ); // The queue size at which to start restricting logging by disabling levels
+ init( METRIC_LIMIT_RESPONSE_FACTOR, 10 ); // The additional queue size at which to disable logging of another level (higher == less restrictive)
+
+diff --git a/flow/Platform.cpp b/flow/Platform.cpp
+index a754c8747..4d47fad32 100644
+--- a/flow/Platform.cpp
++++ b/flow/Platform.cpp
+@@ -98,6 +98,8 @@
+ #include
+ /* Needed for crash handler */
+ #include
++/* Needed for major() and minor() with recent glibc */
++#include
+ #endif
+
+ #ifdef __APPLE__
+diff --git a/flow/Profiler.actor.cpp b/flow/Profiler.actor.cpp
+index 4603dcb77..78eda7278 100644
+--- a/flow/Profiler.actor.cpp
++++ b/flow/Profiler.actor.cpp
+@@ -35,8 +35,6 @@
+
+ extern volatile int profilingEnabled;
+
+-static uint64_t gettid() { return syscall(__NR_gettid); }
+-
+ struct SignalClosure {
+ void (* func)(int, siginfo_t*, void*, void*);
+ void *userdata;
+diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h
+index 306352c39..fc63e12f9 100755
+--- a/flow/TDMetric.actor.h
++++ b/flow/TDMetric.actor.h
+@@ -35,6 +35,7 @@
+ #include "genericactors.actor.h"
+ #include "CompressedInt.h"
+ #include
++#include
+ #include
+
+ struct MetricNameRef {
+@@ -799,7 +800,7 @@ struct EventMetric : E, ReferenceCounted>, MetricUtilMAX_METRIC_LEVEL-1;
+ else
+- l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR));
++ l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(std::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR));
+
+ if(!canLog(l))
+ return 0;
+@@ -1274,7 +1275,7 @@ public:
+ l = std::min(
+ FLOW_KNOBS->MAX_METRIC_LEVEL-1,
+ (int64_t)(
+- log((toggleTime - tv.time) / x) /
++ std::log((toggleTime - tv.time) / x) /
+ FLOW_KNOBS->METRIC_LEVEL_DIVISOR
+ )
+ );
diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch b/third_party/nixpkgs/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch
new file mode 100644
index 0000000000..9ebe0c6c0f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch
@@ -0,0 +1,24 @@
+diff --git a/FDBLibTLS/FDBLibTLSPolicy.cpp b/FDBLibTLS/FDBLibTLSPolicy.cpp
+index 728ff871d..46e1dd289 100644
+--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
++++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
+@@ -31,6 +31,7 @@
+ #include
+ #include
+ #include